@telus-uds/components-base 0.0.2-prerelease.9 → 1.0.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.
Files changed (282) hide show
  1. package/.eslintrc.js +9 -0
  2. package/.ultra.cache.json +1 -1
  3. package/CHANGELOG.md +32 -0
  4. package/README.md +4 -2
  5. package/__fixtures__/test-utils.js +25 -0
  6. package/__fixtures__/testTheme.js +4 -2
  7. package/__tests__/Button/ButtonGroup.test.jsx +4 -5
  8. package/__tests__/Checkbox/Checkbox.test.jsx +2 -2
  9. package/__tests__/Checkbox/CheckboxGroup.test.jsx +4 -5
  10. package/__tests__/ExpandCollapse/ExpandCollapse.test.jsx +2 -2
  11. package/__tests__/HorizontalScroll/HorizontalScroll.test.jsx +164 -0
  12. package/__tests__/Link/LinkBase.test.jsx +0 -14
  13. package/__tests__/Radio/Radio.test.jsx +2 -2
  14. package/__tests__/Radio/RadioGroup.test.jsx +4 -5
  15. package/__tests__/RadioCard/RadioCard.test.jsx +2 -2
  16. package/__tests__/RadioCard/RadioCardGroup.test.jsx +4 -5
  17. package/__tests__/Search/Search.test.jsx +9 -8
  18. package/__tests__/Select/Select.test.jsx +3 -2
  19. package/__tests__/Tabs/Tabs.test.jsx +1 -161
  20. package/__tests__/Tags/Tags.test.jsx +4 -5
  21. package/__tests__/TextInput/TextArea.test.jsx +3 -2
  22. package/__tests__/TextInput/TextInputBase.test.jsx +10 -5
  23. package/__tests__/ThemeProvider/ThemeProvider.test.jsx +77 -0
  24. package/__tests__/ThemeProvider/useThemeTokens.test.jsx +9 -5
  25. package/__tests__/ThemeProvider/utils/theme-tokens.test.js +41 -0
  26. package/__tests__/ToggleSwitch/ToggleSwitch.test.jsx +3 -2
  27. package/__tests__/utils/children.test.jsx +128 -0
  28. package/__tests__/utils/input.test.js +1 -1
  29. package/__tests__/utils/semantics.test.jsx +43 -0
  30. package/lib/A11yText/index.js +10 -5
  31. package/lib/ActivityIndicator/Spinner.js +16 -13
  32. package/lib/ActivityIndicator/Spinner.native.js +12 -8
  33. package/lib/Box/Box.js +102 -8
  34. package/lib/Button/Button.js +9 -8
  35. package/lib/Button/ButtonBase.js +14 -7
  36. package/lib/Button/ButtonGroup.js +25 -10
  37. package/lib/Button/ButtonLink.js +10 -7
  38. package/lib/Card/Card.js +2 -0
  39. package/lib/Card/CardBase.js +12 -5
  40. package/lib/Card/PressableCardBase.js +12 -8
  41. package/lib/Checkbox/Checkbox.js +25 -14
  42. package/lib/Checkbox/CheckboxGroup.js +22 -12
  43. package/lib/Divider/Divider.js +12 -7
  44. package/lib/ExpandCollapse/Accordion.js +10 -4
  45. package/lib/ExpandCollapse/Control.js +12 -6
  46. package/lib/ExpandCollapse/ExpandCollapse.js +10 -5
  47. package/lib/ExpandCollapse/Panel.js +8 -7
  48. package/lib/Feedback/Feedback.js +10 -5
  49. package/lib/Fieldset/Fieldset.js +10 -5
  50. package/lib/Fieldset/FieldsetContainer.js +10 -5
  51. package/lib/Fieldset/FieldsetContainer.native.js +10 -5
  52. package/lib/Fieldset/Legend.js +10 -5
  53. package/lib/Fieldset/Legend.native.js +10 -5
  54. package/lib/FlexGrid/Col/Col.js +8 -5
  55. package/lib/FlexGrid/FlexGrid.js +31 -6
  56. package/lib/FlexGrid/Row/Row.js +12 -5
  57. package/lib/{Tabs → HorizontalScroll}/HorizontalScroll.js +5 -4
  58. package/lib/{Tabs/TabsScrollButton.js → HorizontalScroll/HorizontalScrollButton.js} +14 -8
  59. package/lib/{Tabs → HorizontalScroll}/ScrollViewEnd.js +0 -0
  60. package/lib/{Tabs → HorizontalScroll}/ScrollViewEnd.native.js +0 -0
  61. package/lib/{Tabs → HorizontalScroll}/dictionary.js +0 -0
  62. package/lib/HorizontalScroll/index.js +35 -0
  63. package/lib/{Tabs → HorizontalScroll}/itemPositions.js +0 -0
  64. package/lib/Icon/Icon.js +16 -9
  65. package/lib/Icon/IconText.js +8 -7
  66. package/lib/IconButton/IconButton.js +10 -5
  67. package/lib/InputLabel/InputLabel.js +33 -5
  68. package/lib/InputLabel/LabelContent.js +22 -12
  69. package/lib/InputLabel/LabelContent.native.js +23 -5
  70. package/lib/InputSupports/InputSupports.js +10 -5
  71. package/lib/Link/ChevronLink.js +12 -5
  72. package/lib/Link/InlinePressable.js +10 -4
  73. package/lib/Link/InlinePressable.native.js +5 -4
  74. package/lib/Link/Link.js +12 -5
  75. package/lib/Link/LinkBase.js +12 -5
  76. package/lib/Link/TextButton.js +10 -5
  77. package/lib/List/List.js +5 -4
  78. package/lib/List/ListItem.js +16 -8
  79. package/lib/Modal/Modal.js +10 -5
  80. package/lib/Notification/Notification.js +21 -5
  81. package/lib/Pagination/PageButton.js +21 -10
  82. package/lib/Pagination/Pagination.js +12 -7
  83. package/lib/Pagination/SideButton.js +12 -7
  84. package/lib/Pagination/usePagination.js +2 -2
  85. package/lib/Progress/Progress.js +10 -5
  86. package/lib/Progress/ProgressBar.js +21 -10
  87. package/lib/Progress/ProgressBarBackground.js +12 -8
  88. package/lib/Radio/Radio.js +14 -13
  89. package/lib/Radio/RadioButton.js +20 -9
  90. package/lib/Radio/RadioGroup.js +24 -13
  91. package/lib/RadioCard/RadioCard.js +14 -10
  92. package/lib/RadioCard/RadioCardGroup.js +13 -12
  93. package/lib/Search/Search.js +29 -18
  94. package/lib/Select/Picker.js +11 -6
  95. package/lib/Select/Picker.native.js +21 -6
  96. package/lib/Select/Select.js +46 -4
  97. package/lib/SideNav/Item.js +10 -5
  98. package/lib/SideNav/ItemsGroup.js +10 -5
  99. package/lib/SideNav/SideNav.js +11 -7
  100. package/lib/Skeleton/Skeleton.js +15 -15
  101. package/lib/Skeleton/skeletonWebAnimation.js +1 -1
  102. package/lib/Spacer/Spacer.js +19 -7
  103. package/lib/StackView/StackView.js +25 -7
  104. package/lib/StackView/StackWrap.js +16 -9
  105. package/lib/StackView/StackWrapBox.js +33 -8
  106. package/lib/StackView/StackWrapGap.js +16 -7
  107. package/lib/StackView/common.js +4 -2
  108. package/lib/StackView/getStackedContent.js +2 -2
  109. package/lib/StepTracker/StepTracker.js +10 -5
  110. package/lib/Tabs/Tabs.js +26 -19
  111. package/lib/Tabs/TabsItem.js +16 -12
  112. package/lib/Tags/Tags.js +27 -11
  113. package/lib/TextInput/TextArea.js +7 -5
  114. package/lib/TextInput/TextInput.js +12 -6
  115. package/lib/TextInput/TextInputBase.js +12 -8
  116. package/lib/ThemeProvider/ThemeProvider.js +14 -10
  117. package/lib/ThemeProvider/useSetTheme.js +6 -1
  118. package/lib/ThemeProvider/utils/styles.js +2 -2
  119. package/lib/ThemeProvider/utils/theme-tokens.js +39 -8
  120. package/lib/ToggleSwitch/ToggleSwitch.js +11 -6
  121. package/lib/Tooltip/Backdrop.js +10 -2
  122. package/lib/Tooltip/Tooltip.js +5 -4
  123. package/lib/Typography/Typography.js +40 -24
  124. package/lib/index.js +21 -0
  125. package/lib/utils/a11y/index.js +13 -0
  126. package/lib/utils/a11y/semantics.js +173 -0
  127. package/lib/utils/animation/useVerticalExpandAnimation.js +1 -1
  128. package/lib/utils/children.js +55 -8
  129. package/lib/utils/input.js +27 -17
  130. package/lib/utils/propTypes.js +82 -29
  131. package/lib/utils/useCopy.js +1 -1
  132. package/lib/utils/useHash.js +8 -4
  133. package/lib/utils/useSpacingScale.js +1 -3
  134. package/lib/utils/useUniqueId.js +1 -1
  135. package/package.json +9 -5
  136. package/release-context.json +4 -4
  137. package/src/A11yText/index.jsx +6 -4
  138. package/src/ActivityIndicator/Spinner.jsx +5 -3
  139. package/src/ActivityIndicator/Spinner.native.jsx +5 -3
  140. package/src/Box/Box.jsx +124 -39
  141. package/src/Button/Button.jsx +7 -4
  142. package/src/Button/ButtonBase.jsx +86 -77
  143. package/src/Button/ButtonGroup.jsx +81 -69
  144. package/src/Button/ButtonLink.jsx +18 -13
  145. package/src/Card/Card.jsx +2 -2
  146. package/src/Card/CardBase.jsx +5 -4
  147. package/src/Card/PressableCardBase.jsx +71 -64
  148. package/src/Checkbox/Checkbox.jsx +118 -108
  149. package/src/Checkbox/CheckboxGroup.jsx +72 -62
  150. package/src/Divider/Divider.jsx +7 -4
  151. package/src/ExpandCollapse/Accordion.jsx +3 -2
  152. package/src/ExpandCollapse/Control.jsx +40 -43
  153. package/src/ExpandCollapse/ExpandCollapse.jsx +26 -23
  154. package/src/ExpandCollapse/Panel.jsx +69 -63
  155. package/src/Feedback/Feedback.jsx +36 -33
  156. package/src/Fieldset/Fieldset.jsx +63 -56
  157. package/src/Fieldset/FieldsetContainer.jsx +14 -5
  158. package/src/Fieldset/FieldsetContainer.native.jsx +7 -4
  159. package/src/Fieldset/Legend.jsx +7 -2
  160. package/src/Fieldset/Legend.native.jsx +7 -2
  161. package/src/FlexGrid/Col/Col.jsx +139 -132
  162. package/src/FlexGrid/FlexGrid.jsx +79 -51
  163. package/src/FlexGrid/Row/Row.jsx +55 -48
  164. package/src/HorizontalScroll/HorizontalScroll.jsx +168 -0
  165. package/src/HorizontalScroll/HorizontalScrollButton.jsx +105 -0
  166. package/src/{Tabs → HorizontalScroll}/ScrollViewEnd.jsx +0 -0
  167. package/src/{Tabs → HorizontalScroll}/ScrollViewEnd.native.jsx +0 -0
  168. package/src/{Tabs → HorizontalScroll}/dictionary.js +0 -0
  169. package/src/HorizontalScroll/index.js +17 -0
  170. package/src/{Tabs → HorizontalScroll}/itemPositions.js +0 -0
  171. package/src/Icon/Icon.jsx +37 -35
  172. package/src/Icon/IconText.jsx +22 -17
  173. package/src/IconButton/IconButton.jsx +49 -42
  174. package/src/InputLabel/InputLabel.jsx +53 -38
  175. package/src/InputLabel/LabelContent.jsx +14 -6
  176. package/src/InputLabel/LabelContent.native.jsx +11 -2
  177. package/src/InputSupports/InputSupports.jsx +29 -34
  178. package/src/Link/ChevronLink.jsx +26 -16
  179. package/src/Link/InlinePressable.jsx +5 -3
  180. package/src/Link/InlinePressable.native.jsx +5 -3
  181. package/src/Link/Link.jsx +22 -16
  182. package/src/Link/LinkBase.jsx +67 -58
  183. package/src/Link/TextButton.jsx +30 -23
  184. package/src/List/List.jsx +5 -4
  185. package/src/List/ListItem.jsx +77 -82
  186. package/src/Modal/Modal.jsx +9 -4
  187. package/src/Notification/Notification.jsx +58 -43
  188. package/src/Pagination/PageButton.jsx +42 -35
  189. package/src/Pagination/Pagination.jsx +88 -92
  190. package/src/Pagination/SideButton.jsx +44 -41
  191. package/src/Progress/Progress.jsx +5 -4
  192. package/src/Progress/ProgressBar.jsx +42 -29
  193. package/src/Progress/ProgressBarBackground.jsx +5 -3
  194. package/src/Radio/Radio.jsx +85 -78
  195. package/src/Radio/RadioButton.jsx +54 -43
  196. package/src/Radio/RadioGroup.jsx +74 -63
  197. package/src/RadioCard/RadioCard.jsx +75 -68
  198. package/src/RadioCard/RadioCardGroup.jsx +82 -75
  199. package/src/Search/Search.jsx +127 -106
  200. package/src/Select/Picker.jsx +49 -42
  201. package/src/Select/Picker.native.jsx +56 -49
  202. package/src/Select/Select.jsx +115 -72
  203. package/src/SideNav/Item.jsx +53 -46
  204. package/src/SideNav/ItemsGroup.jsx +50 -43
  205. package/src/SideNav/SideNav.jsx +68 -60
  206. package/src/Skeleton/Skeleton.jsx +9 -13
  207. package/src/Spacer/Spacer.jsx +11 -4
  208. package/src/StackView/StackView.jsx +46 -23
  209. package/src/StackView/StackWrap.jsx +7 -6
  210. package/src/StackView/StackWrapBox.jsx +61 -28
  211. package/src/StackView/StackWrapGap.jsx +46 -24
  212. package/src/StackView/common.jsx +3 -2
  213. package/src/StepTracker/StepTracker.jsx +73 -62
  214. package/src/Tabs/Tabs.jsx +70 -62
  215. package/src/Tabs/TabsItem.jsx +111 -103
  216. package/src/Tags/Tags.jsx +114 -102
  217. package/src/TextInput/TextArea.jsx +5 -4
  218. package/src/TextInput/TextInput.jsx +5 -4
  219. package/src/TextInput/TextInputBase.jsx +84 -77
  220. package/src/ThemeProvider/ThemeProvider.jsx +11 -7
  221. package/src/ThemeProvider/useSetTheme.js +4 -0
  222. package/src/ThemeProvider/utils/theme-tokens.js +28 -0
  223. package/src/ToggleSwitch/ToggleSwitch.jsx +49 -50
  224. package/src/Tooltip/Tooltip.jsx +134 -130
  225. package/src/Typography/Typography.jsx +67 -44
  226. package/src/index.js +2 -0
  227. package/src/utils/a11y/index.js +1 -0
  228. package/src/utils/a11y/semantics.js +162 -0
  229. package/src/utils/children.jsx +60 -7
  230. package/src/utils/input.js +20 -17
  231. package/src/utils/propTypes.js +101 -39
  232. package/src/utils/useCopy.js +1 -1
  233. package/src/utils/useHash.js +8 -3
  234. package/stories/A11yText/A11yText.stories.jsx +2 -2
  235. package/stories/ActivityIndicator/ActivityIndicator.stories.jsx +1 -1
  236. package/stories/Box/Box.stories.jsx +1 -1
  237. package/stories/Button/Button.stories.jsx +2 -2
  238. package/stories/Button/ButtonGroup.stories.jsx +1 -1
  239. package/stories/Button/ButtonLink.stories.jsx +1 -1
  240. package/stories/Card/Card.stories.jsx +1 -1
  241. package/stories/Checkbox/Checkbox.stories.jsx +1 -1
  242. package/stories/Divider/Divider.stories.jsx +1 -1
  243. package/stories/ExpandCollapse/ExpandCollapse.stories.jsx +2 -2
  244. package/stories/Feedback/Feedback.stories.jsx +1 -1
  245. package/stories/FlexGrid/01 FlexGrid.stories.jsx +1 -1
  246. package/stories/FlexGrid/02 Row.stories.jsx +1 -1
  247. package/stories/FlexGrid/03 Col.stories.jsx +1 -1
  248. package/stories/Icon/Icon.stories.jsx +1 -1
  249. package/stories/IconButton/IconButton.stories.jsx +1 -1
  250. package/stories/InputLabel/InputLabel.stories.jsx +1 -1
  251. package/stories/Link/ChevronLink.stories.jsx +1 -1
  252. package/stories/Link/Link.stories.jsx +1 -1
  253. package/stories/Link/TextButton.stories.jsx +1 -1
  254. package/stories/List/List.stories.jsx +1 -1
  255. package/stories/Modal/Modal.stories.jsx +1 -1
  256. package/stories/Notification/Notification.stories.jsx +1 -1
  257. package/stories/Pagination/Pagination.stories.jsx +1 -1
  258. package/stories/Progress/Progress.stories.jsx +1 -1
  259. package/stories/Radio/Radio.stories.jsx +1 -1
  260. package/stories/RadioCard/RadioCard.stories.jsx +1 -1
  261. package/stories/Search/Search.stories.jsx +1 -1
  262. package/stories/Select/Select.stories.jsx +1 -1
  263. package/stories/SideNav/SideNav.stories.jsx +1 -1
  264. package/stories/SideNav/SideNavItem.stories.jsx +1 -1
  265. package/stories/SideNav/SideNavItemsGroup.stories.jsx +1 -1
  266. package/stories/Skeleton/Skeleton.stories.jsx +2 -2
  267. package/stories/Spacer/Spacer.stories.jsx +1 -1
  268. package/stories/StackView/StackView.stories.jsx +1 -1
  269. package/stories/StackView/StackWrap.stories.jsx +1 -1
  270. package/stories/StepTracker/StepTracker.stories.jsx +1 -1
  271. package/stories/Tabs/Tabs.stories.jsx +1 -1
  272. package/stories/Tags/Tags.stories.jsx +1 -1
  273. package/stories/TextInput/TextArea.stories.jsx +1 -1
  274. package/stories/TextInput/TextInput.stories.jsx +1 -1
  275. package/stories/ToggleSwitch/ToggleSwitch.stories.jsx +1 -1
  276. package/stories/Tooltip/Tooltip.stories.jsx +1 -1
  277. package/stories/TooltipButton/TooltipButton.stories.jsx +1 -1
  278. package/stories/Typography/Typography.stories.jsx +1 -1
  279. package/stories/platform-supports.jsx +1 -1
  280. package/stories/supports.jsx +2 -2
  281. package/src/Tabs/HorizontalScroll.jsx +0 -165
  282. package/src/Tabs/TabsScrollButton.jsx +0 -100
