@telus-uds/components-base 1.2.0 → 1.4.0

package/generate-component-docs.js

@@ -40,6 +40,9 @@ const parseComponentDocs = (name, generated) => {
 const components = {}
 
 Object.entries(allExports).forEach(([name, exp]) => {
+  // fail fast with meaningful error on typos, missing exports, etc
+  if (!exp) throw new Error(`components-base export "${name}" is ${exp} (typeof ${typeof exp})`)
+
   if (exp.__docgenInfo) {
     // populated by babel-plugin-react-docgen
     components[name] = parseComponentDocs(name, exp.__docgenInfo)

package/lib/A11yText/index.js

@@ -15,7 +15,7 @@ var _View = _interopRequireDefault(require("react-native-web/dist/cjs/exports/Vi
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
@@ -25,18 +25,20 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const [selectProps, selectedSystemPropTypes] = (0, _props.selectSystemProps)([_props.a11yProps, _props.viewProps]);
 /**
  * A11yText is a zero-size invisible element that adds text to be read by screen readers.
  *
  * It should be used to add selectable screen-reader-only text to the main document flow,
  * as a sibling to blocks of text like paragraphs and interactive elements like buttons.
  */
+
 const A11yText = /*#__PURE__*/(0, _react.forwardRef)(({
   text,
   heading,
   ...rest
 }, ref) => {
-  const a11y = _propTypes2.a11yProps.select({
+  const selectedProps = selectProps({
     // On iOS, needs `accessible` to be true to be focusable without non-a11y content.
     // On Web, `accessible` causes RNW to set attributes that may make the element be treated as a group.
     // On Android, may cause this to be skipped when with `<Text>` siblings in an `accessible` View,
@@ -46,15 +48,14 @@ const A11yText = /*#__PURE__*/(0, _react.forwardRef)(({
     accessibilityRole: heading ? 'header' : 'text',
     ...rest
   });
-
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
     style: styles.invisible,
     ref: ref,
-    ...a11y
+    ...selectedProps
   });
 });
 A11yText.displayName = 'A11yText';
-A11yText.propTypes = {
+A11yText.propTypes = { ...selectedSystemPropTypes,
   text: _propTypes.default.string.isRequired,
   heading: _propTypes.default.bool
 };

package/lib/ActivityIndicator/Spinner.js

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _shared = require("./shared");
 
+var _A11yInfoProvider = require("../A11yInfoProvider");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -37,44 +39,51 @@ const Spinner = /*#__PURE__*/(0, _react.forwardRef)(({
   color,
   thickness,
   label
-}, ref) => /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", {
-  ref: ref,
-  width: `${size}px`,
-  height: `${size}px`,
-  viewBox: "0 0 48 48",
-  "aria-valuetext": label,
-  role: "progressbar",
-  "aria-busy": true,
-  children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("g", {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("animateTransform", {
-      attributeName: "transform",
-      type: "rotate",
-      values: `-180 24 24;${360 + _shared.MIN_STROKE_ANGLE - 180} 24 24`,
-      ...animationProps
-    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("circle", {
-      fill: "none",
-      stroke: color,
-      strokeWidth: thickness * 48 / size,
-      strokeLinecap: "round",
-      cx: "24",
-      cy: "24",
-      r: "20",
-      strokeDasharray: [MIN_SVG_LENGTH, SVG_CIRCUMFERENCE],
-      strokeDashoffset: 0,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("animate", {
-        attributeName: "stroke-dashoffset",
-        values: `0;-10;${MIN_SVG_LENGTH - SVG_CIRCUMFERENCE}`,
-        ...animationProps,
-        ...bezierProps
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("animate", {
-        attributeName: "stroke-dasharray",
-        values: `${MIN_SVG_LENGTH}, 200;${MAX_SVG_LENGTH}, 200;${MIN_SVG_LENGTH}, 200`,
-        ...animationProps,
-        ...bezierProps
+}, ref) => {
+  const {
+    reduceMotionEnabled
+  } = (0, _A11yInfoProvider.useA11yInfo)();
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", {
+    ref: ref,
+    width: `${size}px`,
+    height: `${size}px`,
+    viewBox: "0 0 48 48",
+    "aria-valuetext": label,
+    role: "progressbar",
+    "aria-busy": true,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("g", {
+      children: [reduceMotionEnabled ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)("animateTransform", {
+        attributeName: "transform",
+        type: "rotate",
+        values: `-180 24 24;${360 + _shared.MIN_STROKE_ANGLE - 180} 24 24`,
+        ...animationProps
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("circle", {
+        fill: "none",
+        stroke: color,
+        strokeWidth: thickness * 48 / size,
+        strokeLinecap: "round",
+        cx: "24",
+        cy: "24",
+        r: "20",
+        strokeDasharray: reduceMotionEnabled ? MAX_SVG_LENGTH : [MIN_SVG_LENGTH, SVG_CIRCUMFERENCE],
+        strokeDashoffset: 0,
+        children: reduceMotionEnabled ? null : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("animate", {
+            attributeName: "stroke-dashoffset",
+            values: `0;-10;${MIN_SVG_LENGTH - SVG_CIRCUMFERENCE}`,
+            ...animationProps,
+            ...bezierProps
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("animate", {
+            attributeName: "stroke-dasharray",
+            values: `${MIN_SVG_LENGTH}, 200;${MAX_SVG_LENGTH}, 200;${MIN_SVG_LENGTH}, 200`,
+            ...animationProps,
+            ...bezierProps
+          })]
+        })
       })]
-    })]
-  })
-}));
+    })
+  });
+});
 Spinner.displayName = 'Spinner';
 Spinner.propTypes = _shared.propTypes;
 var _default = Spinner;

package/lib/ActivityIndicator/Spinner.native.js

@@ -17,6 +17,8 @@ var _View = _interopRequireDefault(require("react-native-web/dist/cjs/exports/Vi
 
 var _shared = require("./shared");
 
+var _A11yInfoProvider = require("../A11yInfoProvider");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -37,6 +39,10 @@ const Spinner = /*#__PURE__*/(0, _react.forwardRef)(({
     current: timer
   } = _react.default.useRef(new _Animated.default.Value(0));
 
+  const {
+    reduceMotionEnabled
+  } = (0, _A11yInfoProvider.useA11yInfo)();
+
   _react.default.useLayoutEffect(() => {
     const loop = _Animated.default.timing(timer, {
       duration: _shared.DURATION,
@@ -47,8 +53,8 @@ const Spinner = /*#__PURE__*/(0, _react.forwardRef)(({
       isInteraction: false
     });
 
-    _Animated.default.loop(loop).start();
-  }, [timer]);
+    if (!reduceMotionEnabled) _Animated.default.loop(loop).start();else loop.stop();
+  }, [timer, reduceMotionEnabled]);
 
   const frames = 60 * _shared.DURATION / 1000;
 
@@ -56,9 +62,10 @@ const Spinner = /*#__PURE__*/(0, _react.forwardRef)(({
 
   const containerStyle = {
     width: size,
-    height: size / 2,
+    height: size / (reduceMotionEnabled ? 1.5 : 2),
     overflow: 'hidden'
-  }; // Credit to https://github.com/n4kz/react-native-indicators and https://github.com/callstack/react-native-paper for this
+  };
+  const animationFrequency = reduceMotionEnabled ? [0] : [0, 1]; // Credit to https://github.com/n4kz/react-native-indicators and https://github.com/callstack/react-native-paper for this
 
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
     ref: ref,
@@ -75,7 +82,7 @@ const Spinner = /*#__PURE__*/(0, _react.forwardRef)(({
         height: size
       }],
       collapsable: false,
-      children: [0, 1].map(index => {
+      children: animationFrequency.map(index => {
         const inputRange = Array.from(new Array(frames), (_, frameIndex) => frameIndex / (frames - 1));
         const outputRange = Array.from(new Array(frames), (_, frameIndex) => {
           let progress = 2 * frameIndex / (frames - 1);
@@ -90,26 +97,30 @@ const Spinner = /*#__PURE__*/(0, _react.forwardRef)(({
         });
         const layerStyle = {
           width: size,
-          height: size,
-          transform: [{
+          height: size
+        };
+        const viewportStyle = {
+          width: size,
+          height: size
+        };
+
+        if (!reduceMotionEnabled) {
+          layerStyle.transform = [{
             rotate: timer.interpolate({
               inputRange: [0, 1],
               outputRange: [`${0 + ea + sa}deg`, `${2 * 360 + ea + sa}deg`]
             })
-          }]
-        };
-        const viewportStyle = {
-          width: size,
-          height: size,
-          transform: [{
+          }];
+          viewportStyle.transform = [{
             translateY: index ? -size / 2 : 0
           }, {
             rotate: timer.interpolate({
               inputRange,
               outputRange
             })
-          }]
-        };
+          }];
+        }
+
         const offsetStyle = index ? {
           top: size / 2
         } : null;

package/lib/ActivityIndicator/index.js

@@ -11,7 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _ThemeProvider = require("../ThemeProvider");
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _Spinner = _interopRequireDefault(require("./Spinner"));
 
@@ -42,8 +42,8 @@ const ActivityIndicator = ({
 };
 
 ActivityIndicator.propTypes = {
-  variant: _propTypes2.variantProp.propType,
-  tokens: (0, _propTypes2.getTokensPropType)('ActivityIndicator'),
+  variant: _props.variantProp.propType,
+  tokens: (0, _props.getTokensPropType)('ActivityIndicator'),
 
   /**
    * A visually hidden accessible label describing the action taking place

package/lib/Box/Box.js

@@ -25,12 +25,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const [selectProps, selectedSystemPropTypes] = (0, _utils.selectSystemProps)([_utils.a11yProps, _utils.viewProps]);
 /**
- * @typedef {import('../utils/propTypes.js').SpacingValue} SpacingValue
- * @typedef {import('../utils/propTypes.js').SpacingIndex} SpacingIndex
- * @typedef {import('../utils/propTypes.js').SpacingObject} SpacingObject
- * @typedef {import('../utils/propTypes.js').SpacingOptions} SpacingOptions
+ * @typedef {import('../utils/props/spacingProps.js').SpacingValue} SpacingValue
+ * @typedef {import('../utils/props/spacingProps.js').SpacingIndex} SpacingIndex
+ * @typedef {import('../utils/props/spacingProps.js').SpacingObject} SpacingObject
+ * @typedef {import('../utils/props/spacingProps.js').SpacingOptions} SpacingOptions
  */
+
 const selectBoxStyles = tokens => {
   const styles = {
     backgroundColor: tokens.backgroundColor
@@ -131,8 +133,7 @@ const Box = /*#__PURE__*/(0, _react.forwardRef)(({
   ...rest
 }, ref) => {
   const props = { ...(0, _utils.getA11yPropsFromHtmlTag)(tag, accessibilityRole),
-    ..._utils.a11yProps.select(rest),
-    ..._utils.viewProps.select(rest)
+    ...selectProps(rest)
   };
   const themeTokens = (0, _ThemeProvider.useThemeTokens)('Box', tokens, variant);
   const styles = {
@@ -165,8 +166,7 @@ const Box = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 Box.displayName = 'Box';
-Box.propTypes = { ..._utils.a11yProps.propTypes,
-  ..._utils.viewProps.types,
+Box.propTypes = { ...selectedSystemPropTypes,
   variant: _utils.variantProp.propType,
   tokens: (0, _utils.getTokensPropType)('Box'),
 

package/lib/Button/Button.js

@@ -13,7 +13,7 @@ var _propTypes = _interopRequireWildcard(require("./propTypes"));
 
 var _ThemeProvider = require("../ThemeProvider");
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
@@ -37,7 +37,7 @@ const Button = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 Button.displayName = 'Button';
-Button.propTypes = { ..._propTypes2.a11yProps.types,
+Button.propTypes = { ..._props.a11yProps.types,
   ..._propTypes.default,
   children: _propTypes.textAndA11yText
 };

package/lib/Button/ButtonBase.js

@@ -31,6 +31,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const [selectProps, selectedSystemPropTypes] = (0, _utils2.selectSystemProps)([_utils2.a11yProps, _utils2.linkProps, _utils2.viewProps]);
+
 const getOuterBorderOffset = ({
   outerBorderGap = 0,
   outerBorderWidth = 0
@@ -181,7 +183,6 @@ const ButtonBase = /*#__PURE__*/(0, _react.forwardRef)(({
   // alias for inactive
   inactive = disabled,
   selected = false,
-  dataSet,
   ...rawRest
 }, ref) => {
   const {
@@ -196,11 +197,11 @@ const ButtonBase = /*#__PURE__*/(0, _react.forwardRef)(({
 
   const resolveButtonTokens = pressableState => (0, _utils2.resolvePressableTokens)(tokens, pressableState, extraButtonState);
 
-  const a11y = _utils2.a11yProps.select(rest);
+  const systemProps = selectProps(rest);
 
   const getPressableStyle = pressableState => {
     const themeTokens = resolveButtonTokens(pressableState);
-    return [staticStyles.row, selectWebOnlyStyles(inactive, themeTokens, a11y), selectOuterContainerStyles(themeTokens), selectOuterWidthStyles(themeTokens)];
+    return [staticStyles.row, selectWebOnlyStyles(inactive, themeTokens, systemProps), selectOuterContainerStyles(themeTokens), selectOuterWidthStyles(themeTokens)];
   };
 
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Pressable.default, {
@@ -212,9 +213,8 @@ const ButtonBase = /*#__PURE__*/(0, _react.forwardRef)(({
     }),
     style: getPressableStyle,
     disabled: inactive,
-    dataSet: dataSet,
     hrefAttrs: hrefAttrs,
-    ...a11y,
+    ...systemProps,
     children: pressableState => {
       const themeTokens = resolveButtonTokens(pressableState);
       const containerStyles = selectInnerContainerStyles(themeTokens);
@@ -245,9 +245,8 @@ const ButtonBase = /*#__PURE__*/(0, _react.forwardRef)(({
 ButtonBase.displayName = 'ButtonBase';
 ButtonBase.propTypes = {
   id: _propTypes.default.string,
-  ..._utils2.a11yProps.types,
-  ..._propTypes2.default,
-  ..._utils2.linkProps.types
+  ...selectedSystemPropTypes,
+  ..._propTypes2.default
 };
 ButtonBase.defaultProps = {
   id: undefined

package/lib/Button/ButtonGroup.js

@@ -21,7 +21,7 @@ var _ViewportProvider = require("../ViewportProvider");
 
 var _ThemeProvider = require("../ThemeProvider");
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _input = require("../utils/input");
 
@@ -35,6 +35,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const [selectProps, selectedSystemPropTypes] = (0, _props.selectSystemProps)([_props.a11yProps, _props.pressProps, _props.viewProps]);
 const ButtonGroup = /*#__PURE__*/(0, _react.forwardRef)(({
   variant,
   tokens,
@@ -56,7 +57,7 @@ const ButtonGroup = /*#__PURE__*/(0, _react.forwardRef)(({
   const themeTokens = (0, _ThemeProvider.useThemeTokens)('ButtonGroup', tokens, variant, {
     viewport
   });
-  const stackTokens = (0, _propTypes2.selectTokens)('StackView', themeTokens);
+  const stackTokens = (0, _props.selectTokens)('StackView', themeTokens);
   const {
     direction,
     space
@@ -72,14 +73,12 @@ const ButtonGroup = /*#__PURE__*/(0, _react.forwardRef)(({
     onChange,
     readOnly
   });
-
-  const a11y = _propTypes2.a11yProps.select({
+  const systemProps = selectProps({
     accessibilityRole,
     ...rest
   });
-
-  const itemA11yRole = a11y.accessibilityRole === 'radiogroup' ? 'radio' : 'checkbox';
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_StackView.StackWrap, { ...a11y,
+  const itemA11yRole = systemProps.accessibilityRole === 'radiogroup' ? 'radio' : 'checkbox';
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_StackView.StackWrap, { ...systemProps,
     space: space,
     direction: direction,
     tokens: stackTokens,
@@ -109,7 +108,7 @@ const ButtonGroup = /*#__PURE__*/(0, _react.forwardRef)(({
         },
         accessibilityRole: itemA11yRole,
         accessibilityLabel,
-        ..._propTypes2.a11yProps.getPositionInSet(items.length, index)
+        ..._props.a11yProps.getPositionInSet(items.length, index)
       }; // Ensure button is direct child of group as MacOS voiceover only applies "X of Y" to
       // "radio" if it's a direct child of "radiogroup", even if aria-posinset etc exists
 
@@ -127,10 +126,9 @@ const ButtonGroup = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 ButtonGroup.displayName = 'ButtonGroup';
-ButtonGroup.propTypes = { ..._propTypes2.a11yProps.propTypes,
-  ..._propTypes2.pressProps.propTypes,
-  tokens: (0, _propTypes2.getTokensPropType)('ButtonGroup'),
-  variant: _propTypes2.variantProp.propType,
+ButtonGroup.propTypes = { ...selectedSystemPropTypes,
+  tokens: (0, _props.getTokensPropType)('ButtonGroup'),
+  variant: _props.variantProp.propType,
 
   /**
    * The maximum number of items a user may select at once. Defaults to 1 and behaves

package/lib/Button/ButtonLink.js

@@ -11,7 +11,7 @@ var _ButtonBase = _interopRequireDefault(require("./ButtonBase"));
 
 var _propTypes = _interopRequireWildcard(require("./propTypes"));
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _ThemeProvider = require("../ThemeProvider");
 
@@ -37,7 +37,7 @@ const ButtonLink = /*#__PURE__*/(0, _react.forwardRef)(({
   const {
     hrefAttrs,
     rest
-  } = _propTypes2.hrefAttrsProp.bundle(props);
+  } = _props.hrefAttrsProp.bundle(props);
 
   const getTokens = (0, _ThemeProvider.useThemeTokensCallback)('Button', tokens, variant);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ButtonBase.default, {
@@ -50,9 +50,9 @@ const ButtonLink = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 ButtonLink.displayName = 'ButtonLink';
-ButtonLink.propTypes = { ..._propTypes2.a11yProps.types,
+ButtonLink.propTypes = { ..._props.a11yProps.types,
   ..._propTypes.default,
-  ..._propTypes2.linkProps.types,
+  ..._props.linkProps.types,
   children: _propTypes.textAndA11yText
 };
 var _default = ButtonLink;

package/lib/Button/propTypes.js

@@ -9,7 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _airbnbPropTypes = _interopRequireDefault(require("airbnb-prop-types"));
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _A11yText = _interopRequireDefault(require("../A11yText"));
 
@@ -19,6 +19,8 @@ const textAndA11yText = _airbnbPropTypes.default.childrenOf(_propTypes.default.o
 
 exports.textAndA11yText = textAndA11yText;
 const buttonPropTypes = {
+  tokens: (0, _props.getTokensPropType)('Button'),
+
   /**
    * If true, prevents the button from being pressed, changes the cursor (on web) and accessibility
    * attributes to communicate this to the user, and applies `inactive: true` appearances from the theme
@@ -44,7 +46,7 @@ const buttonPropTypes = {
    * Function called when the button is pressed. Required unless the button has a href.
    */
   onPress: _propTypes.default.func,
-  variant: _propTypes2.variantProp.propType
+  variant: _props.variantProp.propType
 };
 var _default = buttonPropTypes;
 exports.default = _default;

package/lib/Card/Card.js

@@ -15,7 +15,7 @@ var _utils = require("../utils");
 
 var _ViewportProvider = require("../ViewportProvider");
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _CardBase = _interopRequireDefault(require("./CardBase"));
 
@@ -23,6 +23,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const [selectProps, selectedSystemPropTypes] = (0, _props.selectSystemProps)([_props.a11yProps, _props.viewProps]);
 /**
  * A basic card component, unstyled by default.
  *
@@ -71,6 +72,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * you automatically make inaccessible its children, which may or may not be appropriate
  * depending on what you are trying to achieve.
  */
+
 const Card = ({
   children,
   tokens,
@@ -85,16 +87,15 @@ const Card = ({
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CardBase.default, {
     tokens: themeTokens,
     dataSet: dataSet,
-    ...rest,
+    ...selectProps(rest),
     children: children
   });
 };
 
-Card.propTypes = {
+Card.propTypes = { ...selectedSystemPropTypes,
   children: _propTypes.default.node,
   tokens: (0, _utils.getTokensPropType)('Card'),
-  variant: _utils.variantProp.propType,
-  ..._propTypes2.a11yProps.types
+  variant: _utils.variantProp.propType
 };
 var _default = Card;
 exports.default = _default;

package/lib/Card/CardBase.js

@@ -15,7 +15,7 @@ var _ThemeProvider = require("../ThemeProvider");
 
 var _utils = require("../utils");
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
@@ -25,7 +25,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-// Ensure explicit selection of tokens
+const [selectProps, selectedSystemPropTypes] = (0, _props.selectSystemProps)([_props.a11yProps, _props.viewProps]); // Ensure explicit selection of tokens
+
 const selectStyles = ({
   flex,
   backgroundColor,
@@ -64,9 +65,7 @@ const CardBase = /*#__PURE__*/(0, _react.forwardRef)(({
   ...rest
 }, ref) => {
   const cardStyle = selectStyles(typeof tokens === 'function' ? tokens() : tokens);
-  const props = { ..._propTypes2.a11yProps.select(rest),
-    ..._propTypes2.viewProps.select(rest)
-  };
+  const props = selectProps(rest);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
     style: cardStyle,
     dataSet: dataSet,
@@ -76,11 +75,9 @@ const CardBase = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 CardBase.displayName = 'CardBase';
-CardBase.propTypes = {
+CardBase.propTypes = { ...selectedSystemPropTypes,
   children: _propTypes.default.node,
-  tokens: (0, _utils.getTokensPropType)('Card'),
-  ..._propTypes2.viewProps.types,
-  ..._propTypes2.a11yProps.types
+  tokens: (0, _utils.getTokensPropType)('Card')
 };
 var _default = CardBase;
 exports.default = _default;

package/lib/Card/PressableCardBase.js

@@ -19,8 +19,6 @@ var _ThemeProvider = require("../ThemeProvider");
 
 var _utils = require("../utils");
 
-var _propTypes2 = require("../utils/propTypes");
-
 var _CardBase = _interopRequireDefault(require("./CardBase"));
 
 var _jsxRuntime = require("react/jsx-runtime");
@@ -31,6 +29,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const [selectProps, selectedSystemPropTypes] = (0, _utils.selectSystemProps)([_utils.a11yProps, _utils.viewProps]);
 const tokenKeys = [...(0, _utils.getTokenNames)('Card'), // Outer border tokens. TODO: centralise common token sets like these as part of
 // https://github.com/telus/universal-design-system/issues/782
 'outerBorderColor', 'outerBorderWidth', 'outerBorderGap'];
@@ -61,11 +60,6 @@ const PressableCardBase = /*#__PURE__*/(0, _react.forwardRef)(({
   } = _utils.clickProps.toPressProps(rawRest);
 
   const viewport = (0, _ViewportProvider.useViewport)();
-
-  const a11y = _propTypes2.a11yProps.select({ ...rest,
-    accessibilityRole
-  });
-
   const additionalState = {
     checked,
     validation,
@@ -124,7 +118,9 @@ const PressableCardBase = /*#__PURE__*/(0, _react.forwardRef)(({
     onKeyDown: handleKeyDown,
     hrefAttrs: hrefAttrs,
     style: getOuterBorderStyle,
-    ...a11y,
+    ...selectProps({ ...rest,
+      accessibilityRole
+    }),
     children: pressableState => /*#__PURE__*/(0, _jsxRuntime.jsx)(_CardBase.default, {
       tokens: getCardTokens(pressableState),
       children: typeof children === 'function' ? children(getCardState(pressableState)) : children
@@ -132,14 +128,13 @@ const PressableCardBase = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 PressableCardBase.displayName = 'PressableCardBase';
-PressableCardBase.propTypes = {
+PressableCardBase.propTypes = { ...selectedSystemPropTypes,
   children: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.node]),
   tokens: (0, _utils.getTokensSetPropType)(tokenKeys, {
     requireAll: true,
     allowFunction: true
   }),
-  variant: _utils.variantProp.propType,
-  ..._propTypes2.a11yProps.types
+  variant: _utils.variantProp.propType
 };
 
 var _default = (0, _utils.withLinkRouter)(PressableCardBase);