@telus-uds/components-base 1.2.0 → 1.4.0

package/src/List/List.jsx

@@ -1,17 +1,24 @@
 import React, { cloneElement, forwardRef, Children } from 'react'
 import { View, Platform } from 'react-native'
 import PropTypes from 'prop-types'
-import { getTokensPropType, variantProp, componentPropType } from '../utils'
-import { a11yProps } from '../utils/propTypes'
+import {
+  a11yProps,
+  componentPropType,
+  getTokensPropType,
+  selectSystemProps,
+  variantProp,
+  viewProps
+} from '../utils'
 import ListItem from './ListItem'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 /**
  * An unordered List component has a child a ListItem that
  * allows icon, dividers and customized typography
  */
 const List = forwardRef(({ children, showDivider, tokens, variant, ...rest }, ref) => {
   const accessibilityRole = Platform.select({ web: 'list', default: 'none' })
-  const a11y = a11yProps.select(rest)
   const items = Children.map(children, (child, index) => {
     if (child.type.name === ListItem.name) {
       return cloneElement(child, {
@@ -25,7 +32,7 @@ const List = forwardRef(({ children, showDivider, tokens, variant, ...rest }, re
   })
 
   return (
-    <View ref={ref} accessibilityRole={accessibilityRole} {...a11y}>
+    <View ref={ref} accessibilityRole={accessibilityRole} {...selectProps(rest)}>
       {items}
     </View>
   )
@@ -33,7 +40,7 @@ const List = forwardRef(({ children, showDivider, tokens, variant, ...rest }, re
 List.displayName = 'List'
 
 List.propTypes = {
-  ...a11yProps.types,
+  ...selectedSystemPropTypes,
   tokens: getTokensPropType('List'),
   variant: variantProp.propType,
   children: componentPropType('ListItem'),

package/src/List/ListItem.jsx

@@ -2,7 +2,16 @@ import React, { forwardRef } from 'react'
 import { View, Platform, StyleSheet } from 'react-native'
 import PropTypes from 'prop-types'
 import { useThemeTokens, applyTextStyles } from '../ThemeProvider'
-import { getTokensPropType, variantProp, wrapStringsInText } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  variantProp,
+  viewProps,
+  wrapStringsInText
+} from '../utils'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
 
 const selectBulletStyles = ({ itemBulletWidth, itemBulletHeight, itemBulletColor }) => ({
   width: itemBulletWidth,
@@ -53,7 +62,10 @@ const selectDividerStyles = ({ dividerColor, dividerSize, interItemMarginWithDiv
  * ListItem is responsible for rendering icon or a bullet as side item
  */
 const ListItem = forwardRef(
-  ({ tokens, variant, icon, iconColor, iconSize, showDivider, children, isLastItem }, ref) => {
+  (
+    { tokens, variant, icon, iconColor, iconSize, showDivider, children, isLastItem, ...rest },
+    ref
+  ) => {
     const themeTokens = useThemeTokens('List', tokens, variant)
 
     const itemStyles = selectItemStyles(themeTokens)
@@ -118,6 +130,7 @@ const ListItem = forwardRef(
         ref={ref}
         style={[staticStyles.itemContainer, getContainerStyle()]}
         accessibilityRole={accessibilityRole}
+        {...selectProps(rest)}
       >
         {renderMarker()}
         {renderItem()}
@@ -137,6 +150,7 @@ const staticStyles = StyleSheet.create({
 })
 
 ListItem.propTypes = {
+  ...selectedSystemPropTypes,
   tokens: getTokensPropType('List'),
   variant: variantProp.propType,
   children: PropTypes.node.isRequired,

package/src/Modal/Modal.jsx

@@ -9,11 +9,21 @@ import {
 
 import PropTypes from 'prop-types'
 import { applyShadowToken, useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, useCopy, copyPropTypes, variantProp } from '../utils'
+import {
+  a11yProps,
+  copyPropTypes,
+  getTokensPropType,
+  selectSystemProps,
+  useCopy,
+  variantProp,
+  viewProps
+} from '../utils'
 import { useViewport } from '../ViewportProvider'
 import ButtonBase from '../Button/ButtonBase'
 import dictionary from './dictionary'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectContainerStyles = ({
   containerPaddingLeft,
   containerPaddingRight,
@@ -79,72 +89,75 @@ const selectCloseIconProps = ({ closeIconSize, closeIconColor }) => ({
  * - Don’t use modals to reinforce or repeat information already available in the parent page or view
  * - Don’t use modals consecutively
  */
-const Modal = forwardRef(({ children, isOpen, onClose, maxWidth, tokens, variant, copy }, ref) => {
-  const viewport = useViewport()
-  const themeTokens = useThemeTokens('Modal', tokens, variant, { viewport, maxWidth })
+const Modal = forwardRef(
+  ({ children, isOpen, onClose, maxWidth, tokens, variant, copy, ...rest }, ref) => {
+    const viewport = useViewport()
+    const themeTokens = useThemeTokens('Modal', tokens, variant, { viewport, maxWidth })
 
-  const { closeIcon: CloseIconComponent } = themeTokens
+    const { closeIcon: CloseIconComponent } = themeTokens
 
-  const getCopy = useCopy({ dictionary, copy })
-  const closeLabel = getCopy('closeButton')
+    const getCopy = useCopy({ dictionary, copy })
+    const closeLabel = getCopy('closeButton')
 
-  const handleClose = () => {
-    if (typeof onClose === 'function') onClose()
-  }
+    const handleClose = () => {
+      if (typeof onClose === 'function') onClose()
+    }
 
-  const handleKeyUp = (event) => {
-    if (event.key === 'Escape') onClose()
-  }
+    const handleKeyUp = (event) => {
+      if (event.key === 'Escape') onClose()
+    }
 
-  if (!isOpen) {
-    return null
-  }
+    if (!isOpen) {
+      return null
+    }
 
-  // TODO: replace the close button with IconButton when implemented (https://github.com/telus/universal-design-system/issues/281)
-  return (
-    <NativeModal transparent>
-      <View style={[staticStyles.positioningContainer]}>
-        <View
-          style={[staticStyles.sizingContainer, selectContainerStyles(themeTokens)]}
-          pointerEvents="box-none" // don't capture backdrop press events
-        >
+    // TODO: replace the close button with IconButton when implemented (https://github.com/telus/universal-design-system/issues/281)
+    return (
+      <NativeModal transparent {...selectProps(rest)}>
+        <View style={[staticStyles.positioningContainer]}>
           <View
-            ref={ref}
-            style={[staticStyles.modal, selectModalStyles(themeTokens)]}
-            onKeyUp={handleKeyUp}
+            style={[staticStyles.sizingContainer, selectContainerStyles(themeTokens)]}
+            pointerEvents="box-none" // don't capture backdrop press events
           >
             <View
-              style={[
-                staticStyles.closeButtonContainer,
-                selectCloseButtonContainerStyles(themeTokens)
-              ]}
+              ref={ref}
+              style={[staticStyles.modal, selectModalStyles(themeTokens)]}
+              onKeyUp={handleKeyUp}
             >
-              <ButtonBase
-                onPress={handleClose}
-                accessibilityRole="button"
-                accessibilityLabel={closeLabel}
+              <View
+                style={[
+                  staticStyles.closeButtonContainer,
+                  selectCloseButtonContainerStyles(themeTokens)
+                ]}
               >
-                {
-                  // TODO: add close button interactive states after IconButton is done
-                  () => <CloseIconComponent {...selectCloseIconProps(themeTokens)} />
-                }
-              </ButtonBase>
+                <ButtonBase
+                  onPress={handleClose}
+                  accessibilityRole="button"
+                  accessibilityLabel={closeLabel}
+                >
+                  {
+                    // TODO: add close button interactive states after IconButton is done
+                    () => <CloseIconComponent {...selectCloseIconProps(themeTokens)} />
+                  }
+                </ButtonBase>
+              </View>
+              {children}
             </View>
-            {children}
           </View>
+          {/* when a modal becomes open its first focusable element is being automatically focused */}
+          {/* and we prefer the close button over backdrop */}
+          <TouchableWithoutFeedback onPress={handleClose}>
+            <View style={[staticStyles.backdrop, selectBackdropStyles(themeTokens)]} />
+          </TouchableWithoutFeedback>
         </View>
-        {/* when a modal becomes open its first focusable element is being automatically focused */}
-        {/* and we prefer the close button over backdrop */}
-        <TouchableWithoutFeedback onPress={handleClose}>
-          <View style={[staticStyles.backdrop, selectBackdropStyles(themeTokens)]} />
-        </TouchableWithoutFeedback>
-      </View>
-    </NativeModal>
-  )
-})
+      </NativeModal>
+    )
+  }
+)
 Modal.displayName = 'Modal'
 
 Modal.propTypes = {
+  ...selectedSystemPropTypes,
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
   copy: copyPropTypes,
   isOpen: PropTypes.bool,

package/src/Notification/Notification.jsx

@@ -1,13 +1,23 @@
 import React, { forwardRef, useState } from 'react'
-import { StyleSheet, Text, View } from 'react-native'
+import { StyleSheet, View } from 'react-native'
 
 import PropTypes from 'prop-types'
 import { applyTextStyles, useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, selectTokens, variantProp } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  selectTokens,
+  variantProp,
+  viewProps,
+  wrapStringsInText
+} from '../utils'
 import ButtonBase from '../Button/ButtonBase'
 import useCopy from '../utils/useCopy'
 import dictionary from './dictionary'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectContainerStyles = (tokens) => ({ ...tokens })
 
 const selectTextStyles = (tokens) => applyTextStyles(selectTokens('Typography', tokens))
@@ -82,7 +92,7 @@ const selectDismissButtonContainerStyles = ({ dismissButtonGap }) => ({
  * Show system notifications at the top of the page, below the navigation, and expands the full-width of the viewport
  */
 const Notification = forwardRef(
-  ({ children, system, dismissible, copy = 'en', tokens, variant }, ref) => {
+  ({ children, system, dismissible, copy = 'en', tokens, variant, ...rest }, ref) => {
     const [isDismissed, setIsDismissed] = useState(false)
     const themeTokens = useThemeTokens('Notification', tokens, variant, { system })
     const getCopy = useCopy({ dictionary, copy })
@@ -93,8 +103,10 @@ const Notification = forwardRef(
 
     const textStyles = selectTextStyles(themeTokens)
 
-    const content =
-      typeof children === 'string' ? <Text style={textStyles}>{children}</Text> : children
+    const content = wrapStringsInText(
+      typeof children === 'function' ? children({ textStyles }) : children,
+      { style: textStyles }
+    )
 
     const { icon: IconComponent, dismissIcon: DismissIconComponent } = themeTokens
 
@@ -102,7 +114,11 @@ const Notification = forwardRef(
 
     // TODO: replace the dismiss button with IconButton when implemented (https://github.com/telus/universal-design-system/issues/281)
     return (
-      <View ref={ref} style={[staticStyles.container, selectContainerStyles(themeTokens)]}>
+      <View
+        ref={ref}
+        style={[staticStyles.container, selectContainerStyles(themeTokens)]}
+        {...selectProps(rest)}
+      >
         {IconComponent && (
           <View style={selectIconContainerStyles(themeTokens)}>
             <IconComponent {...selectIconProps(themeTokens)} />
@@ -129,6 +145,7 @@ const Notification = forwardRef(
 Notification.displayName = 'Notification'
 
 Notification.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Content of the `Notification`.
    */

package/src/Pagination/Pagination.jsx

@@ -2,10 +2,13 @@ import React, { forwardRef } from 'react'
 import { View, Text, StyleSheet } from 'react-native'
 
 import {
+  a11yProps,
   componentPropType,
   copyPropTypes,
   getTokensPropType,
+  selectSystemProps,
   variantProp,
+  viewProps,
   withLinkRouter
 } from '../utils'
 import { applyTextStyles, useThemeTokens } from '../ThemeProvider'
@@ -16,6 +19,8 @@ import usePagination from './usePagination'
 import PageButton from './PageButton'
 import SideButton from './SideButton'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectTextStyles = ({ color, fontName, fontSize, fontWeight, lineHeight }) =>
   applyTextStyles({
     color,
@@ -35,7 +40,8 @@ const Pagination = forwardRef(
       sideButtonVariant,
       sideButtonTokens,
       LinkRouter,
-      linkRouterProps
+      linkRouterProps,
+      ...rest
     },
     ref
   ) => {
@@ -80,7 +86,7 @@ const Pagination = forwardRef(
           linkRouterProps={linkRouterProps}
         />
       ),
-      ...items.map((child, itemIndex) => {
+      ...items.map((_child, itemIndex) => {
         const buttonLabel = `${itemIndex + 1}`
         const itemProps = getItemProps(itemIndex)
         const ItemLinkRouter = itemProps.LinkRouter ?? LinkRouter
@@ -119,7 +125,7 @@ const Pagination = forwardRef(
     ]
 
     return (
-      <View style={staticStyles.container} ref={ref}>
+      <View style={staticStyles.container} ref={ref} {...selectProps(rest)}>
         {buttons
           // keep the keys in-line with the page numbers regardless of which buttons are actually rendered
           .map((element, index) => [element, `page-${index + 1}`])
@@ -138,6 +144,7 @@ PageButton.displayName = 'PageButton'
 Pagination.PageButton = PageButton
 
 Pagination.propTypes = {
+  ...selectedSystemPropTypes,
   ...withLinkRouter.propTypes,
   children: componentPropType('PageButton'),
   copy: copyPropTypes,

package/src/Progress/Progress.jsx

@@ -2,9 +2,10 @@ import React, { forwardRef } from 'react'
 import PropTypes from 'prop-types'
 import { View } from 'react-native'
 
-import { a11yProps } from '../utils/propTypes'
 import { useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, variantProp } from '../utils'
+import { a11yProps, getTokensPropType, selectSystemProps, variantProp, viewProps } from '../utils'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
 
 const selectProgressStyles = ({
   backgroundColor,
@@ -53,7 +54,7 @@ const Progress = forwardRef(({ children, tokens, variant, ...rest }, ref) => {
   const themeTokens = useThemeTokens('Progress', tokens, variant)
 
   return (
-    <View ref={ref} style={selectProgressStyles(themeTokens)} {...a11yProps.select(rest)}>
+    <View ref={ref} style={selectProgressStyles(themeTokens)} {...selectProps(rest)}>
       {children}
     </View>
   )
@@ -61,6 +62,7 @@ const Progress = forwardRef(({ children, tokens, variant, ...rest }, ref) => {
 Progress.displayName = 'Progress'
 
 Progress.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Use the `children` prop to supply one or several `ProgressBar`s.
    */

package/src/Progress/ProgressBar.jsx

@@ -3,9 +3,10 @@ import PropTypes from 'prop-types'
 import { Platform, StyleSheet, View } from 'react-native'
 
 import ProgressBarBackground from './ProgressBarBackground'
-import { a11yProps } from '../utils/propTypes'
 import { useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, variantProp } from '../utils'
+import { a11yProps, getTokensPropType, selectSystemProps, variantProp, viewProps } from '../utils'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
 
 const selectBarStyles = (
   { backgroundColor, borderRadius, outlineWidth, outlineColor },
@@ -60,7 +61,7 @@ const ProgressBar = forwardRef(
     } else if (percentage > 100) {
       throw new Error('ProgressBar: `percentage` cannot exceed 100')
     }
-    const accessibilityProps = {
+    const selectedProps = selectProps({
       accessibilityRole: 'progressbar',
       accessibilityValue: {
         min: 0,
@@ -68,14 +69,14 @@ const ProgressBar = forwardRef(
         now: percentage,
         text: `${percentage}%`
       },
-      ...a11yProps.select(rest)
-    }
+      ...rest
+    })
 
     return percentage > 0 ? (
       <View
         ref={ref}
         style={[staticStyles.bar, selectBarStyles(themeTokens, percentage)]}
-        {...accessibilityProps}
+        {...selectedProps}
       >
         {children ?? <ProgressBarBackground variant={variant} />}
       </View>
@@ -85,6 +86,7 @@ const ProgressBar = forwardRef(
 ProgressBar.displayName = 'ProgressBar'
 
 ProgressBar.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Optional children that can be used to customize the progress bar filling.
    */

package/src/Radio/Radio.jsx

@@ -5,10 +5,19 @@ import { Pressable, StyleSheet, Text, View } from 'react-native'
 import RadioLabel from '../InputLabel/LabelContent'
 import RadioButton, { selectRadioButtonTokens } from './RadioButton'
 import { applyShadowToken, applyTextStyles, useThemeTokensCallback } from '../ThemeProvider'
-import { getTokensPropType, useInputValue, useUniqueId, variantProp } from '../utils'
-import { a11yProps } from '../utils/propTypes'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  useInputValue,
+  useUniqueId,
+  variantProp,
+  viewProps
+} from '../utils'
 import StackView from '../StackView'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectContainerStyles = ({
   containerBackgroundColor,
   containerBorderRadius,
@@ -130,7 +139,6 @@ const Radio = forwardRef(
       // The expected keyboard shortcut for activating a radio is the Space key
       if (event?.key === ' ') handleChange(event)
     }
-    const accessibilityProps = a11yProps.select(rest)
     const uniqueId = useUniqueId('radio')
     const inputId = id ?? uniqueId
 
@@ -142,7 +150,7 @@ const Radio = forwardRef(
         onPress={handleChange}
         accessibilityRole="radio"
         accessibilityState={{ checked: isChecked, disabled: inactive }}
-        {...accessibilityProps}
+        {...selectProps(rest)}
       >
         {({ focused: focus, hovered: hover, pressed }) => {
           const stateTokens = getTokens({ focus, hover, pressed })
@@ -180,7 +188,7 @@ const Radio = forwardRef(
 Radio.displayName = 'Radio'
 
 Radio.propTypes = {
-  ...a11yProps.propTypes,
+  ...selectedSystemPropTypes,
   /**
    * Use `checked` for controlled Radio. For uncontrolled Radio, use the `defaultChecked` prop.
    */

package/src/Radio/RadioButton.jsx

@@ -4,7 +4,15 @@ import { Platform, StyleSheet, View } from 'react-native'
 
 import RadioInput from './RadioInput'
 import { applyOuterBorder, resolveThemeTokens, validateThemeTokens } from '../ThemeProvider'
-import { getTokensSetPropType, selectTokens } from '../utils'
+import {
+  a11yProps,
+  getTokensSetPropType,
+  selectSystemProps,
+  selectTokens,
+  viewProps
+} from '../utils'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
 
 // TODO: roll out a standard approach to token sets
 // https://github.com/telus/universal-design-system/issues/782
@@ -87,7 +95,8 @@ const RadioButton = forwardRef(
       isControlled,
       handleChange,
       name: inputName,
-      value
+      value,
+      ...rest
     },
     ref
   ) => {
@@ -98,7 +107,7 @@ const RadioButton = forwardRef(
     )
 
     return (
-      <View style={selectOuterBorderStyles(themeTokens)}>
+      <View style={selectOuterBorderStyles(themeTokens)} {...selectProps(rest)}>
         <View
           style={[staticStyles.defaultInputStyles, selectInputStyles(themeTokens, isChecked)]}
           testID="Radio-Input"
@@ -124,6 +133,7 @@ const RadioButton = forwardRef(
 RadioButton.displayName = 'RadioButton'
 
 RadioButton.propTypes = {
+  ...selectedSystemPropTypes,
   isChecked: PropTypes.bool,
   tokens: getTokensSetPropType(tokenKeys, { allowFunction: true }),
   inactive: PropTypes.bool,

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
    */