@telus-uds/components-base 1.2.0 → 1.4.0

package/src/Card/PressableCardBase.jsx

@@ -5,19 +5,23 @@ import { Pressable, Platform } from 'react-native'
 import { useViewport } from '../ViewportProvider'
 import { applyOuterBorder, validateThemeTokens } from '../ThemeProvider'
 import {
+  a11yProps,
+  clickProps,
+  getTokenNames,
+  getTokensSetPropType,
+  linkProps,
   resolvePressableState,
   resolvePressableTokens,
+  selectSystemProps,
   selectTokens,
-  getTokenNames,
-  getTokensSetPropType,
   variantProp,
-  linkProps,
-  clickProps,
+  viewProps,
   withLinkRouter
 } from '../utils'
-import { a11yProps } from '../utils/propTypes'
 import CardBase from './CardBase'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const tokenKeys = [
   ...getTokenNames('Card'),
 
@@ -52,10 +56,6 @@ const PressableCardBase = forwardRef(
   ) => {
     const { onPress, ...rest } = clickProps.toPressProps(rawRest)
     const viewport = useViewport()
-    const a11y = a11yProps.select({
-      ...rest,
-      accessibilityRole
-    })
     const additionalState = { checked, validation, inactive, viewport }
 
     const getCardState = (pressableState) => resolvePressableState(pressableState, additionalState)
@@ -98,7 +98,7 @@ const PressableCardBase = forwardRef(
         onKeyDown={handleKeyDown}
         hrefAttrs={hrefAttrs}
         style={getOuterBorderStyle}
-        {...a11y}
+        {...selectProps({ ...rest, accessibilityRole })}
       >
         {(pressableState) => (
           <CardBase tokens={getCardTokens(pressableState)}>
@@ -112,10 +112,10 @@ const PressableCardBase = forwardRef(
 PressableCardBase.displayName = 'PressableCardBase'
 
 PressableCardBase.propTypes = {
+  ...selectedSystemPropTypes,
   children: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
   tokens: getTokensSetPropType(tokenKeys, { requireAll: true, allowFunction: true }),
-  variant: variantProp.propType,
-  ...a11yProps.types
+  variant: variantProp.propType
 }
 
 export default withLinkRouter(PressableCardBase)

package/src/Checkbox/Checkbox.jsx

@@ -7,10 +7,18 @@ import CheckboxLabel from '../InputLabel/LabelContent'
 import Feedback from '../Feedback'
 import StackView from '../StackView'
 import { applyShadowToken, applyTextStyles, useThemeTokensCallback } from '../ThemeProvider'
-import { getTokensPropType, useInputValue, variantProp } from '../utils'
-import { a11yProps } from '../utils/propTypes'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  useInputValue,
+  variantProp,
+  viewProps
+} from '../utils'
 import useUniqueId from '../utils/useUniqueId'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectInputStyles = (
   {
     iconBackgroundColor,
@@ -154,7 +162,6 @@ const Checkbox = forwardRef(
       // The expected keyboard shortcut for activating a checkbox is the Space key
       if (event?.key === ' ') handleChange(event)
     }
-    const accessibilityProps = a11yProps.select(rest)
     const uniqueId = useUniqueId('checkbox')
     const inputId = id ?? uniqueId
 
@@ -167,7 +174,7 @@ const Checkbox = forwardRef(
             onPress={handleChange}
             accessibilityRole="checkbox"
             accessibilityState={{ checked: isChecked, disabled: inactive }}
-            {...accessibilityProps}
+            {...selectProps(rest)}
           >
             {({ focused: focus, hovered: hover, pressed }) => {
               const { icon: IconComponent, ...stateTokens } = getTokens({ focus, hover, pressed })
@@ -222,7 +229,7 @@ const Checkbox = forwardRef(
 Checkbox.displayName = 'Checkbox'
 
 Checkbox.propTypes = {
-  ...a11yProps.propTypes,
+  ...selectedSystemPropTypes,
   /**
    * Use `checked` for controlled Checkbox. For uncontrolled Checkbox, use the `defaultChecked` prop.
    */

package/src/Divider/Divider.jsx

@@ -3,10 +3,20 @@ import PropTypes from 'prop-types'
 import { View, StyleSheet, Platform } from 'react-native'
 import { useThemeTokens } from '../ThemeProvider'
 import Spacer from '../Spacer'
-import { getTokensPropType, variantProp, spacingProps } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  spacingProps,
+  variantProp,
+  viewProps
+} from '../utils'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 /**
- * @typedef {import('../utils/propTypes.js').SpacingIndex} SpacingIndex
- * @typedef {import('../utils/propTypes.js').SpacingObject} SpacingObject
+ * @typedef {import('../utils/props/spacingProps.js').SpacingIndex} SpacingIndex
+ * @typedef {import('../utils/props/spacingProps.js').SpacingObject} SpacingObject
  */
 
 /**
@@ -45,7 +55,7 @@ import { getTokensPropType, variantProp, spacingProps } from '../utils'
  *
  * For accessibility purposes a divider component will be described with ARIA attributes, i.e. `role="separator"` and `aria-orientation="vertical/horizontal"`.
  */
-const Divider = forwardRef(({ variant, vertical = false, space, tokens, testID }, ref) => {
+const Divider = forwardRef(({ variant, vertical = false, space, tokens, ...rest }, ref) => {
   const { color, width } = useThemeTokens('Divider', tokens, variant)
 
   const borderStyles = vertical
@@ -68,8 +78,10 @@ const Divider = forwardRef(({ variant, vertical = false, space, tokens, testID }
       : // There are no such equivalent attributes for native
         {}
 
+  const { testID, ...selectedProps } = selectProps({ ...a11y, ...rest })
+
   const divider = (
-    <View ref={ref} style={[styles.divider, borderStyles]} testID={testID} {...a11y} />
+    <View ref={ref} style={[styles.divider, borderStyles]} testID={testID} {...selectedProps} />
   )
   if (!space) return divider
   const spacerProps = { space, direction: vertical ? 'row' : 'column' }
@@ -84,6 +96,7 @@ const Divider = forwardRef(({ variant, vertical = false, space, tokens, testID }
 Divider.displayName = 'Divider'
 
 Divider.propTypes = {
+  ...selectedSystemPropTypes,
   tokens: getTokensPropType('Divider'),
   space: spacingProps.types.spacingValue,
   variant: variantProp.propType,
@@ -91,13 +104,7 @@ Divider.propTypes = {
    * By default, the divider is a horizontal line the full width of its parent.
    * With `vertical` prop and when inside a container with { flexDirection: row }, draws a full height vertical line.
    */
-  vertical: PropTypes.bool,
-  /**
-   * @ignore
-   * In tests, the only way to select dividers is with testID prop and getByTestId, since they have no content,
-   * no accessibility role on native, and there is no equivalent of nextSibling in React Native Testing Library.
-   */
-  testID: PropTypes.string
+  vertical: PropTypes.bool
 }
 
 const styles = StyleSheet.create({

package/src/ExpandCollapse/Control.jsx

@@ -3,7 +3,9 @@ import { Pressable, View } from 'react-native'
 import PropTypes from 'prop-types'
 
 import { useThemeTokensCallback, verticalAlignRow } from '../ThemeProvider'
-import { getTokensPropType, variantProp, a11yProps } from '../utils'
+import { a11yProps, getTokensPropType, selectSystemProps, variantProp, viewProps } from '../utils'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
 
 function selectContainerStyles({
   backgroundColor,
@@ -48,12 +50,15 @@ function selectIconTokens(tokens) {
 }
 
 const ExpandCollapseControl = forwardRef(
-  ({ onPress, isExpanded, children, tokens, accessibilityRole = 'button', variant, rest }, ref) => {
+  (
+    { onPress, isExpanded, children, tokens, accessibilityRole = 'button', variant, ...rest },
+    ref
+  ) => {
     const getTokens = useThemeTokensCallback('ExpandCollapseControl', tokens, variant)
 
-    const a11y = a11yProps.select({ ...rest, accessibilityRole })
-    a11y.accessibilityState = {
-      ...(a11y.accessibilityState || {}),
+    const selectedProps = selectProps({ ...rest, accessibilityRole })
+    selectedProps.accessibilityState = {
+      ...(selectedProps.accessibilityState || {}),
       expanded: isExpanded
     }
 
@@ -68,7 +73,7 @@ const ExpandCollapseControl = forwardRef(
       selectContainerStyles(getControlTokens(pressableState))
 
     return (
-      <Pressable ref={ref} {...a11y} onPress={onPress} style={getPressableStyle}>
+      <Pressable ref={ref} {...selectedProps} onPress={onPress} style={getPressableStyle}>
         {(pressableState) => {
           const { icon: IconComponent, ...themeTokens } = getControlTokens(pressableState)
           return (
@@ -91,7 +96,7 @@ const ExpandCollapseControl = forwardRef(
 ExpandCollapseControl.displayName = 'ExpandCollapseControl'
 
 ExpandCollapseControl.propTypes = {
-  ...a11yProps.propTypes,
+  ...selectedSystemPropTypes,
   tokens: getTokensPropType('ExpandCollapseControl'),
   variant: variantProp.propType,
   /**

package/src/ExpandCollapse/ExpandCollapse.jsx

@@ -3,7 +3,16 @@ import { View } from 'react-native'
 import PropTypes from 'prop-types'
 
 import { useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, variantProp, useMultipleInputValues } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  useMultipleInputValues,
+  variantProp,
+  viewProps
+} from '../utils'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
 
 function selectBorderStyles(tokens) {
   return {
@@ -21,7 +30,7 @@ function selectBorderStyles(tokens) {
  * nested (they do not need to be direct children), and non-interactive items may be included too.
  */
 const ExpandCollapse = forwardRef(
-  ({ children, tokens, variant, maxOpen, open, initialOpen, onChange }, ref) => {
+  ({ children, tokens, variant, maxOpen, open, initialOpen, onChange, ...rest }, ref) => {
     const {
       currentValues: openIds,
       toggleOneValue: onToggle,
@@ -37,7 +46,7 @@ const ExpandCollapse = forwardRef(
     const themeTokens = useThemeTokens('ExpandCollapse', tokens, variant)
 
     return (
-      <View ref={ref} style={selectBorderStyles(themeTokens)}>
+      <View ref={ref} style={selectBorderStyles(themeTokens)} {...selectProps(rest)}>
         {typeof children === 'function'
           ? children({ openIds, onToggle, resetValues, setValues, unsetValues })
           : children}
@@ -48,6 +57,7 @@ const ExpandCollapse = forwardRef(
 ExpandCollapse.displayName = 'ExpandCollapse'
 
 ExpandCollapse.propTypes = {
+  ...selectedSystemPropTypes,
   variant: variantProp.propType,
   tokens: getTokensPropType('ExpandCollapse'),
   /**

package/src/ExpandCollapse/Panel.jsx

@@ -4,7 +4,16 @@ import PropTypes from 'prop-types'
 
 import ExpandCollapseControl from './Control'
 import { useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, variantProp, useVerticalExpandAnimation, a11yProps } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  useVerticalExpandAnimation,
+  variantProp,
+  viewProps
+} from '../utils'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
 
 // just void functions for now, since there are no style tokens for a panel or control at this point
 const selectGroupStyles = () => {}
@@ -49,9 +58,9 @@ const ExpandCollapsePanel = forwardRef(
     const [containerHeight, setContainerHeight] = useState(null)
     const isExpanded = openIds.includes(panelId)
 
-    const a11y = a11yProps.select(rest)
-    a11y.accessibilityState = {
-      ...(a11y.accessibilityState || {}),
+    const selectedProps = selectProps(rest)
+    selectedProps.accessibilityState = {
+      ...(selectedProps.accessibilityState || {}),
       expanded: isExpanded
     }
 
@@ -88,7 +97,7 @@ const ExpandCollapsePanel = forwardRef(
     return (
       <View ref={ref} style={selectGroupStyles(themeTokens)}>
         <ExpandCollapseControl
-          {...a11y}
+          {...selectedProps}
           isExpanded={isExpanded}
           tokens={controlTokens}
           onPress={handleControlPress}
@@ -110,6 +119,7 @@ const ExpandCollapsePanel = forwardRef(
 ExpandCollapsePanel.displayName = 'ExpandCollapsePanel'
 
 ExpandCollapsePanel.propTypes = {
+  ...selectedSystemPropTypes,
   variant: variantProp.propType,
   tokens: getTokensPropType('ExpandCollapsePanel'),
   /**

package/src/Feedback/Feedback.jsx

@@ -3,9 +3,18 @@ import { StyleSheet, Text, View } from 'react-native'
 import PropTypes from 'prop-types'
 
 import { applyTextStyles, useThemeTokens } from '../ThemeProvider'
-import { a11yProps, getTokensPropType, selectTokens, variantProp } from '../utils'
+import {
+  a11yProps,
+  getTokensPropType,
+  selectSystemProps,
+  selectTokens,
+  variantProp,
+  viewProps
+} from '../utils'
 import StackView from '../StackView'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectStyles = (tokens) => selectTokens('Feedback', tokens)
 
 const selectTitleTextStyles = ({ titleFontSize, ...tokens }) =>
@@ -53,13 +62,13 @@ const Feedback = forwardRef(
     const content =
       typeof children === 'string' ? <Text style={contentTextStyles}>{children}</Text> : children
 
-    const accessibilityProps = a11yProps.select({
+    const selectedProps = selectProps({
       accessibilityRole: validation === 'error' ? 'alert' : undefined,
       ...rest
     })
 
     return (
-      <View ref={ref} style={selectStyles(themeTokens)} {...accessibilityProps} nativeID={id}>
+      <View ref={ref} style={selectStyles(themeTokens)} nativeID={id} {...selectedProps}>
         <StackView space={space}>
           {title !== undefined && (
             <View style={staticStyles.title}>
@@ -82,6 +91,7 @@ const Feedback = forwardRef(
 Feedback.displayName = 'Feedback'
 
 Feedback.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Emphasized summary of the feedback. If an icon is set, it is rendered next to the title.
    */

package/src/Fieldset/Fieldset.jsx

@@ -60,7 +60,7 @@ const Fieldset = forwardRef(
     // and on MacOS voiceover, radiogroup -> radio. To allow elements to be direct children of the
     // fieldset as much as possible, but also allow different spacing within content and between
     // fieldset / feedback / etc, wrap resolved children in a fragment, and stack with `preserveFragments`.
-    const childContent = <>{typeof children === 'function' ? children({ a11yProps }) : children}</>
+    const childContent = <>{typeof children === 'function' ? children(a11yProps) : children}</>
     const orderedContent =
       feedbackPosition === 'bottom'
         ? [legendContent, feedbackContent, childContent]

package/src/FlexGrid/FlexGrid.jsx

@@ -8,7 +8,15 @@ import Col from './Col'
 import { useViewport } from '../ViewportProvider'
 import GutterContext from './providers/GutterContext'
 import applyInheritance from './helpers'
-import { a11yProps, viewProps, getA11yPropsFromHtmlTag, layoutTags } from '../utils'
+import {
+  a11yProps,
+  viewProps,
+  getA11yPropsFromHtmlTag,
+  layoutTags,
+  selectSystemProps
+} from '../utils'
+
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
 
 /**
  * A mobile-first flexbox grid.
@@ -62,8 +70,7 @@ const FlexGrid = forwardRef(
 
     const props = {
       ...getA11yPropsFromHtmlTag(tag, accessibilityRole),
-      ...a11yProps.select(rest),
-      ...viewProps.select(rest)
+      ...selectProps(rest)
     }
 
     return (
@@ -91,8 +98,7 @@ const styles = StyleSheet.create({
 })
 
 FlexGrid.propTypes = {
-  ...a11yProps.propTypes,
-  ...viewProps.types,
+  ...selectedSystemPropTypes,
   /**
    * Whether or not to give the grid a fixed width. This also centres the grid horizontally.
    */

package/src/FlexGrid/helpers/index.js

@@ -1,10 +1,8 @@
 const applyInheritance = (sizes) => {
   let prevSize
   return sizes.map((size, index) => {
-    if (size) {
-      prevSize = size
-    }
     if (size !== undefined) {
+      prevSize = size
       return size
     }
     if (index) {

package/src/HorizontalScroll/HorizontalScroll.jsx

@@ -3,10 +3,18 @@ import PropTypes from 'prop-types'
 import { Platform, StyleSheet, View } from 'react-native'
 
 import { validateThemeTokens, resolveThemeTokens } from '../ThemeProvider'
-import { getTokensSetPropType, selectTokens, a11yProps } from '../utils'
+import {
+  a11yProps,
+  getTokensSetPropType,
+  selectSystemProps,
+  selectTokens,
+  viewProps
+} from '../utils'
 import ScrollViewEnd from './ScrollViewEnd'
 import { getItemPositionScrollTarget, itemPositionsPropType } from './itemPositions'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const tokenKeys = [
   'nextIcon',
   'previousIcon',
@@ -22,7 +30,7 @@ export const selectHorizontalScrollTokens = (themeTokens, prefix) =>
  * Base component that scrolls horizontally and displays left and right buttons if
  * there is content to the left and the right which can be scrolled to.
  *
- * @TODO revist `ScrollButton` after IconButton is stable.
+ * @TODO revisit `ScrollButton` after IconButton is stable.
  */
 const HorizontalScroll = forwardRef(
   ({ ScrollButton, tokens, itemPositions, children, ...rest }, ref) => {
@@ -108,8 +116,6 @@ const HorizontalScroll = forwardRef(
     const scrollNext = () => scrollTo(scrollOffset + scrollDistance)
     const scrollPrevious = () => scrollTo(scrollOffset - scrollDistance)
 
-    const a11y = a11yProps.select(rest)
-
     // On Web, being scrollable in one direction prevents overflow: visible in the other direction.
     // Apply a fixed margin gutter that tab highlight effects can overhang without getting trimmed.
     return (
@@ -125,7 +131,7 @@ const HorizontalScroll = forwardRef(
             staticStyles.scrollContainer,
             { marginBottom: gutter, borderBottomWidth, borderBottomColor }
           ]}
-          {...a11y}
+          {...selectProps(rest)}
         >
           {children}
         </ScrollViewEnd>
@@ -159,6 +165,7 @@ const staticStyles = StyleSheet.create({
 })
 
 HorizontalScroll.propTypes = {
+  ...selectedSystemPropTypes,
   itemPositions: itemPositionsPropType,
   ScrollButton: PropTypes.elementType,
   tokens: getTokensSetPropType(tokenKeys, { allowFunction: true }),

package/src/IconButton/IconButton.jsx

@@ -4,18 +4,22 @@ import { Pressable, Platform, StyleSheet, View } from 'react-native'
 
 import { applyOuterBorder, useThemeTokensCallback, applyShadowToken } from '../ThemeProvider'
 import {
-  variantProp,
+  a11yProps,
   clickProps,
+  getTokensPropType,
+  hrefAttrsProp,
   linkProps,
   resolvePressableState,
-  hrefAttrsProp,
-  getTokensPropType,
+  selectSystemProps,
   selectTokens,
+  variantProp,
+  viewProps,
   withLinkRouter
 } from '../utils'
-import { a11yProps } from '../utils/propTypes'
 import Icon from '../Icon'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectOuterStyle = ({
   backgroundColor,
   borderRadius,
@@ -60,7 +64,7 @@ const IconButton = forwardRef(
     ref
   ) => {
     const { onPress, ...rest } = clickProps.toPressProps(rawRest)
-    const a11y = a11yProps.select({
+    const selectedProps = selectProps({
       ...rest,
       accessibilityRole
     })
@@ -77,7 +81,7 @@ const IconButton = forwardRef(
         onPress={handlePress}
         hrefAttrs={hrefAttrs}
         style={getOuterStyle}
-        {...a11y}
+        {...selectedProps}
       >
         {(pressableState) => {
           const themeTokens = getTokens(resolvePressableState(pressableState))
@@ -85,7 +89,7 @@ const IconButton = forwardRef(
             <View style={selectInnerStyle(themeTokens)}>
               <Icon
                 icon={IconComponent}
-                title={a11y.accessibilityLabel}
+                title={selectedProps.accessibilityLabel}
                 tokens={selectTokens('Icon', themeTokens, 'icon')}
               />
             </View>
@@ -98,7 +102,7 @@ const IconButton = forwardRef(
 IconButton.displayName = 'IconButton'
 
 IconButton.propTypes = {
-  ...a11yProps.types,
+  ...selectedSystemPropTypes,
   variant: variantProp.propType,
   tokens: getTokensPropType('IconButton'),
   icon: PropTypes.elementType.isRequired,

package/src/InputLabel/InputLabel.jsx

@@ -3,11 +3,20 @@ import { StyleSheet, Text, 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
+} from '../utils'
 
 import LabelContent from './LabelContent'
 import Tooltip from '../Tooltip'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+
 const selectLabelStyles = (tokens) => applyTextStyles(selectTokens('Typography', tokens))
 
 const selectHintStyles = ({
@@ -28,7 +37,10 @@ const selectHintStyles = ({
 const selectGapStyles = ({ gap }) => ({ marginRight: gap })
 
 const InputLabel = forwardRef(
-  ({ label, forId, hint, hintPosition = 'inline', hintId, tooltip, tokens, variant }, ref) => {
+  (
+    { label, forId, hint, hintPosition = 'inline', hintId, tooltip, tokens, variant, ...rest },
+    ref
+  ) => {
     const themeTokens = useThemeTokens('InputLabel', tokens, variant)
 
     const hasTooltip = tooltip !== undefined
@@ -38,6 +50,7 @@ const InputLabel = forwardRef(
       <View
         ref={ref}
         style={[staticStyles.container, !isHintInline && staticStyles.containerWithHintBelow]}
+        {...selectProps(rest)}
       >
         <Text
           style={[selectLabelStyles(themeTokens), selectGapStyles(themeTokens), staticStyles.label]}
@@ -69,6 +82,7 @@ const InputLabel = forwardRef(
 InputLabel.displayName = 'InputLabel'
 
 InputLabel.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * The input label.
    */

package/src/InputSupports/InputSupports.jsx

@@ -30,7 +30,7 @@ const InputSupports = forwardRef(
             forId={inputId}
           />
         )}
-        {typeof children === 'function' ? children({ a11yProps, inputId }) : children}
+        {typeof children === 'function' ? children({ inputId, ...a11yProps }) : children}
         {feedback && <Feedback id={feedbackId} title={feedback} validation={validation} />}
       </StackView>
     )

package/src/Link/LinkBase.jsx

@@ -3,12 +3,14 @@ import PropTypes from 'prop-types'
 import { Text, Platform, StyleSheet } from 'react-native'
 import {
   a11yProps,
+  clickProps,
+  getTokensPropType,
   hrefAttrsProp,
-  variantProp,
   linkProps,
-  getTokensPropType,
-  clickProps
-} from '../utils/propTypes'
+  selectSystemProps,
+  variantProp,
+  viewProps
+} from '../utils/props'
 import { resolvePressableTokens } from '../utils/pressability'
 import { withLinkRouter } from '../utils'
 
@@ -16,6 +18,8 @@ import InlinePressable from './InlinePressable'
 import { applyTextStyles, applyOuterBorder } from '../ThemeProvider'
 import { IconText, iconComponentPropTypes } from '../Icon'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, linkProps, viewProps])
+
 const selectOuterBorderStyles = ({
   outerBorderColor,
   outerBorderWidth,
@@ -101,14 +105,13 @@ const LinkBase = forwardRef(
       tokens = {},
       children,
       accessibilityRole = 'link',
-      dataSet,
       ...rawRest
     },
     ref
   ) => {
     const { onPress, ...props } = clickProps.toPressProps(rawRest)
     const { hrefAttrs, rest } = hrefAttrsProp.bundle(props)
-    const linkPropSet = linkProps.select({
+    const selectedProps = selectProps({
       accessibilityRole,
       href,
       onPress: linkProps.handleHref({ href, onPress }),
@@ -124,9 +127,8 @@ const LinkBase = forwardRef(
 
     return (
       <InlinePressable
-        {...linkPropSet}
+        {...selectedProps}
         ref={ref}
-        dataSet={dataSet}
         style={(linkState) => {
           const themeTokens = resolveLinkTokens(linkState)
           const outerBorderStyles = selectOuterBorderStyles(themeTokens)
@@ -164,8 +166,7 @@ const LinkBase = forwardRef(
 LinkBase.displayName = 'LinkBase'
 
 LinkBase.propTypes = {
-  ...a11yProps.types,
-  ...linkProps.types,
+  ...selectedSystemPropTypes,
   tokens: getTokensPropType('Link'),
   variant: variantProp.propType,
   /**