@telus-uds/components-base 0.0.2-prerelease.9 → 1.1.0
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/.eslintrc.js +9 -0
- package/.storybook/main.js +4 -0
- package/.storybook/preview.js +37 -0
- package/.ultra.cache.json +1 -1
- package/CHANGELOG.md +50 -0
- package/README.md +4 -2
- package/__fixtures__/test-utils.js +25 -0
- package/__fixtures__/testTheme.js +4 -2
- package/__tests__/Button/ButtonGroup.test.jsx +4 -5
- package/__tests__/Checkbox/Checkbox.test.jsx +2 -2
- package/__tests__/Checkbox/CheckboxGroup.test.jsx +4 -5
- package/__tests__/ExpandCollapse/ExpandCollapse.test.jsx +2 -2
- package/__tests__/HorizontalScroll/HorizontalScroll.test.jsx +164 -0
- package/__tests__/Link/LinkBase.test.jsx +0 -14
- package/__tests__/Radio/Radio.test.jsx +2 -2
- package/__tests__/Radio/RadioGroup.test.jsx +4 -5
- package/__tests__/RadioCard/RadioCard.test.jsx +2 -2
- package/__tests__/RadioCard/RadioCardGroup.test.jsx +4 -5
- package/__tests__/Search/Search.test.jsx +9 -8
- package/__tests__/Select/Select.test.jsx +3 -2
- package/__tests__/Tabs/Tabs.test.jsx +1 -161
- package/__tests__/Tags/Tags.test.jsx +4 -5
- package/__tests__/TextInput/TextArea.test.jsx +3 -2
- package/__tests__/TextInput/TextInputBase.test.jsx +10 -5
- package/__tests__/ThemeProvider/ThemeProvider.test.jsx +77 -0
- package/__tests__/ThemeProvider/useThemeTokens.test.jsx +9 -5
- package/__tests__/ThemeProvider/utils/theme-tokens.test.js +41 -0
- package/__tests__/ToggleSwitch/ToggleSwitch.test.jsx +3 -2
- package/__tests__/utils/children.test.jsx +128 -0
- package/__tests__/utils/input.test.js +1 -1
- package/__tests__/utils/semantics.test.jsx +43 -0
- package/babel.config.js +9 -16
- package/component-docs.json +10313 -0
- package/generate-component-docs.js +56 -0
- package/lib/A11yText/index.js +10 -5
- package/lib/ActivityIndicator/Spinner.js +16 -13
- package/lib/ActivityIndicator/Spinner.native.js +12 -8
- package/lib/Box/Box.js +103 -8
- package/lib/Button/Button.js +9 -8
- package/lib/Button/ButtonBase.js +14 -7
- package/lib/Button/ButtonGroup.js +25 -10
- package/lib/Button/ButtonLink.js +10 -7
- package/lib/Card/Card.js +2 -0
- package/lib/Card/CardBase.js +13 -5
- package/lib/Card/PressableCardBase.js +12 -8
- package/lib/Checkbox/Checkbox.js +25 -14
- package/lib/Checkbox/CheckboxGroup.js +22 -12
- package/lib/Divider/Divider.js +12 -7
- package/lib/ExpandCollapse/Accordion.js +10 -4
- package/lib/ExpandCollapse/Control.js +12 -6
- package/lib/ExpandCollapse/ExpandCollapse.js +10 -5
- package/lib/ExpandCollapse/Panel.js +8 -7
- package/lib/Feedback/Feedback.js +10 -5
- package/lib/Fieldset/Fieldset.js +10 -5
- package/lib/Fieldset/FieldsetContainer.js +10 -5
- package/lib/Fieldset/FieldsetContainer.native.js +10 -5
- package/lib/Fieldset/Legend.js +10 -5
- package/lib/Fieldset/Legend.native.js +10 -5
- package/lib/FlexGrid/Col/Col.js +8 -5
- package/lib/FlexGrid/FlexGrid.js +31 -6
- package/lib/FlexGrid/Row/Row.js +12 -5
- package/lib/{Tabs → HorizontalScroll}/HorizontalScroll.js +5 -4
- package/lib/{Tabs/TabsScrollButton.js → HorizontalScroll/HorizontalScrollButton.js} +14 -8
- package/lib/{Tabs → HorizontalScroll}/ScrollViewEnd.js +0 -0
- package/lib/{Tabs → HorizontalScroll}/ScrollViewEnd.native.js +0 -0
- package/lib/{Tabs → HorizontalScroll}/dictionary.js +0 -0
- package/lib/HorizontalScroll/index.js +35 -0
- package/lib/{Tabs → HorizontalScroll}/itemPositions.js +0 -0
- package/lib/Icon/Icon.js +16 -9
- package/lib/Icon/IconText.js +8 -7
- package/lib/IconButton/IconButton.js +10 -5
- package/lib/InputLabel/InputLabel.js +33 -5
- package/lib/InputLabel/LabelContent.js +22 -12
- package/lib/InputLabel/LabelContent.native.js +23 -5
- package/lib/InputSupports/InputSupports.js +10 -5
- package/lib/Link/ChevronLink.js +12 -5
- package/lib/Link/InlinePressable.js +10 -4
- package/lib/Link/InlinePressable.native.js +5 -4
- package/lib/Link/Link.js +12 -5
- package/lib/Link/LinkBase.js +12 -5
- package/lib/Link/TextButton.js +10 -5
- package/lib/List/List.js +6 -6
- package/lib/List/ListItem.js +28 -33
- package/lib/List/index.js +15 -0
- package/lib/Modal/Modal.js +10 -5
- package/lib/Notification/Notification.js +21 -5
- package/lib/Pagination/PageButton.js +16 -11
- package/lib/Pagination/Pagination.js +12 -7
- package/lib/Pagination/SideButton.js +12 -7
- package/lib/Pagination/usePagination.js +2 -2
- package/lib/Progress/Progress.js +10 -5
- package/lib/Progress/ProgressBar.js +21 -10
- package/lib/Progress/ProgressBarBackground.js +12 -8
- package/lib/Radio/Radio.js +14 -13
- package/lib/Radio/RadioButton.js +20 -9
- package/lib/Radio/RadioGroup.js +24 -13
- package/lib/RadioCard/RadioCard.js +14 -10
- package/lib/RadioCard/RadioCardGroup.js +13 -12
- package/lib/Search/Search.js +29 -18
- package/lib/Select/Picker.js +11 -6
- package/lib/Select/Picker.native.js +21 -6
- package/lib/Select/Select.js +46 -4
- package/lib/SideNav/Item.js +10 -5
- package/lib/SideNav/ItemsGroup.js +10 -5
- package/lib/SideNav/SideNav.js +11 -7
- package/lib/Skeleton/Skeleton.js +15 -15
- package/lib/Skeleton/skeletonWebAnimation.js +1 -1
- package/lib/Spacer/Spacer.js +19 -7
- package/lib/StackView/StackView.js +26 -7
- package/lib/StackView/StackWrap.js +24 -13
- package/lib/StackView/StackWrapBox.js +34 -8
- package/lib/StackView/StackWrapGap.js +16 -7
- package/lib/StackView/common.js +4 -2
- package/lib/StackView/getStackedContent.js +2 -2
- package/lib/StepTracker/StepTracker.js +10 -5
- package/lib/Tabs/Tabs.js +26 -19
- package/lib/Tabs/TabsItem.js +16 -12
- package/lib/Tags/Tags.js +27 -11
- package/lib/TextInput/TextArea.js +7 -5
- package/lib/TextInput/TextInput.js +12 -6
- package/lib/TextInput/TextInputBase.js +12 -8
- package/lib/ThemeProvider/ThemeProvider.js +14 -10
- package/lib/ThemeProvider/useSetTheme.js +6 -1
- package/lib/ThemeProvider/utils/styles.js +2 -2
- package/lib/ThemeProvider/utils/theme-tokens.js +39 -8
- package/lib/ToggleSwitch/ToggleSwitch.js +11 -6
- package/lib/Tooltip/Backdrop.js +10 -2
- package/lib/Tooltip/Tooltip.js +5 -4
- package/lib/Typography/Typography.js +40 -24
- package/lib/index.js +36 -1
- package/lib/utils/a11y/index.js +13 -0
- package/lib/utils/a11y/propTypes.js +61 -0
- package/lib/utils/a11y/propTypes.native.js +47 -0
- package/lib/utils/a11y/semantics.js +173 -0
- package/lib/utils/animation/useVerticalExpandAnimation.js +1 -1
- package/lib/utils/children.js +55 -8
- package/lib/utils/input.js +27 -17
- package/lib/utils/propTypes.js +40 -68
- package/lib/utils/useCopy.js +1 -1
- package/lib/utils/useHash.js +8 -4
- package/lib/utils/useSpacingScale.js +1 -3
- package/lib/utils/useUniqueId.js +1 -1
- package/package.json +14 -6
- package/release-context.json +4 -4
- package/src/A11yText/index.jsx +6 -4
- package/src/ActivityIndicator/Spinner.jsx +5 -3
- package/src/ActivityIndicator/Spinner.native.jsx +5 -3
- package/src/Box/Box.jsx +125 -39
- package/src/Button/Button.jsx +7 -4
- package/src/Button/ButtonBase.jsx +86 -77
- package/src/Button/ButtonGroup.jsx +81 -69
- package/src/Button/ButtonLink.jsx +18 -13
- package/src/Card/Card.jsx +2 -2
- package/src/Card/CardBase.jsx +6 -4
- package/src/Card/PressableCardBase.jsx +71 -64
- package/src/Checkbox/Checkbox.jsx +118 -108
- package/src/Checkbox/CheckboxGroup.jsx +72 -62
- package/src/Divider/Divider.jsx +7 -4
- package/src/ExpandCollapse/Accordion.jsx +3 -2
- package/src/ExpandCollapse/Control.jsx +40 -43
- package/src/ExpandCollapse/ExpandCollapse.jsx +26 -23
- package/src/ExpandCollapse/Panel.jsx +69 -63
- package/src/Feedback/Feedback.jsx +36 -33
- package/src/Fieldset/Fieldset.jsx +63 -56
- package/src/Fieldset/FieldsetContainer.jsx +14 -5
- package/src/Fieldset/FieldsetContainer.native.jsx +7 -4
- package/src/Fieldset/Legend.jsx +7 -2
- package/src/Fieldset/Legend.native.jsx +7 -2
- package/src/FlexGrid/Col/Col.jsx +139 -132
- package/src/FlexGrid/FlexGrid.jsx +79 -51
- package/src/FlexGrid/Row/Row.jsx +55 -48
- package/src/HorizontalScroll/HorizontalScroll.jsx +168 -0
- package/src/HorizontalScroll/HorizontalScrollButton.jsx +105 -0
- package/src/{Tabs → HorizontalScroll}/ScrollViewEnd.jsx +0 -0
- package/src/{Tabs → HorizontalScroll}/ScrollViewEnd.native.jsx +0 -0
- package/src/{Tabs → HorizontalScroll}/dictionary.js +0 -0
- package/src/HorizontalScroll/index.js +17 -0
- package/src/{Tabs → HorizontalScroll}/itemPositions.js +0 -0
- package/src/Icon/Icon.jsx +37 -35
- package/src/Icon/IconText.jsx +22 -17
- package/src/IconButton/IconButton.jsx +49 -42
- package/src/InputLabel/InputLabel.jsx +53 -38
- package/src/InputLabel/LabelContent.jsx +14 -6
- package/src/InputLabel/LabelContent.native.jsx +11 -2
- package/src/InputSupports/InputSupports.jsx +29 -34
- package/src/Link/ChevronLink.jsx +26 -16
- package/src/Link/InlinePressable.jsx +5 -3
- package/src/Link/InlinePressable.native.jsx +5 -3
- package/src/Link/Link.jsx +22 -16
- package/src/Link/LinkBase.jsx +67 -58
- package/src/Link/TextButton.jsx +30 -23
- package/src/List/List.jsx +6 -7
- package/src/List/ListItem.jsx +70 -90
- package/src/List/index.js +5 -0
- package/src/Modal/Modal.jsx +9 -4
- package/src/Notification/Notification.jsx +58 -43
- package/src/Pagination/PageButton.jsx +37 -34
- package/src/Pagination/Pagination.jsx +88 -92
- package/src/Pagination/SideButton.jsx +44 -41
- package/src/Progress/Progress.jsx +5 -4
- package/src/Progress/ProgressBar.jsx +42 -29
- package/src/Progress/ProgressBarBackground.jsx +5 -3
- package/src/Radio/Radio.jsx +85 -78
- package/src/Radio/RadioButton.jsx +54 -43
- package/src/Radio/RadioGroup.jsx +74 -63
- package/src/RadioCard/RadioCard.jsx +75 -68
- package/src/RadioCard/RadioCardGroup.jsx +82 -75
- package/src/Search/Search.jsx +127 -106
- package/src/Select/Picker.jsx +49 -42
- package/src/Select/Picker.native.jsx +56 -49
- package/src/Select/Select.jsx +115 -72
- package/src/SideNav/Item.jsx +53 -46
- package/src/SideNav/ItemsGroup.jsx +50 -43
- package/src/SideNav/SideNav.jsx +68 -60
- package/src/Skeleton/Skeleton.jsx +9 -13
- package/src/Spacer/Spacer.jsx +11 -4
- package/src/StackView/StackView.jsx +47 -23
- package/src/StackView/StackWrap.jsx +14 -12
- package/src/StackView/StackWrapBox.jsx +62 -28
- package/src/StackView/StackWrapGap.jsx +46 -24
- package/src/StackView/common.jsx +3 -2
- package/src/StepTracker/StepTracker.jsx +73 -62
- package/src/Tabs/Tabs.jsx +70 -62
- package/src/Tabs/TabsItem.jsx +111 -103
- package/src/Tags/Tags.jsx +114 -102
- package/src/TextInput/TextArea.jsx +5 -4
- package/src/TextInput/TextInput.jsx +5 -4
- package/src/TextInput/TextInputBase.jsx +84 -77
- package/src/ThemeProvider/ThemeProvider.jsx +11 -7
- package/src/ThemeProvider/useSetTheme.js +4 -0
- package/src/ThemeProvider/utils/theme-tokens.js +28 -0
- package/src/ToggleSwitch/ToggleSwitch.jsx +49 -50
- package/src/Tooltip/Tooltip.jsx +134 -130
- package/src/Typography/Typography.jsx +67 -44
- package/src/index.js +3 -1
- package/src/utils/a11y/index.js +1 -0
- package/src/utils/a11y/propTypes.js +61 -0
- package/src/utils/a11y/propTypes.native.js +39 -0
- package/src/utils/a11y/semantics.js +162 -0
- package/src/utils/children.jsx +60 -7
- package/src/utils/input.js +20 -17
- package/src/utils/propTypes.js +30 -76
- package/src/utils/useCopy.js +1 -1
- package/src/utils/useHash.js +8 -3
- package/stories/A11yText/A11yText.stories.jsx +3 -3
- package/stories/ActivityIndicator/ActivityIndicator.stories.jsx +2 -2
- package/stories/Box/Box.stories.jsx +2 -2
- package/stories/Button/Button.stories.jsx +3 -3
- package/stories/Button/ButtonGroup.stories.jsx +2 -2
- package/stories/Button/ButtonLink.stories.jsx +2 -2
- package/stories/Card/Card.stories.jsx +2 -2
- package/stories/Checkbox/Checkbox.stories.jsx +2 -2
- package/stories/Divider/Divider.stories.jsx +2 -2
- package/stories/ExpandCollapse/ExpandCollapse.stories.jsx +3 -3
- package/stories/Feedback/Feedback.stories.jsx +2 -2
- package/stories/FlexGrid/01 FlexGrid.stories.jsx +2 -2
- package/stories/FlexGrid/02 Row.stories.jsx +2 -2
- package/stories/FlexGrid/03 Col.stories.jsx +2 -2
- package/stories/Icon/Icon.stories.jsx +2 -2
- package/stories/IconButton/IconButton.stories.jsx +2 -2
- package/stories/InputLabel/InputLabel.stories.jsx +2 -2
- package/stories/Link/ChevronLink.stories.jsx +2 -2
- package/stories/Link/Link.stories.jsx +2 -2
- package/stories/Link/TextButton.stories.jsx +2 -2
- package/stories/List/List.stories.jsx +2 -2
- package/stories/Modal/Modal.stories.jsx +2 -2
- package/stories/Notification/Notification.stories.jsx +2 -2
- package/stories/Pagination/Pagination.stories.jsx +2 -2
- package/stories/Progress/Progress.stories.jsx +2 -2
- package/stories/Radio/Radio.stories.jsx +2 -2
- package/stories/RadioCard/RadioCard.stories.jsx +2 -2
- package/stories/Search/Search.stories.jsx +2 -2
- package/stories/Select/Select.stories.jsx +2 -2
- package/stories/SideNav/SideNav.stories.jsx +2 -2
- package/stories/SideNav/SideNavItem.stories.jsx +2 -2
- package/stories/SideNav/SideNavItemsGroup.stories.jsx +2 -2
- package/stories/Skeleton/Skeleton.stories.jsx +3 -3
- package/stories/Spacer/Spacer.stories.jsx +2 -2
- package/stories/StackView/StackView.stories.jsx +2 -2
- package/stories/StackView/StackWrap.stories.jsx +2 -2
- package/stories/StepTracker/StepTracker.stories.jsx +2 -2
- package/stories/Tabs/Tabs.stories.jsx +2 -2
- package/stories/Tags/Tags.stories.jsx +2 -2
- package/stories/TextInput/TextArea.stories.jsx +2 -2
- package/stories/TextInput/TextInput.stories.jsx +2 -2
- package/stories/ToggleSwitch/ToggleSwitch.stories.jsx +2 -2
- package/stories/Tooltip/Tooltip.stories.jsx +2 -2
- package/stories/TooltipButton/TooltipButton.stories.jsx +2 -2
- package/stories/Typography/Typography.stories.jsx +2 -2
- package/stories/platform-supports.jsx +1 -1
- package/stories/supports.jsx +4 -5
- package/src/Tabs/HorizontalScroll.jsx +0 -165
- package/src/Tabs/TabsScrollButton.jsx +0 -100
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { forwardRef } from 'react'
|
|
2
2
|
import { Pressable, View } from 'react-native'
|
|
3
3
|
import PropTypes from 'prop-types'
|
|
4
4
|
|
|
@@ -47,51 +47,48 @@ function selectIconTokens(tokens) {
|
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
const ExpandCollapseControl = (
|
|
51
|
-
onPress,
|
|
52
|
-
|
|
53
|
-
children,
|
|
54
|
-
tokens,
|
|
55
|
-
accessibilityRole = 'button',
|
|
56
|
-
variant,
|
|
57
|
-
rest
|
|
58
|
-
}) => {
|
|
59
|
-
const getTokens = useThemeTokensCallback('ExpandCollapseControl', tokens, variant)
|
|
50
|
+
const ExpandCollapseControl = forwardRef(
|
|
51
|
+
({ onPress, isExpanded, children, tokens, accessibilityRole = 'button', variant, rest }, ref) => {
|
|
52
|
+
const getTokens = useThemeTokensCallback('ExpandCollapseControl', tokens, variant)
|
|
60
53
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
54
|
+
const a11y = a11yProps.select({ ...rest, accessibilityRole })
|
|
55
|
+
a11y.accessibilityState = {
|
|
56
|
+
...(a11y.accessibilityState || {}),
|
|
57
|
+
expanded: isExpanded
|
|
58
|
+
}
|
|
66
59
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
60
|
+
const getControlState = ({ pressed, hovered, focused }) => ({
|
|
61
|
+
pressed,
|
|
62
|
+
hover: hovered,
|
|
63
|
+
focus: focused,
|
|
64
|
+
expanded: isExpanded
|
|
65
|
+
})
|
|
66
|
+
const getControlTokens = (pressableState) => getTokens(getControlState(pressableState))
|
|
67
|
+
const getPressableStyle = (pressableState) =>
|
|
68
|
+
selectContainerStyles(getControlTokens(pressableState))
|
|
76
69
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
70
|
+
return (
|
|
71
|
+
<Pressable ref={ref} {...a11y} onPress={onPress} style={getPressableStyle}>
|
|
72
|
+
{(pressableState) => {
|
|
73
|
+
const { icon: IconComponent, ...themeTokens } = getControlTokens(pressableState)
|
|
74
|
+
return (
|
|
75
|
+
<>
|
|
76
|
+
{IconComponent && (
|
|
77
|
+
<View style={selectIconContainerStyles(themeTokens)}>
|
|
78
|
+
<IconComponent {...selectIconTokens(themeTokens)} />
|
|
79
|
+
</View>
|
|
80
|
+
)}
|
|
81
|
+
{typeof children === 'function'
|
|
82
|
+
? children(getControlState(pressableState))
|
|
83
|
+
: children}
|
|
84
|
+
</>
|
|
85
|
+
)
|
|
86
|
+
}}
|
|
87
|
+
</Pressable>
|
|
88
|
+
)
|
|
89
|
+
}
|
|
90
|
+
)
|
|
91
|
+
ExpandCollapseControl.displayName = 'ExpandCollapseControl'
|
|
95
92
|
|
|
96
93
|
ExpandCollapseControl.propTypes = {
|
|
97
94
|
...a11yProps.propTypes,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { forwardRef } from 'react'
|
|
2
2
|
import { View } from 'react-native'
|
|
3
3
|
import PropTypes from 'prop-types'
|
|
4
4
|
|
|
@@ -20,29 +20,32 @@ function selectBorderStyles(tokens) {
|
|
|
20
20
|
* <ExpandCollapse.Panel> children, and assign the panels explicit `panelId` props. The panels may be
|
|
21
21
|
* nested (they do not need to be direct children), and non-interactive items may be included too.
|
|
22
22
|
*/
|
|
23
|
-
const ExpandCollapse = (
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
23
|
+
const ExpandCollapse = forwardRef(
|
|
24
|
+
({ children, tokens, variant, maxOpen, open, initialOpen, onChange }, ref) => {
|
|
25
|
+
const {
|
|
26
|
+
currentValues: openIds,
|
|
27
|
+
toggleOneValue: onToggle,
|
|
28
|
+
resetValues,
|
|
29
|
+
setValues,
|
|
30
|
+
unsetValues
|
|
31
|
+
} = useMultipleInputValues({
|
|
32
|
+
maxValues: maxOpen,
|
|
33
|
+
values: open,
|
|
34
|
+
initialValues: initialOpen,
|
|
35
|
+
onChange
|
|
36
|
+
})
|
|
37
|
+
const themeTokens = useThemeTokens('ExpandCollapse', tokens, variant)
|
|
37
38
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}
|
|
39
|
+
return (
|
|
40
|
+
<View ref={ref} style={selectBorderStyles(themeTokens)}>
|
|
41
|
+
{typeof children === 'function'
|
|
42
|
+
? children({ openIds, onToggle, resetValues, setValues, unsetValues })
|
|
43
|
+
: children}
|
|
44
|
+
</View>
|
|
45
|
+
)
|
|
46
|
+
}
|
|
47
|
+
)
|
|
48
|
+
ExpandCollapse.displayName = 'ExpandCollapse'
|
|
46
49
|
|
|
47
50
|
ExpandCollapse.propTypes = {
|
|
48
51
|
variant: variantProp.propType,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useState } from 'react'
|
|
1
|
+
import React, { forwardRef, useState } from 'react'
|
|
2
2
|
import { Animated, Platform, StyleSheet, View } from 'react-native'
|
|
3
3
|
import PropTypes from 'prop-types'
|
|
4
4
|
|
|
@@ -30,78 +30,84 @@ const selectContainerStyles = ({
|
|
|
30
30
|
* The panel does not need to be a direct child of the `<ExpandCollapse>` (unless this is required
|
|
31
31
|
* by the chosen accessibility props for a particular accessibility tools).
|
|
32
32
|
*/
|
|
33
|
-
const ExpandCollapsePanel = (
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
33
|
+
const ExpandCollapsePanel = forwardRef(
|
|
34
|
+
(
|
|
35
|
+
{
|
|
36
|
+
openIds = [],
|
|
37
|
+
panelId,
|
|
38
|
+
onToggle,
|
|
39
|
+
onPress,
|
|
40
|
+
control,
|
|
41
|
+
controlTokens,
|
|
42
|
+
children,
|
|
43
|
+
tokens,
|
|
44
|
+
variant,
|
|
45
|
+
...rest
|
|
46
|
+
},
|
|
47
|
+
ref
|
|
48
|
+
) => {
|
|
49
|
+
const [containerHeight, setContainerHeight] = useState(null)
|
|
50
|
+
const isExpanded = openIds.includes(panelId)
|
|
47
51
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
52
|
+
const a11y = a11yProps.select(rest)
|
|
53
|
+
a11y.accessibilityState = {
|
|
54
|
+
...(a11y.accessibilityState || {}),
|
|
55
|
+
expanded: isExpanded
|
|
56
|
+
}
|
|
53
57
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
58
|
+
const themeTokens = useThemeTokens('ExpandCollapsePanel', tokens, variant, {
|
|
59
|
+
expanded: isExpanded
|
|
60
|
+
})
|
|
57
61
|
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
+
const handleControlPress = (event) => {
|
|
63
|
+
onToggle(panelId, event)
|
|
64
|
+
if (onPress) onPress(panelId, event)
|
|
65
|
+
}
|
|
62
66
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
+
const onContainerLayout = (event) => {
|
|
68
|
+
if (containerHeight === null) {
|
|
69
|
+
const { layout: { height = 0 } = {} } = event.nativeEvent
|
|
70
|
+
setContainerHeight(height)
|
|
71
|
+
}
|
|
67
72
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
})
|
|
73
|
+
const animatedStyles = useVerticalExpandAnimation({
|
|
74
|
+
containerHeight,
|
|
75
|
+
isExpanded,
|
|
76
|
+
tokens: themeTokens
|
|
77
|
+
})
|
|
74
78
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
79
|
+
// on web we can hide the contents until we have the container measured and avoid occasional jitter
|
|
80
|
+
// this won't work on native platforms
|
|
81
|
+
const overflowContainerStyles =
|
|
82
|
+
containerHeight === null && Platform.OS === 'web'
|
|
83
|
+
? { height: 0, visibility: 'hidden' }
|
|
84
|
+
: undefined
|
|
81
85
|
|
|
82
|
-
|
|
86
|
+
const focusabilityProps = isExpanded ? {} : a11yProps.nonFocusableProps
|
|
83
87
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
>
|
|
92
|
-
{control}
|
|
93
|
-
</ExpandCollapseControl>
|
|
94
|
-
<View style={overflowContainerStyles} {...focusabilityProps}>
|
|
95
|
-
<Animated.View
|
|
96
|
-
onLayout={onContainerLayout}
|
|
97
|
-
style={[staticStyles.itemsContainer, animatedStyles]}
|
|
88
|
+
return (
|
|
89
|
+
<View ref={ref} style={selectGroupStyles(themeTokens)}>
|
|
90
|
+
<ExpandCollapseControl
|
|
91
|
+
{...a11y}
|
|
92
|
+
isExpanded={isExpanded}
|
|
93
|
+
tokens={controlTokens}
|
|
94
|
+
onPress={handleControlPress}
|
|
98
95
|
>
|
|
99
|
-
|
|
100
|
-
</
|
|
96
|
+
{control}
|
|
97
|
+
</ExpandCollapseControl>
|
|
98
|
+
<View style={overflowContainerStyles} {...focusabilityProps}>
|
|
99
|
+
<Animated.View
|
|
100
|
+
onLayout={onContainerLayout}
|
|
101
|
+
style={[staticStyles.itemsContainer, animatedStyles]}
|
|
102
|
+
>
|
|
103
|
+
<View style={selectContainerStyles(themeTokens)}>{children}</View>
|
|
104
|
+
</Animated.View>
|
|
105
|
+
</View>
|
|
101
106
|
</View>
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
107
|
+
)
|
|
108
|
+
}
|
|
109
|
+
)
|
|
110
|
+
ExpandCollapsePanel.displayName = 'ExpandCollapsePanel'
|
|
105
111
|
|
|
106
112
|
ExpandCollapsePanel.propTypes = {
|
|
107
113
|
variant: variantProp.propType,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { forwardRef } from 'react'
|
|
2
2
|
import { StyleSheet, Text, View } from 'react-native'
|
|
3
3
|
import PropTypes from 'prop-types'
|
|
4
4
|
|
|
@@ -40,43 +40,46 @@ const selectIconContainerStyles = ({ iconGap }) => ({
|
|
|
40
40
|
* ### Accessibility
|
|
41
41
|
* All accessibility props set on this component will be applied to the outer container.
|
|
42
42
|
*/
|
|
43
|
-
const Feedback = (
|
|
44
|
-
|
|
45
|
-
|
|
43
|
+
const Feedback = forwardRef(
|
|
44
|
+
({ title, children, id, validation, tokens, variant, ...rest }, ref) => {
|
|
45
|
+
const themeTokens = useThemeTokens('Feedback', tokens, { ...variant, validation })
|
|
46
|
+
const { space } = themeTokens
|
|
46
47
|
|
|
47
|
-
|
|
48
|
+
const { icon: IconComponent } = themeTokens
|
|
48
49
|
|
|
49
|
-
|
|
50
|
-
|
|
50
|
+
const titleTextStyles = selectTitleTextStyles(themeTokens)
|
|
51
|
+
const contentTextStyles = selectContentTextStyles(themeTokens)
|
|
51
52
|
|
|
52
|
-
|
|
53
|
-
|
|
53
|
+
const content =
|
|
54
|
+
typeof children === 'string' ? <Text style={contentTextStyles}>{children}</Text> : children
|
|
54
55
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
const accessibilityProps = a11yProps.select({
|
|
57
|
+
accessibilityRole: validation === 'error' ? 'alert' : undefined,
|
|
58
|
+
...rest
|
|
59
|
+
})
|
|
59
60
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
}
|
|
61
|
+
return (
|
|
62
|
+
<View ref={ref} style={selectStyles(themeTokens)} {...accessibilityProps} nativeID={id}>
|
|
63
|
+
<StackView space={space}>
|
|
64
|
+
{title !== undefined && (
|
|
65
|
+
<View style={staticStyles.title}>
|
|
66
|
+
{IconComponent && (
|
|
67
|
+
<View style={selectIconContainerStyles(themeTokens)}>
|
|
68
|
+
<IconComponent {...selectIconTokens(themeTokens)} />
|
|
69
|
+
</View>
|
|
70
|
+
)}
|
|
71
|
+
<Text style={titleTextStyles}>{title}</Text>
|
|
72
|
+
</View>
|
|
73
|
+
)}
|
|
74
|
+
{content && typeof content === 'function'
|
|
75
|
+
? content({ textStyles: contentTextStyles, variant })
|
|
76
|
+
: content}
|
|
77
|
+
</StackView>
|
|
78
|
+
</View>
|
|
79
|
+
)
|
|
80
|
+
}
|
|
81
|
+
)
|
|
82
|
+
Feedback.displayName = 'Feedback'
|
|
80
83
|
|
|
81
84
|
Feedback.propTypes = {
|
|
82
85
|
/**
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { forwardRef } from 'react'
|
|
2
2
|
import PropTypes from 'prop-types'
|
|
3
3
|
|
|
4
4
|
import Feedback from '../Feedback'
|
|
@@ -15,64 +15,71 @@ import Legend from './Legend'
|
|
|
15
15
|
*
|
|
16
16
|
* Follows the same theming and most of the same props as InputSupports.
|
|
17
17
|
*/
|
|
18
|
-
const Fieldset = (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
18
|
+
const Fieldset = forwardRef(
|
|
19
|
+
(
|
|
20
|
+
{
|
|
21
|
+
space,
|
|
22
|
+
feedback,
|
|
23
|
+
feedbackPosition = 'top',
|
|
24
|
+
validation,
|
|
25
|
+
legend,
|
|
26
|
+
hint,
|
|
27
|
+
hintPosition,
|
|
28
|
+
tooltip,
|
|
29
|
+
inactive,
|
|
30
|
+
accessibilityRole,
|
|
31
|
+
name: fieldsetName,
|
|
32
|
+
children
|
|
33
|
+
},
|
|
34
|
+
ref
|
|
35
|
+
) => {
|
|
36
|
+
// Skips `inputId` because a fieldset' legend describes multiple inputs
|
|
37
|
+
const { hintId, feedbackId, a11yProps } = useInputSupports({
|
|
38
|
+
feedback,
|
|
39
|
+
hint,
|
|
40
|
+
label: legend,
|
|
41
|
+
validation
|
|
42
|
+
})
|
|
39
43
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
44
|
+
const legendContent = legend && (
|
|
45
|
+
<Legend>
|
|
46
|
+
<InputLabel
|
|
47
|
+
label={legend}
|
|
48
|
+
hint={hint}
|
|
49
|
+
hintPosition={hintPosition}
|
|
50
|
+
hintId={hintId}
|
|
51
|
+
tooltip={tooltip}
|
|
52
|
+
/>
|
|
53
|
+
</Legend>
|
|
54
|
+
)
|
|
55
|
+
const feedbackContent = feedback && (
|
|
56
|
+
<Feedback id={feedbackId} title={feedback} validation={validation} />
|
|
57
|
+
)
|
|
54
58
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
59
|
+
// Some accessibility patterns depend on elements being direct children, e.g. fieldset -> legend,
|
|
60
|
+
// and on MacOS voiceover, radiogroup -> radio. To allow elements to be direct children of the
|
|
61
|
+
// fieldset as much as possible, but also allow different spacing within content and between
|
|
62
|
+
// fieldset / feedback / etc, wrap resolved children in a fragment, and stack with `preserveFragments`.
|
|
63
|
+
const childContent = <>{typeof children === 'function' ? children({ a11yProps }) : children}</>
|
|
64
|
+
const orderedContent =
|
|
65
|
+
feedbackPosition === 'bottom'
|
|
66
|
+
? [legendContent, feedbackContent, childContent]
|
|
67
|
+
: [legendContent, childContent, feedbackContent]
|
|
68
|
+
const stackedContent = getStackedContent(orderedContent, { space, preserveFragments: true })
|
|
65
69
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
70
|
+
return (
|
|
71
|
+
<FieldsetContainer
|
|
72
|
+
ref={ref}
|
|
73
|
+
inactive={inactive}
|
|
74
|
+
accessibilityRole={accessibilityRole}
|
|
75
|
+
name={fieldsetName}
|
|
76
|
+
>
|
|
77
|
+
{stackedContent}
|
|
78
|
+
</FieldsetContainer>
|
|
79
|
+
)
|
|
80
|
+
}
|
|
81
|
+
)
|
|
82
|
+
Fieldset.displayName = 'Fieldset'
|
|
76
83
|
|
|
77
84
|
Fieldset.propTypes = {
|
|
78
85
|
children: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { forwardRef } from 'react'
|
|
2
2
|
import PropTypes from 'prop-types'
|
|
3
3
|
|
|
4
4
|
import cssReset from './cssReset'
|
|
@@ -6,11 +6,20 @@ import cssReset from './cssReset'
|
|
|
6
6
|
/**
|
|
7
7
|
* On Web, wraps children with a HTML `<fieldset>` and sets its attributes as necessary.
|
|
8
8
|
*/
|
|
9
|
-
const FieldsetContainer = (
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
const FieldsetContainer = forwardRef(
|
|
10
|
+
({ children, inactive, accessibilityRole, name: fieldsetName }, ref) => (
|
|
11
|
+
<fieldset
|
|
12
|
+
ref={ref}
|
|
13
|
+
disabled={inactive}
|
|
14
|
+
style={cssReset}
|
|
15
|
+
role={accessibilityRole}
|
|
16
|
+
name={fieldsetName}
|
|
17
|
+
>
|
|
18
|
+
{children}
|
|
19
|
+
</fieldset>
|
|
20
|
+
)
|
|
13
21
|
)
|
|
22
|
+
FieldsetContainer.displayName = 'FieldsetContainer'
|
|
14
23
|
|
|
15
24
|
FieldsetContainer.propTypes = {
|
|
16
25
|
accessibilityRole: PropTypes.string,
|
|
@@ -1,12 +1,15 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { forwardRef } from 'react'
|
|
2
2
|
import PropTypes from 'prop-types'
|
|
3
3
|
import { View } from 'react-native'
|
|
4
4
|
|
|
5
5
|
// No equivalent of `<fieldset>` on native, so just apply accessibility role to container.
|
|
6
6
|
// If a11y testing finds any additional handling is needed at the container level, add it here.
|
|
7
|
-
const FieldsetContainer = ({ children, accessibilityRole }) => (
|
|
8
|
-
<View accessibilityRole={accessibilityRole}>
|
|
9
|
-
|
|
7
|
+
const FieldsetContainer = forwardRef(({ children, accessibilityRole }, ref) => (
|
|
8
|
+
<View ref={ref} accessibilityRole={accessibilityRole}>
|
|
9
|
+
{children}
|
|
10
|
+
</View>
|
|
11
|
+
))
|
|
12
|
+
FieldsetContainer.displayName = 'FieldsetContainer'
|
|
10
13
|
|
|
11
14
|
FieldsetContainer.propTypes = {
|
|
12
15
|
children: PropTypes.node,
|
package/src/Fieldset/Legend.jsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { forwardRef } from 'react'
|
|
2
2
|
import PropTypes from 'prop-types'
|
|
3
3
|
|
|
4
4
|
import cssReset from './cssReset'
|
|
@@ -7,7 +7,12 @@ import cssReset from './cssReset'
|
|
|
7
7
|
* On Web, wraps children in HTML `<legend>` tag.
|
|
8
8
|
* On Native, `<legend>` does not exist, wraps in a width 100% block to follow <legend>'s behaviour in a flex.
|
|
9
9
|
*/
|
|
10
|
-
const Legend = ({ children }) =>
|
|
10
|
+
const Legend = forwardRef(({ children }, ref) => (
|
|
11
|
+
<legend ref={ref} style={cssReset}>
|
|
12
|
+
{children}
|
|
13
|
+
</legend>
|
|
14
|
+
))
|
|
15
|
+
Legend.displayName = 'Legend'
|
|
11
16
|
|
|
12
17
|
Legend.propTypes = {
|
|
13
18
|
children: PropTypes.node
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { forwardRef } from 'react'
|
|
2
2
|
import { View, StyleSheet } from 'react-native'
|
|
3
3
|
import PropTypes from 'prop-types'
|
|
4
4
|
|
|
@@ -6,7 +6,12 @@ import PropTypes from 'prop-types'
|
|
|
6
6
|
* On Web, wraps children in HTML `<legend>` tag.
|
|
7
7
|
* On Native, `<legend>` does not exist, wraps in a width 100% block to follow <legend>'s behaviour in a flex.
|
|
8
8
|
*/
|
|
9
|
-
const Legend = ({ children }) =>
|
|
9
|
+
const Legend = forwardRef(({ children }, ref) => (
|
|
10
|
+
<View ref={ref} style={staticStyles.stretch}>
|
|
11
|
+
{children}
|
|
12
|
+
</View>
|
|
13
|
+
))
|
|
14
|
+
Legend.displayName = 'Legend'
|
|
10
15
|
|
|
11
16
|
Legend.propTypes = {
|
|
12
17
|
children: PropTypes.node
|