@telus-uds/components-base 1.1.0 → 1.3.1

package/src/Radio/RadioGroup.jsx

@@ -4,11 +4,20 @@ import ABBPropTypes from 'airbnb-prop-types'
 
 import { useViewport } from '../ViewportProvider'
 import { useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, useInputValue, variantProp } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  useInputValue,
+  variantProp,
+  viewProps
+} from '../utils'
 import { getStackedContent } from '../StackView'
 import Radio from './Radio'
 import Fieldset from '../Fieldset'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 /**
  * A group of Radios that behave as a radio group. Use when users select a single choice from mutually
  * exclusive options.
@@ -74,7 +83,8 @@ const RadioGroup = forwardRef(
       onChange,
       readOnly,
       name: inputGroupName,
-      inactive
+      inactive,
+      ...rest
     },
     ref
   ) => {
@@ -125,6 +135,7 @@ const RadioGroup = forwardRef(
         inactive={inactive}
         validation={validation}
         accessibilityRole="radiogroup"
+        {...selectProps(rest)}
       >
         {getStackedContent(radios, { space, direction: 'column' })}
       </Fieldset>
@@ -134,6 +145,7 @@ const RadioGroup = forwardRef(
 RadioGroup.displayName = 'RadioGroup'
 
 RadioGroup.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Optional theme token overrides for the outer RadioGroup component
    */

package/src/RadioCard/RadioCard.jsx

@@ -4,17 +4,21 @@ import { StyleSheet, Text, View } from 'react-native'
 
 import { useThemeTokensCallback, applyTextStyles } from '../ThemeProvider'
 import {
+  a11yProps,
   getTokensPropType,
-  variantProp,
+  selectSystemProps,
   selectTokens,
   useInputValue,
-  a11yProps,
-  useUniqueId
+  useUniqueId,
+  variantProp,
+  viewProps
 } from '../utils'
 import { PressableCardBase, selectPressableCardTokens } from '../Card'
 import StackView from '../StackView'
 import RadioButton, { selectRadioButtonTokens } from '../Radio/RadioButton'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 /**
  * A Card that behaves like a radio button. Use when users select a single choice from mutually exclusive options
  * with need to show additional information for each option. The whole card is interactive as one item.
@@ -78,7 +82,6 @@ const RadioCard = forwardRef(
         setIsChecked(true, event)
       }
     }
-    const a11y = a11yProps.select(rest)
     const uniqueId = useUniqueId('RadioCard')
     const inputId = id ?? uniqueId
 
@@ -94,7 +97,7 @@ const RadioCard = forwardRef(
         onPress={handleChange}
         accessibilityRole="radio"
         accessibilityState={{ checked: isChecked, disabled: inactive }}
-        {...a11y}
+        {...selectProps(rest)}
       >
         {(cardState) => {
           const { radioSpace, contentSpace, ...themeTokens } = getTokens(cardState)
@@ -130,7 +133,7 @@ const RadioCard = forwardRef(
 RadioCard.displayName = 'RadioCard'
 
 RadioCard.propTypes = {
-  ...a11yProps.propTypes,
+  ...selectedSystemPropTypes,
   /**
    * Content to be displayed at the top of the card alongside the radio button
    */

package/src/RadioCard/RadioCardGroup.jsx

@@ -3,11 +3,20 @@ import PropTypes from 'prop-types'
 
 import { useViewport } from '../ViewportProvider'
 import { useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, useInputValue, variantProp } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  useInputValue,
+  variantProp,
+  viewProps
+} from '../utils'
 import StackView, { StackWrap } from '../StackView'
 import RadioCard from './RadioCard'
 import Fieldset from '../Fieldset'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 /**
  * A group of Cards that behave as a radio button group. Use when users select a single choice from mutually
  * exclusive options with need to show additional information for each option. The whole cards are each
@@ -75,7 +84,8 @@ const RadioCardGroup = forwardRef(
       onChange,
       readOnly,
       name: inputGroupName,
-      inactive
+      inactive,
+      ...rest
     },
     ref
   ) => {
@@ -107,8 +117,9 @@ const RadioCardGroup = forwardRef(
         inactive={inactive || readOnly}
         validation={validation}
         accessibilityRole="radiogroup"
+        {...selectProps(rest)}
       >
-        {({ a11yProps }) => (
+        {(props) => (
           <StackContainer space={space} accessibilityRole="radiogroup">
             {items.map(({ title, content, id, onChange: itemOnChange }, index) => {
               const cardId = id || `RadioCard[${index}]`
@@ -128,7 +139,7 @@ const RadioCardGroup = forwardRef(
                   tokens={radioCardTokens}
                   variant={variant}
                   readOnly={readOnly}
-                  {...a11yProps}
+                  {...props}
                 >
                   {content}
                 </RadioCard>
@@ -143,6 +154,7 @@ const RadioCardGroup = forwardRef(
 RadioCardGroup.displayName = 'RadioCardGroup'
 
 RadioCardGroup.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Optional theme token overrides for the outer RadioCardGroup component
    */

