@telus-uds/components-base 0.0.2-prerelease.3 → 0.0.2-prerelease.7
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/.ultra.cache.json +1 -0
- package/CHANGELOG.md +55 -0
- package/__fixtures__/testTheme.js +528 -42
- package/__tests__/Button/ButtonBase.test.jsx +3 -32
- package/__tests__/Checkbox/Checkbox.test.jsx +94 -0
- package/__tests__/Divider/Divider.test.jsx +26 -5
- package/__tests__/Feedback/Feedback.test.jsx +42 -0
- package/__tests__/FlexGrid/Col.test.jsx +5 -0
- package/__tests__/InputSupports/InputSupports.test.jsx +50 -0
- package/__tests__/List/List.test.jsx +60 -0
- package/__tests__/Radio/Radio.test.jsx +87 -0
- package/__tests__/Select/Select.test.jsx +93 -0
- package/__tests__/Skeleton/Skeleton.test.jsx +61 -0
- package/__tests__/Spacer/Spacer.test.jsx +63 -0
- package/__tests__/StackView/StackView.test.jsx +216 -0
- package/__tests__/StackView/StackWrap.test.jsx +47 -0
- package/__tests__/StackView/getStackedContent.test.jsx +295 -0
- package/__tests__/Tags/Tags.test.jsx +328 -0
- package/__tests__/TextInput/TextArea.test.jsx +34 -0
- package/__tests__/TextInput/TextInputBase.test.jsx +120 -0
- package/__tests__/Tooltip/Tooltip.test.jsx +65 -0
- package/__tests__/Tooltip/getTooltipPosition.test.js +79 -0
- package/__tests__/utils/useCopy.test.js +31 -0
- package/__tests__/utils/useResponsiveProp.test.jsx +202 -0
- package/__tests__/utils/{spacing.test.jsx → useSpacingScale.test.jsx} +1 -1
- package/__tests__/utils/useUniqueId.test.js +31 -0
- package/jest.config.js +8 -2
- package/lib/Box/Box.js +7 -2
- package/lib/Button/Button.js +10 -3
- package/lib/Button/ButtonBase.js +79 -75
- package/lib/Button/ButtonGroup.js +24 -49
- package/lib/Button/ButtonLink.js +5 -0
- package/lib/Checkbox/Checkbox.js +308 -0
- package/lib/Checkbox/CheckboxInput.native.js +6 -0
- package/lib/Checkbox/CheckboxInput.web.js +57 -0
- package/lib/Checkbox/index.js +2 -0
- package/lib/Divider/Divider.js +40 -2
- package/lib/Feedback/Feedback.js +132 -0
- package/lib/Feedback/index.js +2 -0
- package/lib/Icon/Icon.js +9 -6
- package/lib/Icon/IconText.js +72 -0
- package/lib/Icon/index.js +2 -1
- package/lib/InputLabel/InputLabel.js +88 -0
- package/lib/InputLabel/LabelContent.native.js +8 -0
- package/lib/InputLabel/LabelContent.web.js +17 -0
- package/lib/InputLabel/index.js +2 -0
- package/lib/InputSupports/InputSupports.js +90 -0
- package/lib/InputSupports/index.js +2 -0
- package/lib/InputSupports/propTypes.js +55 -0
- package/lib/Link/ChevronLink.js +35 -10
- package/lib/Link/InlinePressable.native.js +78 -0
- package/lib/Link/InlinePressable.web.js +32 -0
- package/lib/Link/Link.js +11 -10
- package/lib/Link/LinkBase.js +69 -124
- package/lib/Link/TextButton.js +20 -9
- package/lib/Link/index.js +2 -1
- package/lib/List/List.js +52 -0
- package/lib/List/ListItem.js +207 -0
- package/lib/List/index.js +2 -0
- package/lib/Pagination/PageButton.js +3 -26
- package/lib/Pagination/SideButton.js +32 -42
- package/lib/Radio/Radio.js +291 -0
- package/lib/Radio/RadioInput.native.js +6 -0
- package/lib/Radio/RadioInput.web.js +59 -0
- package/lib/Radio/index.js +2 -0
- package/lib/Select/Group.native.js +14 -0
- package/lib/Select/Group.web.js +18 -0
- package/lib/Select/Item.native.js +9 -0
- package/lib/Select/Item.web.js +15 -0
- package/lib/Select/Picker.native.js +87 -0
- package/lib/Select/Picker.web.js +63 -0
- package/lib/Select/Select.js +272 -0
- package/lib/Select/index.js +6 -0
- package/lib/Skeleton/Skeleton.js +119 -0
- package/lib/Skeleton/index.js +2 -0
- package/lib/Spacer/Spacer.js +98 -0
- package/lib/Spacer/index.js +2 -0
- package/lib/StackView/StackView.js +107 -0
- package/lib/StackView/StackWrap.js +32 -0
- package/lib/StackView/StackWrap.native.js +3 -0
- package/lib/StackView/StackWrapBox.js +90 -0
- package/lib/StackView/StackWrapGap.js +50 -0
- package/lib/StackView/common.js +30 -0
- package/lib/StackView/getStackedContent.js +111 -0
- package/lib/StackView/index.js +5 -0
- package/lib/Tags/Tags.js +217 -0
- package/lib/Tags/index.js +2 -0
- package/lib/TextInput/TextArea.js +82 -0
- package/lib/TextInput/TextInput.js +54 -0
- package/lib/TextInput/TextInputBase.js +229 -0
- package/lib/TextInput/index.js +3 -0
- package/lib/TextInput/propTypes.js +31 -0
- package/lib/ThemeProvider/useThemeTokens.js +54 -3
- package/lib/ToggleSwitch/ToggleSwitch.js +1 -1
- package/lib/Tooltip/Backdrop.native.js +35 -0
- package/lib/Tooltip/Backdrop.web.js +52 -0
- package/lib/Tooltip/Tooltip.js +315 -0
- package/lib/Tooltip/dictionary.js +8 -0
- package/lib/Tooltip/getTooltipPosition.js +164 -0
- package/lib/Tooltip/index.js +2 -0
- package/lib/TooltipButton/TooltipButton.js +64 -0
- package/lib/TooltipButton/index.js +2 -0
- package/lib/Typography/Typography.js +4 -23
- package/lib/ViewportProvider/ViewportProvider.js +25 -0
- package/lib/ViewportProvider/index.js +2 -43
- package/lib/ViewportProvider/useViewport.js +3 -0
- package/lib/ViewportProvider/useViewportListener.js +43 -0
- package/lib/index.js +15 -1
- package/lib/utils/a11y/index.js +1 -0
- package/lib/utils/a11y/textSize.js +33 -0
- package/lib/utils/index.js +7 -1
- package/lib/utils/info/index.js +7 -0
- package/lib/utils/info/platform/index.js +11 -0
- package/lib/utils/info/platform/platform.android.js +1 -0
- package/lib/utils/info/platform/platform.ios.js +1 -0
- package/lib/utils/info/platform/platform.native.js +4 -0
- package/lib/utils/info/platform/platform.web.js +1 -0
- package/lib/utils/info/versions.js +5 -0
- package/lib/utils/input.js +3 -1
- package/lib/utils/pressability.js +92 -0
- package/lib/utils/propTypes.js +77 -8
- package/lib/utils/useCopy.js +16 -0
- package/lib/utils/useResponsiveProp.js +47 -0
- package/lib/utils/{spacing/useSpacingScale.js → useSpacingScale.js} +30 -9
- package/lib/utils/useUniqueId.js +12 -0
- package/package.json +7 -5
- package/release-context.json +4 -4
- package/src/Box/Box.jsx +4 -2
- package/src/Button/Button.jsx +6 -3
- package/src/Button/ButtonBase.jsx +72 -75
- package/src/Button/ButtonGroup.jsx +22 -39
- package/src/Button/ButtonLink.jsx +11 -2
- package/src/Checkbox/Checkbox.jsx +275 -0
- package/src/Checkbox/CheckboxInput.native.jsx +6 -0
- package/src/Checkbox/CheckboxInput.web.jsx +55 -0
- package/src/Checkbox/index.js +3 -0
- package/src/Divider/Divider.jsx +38 -3
- package/src/Feedback/Feedback.jsx +108 -0
- package/src/Feedback/index.js +3 -0
- package/src/Icon/Icon.jsx +11 -6
- package/src/Icon/IconText.jsx +63 -0
- package/src/Icon/index.js +2 -1
- package/src/InputLabel/InputLabel.jsx +99 -0
- package/src/InputLabel/LabelContent.native.jsx +6 -0
- package/src/InputLabel/LabelContent.web.jsx +13 -0
- package/src/InputLabel/index.js +3 -0
- package/src/InputSupports/InputSupports.jsx +86 -0
- package/src/InputSupports/index.js +3 -0
- package/src/InputSupports/propTypes.js +44 -0
- package/src/Link/ChevronLink.jsx +28 -7
- package/src/Link/InlinePressable.native.jsx +73 -0
- package/src/Link/InlinePressable.web.jsx +37 -0
- package/src/Link/Link.jsx +17 -13
- package/src/Link/LinkBase.jsx +62 -139
- package/src/Link/TextButton.jsx +25 -11
- package/src/Link/index.js +2 -1
- package/src/List/List.jsx +47 -0
- package/src/List/ListItem.jsx +187 -0
- package/src/List/index.js +3 -0
- package/src/Pagination/PageButton.jsx +3 -17
- package/src/Pagination/SideButton.jsx +27 -38
- package/src/Radio/Radio.jsx +270 -0
- package/src/Radio/RadioInput.native.jsx +6 -0
- package/src/Radio/RadioInput.web.jsx +57 -0
- package/src/Radio/index.js +3 -0
- package/src/Select/Group.native.jsx +14 -0
- package/src/Select/Group.web.jsx +15 -0
- package/src/Select/Item.native.jsx +10 -0
- package/src/Select/Item.web.jsx +11 -0
- package/src/Select/Picker.native.jsx +95 -0
- package/src/Select/Picker.web.jsx +67 -0
- package/src/Select/Select.jsx +265 -0
- package/src/Select/index.js +8 -0
- package/src/Skeleton/Skeleton.jsx +101 -0
- package/src/Skeleton/index.js +3 -0
- package/src/Spacer/Spacer.jsx +91 -0
- package/src/Spacer/index.js +3 -0
- package/src/StackView/StackView.jsx +104 -0
- package/src/StackView/StackWrap.jsx +33 -0
- package/src/StackView/StackWrap.native.jsx +4 -0
- package/src/StackView/StackWrapBox.jsx +93 -0
- package/src/StackView/StackWrapGap.jsx +49 -0
- package/src/StackView/common.jsx +28 -0
- package/src/StackView/getStackedContent.jsx +106 -0
- package/src/StackView/index.js +6 -0
- package/src/Tags/Tags.jsx +206 -0
- package/src/Tags/index.js +3 -0
- package/src/TextInput/TextArea.jsx +78 -0
- package/src/TextInput/TextInput.jsx +52 -0
- package/src/TextInput/TextInputBase.jsx +220 -0
- package/src/TextInput/index.js +4 -0
- package/src/TextInput/propTypes.js +29 -0
- package/src/ThemeProvider/useThemeTokens.js +54 -3
- package/src/ToggleSwitch/ToggleSwitch.jsx +1 -1
- package/src/Tooltip/Backdrop.native.jsx +33 -0
- package/src/Tooltip/Backdrop.web.jsx +60 -0
- package/src/Tooltip/Tooltip.jsx +294 -0
- package/src/Tooltip/dictionary.js +8 -0
- package/src/Tooltip/getTooltipPosition.js +161 -0
- package/src/Tooltip/index.js +3 -0
- package/src/TooltipButton/TooltipButton.jsx +53 -0
- package/src/TooltipButton/index.js +3 -0
- package/src/Typography/Typography.jsx +4 -19
- package/src/ViewportProvider/ViewportProvider.jsx +21 -0
- package/src/ViewportProvider/index.jsx +2 -41
- package/src/ViewportProvider/useViewport.js +5 -0
- package/src/ViewportProvider/useViewportListener.js +43 -0
- package/src/index.js +15 -1
- package/src/utils/a11y/index.js +1 -0
- package/src/utils/a11y/textSize.js +30 -0
- package/src/utils/index.js +8 -1
- package/src/utils/info/index.js +8 -0
- package/src/utils/info/platform/index.js +11 -0
- package/src/utils/info/platform/platform.android.js +1 -0
- package/src/utils/info/platform/platform.ios.js +1 -0
- package/src/utils/info/platform/platform.native.js +4 -0
- package/src/utils/info/platform/platform.web.js +1 -0
- package/src/utils/info/versions.js +6 -0
- package/src/utils/input.js +2 -1
- package/src/utils/pressability.js +92 -0
- package/src/utils/propTypes.js +97 -13
- package/src/utils/useCopy.js +13 -0
- package/src/utils/useResponsiveProp.js +50 -0
- package/src/utils/{spacing/useSpacingScale.js → useSpacingScale.js} +25 -10
- package/src/utils/useUniqueId.js +14 -0
- package/stories/A11yText/A11yText.stories.jsx +11 -5
- package/stories/ActivityIndicator/ActivityIndicator.stories.jsx +11 -2
- package/stories/Box/Box.stories.jsx +29 -2
- package/stories/Button/Button.stories.jsx +21 -20
- package/stories/Button/ButtonGroup.stories.jsx +2 -1
- package/stories/Button/ButtonLink.stories.jsx +6 -4
- package/stories/Card/Card.stories.jsx +13 -1
- package/stories/Checkbox/Checkbox.stories.jsx +71 -0
- package/stories/Divider/Divider.stories.jsx +26 -2
- package/stories/ExpandCollapse/ExpandCollapse.stories.jsx +74 -79
- package/stories/Feedback/Feedback.stories.jsx +96 -0
- package/stories/FlexGrid/01 FlexGrid.stories.jsx +20 -7
- package/stories/Icon/Icon.stories.jsx +11 -3
- package/stories/InputLabel/InputLabel.stories.jsx +42 -0
- package/stories/Link/ChevronLink.stories.jsx +20 -4
- package/stories/Link/Link.stories.jsx +39 -3
- package/stories/Link/TextButton.stories.jsx +24 -2
- package/stories/List/List.stories.jsx +117 -0
- package/stories/Pagination/Pagination.stories.jsx +28 -14
- package/stories/Radio/Radio.stories.jsx +113 -0
- package/stories/Select/Select.stories.jsx +55 -0
- package/stories/SideNav/SideNav.stories.jsx +17 -2
- package/stories/Skeleton/Skeleton.stories.jsx +36 -0
- package/stories/Spacer/Spacer.stories.jsx +38 -0
- package/stories/StackView/StackView.stories.jsx +75 -0
- package/stories/StackView/StackWrap.stories.jsx +64 -0
- package/stories/Tags/Tags.stories.jsx +69 -0
- package/stories/TextInput/TextArea.stories.jsx +100 -0
- package/stories/TextInput/TextInput.stories.jsx +103 -0
- package/stories/ToggleSwitch/ToggleSwitch.stories.jsx +16 -3
- package/stories/Tooltip/Tooltip.stories.jsx +81 -0
- package/stories/TooltipButton/TooltipButton.stories.jsx +11 -0
- package/stories/Typography/Typography.stories.jsx +12 -3
- package/stories/platform-supports.web.jsx +1 -1
- package/stories/supports.jsx +110 -14
- package/lib/Pagination/useCopy.js +0 -10
- package/lib/utils/spacing/index.js +0 -2
- package/lib/utils/spacing/utils.js +0 -32
- package/src/Pagination/useCopy.js +0 -7
- package/src/utils/spacing/index.js +0 -3
- package/src/utils/spacing/utils.js +0 -28
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { useLayoutEffect } from 'react'
|
|
2
|
+
import { Dimensions } from 'react-native'
|
|
3
|
+
import { viewports } from '@telus-uds/system-constants'
|
|
4
|
+
|
|
5
|
+
// Use Dimensions instead of useWindowDimensions because useWindowDimensions forces context
|
|
6
|
+
// to update on every pixel change during window resize; but we only want rerenders to occur
|
|
7
|
+
// when a viewport threshold has been crossed.
|
|
8
|
+
const lookupViewport = () => viewports.select(Dimensions.get('window').width)
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* In SSR, React gets spooked if it sees `useLayoutEffect` and fires warnings assuming the
|
|
12
|
+
* developer doesn't realise the effect won't run: https://reactjs.org/link/uselayouteffect-ssr
|
|
13
|
+
*
|
|
14
|
+
* To avoid these warnings while still conforming to the rules of hooks, always use this
|
|
15
|
+
* explicitly no-op hook, instead of the useLayoutEffect that is implicitly no-op on SSR.
|
|
16
|
+
*/
|
|
17
|
+
const useViewportListenerSSR = () => {}
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* When client-side rendering, immediately set the viewport to the correct value as a layout effect so
|
|
21
|
+
* if the viewport isn't the smallest, any SSR-rendered components rerender correctly before anything
|
|
22
|
+
* is shown to the user. Then bind events to update the viewport if it changes.
|
|
23
|
+
*/
|
|
24
|
+
const useViewportListenerCSR = (setViewport) => {
|
|
25
|
+
useLayoutEffect(() => {
|
|
26
|
+
setViewport(lookupViewport())
|
|
27
|
+
|
|
28
|
+
const onChange = ({ window }) => setViewport(viewports.select(window.width))
|
|
29
|
+
const listener = Dimensions.addEventListener('change', onChange)
|
|
30
|
+
|
|
31
|
+
// From RN 0.65.0, Dimensions.removeEventListener is deprecated for `remove` on addEventListener return value;
|
|
32
|
+
// however, that is not available in RN <=0.64.X, therefore not in any Expo release as of 2021 (Expo SDK 43).
|
|
33
|
+
return listener?.remove || (() => Dimensions.removeEventListener('change', onChange))
|
|
34
|
+
|
|
35
|
+
// setViewport is a function from `useState` so it is stable and won't make the effect re-run
|
|
36
|
+
}, [setViewport])
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
// Window is a defined global object in both Web and Native client-side, and undefined in SSR
|
|
40
|
+
const isSSR = typeof window === 'undefined'
|
|
41
|
+
const useViewportListener = isSSR ? useViewportListenerSSR : useViewportListenerCSR
|
|
42
|
+
|
|
43
|
+
export default useViewportListener
|
package/src/index.js
CHANGED
|
@@ -1,21 +1,35 @@
|
|
|
1
|
+
export { default as A11yText } from './A11yText'
|
|
1
2
|
export { default as ActivityIndicator } from './ActivityIndicator'
|
|
2
3
|
export { default as Box } from './Box'
|
|
3
4
|
export * from './Button'
|
|
4
5
|
export { default as Card } from './Card'
|
|
6
|
+
export { default as Checkbox } from './Checkbox'
|
|
5
7
|
export { default as Divider } from './Divider'
|
|
6
8
|
export { default as ExpandCollapse, Accordion } from './ExpandCollapse'
|
|
9
|
+
export { default as Feedback } from './Feedback'
|
|
7
10
|
export { default as FlexGrid } from './FlexGrid'
|
|
8
11
|
export { default as Icon } from './Icon'
|
|
9
12
|
export * from './Icon'
|
|
10
13
|
export * from './Link'
|
|
14
|
+
export { default as List } from './List'
|
|
11
15
|
export { default as Pagination } from './Pagination'
|
|
16
|
+
export { default as Radio } from './Radio'
|
|
17
|
+
export { default as Select } from './Select'
|
|
12
18
|
export { default as SideNav } from './SideNav'
|
|
19
|
+
export { default as Skeleton } from './Skeleton'
|
|
20
|
+
export { default as Spacer } from './Spacer'
|
|
21
|
+
export { default as StackView } from './StackView'
|
|
22
|
+
export * from './StackView'
|
|
23
|
+
export { default as Tags } from './Tags'
|
|
24
|
+
export * from './TextInput'
|
|
13
25
|
export { default as ToggleSwitch } from './ToggleSwitch'
|
|
26
|
+
export { default as Tooltip } from './Tooltip'
|
|
27
|
+
export { default as TooltipButton } from './TooltipButton'
|
|
14
28
|
export { default as Typography } from './Typography'
|
|
15
29
|
|
|
16
30
|
export { default as A11yInfoProvider, useA11yInfo } from './A11yInfoProvider'
|
|
17
31
|
export { default as BaseProvider } from './BaseProvider'
|
|
18
32
|
export { default as ViewportProvider, useViewport } from './ViewportProvider'
|
|
19
|
-
export { default as ThemeProvider, useTheme, useSetTheme } from './ThemeProvider'
|
|
33
|
+
export { default as ThemeProvider, useTheme, useSetTheme, useThemeTokens } from './ThemeProvider'
|
|
20
34
|
|
|
21
35
|
export * from './utils'
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './textSize'
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { PixelRatio, Platform } from 'react-native'
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* When a user increases text size using device accessibility settings, some elements
|
|
5
|
+
* should also scale, such as icons alongside text and space between paragraphs.
|
|
6
|
+
*
|
|
7
|
+
* @param {number} [value] - the value to multiply; defaults to system default font size
|
|
8
|
+
* @param {number} [maxScale] - the maximum multiplier to apply; defaults to no maximum
|
|
9
|
+
*/
|
|
10
|
+
export const scaleWithText = (value, maxScale = Infinity) => {
|
|
11
|
+
if (!value) return value
|
|
12
|
+
const scale = Math.min(PixelRatio.getFontScale(), maxScale) || 1
|
|
13
|
+
return value * scale
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Native only, returns `undefined` on Web.
|
|
18
|
+
*
|
|
19
|
+
* Enforces `fontScaleCap` theme tokens as the maximum font size text can become
|
|
20
|
+
* after iOS or Android font scaling, to give consistent accessible maximum sizes
|
|
21
|
+
* that don't make the content unusable.
|
|
22
|
+
*
|
|
23
|
+
* The return value of this function can be used as a React Native `Text` element's
|
|
24
|
+
* `maxFontSizeMultiplier` prop value.
|
|
25
|
+
*/
|
|
26
|
+
export const getMaxFontMultiplier = ({ fontSize, fontScaleCap }) => {
|
|
27
|
+
if (Platform.OS === 'web' || !fontScaleCap || !fontSize) return undefined
|
|
28
|
+
if (fontScaleCap <= fontSize) return 1
|
|
29
|
+
return fontScaleCap / fontSize
|
|
30
|
+
}
|
package/src/utils/index.js
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
|
+
export * from './a11y'
|
|
1
2
|
export * from './animation'
|
|
2
3
|
export * from './input'
|
|
4
|
+
export * from './pressability'
|
|
3
5
|
export * from './propTypes'
|
|
4
|
-
|
|
6
|
+
|
|
7
|
+
export { default as info } from './info'
|
|
8
|
+
export { default as useSpacingScale } from './useSpacingScale'
|
|
9
|
+
export { default as useResponsiveProp } from './useResponsiveProp'
|
|
10
|
+
export * from './useResponsiveProp'
|
|
11
|
+
export { default as useUniqueId } from './useUniqueId'
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Platform } from 'react-native'
|
|
2
|
+
import fileSuffix from './platform'
|
|
3
|
+
|
|
4
|
+
// Allows consuming libraries that might not have a direct dependency on
|
|
5
|
+
// React Native to check what the current platform is.
|
|
6
|
+
|
|
7
|
+
// Particularly useful for validating Jest config: it is possible for Jest to
|
|
8
|
+
// get configured such that Platform.OS returns a different mocked value to the
|
|
9
|
+
// OS being used to select files by platform suffix (e.g. .web, .native).
|
|
10
|
+
|
|
11
|
+
export default { OS: Platform.OS, fileSuffix }
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default '.android'
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default '.ios'
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
// This shouldn't ever be chosen, as the more specific '.ios' and '.android' are available.
|
|
2
|
+
// If this gets picked, either an unsupported React Native platform is being used somehow
|
|
3
|
+
// (e.g. a native Windows app), or there's a serious config problem somewhere.
|
|
4
|
+
export default '.native'
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default '.web'
|
package/src/utils/input.js
CHANGED
|
@@ -55,6 +55,7 @@ Consumers of this hook must be one of:
|
|
|
55
55
|
* currentValue: any
|
|
56
56
|
* setValue: (value: any) => void
|
|
57
57
|
* resetValue: () => void
|
|
58
|
+
* isControlled: bool
|
|
58
59
|
* }}
|
|
59
60
|
*/
|
|
60
61
|
|
|
@@ -81,7 +82,7 @@ export const useInputValue = (props = {}, hookName = 'useInputValue') => {
|
|
|
81
82
|
)
|
|
82
83
|
const resetValue = useCallback(() => setValue(initializedValue), [initializedValue, setValue])
|
|
83
84
|
|
|
84
|
-
return { currentValue, setValue, resetValue }
|
|
85
|
+
return { currentValue, setValue, resetValue, isControlled }
|
|
85
86
|
}
|
|
86
87
|
|
|
87
88
|
/**
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { Platform, StyleSheet } from 'react-native'
|
|
2
|
+
import { pressProps } from './propTypes'
|
|
3
|
+
|
|
4
|
+
// These roles should result in cursor: pointer but don't in current RNW releases
|
|
5
|
+
const shouldUseCursor = ['checkbox', 'radio', 'switch']
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* React Native Web has some built-in logic for applying cursor styles based on accessibility roles;
|
|
9
|
+
* however, it misses certain cases. This fills in known cases where widely used versions of RNW
|
|
10
|
+
* fail to apply an expected cursor style.
|
|
11
|
+
*
|
|
12
|
+
* @param {object} props
|
|
13
|
+
* @param {boolean} [props.inactive]
|
|
14
|
+
* @param {boolean} [props.disabled]
|
|
15
|
+
* @param {string} [props.accessibilityRole]
|
|
16
|
+
* @returns
|
|
17
|
+
*/
|
|
18
|
+
export const getCursorStyle = ({ inactive, disabled, accessibilityRole }) => {
|
|
19
|
+
if (Platform.OS !== 'web') return undefined
|
|
20
|
+
|
|
21
|
+
if (inactive || disabled) return staticStyles.notAllowed
|
|
22
|
+
if (shouldUseCursor.includes(accessibilityRole)) return staticStyles.pointer
|
|
23
|
+
|
|
24
|
+
return undefined // allows React Native Web's built-in logic to apply
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* @typedef {{ pressed: boolean, focused: boolean, hovered?: boolean }} PressableState
|
|
29
|
+
*/
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Maps the state object given by the React Native `Pressable` component to the set of
|
|
33
|
+
* equivalent appearance names used in UDS.
|
|
34
|
+
*
|
|
35
|
+
* @param {PressableState} pressableState - state object passed by React Native's `<Pressable>` into
|
|
36
|
+
* render functions passed to its `style` or `children` props.
|
|
37
|
+
* @param {object} [additionalState] - properties specific to the current component,
|
|
38
|
+
* such as `inactive`, `selected`, etc.
|
|
39
|
+
* @returns {object}
|
|
40
|
+
*/
|
|
41
|
+
export const resolvePressableState = (
|
|
42
|
+
{ pressed = false, focused = false, hovered = false } = {},
|
|
43
|
+
additionalState
|
|
44
|
+
) => ({
|
|
45
|
+
...additionalState,
|
|
46
|
+
focus: focused,
|
|
47
|
+
hover: hovered,
|
|
48
|
+
pressed
|
|
49
|
+
})
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Takes a UDS `tokens` prop and, if it is a function, resolves it based on a state
|
|
53
|
+
* object passed from the React Native `Pressable` component and optional extra properties.
|
|
54
|
+
*
|
|
55
|
+
* @param {object|function} tokens - UDS system tokens prop
|
|
56
|
+
* @param {PressableState} pressableState - state object passed by React Native's `<Pressable>`
|
|
57
|
+
* @param {object} [additionalState] - properties specific to the current component
|
|
58
|
+
* @returns {object} - resolved tokens object
|
|
59
|
+
*/
|
|
60
|
+
export const resolvePressableTokens = (tokens, pressableState, additionalState) => {
|
|
61
|
+
if (typeof tokens !== 'function') return tokens
|
|
62
|
+
const udsPressableState = resolvePressableState(pressableState, additionalState)
|
|
63
|
+
return tokens(udsPressableState)
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
const staticStyles = StyleSheet.create(
|
|
67
|
+
Platform.select({
|
|
68
|
+
web: {
|
|
69
|
+
notAllowed: { cursor: 'not-allowed' },
|
|
70
|
+
pointer: { cursor: 'pointer' }
|
|
71
|
+
},
|
|
72
|
+
default: {}
|
|
73
|
+
})
|
|
74
|
+
)
|
|
75
|
+
|
|
76
|
+
/**
|
|
77
|
+
* From an object of props, extracts any platform-appropriate press handler functions and wraps
|
|
78
|
+
* them in a function that passes in some provided args. Allows components containing a Pressable
|
|
79
|
+
* to pass in press handlers that are then called with state or values that is otherwise internal.
|
|
80
|
+
*/
|
|
81
|
+
export const getPressHandlersWithArgs = (pressableProps = {}, args = []) => {
|
|
82
|
+
// Allow handlers to be passed down for blur, hover, focus, pressIn, etc
|
|
83
|
+
const pressHandlers = Object.fromEntries(
|
|
84
|
+
Object.entries(pressProps.selectHandlers(pressableProps)).map(([key, handler]) => ({
|
|
85
|
+
[key]: (...defaultArgs) => {
|
|
86
|
+
// Pass each handler data on this button and current selection
|
|
87
|
+
handler(...args, ...defaultArgs)
|
|
88
|
+
}
|
|
89
|
+
}))
|
|
90
|
+
)
|
|
91
|
+
return pressHandlers
|
|
92
|
+
}
|
package/src/utils/propTypes.js
CHANGED
|
@@ -1,6 +1,24 @@
|
|
|
1
1
|
import PropTypes from 'prop-types'
|
|
2
2
|
import { Linking, Platform } from 'react-native'
|
|
3
|
-
import { tokenKeys } from '@telus-uds/
|
|
3
|
+
import { components as tokenKeys } from '@telus-uds/system-themes/schema'
|
|
4
|
+
|
|
5
|
+
export const paddingProp = {
|
|
6
|
+
propType: PropTypes.shape({
|
|
7
|
+
paddingBottom: PropTypes.number,
|
|
8
|
+
paddingLeft: PropTypes.number,
|
|
9
|
+
paddingRight: PropTypes.number,
|
|
10
|
+
paddingTop: PropTypes.number
|
|
11
|
+
})
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export const rectProp = {
|
|
15
|
+
propType: PropTypes.shape({
|
|
16
|
+
bottom: PropTypes.number,
|
|
17
|
+
left: PropTypes.number,
|
|
18
|
+
right: PropTypes.number,
|
|
19
|
+
top: PropTypes.number
|
|
20
|
+
})
|
|
21
|
+
}
|
|
4
22
|
|
|
5
23
|
/**
|
|
6
24
|
* @typedef {{[key: string]: string|number|boolean}} AppearanceSet
|
|
@@ -29,7 +47,7 @@ const tokenValueType = PropTypes.oneOfType([tokenValue, PropTypes.objectOf(token
|
|
|
29
47
|
const getTokenNames = (componentName) => {
|
|
30
48
|
const componentTokenNames = tokenKeys[componentName]
|
|
31
49
|
if (!componentTokenNames) {
|
|
32
|
-
throw new Error(`No "${componentName}" tokenKeys in @telus-uds/
|
|
50
|
+
throw new Error(`No "${componentName}" tokenKeys in @telus-uds/system-themes/schema`)
|
|
33
51
|
}
|
|
34
52
|
return componentTokenNames
|
|
35
53
|
}
|
|
@@ -59,14 +77,48 @@ export const selectTokens = (componentName, tokens) => {
|
|
|
59
77
|
*
|
|
60
78
|
* This prop is intended to be used as an 'escape hatch' for difficult or exceptional cases
|
|
61
79
|
* where the main theming system doesn't apply. It is intentionally permissive about values.
|
|
80
|
+
*
|
|
81
|
+
* @param {...string} componentsNames - one or more ComponentName, which tokens keys are accepted
|
|
82
|
+
* @return {function} - a custom PropTypes validator
|
|
83
|
+
*
|
|
84
|
+
* @example
|
|
85
|
+
* Component.propTypes = {
|
|
86
|
+
* // accepts all tokens keys defined in Component schema
|
|
87
|
+
* tokens: getTokensPropType('Component')
|
|
88
|
+
* }
|
|
89
|
+
*
|
|
90
|
+
* Component.propTypes = {
|
|
91
|
+
* // accepts all tokens keys defined in schemas for Component1 and Component2
|
|
92
|
+
* tokens: getTokensPropType('Component1', 'Component2')
|
|
93
|
+
* }
|
|
62
94
|
*/
|
|
63
|
-
export const getTokensPropType = (componentName) =>
|
|
64
|
-
PropTypes.
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
95
|
+
export const getTokensPropType = (...componentsNames) => (props, propName, componentName) => {
|
|
96
|
+
PropTypes.checkPropTypes(
|
|
97
|
+
{
|
|
98
|
+
[propName]: PropTypes.oneOfType([PropTypes.object, PropTypes.func])
|
|
99
|
+
},
|
|
100
|
+
props,
|
|
101
|
+
propName,
|
|
102
|
+
componentName
|
|
103
|
+
)
|
|
104
|
+
|
|
105
|
+
if (typeof props[propName] !== 'function') {
|
|
106
|
+
PropTypes.checkPropTypes(
|
|
107
|
+
{
|
|
108
|
+
[propName]: PropTypes.exact(
|
|
109
|
+
Object.fromEntries(
|
|
110
|
+
componentsNames.flatMap((component) =>
|
|
111
|
+
getTokenNames(component).map((key) => [key, tokenValueType])
|
|
112
|
+
)
|
|
113
|
+
)
|
|
114
|
+
)
|
|
115
|
+
},
|
|
116
|
+
props,
|
|
117
|
+
propName,
|
|
118
|
+
componentName
|
|
119
|
+
)
|
|
120
|
+
}
|
|
121
|
+
}
|
|
70
122
|
|
|
71
123
|
function getPropSelector(propTypes, regexp) {
|
|
72
124
|
const keys = Object.keys(propTypes)
|
|
@@ -152,7 +204,27 @@ export const a11yProps = {
|
|
|
152
204
|
accessibilityElementsHidden: true
|
|
153
205
|
}
|
|
154
206
|
})
|
|
155
|
-
}
|
|
207
|
+
},
|
|
208
|
+
/**
|
|
209
|
+
* Generates an object of platform-appropriate a11y props describing an item that has an
|
|
210
|
+
* ordered position in a set. Examples of usage by accessibility tools includes screenreaders
|
|
211
|
+
* saying "Item X of Y" when this item is select.
|
|
212
|
+
*
|
|
213
|
+
* @param {number} itemsCount - the number of items in the set
|
|
214
|
+
* @param {number} index - the current item's index in the set
|
|
215
|
+
* @returns {object} - platform-applicable a11y props describing this position (if available)
|
|
216
|
+
*/
|
|
217
|
+
getPositionInSet: (itemsCount, index) =>
|
|
218
|
+
Platform.select({
|
|
219
|
+
web: {
|
|
220
|
+
// accessibilityPosInSet etc exists in React Native Web main branch
|
|
221
|
+
// but not in a release compatible with Expo etc; just use `aria-*`
|
|
222
|
+
'aria-setsize': itemsCount,
|
|
223
|
+
'aria-posinset': index + 1
|
|
224
|
+
},
|
|
225
|
+
// No equivalents exist on the native side
|
|
226
|
+
default: {}
|
|
227
|
+
})
|
|
156
228
|
}
|
|
157
229
|
|
|
158
230
|
// Props related to HTML <a> anchor link attributes.
|
|
@@ -199,7 +271,7 @@ export const hrefAttrsProp = {
|
|
|
199
271
|
})
|
|
200
272
|
}
|
|
201
273
|
|
|
202
|
-
const
|
|
274
|
+
const pressHandlerPropTypes = {
|
|
203
275
|
onPress: PropTypes.func,
|
|
204
276
|
onPressIn: PropTypes.func,
|
|
205
277
|
onPressOut: PropTypes.func,
|
|
@@ -210,7 +282,18 @@ const pressPropTypes = {
|
|
|
210
282
|
onFocus: PropTypes.func,
|
|
211
283
|
onBlur: PropTypes.func
|
|
212
284
|
},
|
|
213
|
-
default: {
|
|
285
|
+
default: {
|
|
286
|
+
onLongPress: PropTypes.func
|
|
287
|
+
}
|
|
288
|
+
})
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
const pressPropTypes = {
|
|
292
|
+
...pressHandlerPropTypes,
|
|
293
|
+
disabled: PropTypes.bool,
|
|
294
|
+
...Platform.select({
|
|
295
|
+
hitSlop: PropTypes.number,
|
|
296
|
+
pressRetentionOffset: PropTypes.oneOfType([PropTypes.number, rectProp.propType])
|
|
214
297
|
})
|
|
215
298
|
}
|
|
216
299
|
|
|
@@ -222,7 +305,8 @@ export const pressProps = {
|
|
|
222
305
|
/**
|
|
223
306
|
* Filters a props object, returning only the platform-relevant press props defined above
|
|
224
307
|
*/
|
|
225
|
-
select: getPropSelector(pressPropTypes)
|
|
308
|
+
select: getPropSelector(pressPropTypes),
|
|
309
|
+
selectHandlers: getPropSelector(pressHandlerPropTypes)
|
|
226
310
|
}
|
|
227
311
|
|
|
228
312
|
const linkPropTypes = {
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Extract translations from a keyed dictionary for a given language.
|
|
3
|
+
* Returns a getter.
|
|
4
|
+
*
|
|
5
|
+
* @param {object} dictionary
|
|
6
|
+
* @param {'en'|'fr'} copy - language
|
|
7
|
+
* @return {function(string): string}
|
|
8
|
+
*/
|
|
9
|
+
function useCopy({ dictionary, copy }) {
|
|
10
|
+
return (key) => dictionary[copy][key]
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export default useCopy
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { viewports } from '@telus-uds/system-constants'
|
|
2
|
+
import { useViewport } from '../ViewportProvider'
|
|
3
|
+
|
|
4
|
+
const hasOwn = (objectProp, key) => Object.prototype.hasOwnProperty.call(objectProp, key)
|
|
5
|
+
const hasResponsiveProperties = (objectProp) =>
|
|
6
|
+
viewports.keys.some((key) => hasOwn(objectProp, key))
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Resolves a prop which may be a responsive object with keys for viewports.
|
|
10
|
+
*
|
|
11
|
+
* Used internally in useResponsiveProp - see that for more details.
|
|
12
|
+
*
|
|
13
|
+
* @param {*} prop
|
|
14
|
+
* @param {"xs"|"sm"|"md"|"lg"|"xl"} viewport
|
|
15
|
+
* @param {*} [defaultValue]
|
|
16
|
+
* @returns {*}
|
|
17
|
+
*/
|
|
18
|
+
export const resolveResponsiveProp = (prop, viewport, defaultValue) => {
|
|
19
|
+
if (prop === undefined) return defaultValue
|
|
20
|
+
if (!prop || typeof prop !== 'object' || !hasResponsiveProperties(prop)) return prop
|
|
21
|
+
|
|
22
|
+
const value = viewports.keys.includes(viewport)
|
|
23
|
+
? // If there's a current viewport, return the closest match at or below it
|
|
24
|
+
viewports.inherit(prop)[viewport]
|
|
25
|
+
: // If no current viewport is available, default to smallest viewport
|
|
26
|
+
prop[viewports.keys.find((key) => hasOwn(prop, key))]
|
|
27
|
+
|
|
28
|
+
return value === undefined ? defaultValue : value
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Takes any value and, if that value is a responsive prop (an object with one or more
|
|
33
|
+
* keys matching system viewport names), returns the value corresponding to the largest
|
|
34
|
+
* viewport key smaller than the current screen's viewport.
|
|
35
|
+
*
|
|
36
|
+
* For example, if passed `{ sm: 4, lg: 8 }`, it will return 8 on `xl` and `lg` viewports,
|
|
37
|
+
* 4 on `md` and `sm` viewports, and `undefined` (or a provided `defaultValue`) on `xs` viewports.
|
|
38
|
+
*
|
|
39
|
+
* To generate propTypes for responsive props, see `responsiveProps` in `./utils/propTypes.js`.
|
|
40
|
+
*
|
|
41
|
+
* @param {*} prop - any value which may be an object with viewport keys
|
|
42
|
+
* @param {*} [defaultValue] - default value to provide if no matches found for the current viewport
|
|
43
|
+
* @returns {*}
|
|
44
|
+
*/
|
|
45
|
+
const useResponsiveProp = (prop, defaultValue) => {
|
|
46
|
+
const viewport = useViewport()
|
|
47
|
+
return resolveResponsiveProp(prop, viewport, defaultValue)
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
export default useResponsiveProp
|
|
@@ -1,14 +1,27 @@
|
|
|
1
|
-
import { useViewport } from '
|
|
2
|
-
import { useThemeTokens } from '
|
|
3
|
-
import {
|
|
1
|
+
import { useViewport } from '../ViewportProvider'
|
|
2
|
+
import { useThemeTokens } from '../ThemeProvider'
|
|
3
|
+
import { resolveResponsiveProp } from './useResponsiveProp'
|
|
4
4
|
/**
|
|
5
5
|
* @typedef {import('@telus-uds/system-constants/viewports').Viewport} Viewport
|
|
6
|
-
* @typedef {import('
|
|
7
|
-
* @typedef {import('
|
|
8
|
-
* @typedef {import('
|
|
9
|
-
* @typedef {import('
|
|
6
|
+
* @typedef {import('./propTypes.js').SpacingValue} SpacingValue
|
|
7
|
+
* @typedef {import('./propTypes.js').SpacingIndex} SpacingIndex
|
|
8
|
+
* @typedef {import('./propTypes.js').SpacingObject} SpacingObject
|
|
9
|
+
* @typedef {import('./propTypes.js').SpacingOptions} SpacingOptions
|
|
10
10
|
*/
|
|
11
11
|
|
|
12
|
+
const resolveSpacingOptions = (space) => {
|
|
13
|
+
if (!space?.options) return {}
|
|
14
|
+
|
|
15
|
+
const { size, variant, subtract = 0 } = space.options
|
|
16
|
+
const overridden = typeof size === 'number'
|
|
17
|
+
|
|
18
|
+
// Might need an option that adapts the size value by current user's system font scale, so that
|
|
19
|
+
// meaningful spacing between items doesn't disappear on the highest a11y font scale settings.
|
|
20
|
+
// https://github.com/telus/universal-design-system/issues/583
|
|
21
|
+
|
|
22
|
+
return { tokens: { size }, variant, overridden, subtract }
|
|
23
|
+
}
|
|
24
|
+
|
|
12
25
|
/**
|
|
13
26
|
* Pass a {@link SpacingValue}, which is one of:
|
|
14
27
|
*
|
|
@@ -82,11 +95,13 @@ const useSpacingScale = (spaceValue) => {
|
|
|
82
95
|
// In future, may need to consider window height as well as width, particularly for native apps,
|
|
83
96
|
// e.g. to ensure designs don't look lost on large, tall, not-so-wide portrait screens.
|
|
84
97
|
const viewport = useViewport()
|
|
85
|
-
|
|
86
98
|
const { tokens, variant, overridden, subtract = 0 } = resolveSpacingOptions(spaceValue)
|
|
87
|
-
const space = overridden
|
|
99
|
+
const space = !overridden && (spaceValue?.space ?? resolveResponsiveProp(spaceValue, viewport, 0))
|
|
88
100
|
|
|
89
|
-
const { size } = useThemeTokens('spacingScale', tokens, variant, {
|
|
101
|
+
const { size } = useThemeTokens('spacingScale', tokens, variant, {
|
|
102
|
+
space: typeof space === 'number' ? space : 0,
|
|
103
|
+
viewport
|
|
104
|
+
})
|
|
90
105
|
return Math.max(size - subtract, 0)
|
|
91
106
|
}
|
|
92
107
|
|
|
@@ -4,6 +4,7 @@ import { StyleSheet, Text, View } from 'react-native'
|
|
|
4
4
|
|
|
5
5
|
import A11yText from '../../lib/A11yText'
|
|
6
6
|
import { Button, Typography } from '../../lib'
|
|
7
|
+
import { EachParentType, parentTypesParams } from '../supports'
|
|
7
8
|
|
|
8
9
|
const defaultArgs = {
|
|
9
10
|
text: 'This text is for screen readers,',
|
|
@@ -31,6 +32,10 @@ const Template = (args) => (
|
|
|
31
32
|
</>
|
|
32
33
|
)
|
|
33
34
|
|
|
35
|
+
export const Default = (args) => <A11yText {...args} />
|
|
36
|
+
Default.storyName = 'A11yText'
|
|
37
|
+
Default.args = defaultArgs
|
|
38
|
+
|
|
34
39
|
export const A11yTextInText = Template.bind({})
|
|
35
40
|
A11yTextInText.args = defaultArgs
|
|
36
41
|
|
|
@@ -50,12 +55,13 @@ export const A11yTextInButton = (args) => (
|
|
|
50
55
|
)
|
|
51
56
|
A11yTextInButton.args = defaultArgs
|
|
52
57
|
|
|
53
|
-
export const
|
|
54
|
-
<
|
|
55
|
-
<Template {...args} />
|
|
56
|
-
</
|
|
58
|
+
export const ParentTypes = (args) => (
|
|
59
|
+
<EachParentType {...args}>
|
|
60
|
+
{({ label }) => <Template {...args} key={label} text={label} />}
|
|
61
|
+
</EachParentType>
|
|
57
62
|
)
|
|
58
|
-
|
|
63
|
+
ParentTypes.args = defaultArgs
|
|
64
|
+
ParentTypes.parameters = parentTypesParams
|
|
59
65
|
|
|
60
66
|
const styles = StyleSheet.create({
|
|
61
67
|
// Use borders so any hairline gaps created by A11yText are visible
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
/* eslint-disable react/no-multi-comp */
|
|
1
2
|
import React from 'react'
|
|
2
3
|
import { ActivityIndicator } from '../../lib'
|
|
4
|
+
import { EachParentType, parentTypesParams } from '../supports'
|
|
3
5
|
|
|
4
6
|
export default {
|
|
5
7
|
title: 'Base/ActivityIndicator',
|
|
@@ -9,5 +11,12 @@ export default {
|
|
|
9
11
|
}
|
|
10
12
|
}
|
|
11
13
|
|
|
12
|
-
export const
|
|
13
|
-
|
|
14
|
+
export const Default = (args) => <ActivityIndicator {...args} />
|
|
15
|
+
Default.storyName = 'ActivityIndicator'
|
|
16
|
+
|
|
17
|
+
export const ParentTypes = (args) => (
|
|
18
|
+
<EachParentType {...args}>
|
|
19
|
+
{({ label }) => <ActivityIndicator {...args} label={label} />}
|
|
20
|
+
</EachParentType>
|
|
21
|
+
)
|
|
22
|
+
ParentTypes.parameters = parentTypesParams
|