@rbxts/uiblox 0.2.0-alpha.28 → 0.2.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +109 -27
- package/out/hooks/index.d.ts +0 -1
- package/out/hooks/init.luau +0 -3
- package/out/hooks/useBreakpoints.luau +11 -2
- package/out/theme/interfaces/theme/Theme.d.ts +0 -15
- package/out/theme/styles/utilities/componentStyles.luau +3 -45
- package/out/theme/styles/utilities/componentTheme.d.ts +0 -15
- package/out/theme/styles/utilities/index.d.ts +0 -2
- package/out/theme/styles/utilities/init.luau +0 -7
- package/out/theme/styles/utilities/resolveStyle.d.ts +2 -10
- package/out/theme/styles/utilities/resolveStyle.luau +3 -7
- package/out/theme/styles/utilities/styleCache.d.ts +0 -2
- package/out/theme/styles/utilities/styleCache.luau +0 -9
- package/out/ui/packages/accordion/components/Accordion.d.ts +0 -2
- package/out/ui/packages/accordion/components/Accordion.luau +30 -46
- package/out/ui/packages/accordion/components/Accordion.styles.d.ts +0 -1
- package/out/ui/packages/accordion/components/Accordion.styles.luau +4 -16
- package/out/ui/packages/accordion/components/accordionOpen.d.ts +0 -1
- package/out/ui/packages/accordion/components/accordionOpen.luau +0 -4
- package/out/ui/packages/alert/components/Alert.d.ts +0 -2
- package/out/ui/packages/alert/components/Alert.luau +42 -48
- package/out/ui/packages/alert/components/Alert.styles.d.ts +0 -2
- package/out/ui/packages/alert/components/Alert.styles.luau +8 -17
- package/out/ui/packages/appBar/components/AppBar.d.ts +1 -2
- package/out/ui/packages/appBar/components/AppBar.luau +16 -14
- package/out/ui/packages/appBar/components/AppBar.styles.d.ts +0 -2
- package/out/ui/packages/appBar/components/AppBar.styles.luau +2 -6
- package/out/ui/packages/assetField/components/AssetField.luau +16 -12
- package/out/ui/packages/autocomplete/components/Autocomplete.luau +0 -8
- package/out/ui/packages/avatar/components/Avatar.d.ts +0 -2
- package/out/ui/packages/avatar/components/Avatar.luau +26 -27
- package/out/ui/packages/avatar/components/Avatar.styles.d.ts +0 -2
- package/out/ui/packages/avatar/components/Avatar.styles.luau +1 -5
- package/out/ui/packages/badge/components/Badge.d.ts +0 -3
- package/out/ui/packages/badge/components/Badge.luau +24 -32
- package/out/ui/packages/badge/components/Badge.styles.d.ts +1 -5
- package/out/ui/packages/badge/components/Badge.styles.luau +8 -20
- package/out/ui/packages/bottomNavigation/components/BottomNavigation.d.ts +0 -1
- package/out/ui/packages/bottomNavigation/components/BottomNavigation.luau +18 -20
- package/out/ui/packages/bottomNavigation/components/BottomNavigation.styles.d.ts +1 -3
- package/out/ui/packages/bottomNavigation/components/BottomNavigation.styles.luau +2 -6
- package/out/ui/packages/breadcrumbs/components/Breadcrumbs.d.ts +0 -1
- package/out/ui/packages/breadcrumbs/components/Breadcrumbs.luau +40 -67
- package/out/ui/packages/breadcrumbs/components/breadcrumbItems.d.ts +0 -9
- package/out/ui/packages/breadcrumbs/components/breadcrumbItems.luau +0 -68
- package/out/ui/packages/breadcrumbs/index.d.ts +0 -1
- package/out/ui/packages/breadcrumbs/init.luau +0 -3
- package/out/ui/packages/brickColorPicker/components/BrickColorPicker.luau +16 -12
- package/out/ui/packages/button/components/Button.luau +22 -28
- package/out/ui/packages/card/components/Card.d.ts +1 -3
- package/out/ui/packages/card/components/Card.luau +0 -10
- package/out/ui/packages/cframeEditor/components/CFrameEditor.luau +53 -75
- package/out/ui/packages/cframeEditor/components/CFrameEditor.styles.luau +9 -26
- package/out/ui/packages/checkbox/components/Checkbox.luau +16 -16
- package/out/ui/packages/checkbox/components/checkboxLook.d.ts +1 -1
- package/out/ui/packages/chip/components/Chip.d.ts +1 -6
- package/out/ui/packages/chip/components/Chip.luau +17 -61
- package/out/ui/packages/chip/components/Chip.styles.d.ts +0 -6
- package/out/ui/packages/chip/components/Chip.styles.luau +9 -54
- package/out/ui/packages/circularProgress/components/CircularProgress.luau +18 -29
- package/out/ui/packages/colorPicker/components/ColorPicker.luau +20 -16
- package/out/ui/packages/colorPicker/components/ColorPicker.styles.luau +20 -34
- package/out/ui/packages/colorPicker/components/ColorSequenceEditor.luau +35 -34
- package/out/ui/packages/colorPicker/components/NumberSequenceEditor.luau +62 -65
- package/out/ui/packages/dialog/components/Dialog.d.ts +2 -3
- package/out/ui/packages/dialog/components/Dialog.luau +21 -41
- package/out/ui/packages/divider/components/Divider.d.ts +0 -1
- package/out/ui/packages/divider/components/Divider.luau +17 -52
- package/out/ui/packages/divider/components/Divider.styles.luau +0 -32
- package/out/ui/packages/drawer/components/Drawer.d.ts +1 -3
- package/out/ui/packages/drawer/components/Drawer.luau +37 -71
- package/out/ui/packages/drawer/components/Drawer.styles.d.ts +1 -3
- package/out/ui/packages/drawer/components/Drawer.styles.luau +2 -3
- package/out/ui/packages/fab/components/Fab.d.ts +0 -3
- package/out/ui/packages/fab/components/Fab.luau +37 -79
- package/out/ui/packages/fab/components/Fab.styles.d.ts +0 -3
- package/out/ui/packages/fab/components/Fab.styles.luau +3 -39
- package/out/ui/packages/fab/components/fabSize.d.ts +0 -1
- package/out/ui/packages/fab/components/fabSize.luau +0 -4
- package/out/ui/packages/fab/index.d.ts +1 -1
- package/out/ui/packages/fab/init.luau +0 -1
- package/out/ui/packages/fontEditor/components/FontEditor.luau +16 -12
- package/out/ui/packages/gradientEditor/components/GradientEditor.luau +42 -56
- package/out/ui/packages/gradientEditor/components/GradientEditor.styles.luau +4 -37
- package/out/ui/packages/icon/components/Icon.luau +16 -9
- package/out/ui/packages/iconButton/components/IconButton.luau +17 -22
- package/out/ui/packages/iconButton/components/IconButton.styles.luau +0 -3
- package/out/ui/packages/index.d.ts +0 -8
- package/out/ui/packages/init.luau +0 -24
- package/out/ui/packages/input/components/Input.d.ts +0 -1
- package/out/ui/packages/input/components/Input.luau +19 -22
- package/out/ui/packages/layout/components/Grid.d.ts +1 -5
- package/out/ui/packages/layout/components/Grid.luau +19 -41
- package/out/ui/packages/layout/components/List.luau +16 -9
- package/out/ui/packages/layout/index.d.ts +0 -14
- package/out/ui/packages/layout/init.luau +0 -5
- package/out/ui/packages/listItem/components/ListItem.d.ts +1 -4
- package/out/ui/packages/listItem/components/ListItem.luau +4 -44
- package/out/ui/packages/listItem/components/ListItem.styles.d.ts +0 -1
- package/out/ui/packages/listItem/components/ListItem.styles.luau +5 -16
- package/out/ui/packages/loadingStroke/components/LoadingStroke.d.ts +1 -7
- package/out/ui/packages/loadingStroke/components/LoadingStroke.luau +19 -23
- package/out/ui/packages/menu/components/Menu.d.ts +1 -7
- package/out/ui/packages/menu/components/Menu.luau +26 -68
- package/out/ui/packages/menu/components/Menu.styles.luau +1 -5
- package/out/ui/packages/modal/components/Modal.d.ts +1 -2
- package/out/ui/packages/modal/components/Modal.luau +37 -79
- package/out/ui/packages/motion/index.d.ts +1 -1
- package/out/ui/packages/motion/init.luau +0 -1
- package/out/ui/packages/motion/unit.d.ts +0 -5
- package/out/ui/packages/motion/unit.luau +0 -23
- package/out/ui/packages/numberInput/components/NumberInput.d.ts +0 -2
- package/out/ui/packages/numberInput/components/NumberInput.luau +3 -16
- package/out/ui/packages/numberInput/components/numberValue.d.ts +0 -1
- package/out/ui/packages/numberInput/components/numberValue.luau +0 -45
- package/out/ui/packages/numberRangeEditor/components/NumberRangeEditor.luau +16 -12
- package/out/ui/packages/pagination/components/Pagination.d.ts +1 -6
- package/out/ui/packages/pagination/components/Pagination.luau +38 -62
- package/out/ui/packages/pagination/components/Pagination.styles.d.ts +1 -6
- package/out/ui/packages/pagination/components/Pagination.styles.luau +4 -36
- package/out/ui/packages/pagination/components/pageRange.d.ts +1 -2
- package/out/ui/packages/pagination/components/pageRange.luau +8 -91
- package/out/ui/packages/pagination/index.d.ts +0 -1
- package/out/ui/packages/pagination/init.luau +0 -1
- package/out/ui/packages/paper/components/Paper.d.ts +2 -4
- package/out/ui/packages/paper/components/Paper.luau +8 -28
- package/out/ui/packages/paper/components/Paper.styles.d.ts +1 -1
- package/out/ui/packages/paper/components/Paper.styles.luau +0 -6
- package/out/ui/packages/physicalPropertiesEditor/components/PhysicalPropertiesEditor.luau +38 -63
- package/out/ui/packages/physicalPropertiesEditor/components/PhysicalPropertiesEditor.styles.luau +7 -21
- package/out/ui/packages/physicalPropertiesEditor/components/physicalParts.d.ts +0 -2
- package/out/ui/packages/physicalPropertiesEditor/components/physicalParts.luau +0 -14
- package/out/ui/packages/popup/components/Popup.d.ts +1 -2
- package/out/ui/packages/popup/components/Popup.luau +18 -35
- package/out/ui/packages/popup/index.d.ts +0 -1
- package/out/ui/packages/popup/init.luau +0 -1
- package/out/ui/packages/preloader/components/Preloader.luau +16 -9
- package/out/ui/packages/progressBar/components/ProgressBar.luau +16 -12
- package/out/ui/packages/radioGroup/components/RadioGroup.d.ts +0 -1
- package/out/ui/packages/radioGroup/components/RadioGroup.luau +18 -16
- package/out/ui/packages/radioGroup/components/RadioGroup.styles.d.ts +0 -1
- package/out/ui/packages/radioGroup/components/RadioGroup.styles.luau +1 -4
- package/out/ui/packages/rayEditor/components/RayEditor.luau +16 -12
- package/out/ui/packages/rectEditor/components/RectEditor.luau +43 -86
- package/out/ui/packages/rectEditor/components/RectEditor.styles.luau +7 -30
- package/out/ui/packages/select/components/Select.d.ts +0 -5
- package/out/ui/packages/select/components/Select.luau +77 -61
- package/out/ui/packages/select/components/Select.styles.luau +1 -1
- package/out/ui/packages/select/components/selectMotion.d.ts +2 -0
- package/out/ui/packages/select/components/selectMotion.luau +12 -0
- package/out/ui/packages/shadow/components/Shadow.d.ts +1 -2
- package/out/ui/packages/shadow/components/Shadow.luau +17 -39
- package/out/ui/packages/shadow/components/Shadow.styles.luau +2 -7
- package/out/ui/packages/sidebar/components/Sidebar.luau +16 -9
- package/out/ui/packages/skeleton/components/Skeleton.luau +30 -22
- package/out/ui/packages/skeleton/components/Skeleton.styles.luau +2 -7
- package/out/ui/packages/skeleton/components/skeletonMotion.luau +1 -1
- package/out/ui/packages/slider/components/Slider.d.ts +0 -3
- package/out/ui/packages/slider/components/Slider.luau +19 -47
- package/out/ui/packages/slider/components/Slider.styles.d.ts +0 -2
- package/out/ui/packages/slider/components/Slider.styles.luau +1 -14
- package/out/ui/packages/snackbar/components/Snackbar.d.ts +0 -2
- package/out/ui/packages/snackbar/components/Snackbar.luau +0 -5
- package/out/ui/packages/splitPane/components/SplitPane.luau +17 -13
- package/out/ui/packages/splitPane/components/splitLook.d.ts +1 -1
- package/out/ui/packages/stateMatrix.d.ts +0 -2
- package/out/ui/packages/stateMatrix.luau +445 -1632
- package/out/ui/packages/stepper/components/Stepper.d.ts +0 -1
- package/out/ui/packages/stepper/components/Stepper.luau +17 -16
- package/out/ui/packages/stepper/components/Stepper.styles.d.ts +1 -3
- package/out/ui/packages/stepper/components/Stepper.styles.luau +2 -6
- package/out/ui/packages/switch/components/Switch.d.ts +0 -2
- package/out/ui/packages/switch/components/Switch.luau +16 -21
- package/out/ui/packages/switch/components/Switch.styles.d.ts +0 -2
- package/out/ui/packages/switch/components/Switch.styles.luau +1 -6
- package/out/ui/packages/switch/components/switchLook.d.ts +1 -1
- package/out/ui/packages/table/components/Table.d.ts +0 -1
- package/out/ui/packages/table/components/Table.luau +19 -15
- package/out/ui/packages/table/components/Table.styles.d.ts +1 -3
- package/out/ui/packages/table/components/Table.styles.luau +6 -10
- package/out/ui/packages/tabs/components/Tabs.d.ts +0 -3
- package/out/ui/packages/tabs/components/Tabs.luau +19 -24
- package/out/ui/packages/tabs/components/Tabs.styles.d.ts +1 -5
- package/out/ui/packages/tabs/components/Tabs.styles.luau +10 -26
- package/out/ui/packages/tabs/index.d.ts +0 -1
- package/out/ui/packages/tabs/init.luau +0 -1
- package/out/ui/packages/toast/components/Toast.d.ts +0 -2
- package/out/ui/packages/toast/components/Toast.luau +13 -41
- package/out/ui/packages/toast/components/Toast.styles.luau +5 -23
- package/out/ui/packages/tooltip/components/Tooltip.luau +16 -9
- package/out/ui/packages/treeView/components/TreeView.luau +16 -9
- package/out/ui/packages/typography/components/Typography.luau +14 -13
- package/out/ui/packages/udimEditor/components/UDimEditor.luau +16 -12
- package/out/ui/packages/vectorEditor/components/VectorEditor.luau +16 -12
- package/out/ui/packages/virtualList/components/VirtualList.luau +16 -9
- package/out/ui/packages/virtualList/index.d.ts +0 -2
- package/out/ui/packages/virtualList/init.luau +0 -1
- package/package.json +2 -2
- package/out/hooks/viewportObserver.d.ts +0 -10
- package/out/hooks/viewportObserver.luau +0 -75
- package/out/theme/styles/utilities/resolveSx.d.ts +0 -110
- package/out/theme/styles/utilities/resolveSx.luau +0 -479
- package/out/ui/packages/backdrop/components/Backdrop.d.ts +0 -10
- package/out/ui/packages/backdrop/components/Backdrop.luau +0 -51
- package/out/ui/packages/backdrop/components/Backdrop.styles.d.ts +0 -4
- package/out/ui/packages/backdrop/components/Backdrop.styles.luau +0 -24
- package/out/ui/packages/backdrop/index.d.ts +0 -2
- package/out/ui/packages/backdrop/init.luau +0 -5
- package/out/ui/packages/divider/components/dividerLabel.d.ts +0 -1
- package/out/ui/packages/divider/components/dividerLabel.luau +0 -10
- package/out/ui/packages/formText/components/FormHelperText.d.ts +0 -8
- package/out/ui/packages/formText/components/FormHelperText.luau +0 -40
- package/out/ui/packages/formText/components/FormLabel.d.ts +0 -9
- package/out/ui/packages/formText/components/FormLabel.luau +0 -42
- package/out/ui/packages/formText/components/FormText.styles.d.ts +0 -5
- package/out/ui/packages/formText/components/FormText.styles.luau +0 -33
- package/out/ui/packages/formText/index.d.ts +0 -4
- package/out/ui/packages/formText/init.luau +0 -6
- package/out/ui/packages/host/components/SxHost.d.ts +0 -18
- package/out/ui/packages/host/components/SxHost.luau +0 -202
- package/out/ui/packages/host/hostPaint.d.ts +0 -11
- package/out/ui/packages/host/hostPaint.luau +0 -33
- package/out/ui/packages/host/hostRules.d.ts +0 -15
- package/out/ui/packages/host/hostRules.luau +0 -92
- package/out/ui/packages/host/index.d.ts +0 -3
- package/out/ui/packages/host/init.luau +0 -13
- package/out/ui/packages/imageList/components/ImageList.d.ts +0 -14
- package/out/ui/packages/imageList/components/ImageList.luau +0 -93
- package/out/ui/packages/imageList/components/ImageList.styles.d.ts +0 -6
- package/out/ui/packages/imageList/components/ImageList.styles.luau +0 -73
- package/out/ui/packages/imageList/components/imageListLayout.d.ts +0 -4
- package/out/ui/packages/imageList/components/imageListLayout.luau +0 -31
- package/out/ui/packages/imageList/index.d.ts +0 -2
- package/out/ui/packages/imageList/init.luau +0 -5
- package/out/ui/packages/layout/components/Box.d.ts +0 -11
- package/out/ui/packages/layout/components/Box.luau +0 -40
- package/out/ui/packages/layout/components/Box.styles.d.ts +0 -7
- package/out/ui/packages/layout/components/Box.styles.luau +0 -34
- package/out/ui/packages/layout/components/Container.d.ts +0 -10
- package/out/ui/packages/layout/components/Container.luau +0 -45
- package/out/ui/packages/layout/components/Container.styles.d.ts +0 -6
- package/out/ui/packages/layout/components/Container.styles.luau +0 -41
- package/out/ui/packages/layout/components/FlexItem.d.ts +0 -12
- package/out/ui/packages/layout/components/FlexItem.luau +0 -40
- package/out/ui/packages/layout/components/FlexItem.styles.d.ts +0 -8
- package/out/ui/packages/layout/components/FlexItem.styles.luau +0 -66
- package/out/ui/packages/layout/components/Stack.d.ts +0 -14
- package/out/ui/packages/layout/components/Stack.luau +0 -44
- package/out/ui/packages/layout/components/Stack.styles.d.ts +0 -10
- package/out/ui/packages/layout/components/Stack.styles.luau +0 -101
- package/out/ui/packages/layout/components/boxPad.d.ts +0 -14
- package/out/ui/packages/layout/components/boxPad.luau +0 -59
- package/out/ui/packages/layout/components/containerWidth.d.ts +0 -2
- package/out/ui/packages/layout/components/containerWidth.luau +0 -17
- package/out/ui/packages/layout/components/flexItemMode.d.ts +0 -6
- package/out/ui/packages/layout/components/flexItemMode.luau +0 -36
- package/out/ui/packages/layout/components/gridProps.d.ts +0 -3
- package/out/ui/packages/layout/components/gridProps.luau +0 -20
- package/out/ui/packages/layout/components/stackAlign.d.ts +0 -10
- package/out/ui/packages/layout/components/stackAlign.luau +0 -43
- package/out/ui/packages/link/components/Link.d.ts +0 -11
- package/out/ui/packages/link/components/Link.luau +0 -80
- package/out/ui/packages/link/components/Link.styles.d.ts +0 -8
- package/out/ui/packages/link/components/Link.styles.luau +0 -59
- package/out/ui/packages/link/index.d.ts +0 -3
- package/out/ui/packages/link/init.luau +0 -5
- package/out/ui/packages/loadingStroke/components/loadingStrokeSx.d.ts +0 -11
- package/out/ui/packages/loadingStroke/components/loadingStrokeSx.luau +0 -2
- package/out/ui/packages/markdown/components/Markdown.d.ts +0 -6
- package/out/ui/packages/markdown/components/Markdown.luau +0 -221
- package/out/ui/packages/markdown/components/Markdown.styles.d.ts +0 -2
- package/out/ui/packages/markdown/components/Markdown.styles.luau +0 -101
- package/out/ui/packages/markdown/components/MarkdownEditor.d.ts +0 -16
- package/out/ui/packages/markdown/components/MarkdownEditor.luau +0 -315
- package/out/ui/packages/markdown/components/MarkdownEditor.styles.d.ts +0 -6
- package/out/ui/packages/markdown/components/MarkdownEditor.styles.luau +0 -132
- package/out/ui/packages/markdown/htmlToMarkdown.d.ts +0 -2
- package/out/ui/packages/markdown/htmlToMarkdown.luau +0 -350
- package/out/ui/packages/markdown/index.d.ts +0 -8
- package/out/ui/packages/markdown/init.luau +0 -11
- package/out/ui/packages/markdown/parseMarkdown.d.ts +0 -42
- package/out/ui/packages/markdown/parseMarkdown.luau +0 -459
- package/out/ui/packages/rating/components/Rating.d.ts +0 -11
- package/out/ui/packages/rating/components/Rating.luau +0 -97
- package/out/ui/packages/rating/components/Rating.styles.d.ts +0 -6
- package/out/ui/packages/rating/components/Rating.styles.luau +0 -44
- package/out/ui/packages/rating/index.d.ts +0 -2
- package/out/ui/packages/rating/init.luau +0 -5
- package/out/ui/packages/skeleton/components/skeletonTone.d.ts +0 -20
- package/out/ui/packages/skeleton/components/skeletonTone.luau +0 -14
- package/out/ui/packages/slider/components/sliderMarks.d.ts +0 -1
- package/out/ui/packages/slider/components/sliderMarks.luau +0 -37
- package/out/ui/packages/snackbar/components/snackbarAction.d.ts +0 -1
- package/out/ui/packages/snackbar/components/snackbarAction.luau +0 -10
- package/out/ui/packages/speedDial/components/SpeedDial.d.ts +0 -19
- package/out/ui/packages/speedDial/components/SpeedDial.luau +0 -97
- package/out/ui/packages/speedDial/components/SpeedDial.styles.d.ts +0 -5
- package/out/ui/packages/speedDial/components/SpeedDial.styles.luau +0 -31
- package/out/ui/packages/speedDial/index.d.ts +0 -3
- package/out/ui/packages/speedDial/init.luau +0 -5
- package/out/ui/packages/tabs/components/tabsOrientation.d.ts +0 -2
- package/out/ui/packages/tabs/components/tabsOrientation.luau +0 -7
- package/out/ui/packages/toggleButton/components/ToggleButton.d.ts +0 -21
- package/out/ui/packages/toggleButton/components/ToggleButton.luau +0 -129
- package/out/ui/packages/toggleButton/components/ToggleButton.styles.d.ts +0 -9
- package/out/ui/packages/toggleButton/components/ToggleButton.styles.luau +0 -69
- package/out/ui/packages/toggleButton/index.d.ts +0 -2
- package/out/ui/packages/toggleButton/init.luau +0 -7
- package/out/ui/packages/virtualList/components/EmptyListHint.d.ts +0 -7
- package/out/ui/packages/virtualList/components/EmptyListHint.luau +0 -43
- package/out/ui/packages/virtualList/components/EmptyListHint.styles.d.ts +0 -5
- package/out/ui/packages/virtualList/components/EmptyListHint.styles.luau +0 -26
|
@@ -3,17 +3,7 @@ local TS = _G[script]
|
|
|
3
3
|
local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
|
|
4
4
|
local componentStyles = _theme.componentStyles
|
|
5
5
|
local createStyles = _theme.createStyles
|
|
6
|
-
local useBadgeStyles = componentStyles("Badge", function(theme
|
|
7
|
-
local variant = _param.variant
|
|
8
|
-
if variant == nil then
|
|
9
|
-
variant = "standard"
|
|
10
|
-
end
|
|
11
|
-
local color = _param.color
|
|
12
|
-
if color == nil then
|
|
13
|
-
color = "error"
|
|
14
|
-
end
|
|
15
|
-
local diameter = if variant == "dot" then theme.spacing.calc(1) else theme.spacing.calc(2) + theme.padding.calc(1)
|
|
16
|
-
local tone = if color == "primary" then theme.palette.primary elseif color == "success" then theme.palette.status.success else theme.palette.status.error
|
|
6
|
+
local useBadgeStyles = componentStyles("Badge", function(theme)
|
|
17
7
|
return createStyles({
|
|
18
8
|
root = {
|
|
19
9
|
AutomaticSize = Enum.AutomaticSize.XY,
|
|
@@ -24,23 +14,21 @@ local useBadgeStyles = componentStyles("Badge", function(theme, _param)
|
|
|
24
14
|
badge = {
|
|
25
15
|
AnchorPoint = Vector2.new(0.5, 0.5),
|
|
26
16
|
Position = UDim2.fromScale(1, 0),
|
|
27
|
-
AutomaticSize =
|
|
28
|
-
Size = UDim2.fromOffset(
|
|
29
|
-
BackgroundColor3 =
|
|
17
|
+
AutomaticSize = Enum.AutomaticSize.XY,
|
|
18
|
+
Size = UDim2.fromOffset(theme.padding.calc(2), theme.padding.calc(2)),
|
|
19
|
+
BackgroundColor3 = theme.palette.status.error.main,
|
|
30
20
|
BorderSizePixel = 0,
|
|
31
21
|
Font = theme.typography.fontFamilies.default,
|
|
32
22
|
TextSize = theme.typography.fontSizes.caption,
|
|
33
|
-
TextColor3 =
|
|
34
|
-
TextXAlignment = Enum.TextXAlignment.Center,
|
|
35
|
-
TextYAlignment = Enum.TextYAlignment.Center,
|
|
23
|
+
TextColor3 = theme.palette.text.inverse,
|
|
36
24
|
ZIndex = 2,
|
|
37
25
|
},
|
|
38
26
|
padding = {
|
|
39
|
-
PaddingLeft = UDim.new(0,
|
|
40
|
-
PaddingRight = UDim.new(0,
|
|
27
|
+
PaddingLeft = UDim.new(0, theme.padding.calc(0.5)),
|
|
28
|
+
PaddingRight = UDim.new(0, theme.padding.calc(0.5)),
|
|
41
29
|
},
|
|
42
30
|
corner = {
|
|
43
|
-
CornerRadius = UDim.new(
|
|
31
|
+
CornerRadius = UDim.new(1, 0),
|
|
44
32
|
},
|
|
45
33
|
})
|
|
46
34
|
end)
|
|
@@ -5,7 +5,6 @@ export interface BottomNavigationProps<T> {
|
|
|
5
5
|
options: ChoiceOption<T>[];
|
|
6
6
|
onChange: (value: T) => void;
|
|
7
7
|
disabled?: boolean;
|
|
8
|
-
showLabels?: boolean;
|
|
9
8
|
}
|
|
10
9
|
declare function BottomNavigation<T>(props: CustomizedProps<Frame, BottomNavigationProps<T>>): JSX.Element;
|
|
11
10
|
export default BottomNavigation;
|
|
@@ -3,7 +3,6 @@ local TS = _G[script]
|
|
|
3
3
|
local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
|
|
4
4
|
local cx = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").cx
|
|
5
5
|
local canActivate = TS.import(script, script.Parent.Parent.Parent, "button", "components", "activation").canActivate
|
|
6
|
-
local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
|
|
7
6
|
local useBottomNavigationStyles = TS.import(script, script.Parent, "BottomNavigation.styles").default
|
|
8
7
|
local function BottomNavigation(props)
|
|
9
8
|
local _binding = props
|
|
@@ -11,33 +10,32 @@ local function BottomNavigation(props)
|
|
|
11
10
|
local options = _binding.options
|
|
12
11
|
local onChange = _binding.onChange
|
|
13
12
|
local disabled = _binding.disabled
|
|
14
|
-
local showLabels = _binding.showLabels
|
|
15
|
-
if showLabels == nil then
|
|
16
|
-
showLabels = true
|
|
17
|
-
end
|
|
18
13
|
local className = _binding.className
|
|
19
14
|
local sx = _binding.sx
|
|
20
15
|
local id = _binding.id
|
|
21
16
|
local ref = _binding.ref
|
|
22
|
-
local styles = useBottomNavigationStyles(
|
|
23
|
-
showLabels = showLabels,
|
|
24
|
-
})
|
|
17
|
+
local styles = useBottomNavigationStyles()
|
|
25
18
|
local count = math.max(#options, 1)
|
|
26
|
-
local _attributes = {
|
|
27
|
-
tag = "frame",
|
|
28
|
-
}
|
|
19
|
+
local _attributes = {}
|
|
29
20
|
local _condition = id
|
|
30
21
|
if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
|
|
31
22
|
_condition = "BottomNavigation"
|
|
32
23
|
end
|
|
33
24
|
_attributes.key = _condition
|
|
34
|
-
_attributes.
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
25
|
+
_attributes.ref = ref
|
|
26
|
+
for _k, _v in styles.root do
|
|
27
|
+
_attributes[_k] = _v
|
|
28
|
+
end
|
|
29
|
+
if className then
|
|
30
|
+
for _k, _v in className do
|
|
31
|
+
_attributes[_k] = _v
|
|
32
|
+
end
|
|
33
|
+
end
|
|
34
|
+
if sx then
|
|
35
|
+
for _k, _v in sx do
|
|
36
|
+
_attributes[_k] = _v
|
|
37
|
+
end
|
|
38
|
+
end
|
|
41
39
|
local _attributes_1 = table.clone(styles.list)
|
|
42
40
|
setmetatable(_attributes_1, nil)
|
|
43
41
|
local _exp = React.createElement("uilistlayout", _attributes_1)
|
|
@@ -53,7 +51,7 @@ local function BottomNavigation(props)
|
|
|
53
51
|
_attributes_2[_k] = _v
|
|
54
52
|
end
|
|
55
53
|
_attributes_2.Size = UDim2.new(1 / count, 0, 1, 0)
|
|
56
|
-
_attributes_2.Text =
|
|
54
|
+
_attributes_2.Text = choice.label
|
|
57
55
|
_attributes_2.LayoutOrder = index
|
|
58
56
|
_attributes_2.Active = active
|
|
59
57
|
_attributes_2.Selectable = active
|
|
@@ -80,7 +78,7 @@ local function BottomNavigation(props)
|
|
|
80
78
|
_newValue[_k] = _callback(_v, _k - 1, options)
|
|
81
79
|
end
|
|
82
80
|
-- ▲ ReadonlyArray.map ▲
|
|
83
|
-
return React.createElement(
|
|
81
|
+
return React.createElement("frame", _attributes, _exp, _newValue)
|
|
84
82
|
end
|
|
85
83
|
local default = BottomNavigation
|
|
86
84
|
return {
|
|
@@ -1,4 +1,2 @@
|
|
|
1
|
-
declare const useBottomNavigationStyles: (
|
|
2
|
-
showLabels?: boolean;
|
|
3
|
-
}) => import("../../../../theme/index").ClassNameMap<string>;
|
|
1
|
+
declare const useBottomNavigationStyles: () => import("../../../../theme/index").ClassNameMap<string>;
|
|
4
2
|
export default useBottomNavigationStyles;
|
|
@@ -3,14 +3,10 @@ local TS = _G[script]
|
|
|
3
3
|
local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
|
|
4
4
|
local componentStyles = _theme.componentStyles
|
|
5
5
|
local createStyles = _theme.createStyles
|
|
6
|
-
local useBottomNavigationStyles = componentStyles("BottomNavigation", function(theme
|
|
7
|
-
local showLabels = _param.showLabels
|
|
8
|
-
if showLabels == nil then
|
|
9
|
-
showLabels = true
|
|
10
|
-
end
|
|
6
|
+
local useBottomNavigationStyles = componentStyles("BottomNavigation", function(theme)
|
|
11
7
|
local _object = {
|
|
12
8
|
root = {
|
|
13
|
-
Size = UDim2.new(1, 0, 0, theme.spacing.calc(
|
|
9
|
+
Size = UDim2.new(1, 0, 0, theme.spacing.calc(7)),
|
|
14
10
|
BackgroundColor3 = theme.palette.surface.elevated,
|
|
15
11
|
BorderSizePixel = 0,
|
|
16
12
|
ZIndex = 11000,
|
|
@@ -6,7 +6,6 @@ export interface BreadcrumbItem {
|
|
|
6
6
|
export interface BreadcrumbsProps {
|
|
7
7
|
items: BreadcrumbItem[];
|
|
8
8
|
separator?: string;
|
|
9
|
-
maxItems?: number;
|
|
10
9
|
}
|
|
11
10
|
declare function Breadcrumbs(props: CustomizedProps<Frame, BreadcrumbsProps>): JSX.Element;
|
|
12
11
|
export default Breadcrumbs;
|
|
@@ -2,10 +2,7 @@
|
|
|
2
2
|
local TS = _G[script]
|
|
3
3
|
local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
|
|
4
4
|
local cx = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").cx
|
|
5
|
-
local
|
|
6
|
-
local breadcrumbCurrent = _breadcrumbItems.breadcrumbCurrent
|
|
7
|
-
local breadcrumbVisible = _breadcrumbItems.breadcrumbVisible
|
|
8
|
-
local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
|
|
5
|
+
local breadcrumbCurrent = TS.import(script, script.Parent, "breadcrumbItems").breadcrumbCurrent
|
|
9
6
|
local useBreadcrumbStyles = TS.import(script, script.Parent, "Breadcrumbs.styles").default
|
|
10
7
|
local function Breadcrumbs(props)
|
|
11
8
|
local _binding = props
|
|
@@ -14,94 +11,70 @@ local function Breadcrumbs(props)
|
|
|
14
11
|
if separator == nil then
|
|
15
12
|
separator = "/"
|
|
16
13
|
end
|
|
17
|
-
local maxItems = _binding.maxItems
|
|
18
14
|
local className = _binding.className
|
|
19
15
|
local sx = _binding.sx
|
|
20
16
|
local id = _binding.id
|
|
21
17
|
local ref = _binding.ref
|
|
22
18
|
local styles = useBreadcrumbStyles()
|
|
23
|
-
local
|
|
24
|
-
local _attributes = {
|
|
25
|
-
tag = "frame",
|
|
26
|
-
}
|
|
19
|
+
local _attributes = {}
|
|
27
20
|
local _condition = id
|
|
28
21
|
if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
|
|
29
22
|
_condition = "Breadcrumbs"
|
|
30
23
|
end
|
|
31
24
|
_attributes.key = _condition
|
|
32
|
-
_attributes.
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
25
|
+
_attributes.ref = ref
|
|
26
|
+
for _k, _v in styles.root do
|
|
27
|
+
_attributes[_k] = _v
|
|
28
|
+
end
|
|
29
|
+
if className then
|
|
30
|
+
for _k, _v in className do
|
|
31
|
+
_attributes[_k] = _v
|
|
32
|
+
end
|
|
33
|
+
end
|
|
34
|
+
if sx then
|
|
35
|
+
for _k, _v in sx do
|
|
36
|
+
_attributes[_k] = _v
|
|
37
|
+
end
|
|
38
|
+
end
|
|
36
39
|
local _attributes_1 = table.clone(styles.list)
|
|
37
40
|
setmetatable(_attributes_1, nil)
|
|
38
41
|
local _exp = React.createElement("uilistlayout", _attributes_1)
|
|
39
42
|
-- ▼ ReadonlyArray.map ▼
|
|
40
|
-
local _newValue = table.create(#
|
|
41
|
-
local _callback = function(
|
|
42
|
-
local current =
|
|
43
|
-
local
|
|
44
|
-
local _condition_1 = order > 0
|
|
43
|
+
local _newValue = table.create(#items)
|
|
44
|
+
local _callback = function(item, index)
|
|
45
|
+
local current = breadcrumbCurrent(index, #items)
|
|
46
|
+
local _condition_1 = index > 0
|
|
45
47
|
if _condition_1 then
|
|
46
48
|
local _attributes_2 = table.clone(styles.separator)
|
|
47
49
|
setmetatable(_attributes_2, nil)
|
|
48
50
|
_attributes_2.Text = separator
|
|
49
|
-
_attributes_2.LayoutOrder =
|
|
51
|
+
_attributes_2.LayoutOrder = index * 2
|
|
50
52
|
_condition_1 = React.createElement("textlabel", _attributes_2)
|
|
51
53
|
end
|
|
52
|
-
local
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
_attributes_2.LayoutOrder = order * 2 + 1
|
|
64
|
-
local _condition_2 = not current
|
|
65
|
-
if _condition_2 then
|
|
66
|
-
local _result_1 = item
|
|
67
|
-
if _result_1 ~= nil then
|
|
68
|
-
_result_1 = _result_1.onActivated
|
|
54
|
+
local _attributes_2 = table.clone(cx(styles.item, current and styles.current))
|
|
55
|
+
setmetatable(_attributes_2, nil)
|
|
56
|
+
_attributes_2.Text = item.label
|
|
57
|
+
_attributes_2.LayoutOrder = index * 2 + 1
|
|
58
|
+
_attributes_2.Active = not current and item.onActivated ~= nil
|
|
59
|
+
_attributes_2.Selectable = not current and item.onActivated ~= nil
|
|
60
|
+
_attributes_2.Event = {
|
|
61
|
+
Activated = function()
|
|
62
|
+
local _result = item.onActivated
|
|
63
|
+
if _result ~= nil then
|
|
64
|
+
_result = _result()
|
|
69
65
|
end
|
|
70
|
-
|
|
71
|
-
end
|
|
72
|
-
|
|
73
|
-
local _condition_3 = not current
|
|
74
|
-
if _condition_3 then
|
|
75
|
-
local _result_1 = item
|
|
76
|
-
if _result_1 ~= nil then
|
|
77
|
-
_result_1 = _result_1.onActivated
|
|
78
|
-
end
|
|
79
|
-
_condition_3 = _result_1 ~= nil
|
|
80
|
-
end
|
|
81
|
-
_attributes_2.Selectable = _condition_3
|
|
82
|
-
_attributes_2.Event = {
|
|
83
|
-
Activated = function()
|
|
84
|
-
local _result_1 = item
|
|
85
|
-
if _result_1 ~= nil then
|
|
86
|
-
_result_1 = _result_1.onActivated
|
|
87
|
-
if _result_1 ~= nil then
|
|
88
|
-
_result_1 = _result_1()
|
|
89
|
-
end
|
|
90
|
-
end
|
|
91
|
-
return _result_1
|
|
92
|
-
end,
|
|
93
|
-
}
|
|
94
|
-
_result = (React.createElement("textbutton", _attributes_2))
|
|
95
|
-
end
|
|
66
|
+
return _result
|
|
67
|
+
end,
|
|
68
|
+
}
|
|
96
69
|
return React.createElement(React.Fragment, {
|
|
97
|
-
key = `{
|
|
98
|
-
}, _condition_1,
|
|
70
|
+
key = `{item.label}-{index}`,
|
|
71
|
+
}, _condition_1, React.createElement("textbutton", _attributes_2))
|
|
99
72
|
end
|
|
100
|
-
for _k, _v in
|
|
101
|
-
_newValue[_k] = _callback(_v, _k - 1,
|
|
73
|
+
for _k, _v in items do
|
|
74
|
+
_newValue[_k] = _callback(_v, _k - 1, items)
|
|
102
75
|
end
|
|
103
76
|
-- ▲ ReadonlyArray.map ▲
|
|
104
|
-
return React.createElement(
|
|
77
|
+
return React.createElement("frame", _attributes, _exp, _newValue)
|
|
105
78
|
end
|
|
106
79
|
local default = Breadcrumbs
|
|
107
80
|
return {
|
|
@@ -1,10 +1 @@
|
|
|
1
1
|
export declare function breadcrumbCurrent(index: number, count: number): boolean;
|
|
2
|
-
export interface BreadcrumbSlice {
|
|
3
|
-
label: string;
|
|
4
|
-
index: number;
|
|
5
|
-
ellipsis?: boolean;
|
|
6
|
-
}
|
|
7
|
-
/** Collapse middle items when over maxItems (keep ends). */
|
|
8
|
-
export declare function breadcrumbVisible<T extends {
|
|
9
|
-
label: string;
|
|
10
|
-
}>(items: T[], maxItems?: number): BreadcrumbSlice[];
|
|
@@ -2,74 +2,6 @@
|
|
|
2
2
|
local function breadcrumbCurrent(index, count)
|
|
3
3
|
return count > 0 and index == count - 1
|
|
4
4
|
end
|
|
5
|
-
--* Collapse middle items when over maxItems (keep ends).
|
|
6
|
-
local function breadcrumbVisible(items, maxItems)
|
|
7
|
-
local count = #items
|
|
8
|
-
if maxItems == nil or maxItems < 1 or count <= maxItems then
|
|
9
|
-
local out = {}
|
|
10
|
-
do
|
|
11
|
-
local i = 0
|
|
12
|
-
local _shouldIncrement = false
|
|
13
|
-
while true do
|
|
14
|
-
if _shouldIncrement then
|
|
15
|
-
i += 1
|
|
16
|
-
else
|
|
17
|
-
_shouldIncrement = true
|
|
18
|
-
end
|
|
19
|
-
if not (i < count) then
|
|
20
|
-
break
|
|
21
|
-
end
|
|
22
|
-
local _arg0 = {
|
|
23
|
-
label = items[i + 1].label,
|
|
24
|
-
index = i,
|
|
25
|
-
}
|
|
26
|
-
table.insert(out, _arg0)
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
return out
|
|
30
|
-
end
|
|
31
|
-
if maxItems == 1 then
|
|
32
|
-
return { {
|
|
33
|
-
label = items[count].label,
|
|
34
|
-
index = count - 1,
|
|
35
|
-
} }
|
|
36
|
-
end
|
|
37
|
-
local keepEnd = 1
|
|
38
|
-
local rawStart = maxItems - keepEnd - 1
|
|
39
|
-
local keepStart = if rawStart < 1 then 1 else rawStart
|
|
40
|
-
local out = {}
|
|
41
|
-
do
|
|
42
|
-
local i = 0
|
|
43
|
-
local _shouldIncrement = false
|
|
44
|
-
while true do
|
|
45
|
-
if _shouldIncrement then
|
|
46
|
-
i += 1
|
|
47
|
-
else
|
|
48
|
-
_shouldIncrement = true
|
|
49
|
-
end
|
|
50
|
-
if not (i < keepStart) then
|
|
51
|
-
break
|
|
52
|
-
end
|
|
53
|
-
local _arg0 = {
|
|
54
|
-
label = items[i + 1].label,
|
|
55
|
-
index = i,
|
|
56
|
-
}
|
|
57
|
-
table.insert(out, _arg0)
|
|
58
|
-
end
|
|
59
|
-
end
|
|
60
|
-
table.insert(out, {
|
|
61
|
-
label = "…",
|
|
62
|
-
index = -1,
|
|
63
|
-
ellipsis = true,
|
|
64
|
-
})
|
|
65
|
-
local _arg0 = {
|
|
66
|
-
label = items[count].label,
|
|
67
|
-
index = count - 1,
|
|
68
|
-
}
|
|
69
|
-
table.insert(out, _arg0)
|
|
70
|
-
return out
|
|
71
|
-
end
|
|
72
5
|
return {
|
|
73
6
|
breadcrumbCurrent = breadcrumbCurrent,
|
|
74
|
-
breadcrumbVisible = breadcrumbVisible,
|
|
75
7
|
}
|
|
@@ -2,7 +2,4 @@
|
|
|
2
2
|
local TS = _G[script]
|
|
3
3
|
local exports = {}
|
|
4
4
|
exports.Breadcrumbs = TS.import(script, script, "components", "Breadcrumbs").default
|
|
5
|
-
local _breadcrumbItems = TS.import(script, script, "components", "breadcrumbItems")
|
|
6
|
-
exports.breadcrumbCurrent = _breadcrumbItems.breadcrumbCurrent
|
|
7
|
-
exports.breadcrumbVisible = _breadcrumbItems.breadcrumbVisible
|
|
8
5
|
return exports
|
|
@@ -7,7 +7,6 @@ local useState = _react.useState
|
|
|
7
7
|
local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
|
|
8
8
|
local cx = _theme.cx
|
|
9
9
|
local useTheme = _theme.useTheme
|
|
10
|
-
local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
|
|
11
10
|
local canActivate = TS.import(script, script.Parent.Parent.Parent, "button", "components", "activation").canActivate
|
|
12
11
|
local Input = TS.import(script, script.Parent.Parent.Parent, "input").Input
|
|
13
12
|
local Popup = TS.import(script, script.Parent.Parent.Parent, "popup").Popup
|
|
@@ -65,21 +64,26 @@ local function BrickColorPicker(props)
|
|
|
65
64
|
setOpen(false)
|
|
66
65
|
setQuery("")
|
|
67
66
|
end
|
|
68
|
-
local _attributes = {
|
|
69
|
-
tag = "frame",
|
|
70
|
-
}
|
|
67
|
+
local _attributes = {}
|
|
71
68
|
local _condition = id
|
|
72
69
|
if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
|
|
73
70
|
_condition = "BrickColorPicker"
|
|
74
71
|
end
|
|
75
72
|
_attributes.key = _condition
|
|
76
|
-
_attributes.
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
73
|
+
_attributes.ref = ref
|
|
74
|
+
for _k, _v in styles.root do
|
|
75
|
+
_attributes[_k] = _v
|
|
76
|
+
end
|
|
77
|
+
if className then
|
|
78
|
+
for _k, _v in className do
|
|
79
|
+
_attributes[_k] = _v
|
|
80
|
+
end
|
|
81
|
+
end
|
|
82
|
+
if sx then
|
|
83
|
+
for _k, _v in sx do
|
|
84
|
+
_attributes[_k] = _v
|
|
85
|
+
end
|
|
86
|
+
end
|
|
83
87
|
local _attributes_1 = {
|
|
84
88
|
key = "Trigger",
|
|
85
89
|
ref = setAnchor,
|
|
@@ -222,7 +226,7 @@ local function BrickColorPicker(props)
|
|
|
222
226
|
end,
|
|
223
227
|
})))))
|
|
224
228
|
end
|
|
225
|
-
return React.createElement(
|
|
229
|
+
return React.createElement("frame", _attributes, _exp_6, _condition_1)
|
|
226
230
|
end
|
|
227
231
|
local default = BrickColorPicker
|
|
228
232
|
return {
|
|
@@ -4,9 +4,7 @@ local _react = TS.import(script, TS.getModule(script, "@rbxts", "react"))
|
|
|
4
4
|
local React = _react
|
|
5
5
|
local useEffect = _react.useEffect
|
|
6
6
|
local useState = _react.useState
|
|
7
|
-
local useReducedMotion = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "hooks").useReducedMotion
|
|
8
7
|
local useTheme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").useTheme
|
|
9
|
-
local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
|
|
10
8
|
local CircularProgress = TS.import(script, script.Parent.Parent.Parent, "circularProgress").CircularProgress
|
|
11
9
|
local LoadingStroke = TS.import(script, script.Parent.Parent.Parent, "loadingStroke").LoadingStroke
|
|
12
10
|
local canActivate = TS.import(script, script.Parent, "activation").canActivate
|
|
@@ -38,7 +36,7 @@ local function Button(props)
|
|
|
38
36
|
if loadingPosition == nil then
|
|
39
37
|
loadingPosition = "center"
|
|
40
38
|
end
|
|
41
|
-
local
|
|
39
|
+
local reducedMotion = _binding.reducedMotion
|
|
42
40
|
local rounded = _binding.rounded
|
|
43
41
|
if rounded == nil then
|
|
44
42
|
rounded = true
|
|
@@ -71,14 +69,12 @@ local function Button(props)
|
|
|
71
69
|
local stroke = _binding_1.stroke
|
|
72
70
|
local _binding_2 = useTheme()
|
|
73
71
|
local theme = _binding_2.theme
|
|
74
|
-
local reducedMotion = useReducedMotion(reducedProp)
|
|
75
72
|
local hovering, setHovering = useState(false)
|
|
76
73
|
local focused, setFocused = useState(false)
|
|
77
74
|
local active = canActivate(disabled, loading)
|
|
78
75
|
local pressed = disabled or (not hoveringDisabled and active and (hovering or focused))
|
|
79
76
|
local face = buttonFace(text, loading, loadingLabel)
|
|
80
77
|
local place = spinnerPlace(loadingPosition)
|
|
81
|
-
local busy = loading or animating
|
|
82
78
|
local branded = (props.color or "primary") == "primary"
|
|
83
79
|
local spinnerColor = if variant == "contained" then if branded then theme.palette.primary.on else theme.palette.text.inverse elseif branded then theme.palette.primary.main else theme.palette.text.primary
|
|
84
80
|
useEffect(function()
|
|
@@ -88,30 +84,29 @@ local function Button(props)
|
|
|
88
84
|
setHovering(false)
|
|
89
85
|
setFocused(false)
|
|
90
86
|
end, { active })
|
|
91
|
-
local _attributes = {
|
|
92
|
-
tag = "textbutton",
|
|
93
|
-
}
|
|
87
|
+
local _attributes = {}
|
|
94
88
|
local _condition = id
|
|
95
89
|
if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
|
|
96
90
|
_condition = "Button"
|
|
97
91
|
end
|
|
98
92
|
_attributes.key = _condition
|
|
99
|
-
_attributes.
|
|
100
|
-
|
|
101
|
-
|
|
93
|
+
_attributes.ref = ref
|
|
94
|
+
for _k, _v in root do
|
|
95
|
+
_attributes[_k] = _v
|
|
96
|
+
end
|
|
102
97
|
for _k, _v in font do
|
|
103
|
-
|
|
104
|
-
end
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
98
|
+
_attributes[_k] = _v
|
|
99
|
+
end
|
|
100
|
+
if className then
|
|
101
|
+
for _k, _v in className do
|
|
102
|
+
_attributes[_k] = _v
|
|
103
|
+
end
|
|
104
|
+
end
|
|
105
|
+
if sx then
|
|
106
|
+
for _k, _v in sx do
|
|
107
|
+
_attributes[_k] = _v
|
|
108
|
+
end
|
|
109
|
+
end
|
|
115
110
|
_attributes.Active = active
|
|
116
111
|
_attributes.AutoButtonColor = active
|
|
117
112
|
_attributes.Selectable = active
|
|
@@ -191,15 +186,14 @@ local function Button(props)
|
|
|
191
186
|
end
|
|
192
187
|
end,
|
|
193
188
|
}
|
|
194
|
-
local _condition_1 = variant == "outlined" and not
|
|
189
|
+
local _condition_1 = variant == "outlined" and not animating
|
|
195
190
|
if _condition_1 then
|
|
196
191
|
local _attributes_1 = table.clone(stroke)
|
|
197
192
|
setmetatable(_attributes_1, nil)
|
|
198
193
|
_condition_1 = React.createElement("uistroke", _attributes_1)
|
|
199
194
|
end
|
|
200
|
-
local _exp =
|
|
201
|
-
animating =
|
|
202
|
-
color = spinnerColor,
|
|
195
|
+
local _exp = animating and React.createElement(LoadingStroke, {
|
|
196
|
+
animating = animating,
|
|
203
197
|
})
|
|
204
198
|
local _condition_2 = rounded
|
|
205
199
|
if _condition_2 then
|
|
@@ -207,7 +201,7 @@ local function Button(props)
|
|
|
207
201
|
setmetatable(_attributes_1, nil)
|
|
208
202
|
_condition_2 = React.createElement("uicorner", _attributes_1)
|
|
209
203
|
end
|
|
210
|
-
return React.createElement(
|
|
204
|
+
return React.createElement("textbutton", _attributes, _condition_1, _exp, _condition_2, loading and (React.createElement(CircularProgress, {
|
|
211
205
|
size = spinnerPixels(props.size),
|
|
212
206
|
thickness = 2,
|
|
213
207
|
color = spinnerColor,
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import React from "@rbxts/react";
|
|
2
|
-
import { CustomizedProps } from "../../../../theme/index";
|
|
3
2
|
import { PaperElevation } from "../../paper/index";
|
|
4
3
|
export interface CardProps {
|
|
5
4
|
title?: string;
|
|
6
5
|
subtitle?: string;
|
|
7
6
|
elevation?: PaperElevation;
|
|
8
|
-
square?: boolean;
|
|
9
7
|
actions?: React.ReactNode;
|
|
10
8
|
children?: React.ReactNode;
|
|
11
9
|
}
|
|
12
|
-
declare function Card(props:
|
|
10
|
+
declare function Card(props: CardProps): JSX.Element;
|
|
13
11
|
export default Card;
|
|
@@ -11,13 +11,8 @@ local function Card(props)
|
|
|
11
11
|
if elevation == nil then
|
|
12
12
|
elevation = "flat"
|
|
13
13
|
end
|
|
14
|
-
local square = _binding.square
|
|
15
14
|
local actions = _binding.actions
|
|
16
15
|
local children = _binding.children
|
|
17
|
-
local className = _binding.className
|
|
18
|
-
local sx = _binding.sx
|
|
19
|
-
local id = _binding.id
|
|
20
|
-
local ref = _binding.ref
|
|
21
16
|
local styles = useCardStyles()
|
|
22
17
|
local _attributes = {
|
|
23
18
|
key = "Column",
|
|
@@ -71,11 +66,6 @@ local function Card(props)
|
|
|
71
66
|
end
|
|
72
67
|
return React.createElement(Paper, {
|
|
73
68
|
elevation = elevation,
|
|
74
|
-
square = square,
|
|
75
|
-
className = className,
|
|
76
|
-
sx = sx,
|
|
77
|
-
id = id,
|
|
78
|
-
ref = ref,
|
|
79
69
|
}, React.createElement("frame", _attributes, _exp, _condition, _condition_1, _exp_1, _condition_2))
|
|
80
70
|
end
|
|
81
71
|
local default = Card
|