package/src/Search/Search.jsx

@@ -3,13 +3,23 @@ import { View, StyleSheet } from 'react-native'
 
 import PropTypes from 'prop-types'
 import { useThemeTokens, useThemeTokensCallback } from '../ThemeProvider'
-import { getTokensPropType, selectTokens, useSpacingScale, variantProp } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  selectTokens,
+  useSpacingScale,
+  variantProp,
+  viewProps
+} from '../utils'
 import TextInputBase from '../TextInput/TextInputBase'
 import ButtonBase from '../Button/ButtonBase'
 import StackView from '../StackView'
 import useCopy from '../utils/useCopy'
 import dictionary from './dictionary'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectInputTokens = ({ searchTokens, buttonTokens, buttonsGapSize }) => {
   const { paddingRight: inputPaddingRight, clearButtonIcon, submitButtonIcon } = searchTokens
   const { paddingLeft = 0, paddingRight = 0, iconSize = 0 } = buttonTokens
@@ -53,7 +63,8 @@ const Search = forwardRef(
       accessibilityLabel,
       copy = 'en',
       tokens,
-      variant
+      variant,
+      ...rest
     },
     ref
   ) => {
@@ -99,7 +110,7 @@ const Search = forwardRef(
     const isEmpty = value === ''
 
     return (
-      <View style={staticStyles.container}>
+      <View style={staticStyles.container} {...selectProps(rest)}>
         <TextInputBase
           ref={ref}
           tokens={(appearances) =>
@@ -161,6 +172,7 @@ const Search = forwardRef(
 Search.displayName = 'Search'
 
 Search.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Use this to set the initial value of the search input.
    * Updating `initialValue` will **not** update the actual value.

package/src/Select/Select.jsx

@@ -3,10 +3,24 @@ import React, { forwardRef, useState } from 'react'
 import { View, Platform, StyleSheet } from 'react-native'
 import PropTypes from 'prop-types'
 import { applyTextStyles, useThemeTokens, applyOuterBorder } from '../ThemeProvider'
-import { componentPropType, getTokensPropType, useInputValue, variantProp } from '../utils'
+import {
+  a11yProps,
+  componentPropType,
+  getTokensPropType,
+  inputSupportsProps,
+  selectSystemProps,
+  useInputValue,
+  variantProp,
+  viewProps
+} from '../utils'
 import Picker from './Picker'
 import InputSupports from '../InputSupports'
-import inputSupportsProps from '../InputSupports/propTypes'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([
+  a11yProps,
+  inputSupportsProps,
+  viewProps
+])
 
 const selectInputStyles = (
   {
@@ -180,7 +194,7 @@ const Select = forwardRef(
     const handleMouseOver = () => setIsHovered(true)
     const handleMouseOut = () => setIsHovered(false)
 
-    const { props: supportsProps } = inputSupportsProps.select(rest)
+    const { props: supportsProps, ...selectedProps } = selectProps(rest)
 
     const themeTokens = useThemeTokens('Select', tokens, variant, {
       focus: isFocused,
@@ -192,8 +206,8 @@ const Select = forwardRef(
     const { icon: IconComponent, validationIcon: ValidationIconComponent } = themeTokens
 
     return (
-      <InputSupports {...supportsProps}>
-        {({ a11yProps, inputId }) => (
+      <InputSupports {...supportsProps} {...selectedProps}>
+        {({ inputId, ...props }) => (
           <View style={selectOuterBorderStyles(themeTokens)}>
             <Picker
               ref={ref}
@@ -208,7 +222,7 @@ const Select = forwardRef(
               placeholder={
                 placeholder !== undefined ? { label: placeholder, value: '' } : undefined
               }
-              {...a11yProps}
+              {...props}
               nativeID={inputId}
               testID={testID}
             >
@@ -243,7 +257,7 @@ const Select = forwardRef(
 Select.displayName = 'Select'
 
 Select.propTypes = {
-  ...inputSupportsProps.types,
+  ...selectedSystemPropTypes,
   /**
    * Initial value for the uncontrolled version.
    */

package/src/SideNav/Item.jsx

@@ -1,11 +1,20 @@
 import React, { forwardRef } from 'react'
 import { Pressable } from 'react-native'
 import PropTypes from 'prop-types'
-
-import { variantProp, getTokensPropType, a11yProps, hrefAttrsProp, linkProps } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  hrefAttrsProp,
+  linkProps,
+  selectSystemProps,
+  variantProp,
+  viewProps
+} from '../utils'
 import { useThemeTokensCallback, verticalAlignRow } from '../ThemeProvider'
 import ItemContent from './ItemContent'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, linkProps, viewProps])
+
 function selectItemStyles({
   backgroundColor,
   borderColor,
@@ -58,7 +67,7 @@ const Item = forwardRef(
     const handlePress = () => onPress(itemId, groupId)
 
     const { hrefAttrs, rest } = hrefAttrsProp.bundle(props)
-    const linkPropSet = linkProps.select({
+    const selectedProps = selectProps({
       accessibilityRole,
       href,
       onPress: handlePress,
@@ -79,9 +88,8 @@ const Item = forwardRef(
       <Pressable
         ref={ref}
         style={getPressableStyle}
-        {...linkPropSet}
         accessibilityState={{ selected: isActive }}
-        testID={testID}
+        {...selectedProps}
       >
         {(pressableState) => {
           const themeTokens = getTokens(getAppearanceState(pressableState))
@@ -94,6 +102,7 @@ const Item = forwardRef(
 Item.displayName = 'Item'
 
 Item.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Text content of the `Item`.
    */
@@ -126,8 +135,7 @@ Item.propTypes = {
    */
   isExpanded: PropTypes.bool,
   tokens: getTokensPropType('SideNavItem'),
-  variant: variantProp.propType,
-  ...a11yProps.types
+  variant: variantProp.propType
 }
 
 export default Item

package/src/SideNav/SideNav.jsx

@@ -5,7 +5,14 @@ import ExpandCollapse from '../ExpandCollapse'
 import Item from './Item'
 import ItemsGroup from './ItemsGroup'
 import { useThemeTokens } from '../ThemeProvider'
-import { componentPropType, getTokensPropType, variantProp } from '../utils'
+import {
+  a11yProps,
+  componentPropType,
+  getTokensPropType,
+  selectSystemProps,
+  variantProp,
+  viewProps
+} from '../utils'
 
 function selectBorderStyles(tokens) {
   return {
@@ -15,13 +22,15 @@ function selectBorderStyles(tokens) {
   }
 }
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 /**
  ## Usage Criteria
  - Use in conjunction with a large amount of educational / informational content
  - Allow the user to navigate between options frequently and efficiently
  */
 const SideNav = forwardRef(
-  ({ children, variant = {}, tokens, accordion = true, itemTokens, groupTokens }, ref) => {
+  ({ children, variant = {}, tokens, accordion = true, itemTokens, groupTokens, ...rest }, ref) => {
     const themeTokens = useThemeTokens('SideNav', tokens, variant)
     const [active, setActive] = useState({ groupId: undefined, itemId: undefined })
 
@@ -38,6 +47,7 @@ const SideNav = forwardRef(
         ref={ref}
         maxOpen={accordion ? 1 : null}
         style={selectBorderStyles(themeTokens)}
+        {...selectProps(rest)}
       >
         {({ openIds, onToggle }) => {
           const renderItem = (item, index, groupId) => {
@@ -97,6 +107,7 @@ const SideNav = forwardRef(
 SideNav.displayName = 'SideNav'
 
 SideNav.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Specifies the structure and links of the `SideNav`. It may only consist of `SideNav.Item` and `SideNav.ItemsGroup`.
    */

package/src/Skeleton/Skeleton.jsx

@@ -3,10 +3,19 @@ import { Animated, Platform } from 'react-native'
 import propTypes from 'prop-types'
 import StackView from '../StackView'
 import { useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, useSpacingScale, variantProp } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  useSpacingScale,
+  variantProp,
+  viewProps
+} from '../utils'
 import useSkeletonNativeAnimation from './useSkeletonNativeAnimation'
 import skeletonWebAnimation from './skeletonWebAnimation'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectSkeletonStyles = ({ color, radius, fadeAnimation }) => ({
   backgroundColor: color,
   borderRadius: radius,
@@ -27,62 +36,65 @@ const selectSquareStyles = ({ radius }) => ({
   borderRadius: radius
 })
 
-const Skeleton = forwardRef(({ tokens, variant, size, characters, lines, shape = 'line' }, ref) => {
-  const themeTokens = useThemeTokens('Skeleton', tokens, variant)
-  const skeletonHeight = useSpacingScale(size || themeTokens.size)
-  const nativeAnimation = useSkeletonNativeAnimation()
+const Skeleton = forwardRef(
+  ({ tokens, variant, size, characters, lines, shape = 'line', ...rest }, ref) => {
+    const themeTokens = useThemeTokens('Skeleton', tokens, variant)
+    const skeletonHeight = useSpacingScale(size || themeTokens.size)
+    const nativeAnimation = useSkeletonNativeAnimation()
+
+    const getAnimationBaseOnPlatform = () => {
+      if (Platform.OS !== 'web') {
+        return nativeAnimation
+      }
 
-  const getAnimationBaseOnPlatform = () => {
-    if (Platform.OS !== 'web') {
-      return nativeAnimation
+      return skeletonWebAnimation
     }
 
-    return skeletonWebAnimation
-  }
+    const getLineWidth = () => {
+      if (characters) {
+        return characters * themeTokens.baseWidth
+      }
 
-  const getLineWidth = () => {
-    if (characters) {
-      return characters * themeTokens.baseWidth
+      return themeTokens.characters * themeTokens.baseWidth
     }
 
-    return themeTokens.characters * themeTokens.baseWidth
-  }
+    const getStyledBasedOnShape = () => {
+      if (shape === 'circle') {
+        return selectShapeStyles({ skeletonHeight })
+      }
 
-  const getStyledBasedOnShape = () => {
-    if (shape === 'circle') {
-      return selectShapeStyles({ skeletonHeight })
-    }
+      if (shape === 'box') {
+        return [
+          selectShapeStyles({ skeletonHeight }),
+          selectSquareStyles({ radius: themeTokens.squareRadius })
+        ]
+      }
 
-    if (shape === 'box') {
-      return [
-        selectShapeStyles({ skeletonHeight }),
-        selectSquareStyles({ radius: themeTokens.squareRadius })
-      ]
+      return selectLineStyles({ skeletonHeight, lineWidth: getLineWidth() })
     }
 
-    return selectLineStyles({ skeletonHeight, lineWidth: getLineWidth() })
+    const renderSkeleton = (index = 0) => (
+      <Animated.View
+        testID="skeleton"
+        key={`skeleton-${index + 1}`}
+        style={[
+          selectSkeletonStyles({ ...themeTokens, fadeAnimation: getAnimationBaseOnPlatform() }),
+          getStyledBasedOnShape()
+        ]}
+      />
+    )
+
+    return (
+      <StackView space={themeTokens.spaceBetweenLines} ref={ref} {...selectProps(rest)}>
+        {lines > 1 ? [...Array(lines)].map((_, index) => renderSkeleton(index)) : renderSkeleton()}
+      </StackView>
+    )
   }
-
-  const renderSkeleton = (index = 0) => (
-    <Animated.View
-      testID="skeleton"
-      key={`skeleton-${index + 1}`}
-      style={[
-        selectSkeletonStyles({ ...themeTokens, fadeAnimation: getAnimationBaseOnPlatform() }),
-        getStyledBasedOnShape()
-      ]}
-    />
-  )
-
-  return (
-    <StackView space={themeTokens.spaceBetweenLines} ref={ref}>
-      {lines > 1 ? [...Array(lines)].map((_, index) => renderSkeleton(index)) : renderSkeleton()}
-    </StackView>
-  )
-})
+)
 Skeleton.displayName = 'Skeleton'
 
 Skeleton.propTypes = {
+  ...selectedSystemPropTypes,
   tokens: getTokensPropType('Skeleton'),
   variant: variantProp.propType,
   size: propTypes.number,

package/src/Spacer/Spacer.jsx

@@ -1,13 +1,15 @@
 import React, { forwardRef } from 'react'
 import PropTypes from 'prop-types'
 import { StyleSheet, View } from 'react-native'
+import { a11yProps, selectSystemProps, spacingProps, useSpacingScale, viewProps } from '../utils'
 
-import { useSpacingScale, spacingProps } from '../utils'
 /**
- * @typedef {import('../utils/propTypes.js').SpacingValue} SpacingValue
- * @typedef {import('../utils/propTypes.js').SpacingObject} SpacingObject
+ * @typedef {import('../utils/props/spacingProps.js').SpacingValue} SpacingValue
+ * @typedef {import('../utils/props/spacingProps.js').SpacingObject} SpacingObject
  */
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectSizeStyle = (size, direction) => ({
   // Only apply space in one direction at a time, else large spacers will increase the
   // 'across' size of the parent and mess up siblings with styles like `alignItems: stretch`.
@@ -54,16 +56,16 @@ const selectSizeStyle = (size, direction) => ({
  * Spacer has no content and is ignored by tools such as screen readers. Use `Divider` for
  * separations between elements that may be treated as semantically meaningful on web.
  */
-const Spacer = forwardRef(({ space = 1, direction = 'column', testID, dataSet }, ref) => {
+const Spacer = forwardRef(({ space = 1, direction = 'column', ...rest }, ref) => {
   const size = useSpacingScale(space)
   const sizeStyle = selectSizeStyle(size, direction)
-  return (
-    <View ref={ref} testID={testID} style={[staticStyles.stretch, sizeStyle]} dataSet={dataSet} />
-  )
+
+  return <View ref={ref} style={[staticStyles.stretch, sizeStyle]} {...selectProps(rest)} />
 })
 Spacer.displayName = 'Spacer'
 
 Spacer.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * The size of the spacer according to the theme's spacing scale.
    * Either a number corresponding to a position on the theme's spacing scale (1 is smallest, 2 is second smallest, etc),
@@ -76,17 +78,7 @@ Spacer.propTypes = {
    * - `'column'` (default) applies space vertically; has a fixed height and not width.
    * - `'row'` applies space horizontally; has a fixed width and not height.
    */
-  direction: PropTypes.oneOf(['column', 'row']),
-  /**
-   * @ignore
-   */
-  dataSet: PropTypes.object,
-  /**
-   * @ignore
-   * In tests, the only way to select Spacers is with testID prop and getByTestId, since they have no content,
-   * no accessibility role, and there is no equivalent of nextSibling in React Native Testing Library.
-   */
-  testID: PropTypes.string
+  direction: PropTypes.oneOf(['column', 'row'])
 }
 
 const staticStyles = StyleSheet.create({

package/src/StackView/StackView.jsx

@@ -4,21 +4,24 @@ import { View } from 'react-native'
 
 import Divider from '../Divider'
 import {
-  spacingProps,
   a11yProps,
+  getA11yPropsFromHtmlTag,
   getTokensPropType,
+  layoutTags,
   responsiveProps,
-  variantProp,
-  viewProps,
+  selectSystemProps,
+  spacingProps,
   useResponsiveProp,
-  getA11yPropsFromHtmlTag,
-  layoutTags
+  variantProp,
+  viewProps
 } from '../utils'
 import { useThemeTokens } from '../ThemeProvider'
 import { useViewport } from '../ViewportProvider'
 import getStackedContent from './getStackedContent'
 import { staticStyles, selectFlexStyles } from './common'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 /**
  * StackView evenly spaces its children, by default placing `Spacer` components between them.
  *
@@ -78,17 +81,16 @@ const StackView = forwardRef(
   ) => {
     const viewport = useViewport()
     const direction = useResponsiveProp(directionProp, 'column')
-    const props = {
+    const selectedProps = selectProps({
       ...getA11yPropsFromHtmlTag(tag, accessibilityRole),
-      ...a11yProps.select(rest),
-      ...viewProps.select(rest)
-    }
+      ...rest
+    })
     const content = getStackedContent(children, { direction, divider, space })
     const themeTokens = useThemeTokens('StackView', tokens, variant, { viewport })
     const flexStyles = selectFlexStyles(themeTokens)
 
     return (
-      <View ref={ref} {...props} style={[flexStyles, staticStyles[direction]]}>
+      <View ref={ref} {...selectedProps} style={[flexStyles, staticStyles[direction]]}>
         {content}
       </View>
     )
@@ -97,8 +99,7 @@ const StackView = forwardRef(
 StackView.displayName = 'StackView'
 
 StackView.propTypes = {
-  ...a11yProps.propTypes,
-  ...viewProps.types,
+  ...selectedSystemPropTypes,
   tokens: getTokensPropType('StackView'),
   variant: variantProp.propType,
   /**