Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename RoactSpring to ReactSpring #232

Merged
merged 4 commits into from
Jan 2, 2024
Merged

Rename RoactSpring to ReactSpring #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
259c0ee
Rename RoactSpring -> ReactSpring
vocksel Dec 2, 2023
2040317
Reorder dependencies
vocksel Dec 2, 2023
a4bbe52
Roact is also a dev dependency
vocksel Dec 2, 2023
60e138a
Merge remote-tracking branch 'origin/main' into react-spring-rename
vocksel Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Explorer/Component/Directory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local flipbook = script:FindFirstAncestor("flipbook")

local React = require(flipbook.Packages.React)
local RoactSpring = require(flipbook.Packages.RoactSpring)
local ReactSpring = require(flipbook.Packages.ReactSpring)
local assets = require(flipbook.assets)
local constants = require(flipbook.constants)
local useTheme = require(flipbook.Common.useTheme)
Expand All @@ -21,7 +21,7 @@ type Props = {
local function Directory(props: Props)
local theme = useTheme()
local hover, setHover = React.useState(false)
local styles = (RoactSpring.useSpring :: any)({
local styles = (ReactSpring.useSpring :: any)({
alpha = if hover then 0 else 1,
rotation = if props.expanded then 90 else 0,
config = constants.SPRING_CONFIG,
Expand Down
4 changes: 2 additions & 2 deletions src/Explorer/Component/Story.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local flipbook = script:FindFirstAncestor("flipbook")

local React = require(flipbook.Packages.React)
local RoactSpring = require(flipbook.Packages.RoactSpring)
local ReactSpring = require(flipbook.Packages.ReactSpring)
local assets = require(flipbook.assets)
local constants = require(flipbook.constants)
local useTheme = require(flipbook.Common.useTheme)
Expand All @@ -20,7 +20,7 @@ type Props = {
local function Story(props: Props)
local theme = useTheme()
local hover, setHover = React.useState(false)
local styles = (RoactSpring.useSpring :: any)({
local styles = (ReactSpring.useSpring :: any)({
alpha = if not props.active then if hover then 0 else 1 else 0,
color = if not props.active then theme.divider else theme.selection,
textColor = if not props.active then theme.textFaded else theme.background,
Expand Down
4 changes: 2 additions & 2 deletions src/Forms/Searchbar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local flipbook = script:FindFirstAncestor("flipbook")

local React = require(flipbook.Packages.React)
local RoactSpring = require(flipbook.Packages.RoactSpring)
local ReactSpring = require(flipbook.Packages.ReactSpring)
local Sift = require(flipbook.Packages.Sift)
local assets = require(flipbook.assets)
local constants = require(flipbook.constants)
Expand Down Expand Up @@ -31,7 +31,7 @@ local function Searchbar(props: Props)
local isFocused, setIsFocused = React.useState(false)
local isExpanded = isFocused or search ~= ""

local styles = (RoactSpring.useSpring :: any)({
local styles = (ReactSpring.useSpring :: any)({
alpha = if isExpanded then 1 else 0,
config = constants.SPRING_CONFIG,
})
Expand Down
4 changes: 2 additions & 2 deletions src/Navigation/Item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local flipbook = script:FindFirstAncestor("flipbook")

local React = require(flipbook.Packages.React)
local RoactSpring = require(flipbook.Packages.RoactSpring)
local ReactSpring = require(flipbook.Packages.ReactSpring)
local constants = require(flipbook.constants)
local useTheme = require(flipbook.Common.useTheme)

Expand All @@ -19,7 +19,7 @@ local function Item(props: Props)
local theme = useTheme()

local hover, setHover = React.useState(false)
local styles = (RoactSpring.useSpring :: any)({
local styles = (ReactSpring.useSpring :: any)({
alpha = if not props.active and hover then 0 else 1,
config = constants.SPRING_CONFIG,
})
Expand Down
8 changes: 5 additions & 3 deletions wally.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ realm = "shared"
exclude = ["*"]

[dependencies]
Roact = "roblox/[email protected]"
ModuleLoader = "flipbook-labs/[email protected]"
React = "jsdotlua/[email protected]"
ReactRoblox = "jsdotlua/[email protected]"
ReactSpring = "chriscerie/[email protected]"
Sift = "csqrl/[email protected]"
t = "osyrisrblx/[email protected]"
ModuleLoader = "flipbook-labs/[email protected]"

# dev dependencies
Roact = "roblox/[email protected]"
TestEZ = "roblox/[email protected]"
RoactSpring = "chriscerie/[email protected]"
Loading