@@ -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
- openIds = [],
35
- panelId,
36
- onToggle,
37
- onPress,
38
- control,
39
- controlTokens,
40
- children,
41
- tokens,
42
- variant,
43
- ...rest
44
- }) => {
45
- const [containerHeight, setContainerHeight] = useState(null)
46
- const isExpanded = openIds.includes(panelId)
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
- const a11y = a11yProps.select(rest)
49
- a11y.accessibilityState = {
50
- ...(a11y.accessibilityState || {}),
51
- expanded: isExpanded
52
- }
52
+ const a11y = a11yProps.select(rest)
53
+ a11y.accessibilityState = {
54
+ ...(a11y.accessibilityState || {}),
55
+ expanded: isExpanded
56
+ }
53
57
 
54
- const themeTokens = useThemeTokens('ExpandCollapsePanel', tokens, variant, {
55
- expanded: isExpanded
56
- })
58
+ const themeTokens = useThemeTokens('ExpandCollapsePanel', tokens, variant, {
59
+ expanded: isExpanded
60
+ })
57
61
 
58
- const handleControlPress = () => {
59
- onToggle(panelId)
60
- if (onPress) onPress(panelId)
61
- }
62
+ const handleControlPress = (event) => {
63
+ onToggle(panelId, event)
64
+ if (onPress) onPress(panelId, event)
65
+ }
62
66
 
63
- const onContainerLayout = (event) => {
64
- if (containerHeight === null) {
65
- const { layout: { height = 0 } = {} } = event.nativeEvent
66
- setContainerHeight(height)
67
+ const onContainerLayout = (event) => {
68
+ if (containerHeight === null) {
69
+ const { layout: { height = 0 } = {} } = event.nativeEvent
70
+ setContainerHeight(height)
71
+ }
67
72
  }
68
- }
69
- const animatedStyles = useVerticalExpandAnimation({
70
- containerHeight,
71
- isExpanded,
72
- tokens: themeTokens
73
- })
73
+ const animatedStyles = useVerticalExpandAnimation({
74
+ containerHeight,
75
+ isExpanded,
76
+ tokens: themeTokens
77
+ })
74
78
 
75
- // on web we can hide the contents until we have the container measured and avoid occasional jitter
76
- // this won't work on native platforms
77
- const overflowContainerStyles =
78
- containerHeight === null && Platform.OS === 'web'
79
- ? { height: 0, visibility: 'hidden' }
80
- : undefined
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
- const focusabilityProps = isExpanded ? {} : a11yProps.nonFocusableProps
86
+ const focusabilityProps = isExpanded ? {} : a11yProps.nonFocusableProps
83
87
 
84
- return (
85
- <View style={selectGroupStyles(themeTokens)}>
86
- <ExpandCollapseControl
87
- {...a11y}
88
- isExpanded={isExpanded}
89
- tokens={controlTokens}
90
- onPress={handleControlPress}
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
- <View style={selectContainerStyles(themeTokens)}>{children}</View>
100
- </Animated.View>
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
- </View>
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 = ({ title, children, id, validation, tokens, variant, ...rest }) => {
44
- const themeTokens = useThemeTokens('Feedback', tokens, { ...variant, validation })
45
- const { space } = themeTokens
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
- const { icon: IconComponent } = themeTokens
48
+ const { icon: IconComponent } = themeTokens
48
49
 
49
- const titleTextStyles = selectTitleTextStyles(themeTokens)
50
- const contentTextStyles = selectContentTextStyles(themeTokens)
50
+ const titleTextStyles = selectTitleTextStyles(themeTokens)
51
+ const contentTextStyles = selectContentTextStyles(themeTokens)
51
52
 
52
- const content =
53
- typeof children === 'string' ? <Text style={contentTextStyles}>{children}</Text> : children
53
+ const content =
54
+ typeof children === 'string' ? <Text style={contentTextStyles}>{children}</Text> : children
54
55
 
55
- const accessibilityProps = a11yProps.select({
56
- accessibilityRole: validation === 'error' ? 'alert' : undefined,
57
- ...rest
58
- })
56
+ const accessibilityProps = a11yProps.select({
57
+ accessibilityRole: validation === 'error' ? 'alert' : undefined,
58
+ ...rest
59
+ })
59
60
 
60
- return (
61
- <View style={selectStyles(themeTokens)} {...accessibilityProps} nativeID={id}>
62
- <StackView space={space}>
63
- {title !== undefined && (
64
- <View style={staticStyles.title}>
65
- {IconComponent && (
66
- <View style={selectIconContainerStyles(themeTokens)}>
67
- <IconComponent {...selectIconTokens(themeTokens)} />
68
- </View>
69
- )}
70
- <Text style={titleTextStyles}>{title}</Text>
71
- </View>
72
- )}
73
- {content && typeof content === 'function'
74
- ? content({ textStyles: contentTextStyles, variant })
75
- : content}
76
- </StackView>
77
- </View>
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
- space,
20
- feedback,
21
- feedbackPosition = 'top',
22
- validation,
23
- legend,
24
- hint,
25
- hintPosition,
26
- tooltip,
27
- inactive,
28
- accessibilityRole,
29
- name: fieldsetName,
30
- children
31
- }) => {
32
- // Skips `inputId` because a fieldset' legend describes multiple inputs
33
- const { hintId, feedbackId, a11yProps } = useInputSupports({
34
- feedback,
35
- hint,
36
- label: legend,
37
- validation
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
- const legendContent = legend && (
41
- <Legend>
42
- <InputLabel
43
- label={legend}
44
- hint={hint}
45
- hintPosition={hintPosition}
46
- hintId={hintId}
47
- tooltip={tooltip}
48
- />
49
- </Legend>
50
- )
51
- const feedbackContent = feedback && (
52
- <Feedback id={feedbackId} title={feedback} validation={validation} />
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
- // Some accessibility patterns depend on elements being direct children, e.g. fieldset -> legend,
56
- // and on MacOS voiceover, radiogroup -> radio. To allow elements to be direct children of the
57
- // fieldset as much as possible, but also allow different spacing within content and between
58
- // fieldset / feedback / etc, wrap resolved children in a fragment, and stack with `preserveFragments`.
59
- const childContent = <>{typeof children === 'function' ? children({ a11yProps }) : children}</>
60
- const orderedContent =
61
- feedbackPosition === 'bottom'
62
- ? [legendContent, feedbackContent, childContent]
63
- : [legendContent, childContent, feedbackContent]
64
- const stackedContent = getStackedContent(orderedContent, { space, preserveFragments: true })
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
- return (
67
- <FieldsetContainer
68
- inactive={inactive}
69
- accessibilityRole={accessibilityRole}
70
- name={fieldsetName}
71
- >
72
- {stackedContent}
73
- </FieldsetContainer>
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 = ({ children, inactive, accessibilityRole, name: fieldsetName }) => (
10
- <fieldset disabled={inactive} style={cssReset} role={accessibilityRole} name={fieldsetName}>
11
- {children}
12
- </fieldset>
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}>{children}</View>
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,
@@ -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 }) => <legend style={cssReset}>{children}</legend>
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 }) => <View style={staticStyles.stretch}>{children}</View>
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