@telus-uds/components-base 1.2.0 → 1.3.0

package/.turbo/turbo-build.log

@@ -0,0 +1,5 @@
+@telus-uds/components-base:build: cache hit, replaying output 00426a473859b487
+@telus-uds/components-base:build: $ yarn build:code && yarn build:docs
+@telus-uds/components-base:build: $ babel src -d lib
+@telus-uds/components-base:build: Successfully compiled 214 files with Babel (15991ms).
+@telus-uds/components-base:build: $ babel-node --plugins=react-docgen-alpha generate-component-docs.js

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.3.0](https://github.com/telus/universal-design-system/compare/@telus-uds/components-base/v1.2.0...@telus-uds/components-base/v1.3.0) (2022-03-21)
+
+### Features
+
+- **components-base:** add common system props handler and restructure props-related utils ([#1444](https://github.com/telus/universal-design-system/issues/1444)) ([ab655ec](https://github.com/telus/universal-design-system/commit/ab655ec61796b6a6d7094c2c42ceef8b5197c634))
+- **docs:** add tokens override documentation ([#1330](https://github.com/telus/universal-design-system/issues/1330)) ([49092e5](https://github.com/telus/universal-design-system/commit/49092e5d5f6c2d3a85de930a74a03afff8a60062))
+
+### Bug Fixes
+
+- **base:** inherit FlexGrid.Col responsive size if 0 ([#1419](https://github.com/telus/universal-design-system/issues/1419)) ([9defeb0](https://github.com/telus/universal-design-system/commit/9defeb0da08099afb83df9e7ee902f037cb4de02))
+- **ds-allium:** fix some errors in RN builds ([#1448](https://github.com/telus/universal-design-system/issues/1448)) ([8bc4778](https://github.com/telus/universal-design-system/commit/8bc477890f0183584fdc1009d7929b71d23820a3))
+
 ## [1.2.0](https://github.com/telus/universal-design-system/compare/@telus-uds/components-base/v1.1.0...@telus-uds/components-base/v1.2.0) (2022-03-02)
 
 ### Features

package/__tests__/FlexGrid/Col.test.jsx

@@ -48,7 +48,6 @@ describe('FlexGrid.Col offsets', () => {
     )
     const expectIfOffsetExpected = (propViewport) => {
       const target = getByText(`${propViewport}Offset`).parent
-      // eslint-disable-next-line jest/valid-expect
       return expected[propViewport] ? expect(target) : expect(target).not
     }
     expectIfOffsetExpected('xs').toHaveStyle(getOffsetStyle('xs'))
@@ -104,7 +103,6 @@ describe('FlexGrid.Col sizes', () => {
 
     const expectIfSizeExpected = (propViewport) => {
       const target = getByText(propViewport).parent
-      // eslint-disable-next-line jest/valid-expect
       return expected[propViewport] ? expect(target) : expect(target).not
     }
     expectIfSizeExpected('xs').toHaveStyle(getNumericSizeStyle('xs'))
@@ -154,7 +152,6 @@ describe('FlexGrid.Col sizes', () => {
 
     const expectIfSizeExpected = (text) => {
       const target = getByText(text).parent
-      // eslint-disable-next-line jest/valid-expect
       return expected[text] ? expect(target) : expect(target).not
     }
     expectIfSizeExpected('xs-md').toHaveStyle(getNumericSizeStyle('xs'))
@@ -166,16 +163,17 @@ describe('FlexGrid.Col sizes', () => {
   })
 
   // Testing special "hiding" case on passing xs, sm, md, lg, xl props as 0.
-  // Doesn't inherit like other values for these props, only applies to the given prop
+  // Should inherit like other values for these props, confirmed in:
+  // https://github.com/telus/universal-design-system/pull/364#discussion_r671382300
   it.each(
     // true here indicates hiding styles should apply
     // Align expected results like a table so they're easier to read
     /* prettier-ignore */ [
     ['xs', { xs: true,  sm: false, md: false, lg: false, xl: false }],
-    ['sm', { xs: false, sm: true,  md: false, lg: false, xl: false }],
-    ['md', { xs: false, sm: false, md: true,  lg: false, xl: false }],
-    ['lg', { xs: false, sm: false, md: false, lg: true,  xl: false }],
-    ['xl', { xs: false, sm: false, md: false, lg: false, xl: true  }]
+    ['sm', { xs: true,  sm: true,  md: false, lg: false, xl: false }],
+    ['md', { xs: true,  sm: true,  md: true,  lg: false, xl: false }],
+    ['lg', { xs: true,  sm: true,  md: true,  lg: true,  xl: false }],
+    ['xl', { xs: true,  sm: true,  md: true,  lg: true,  xl: true  }]
   ]
   )('applies hiding styles from one prop at viewport "%s"', (viewport, expected) => {
     const hidingStyle = { display: 'none' }
@@ -199,7 +197,6 @@ describe('FlexGrid.Col sizes', () => {
     )
     const expectIfHidingExpected = (propViewport) => {
       const target = getByText(propViewport).parent
-      // eslint-disable-next-line jest/valid-expect
       return expected[propViewport] ? expect(target) : expect(target).not
     }
     expectIfHidingExpected('xs').toHaveStyle(hidingStyle)
@@ -248,7 +245,6 @@ describe('FlexGrid.Col horizontalAlign', () => {
 
     const expectIfAlignExpected = (propViewport) => {
       const target = getByText(propViewport).parent
-      // eslint-disable-next-line jest/valid-expect
       return expected[propViewport] ? expect(target) : expect(target).not
     }
     expectIfAlignExpected('xs').toHaveStyle(alignRightStyle)

package/__tests__/utils/props.test.js

@@ -0,0 +1,36 @@
+import { selectSystemProps } from '../../src/utils'
+
+describe('selectSystemProps', () => {
+  it('reduces the selectors and the types correctly', () => {
+    const somePropNames = ['a', 'b']
+    const someTypes = { a: 1, b: 2 }
+    const someOtherPropNames = ['c', 'd']
+    const someOtherTypes = { c: 3, d: 4 }
+    const reducer = (props) => (acc, allowedPropName) =>
+      allowedPropName in props ? { ...acc, [allowedPropName]: props[allowedPropName] } : acc
+    const exampleProps = { a: 'a', c: 'c', e: 'e' }
+    const [selectProps, selectedPropTypes] = selectSystemProps([
+      { select: (props) => somePropNames.reduce(reducer(props), {}), types: someTypes },
+      { select: (props) => someOtherPropNames.reduce(reducer(props), {}), types: someOtherTypes }
+    ])
+    expect(selectProps(exampleProps)).toEqual({ a: 'a', c: 'c' })
+    expect(selectedPropTypes).toEqual({ a: 1, b: 2, c: 3, d: 4 })
+  })
+
+  it('returns selector throwing if one of the prop helpers does not have any valid prop selectors', () => {
+    const [selectProps] = selectSystemProps([{ types: {} }])
+    expect(() => {
+      selectProps({ someProp: 'some value' })
+    }).toThrowError(
+      "An invalid system prop helper has been passed to 'selectSystemProps': prop selector ('.select') is missing in"
+    )
+  })
+
+  it('throws if one of the prop helpers does not have any valid prop types selectors', () => {
+    expect(() => {
+      selectSystemProps([{ select: () => {} }])
+    }).toThrowError(
+      "An invalid system prop helper has been passed to 'selectSystemProps': types selector ('.types') is missing in"
+    )
+  })
+})

package/__tests__/utils/semantics.test.jsx

@@ -1,6 +1,6 @@
 import { Platform } from 'react-native'
 
-import { getA11yPropsFromHtmlTag, tagsToRoles, supportedTags } from '../../src'
+import { getA11yPropsFromHtmlTag, supportedTags } from '../../src'
 
 // Note that currently all tests run as ios so only native logic can be tested here
 // until cross-platform tests are set up. See issue:
@@ -8,16 +8,7 @@ import { getA11yPropsFromHtmlTag, tagsToRoles, supportedTags } from '../../src'
 
 // As a temporary measure, there are tests on web-context HTML output for Box component
 // in @telus-uds/ds-allium which test the actual output when the tags are rendered.
-
-// These tests will therefore just test the values returned in a native context.
 describe('getA11yPropsFromHtmlTag', () => {
-  it.each(Object.entries(tagsToRoles))(
-    'responds to tag "%s" with accessibilityRole "%s"',
-    (tag, role) => {
-      expect(getA11yPropsFromHtmlTag(tag)).toEqual({ accessibilityRole: role })
-    }
-  )
-
   it.each([
     [1, 'h1'],
     [2, 'h2'],

package/component-docs.json

@@ -3027,59 +3027,6 @@
             "required": false,
             "description": "Whether or not to include gutter at the ends to the left and right of the FlexGrid"
           },
-          "pointerEvents": {
-            "type": {
-              "name": "enum",
-              "value": [
-                {
-                  "value": "'all'",
-                  "computed": false
-                },
-                {
-                  "value": "'none'",
-                  "computed": false
-                },
-                {
-                  "value": "'box-only'",
-                  "computed": false
-                },
-                {
-                  "value": "'box-none'",
-                  "computed": false
-                }
-              ]
-            },
-            "required": false,
-            "description": ""
-          },
-          "onLayout": {
-            "type": {
-              "name": "func"
-            },
-            "required": false,
-            "description": ""
-          },
-          "nativeID": {
-            "type": {
-              "name": "string"
-            },
-            "required": false,
-            "description": ""
-          },
-          "testID": {
-            "type": {
-              "name": "string"
-            },
-            "required": false,
-            "description": ""
-          },
-          "dataSet": {
-            "type": {
-              "name": "object"
-            },
-            "required": false,
-            "description": ""
-          },
           "xsReverse": {
             "type": {
               "name": "bool"
@@ -7850,6 +7797,38 @@
       "docs": {
         "description": "",
         "props": {
+          "tokens": {
+            "type": {
+              "name": "custom",
+              "raw": {
+                "borderColor": "color",
+                "borderWidth": "border",
+                "borderRadius": "radius",
+                "shadow": "shadow",
+                "fontSize": "fontSize",
+                "color": "color",
+                "lineHeight": "lineHeight",
+                "textAlign": "flexJustifyContent",
+                "alignSelf": "flexAlign",
+                "fontName": "fontName",
+                "fontWeight": "fontWeight",
+                "backgroundColor": "color",
+                "opacity": "opacity",
+                "paddingLeft": "size",
+                "paddingRight": "size",
+                "paddingTop": "size",
+                "paddingBottom": "size",
+                "width": "size",
+                "minWidth": "size",
+                "outerBorderColor": "color",
+                "outerBorderWidth": "border",
+                "outerBorderGap": "size",
+                "outerBackgroundColor": "color"
+              }
+            },
+            "required": false,
+            "description": ""
+          },
           "inactive": {
             "type": {
               "name": "bool"
@@ -7910,6 +7889,38 @@
       "docs": {
         "description": "`ButtonLink` is a component with the semantics and behaviour of a link, but with the visual appearance of a button.\nButtonLink is a block-level component and should not be used inline.",
         "props": {
+          "tokens": {
+            "type": {
+              "name": "custom",
+              "raw": {
+                "borderColor": "color",
+                "borderWidth": "border",
+                "borderRadius": "radius",
+                "shadow": "shadow",
+                "fontSize": "fontSize",
+                "color": "color",
+                "lineHeight": "lineHeight",
+                "textAlign": "flexJustifyContent",
+                "alignSelf": "flexAlign",
+                "fontName": "fontName",
+                "fontWeight": "fontWeight",
+                "backgroundColor": "color",
+                "opacity": "opacity",
+                "paddingLeft": "size",
+                "paddingRight": "size",
+                "paddingTop": "size",
+                "paddingBottom": "size",
+                "width": "size",
+                "minWidth": "size",
+                "outerBorderColor": "color",
+                "outerBorderWidth": "border",
+                "outerBorderGap": "size",
+                "outerBackgroundColor": "color"
+              }
+            },
+            "required": false,
+            "description": ""
+          },
           "inactive": {
             "type": {
               "name": "bool"

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");
 
@@ -36,7 +36,7 @@ const A11yText = /*#__PURE__*/(0, _react.forwardRef)(({
   heading,
   ...rest
 }, ref) => {
-  const a11y = _propTypes2.a11yProps.select({
+  const a11y = _props.a11yProps.select({
     // 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,

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

@@ -26,10 +26,10 @@ 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; }
 
 /**
- * @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 = {

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/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"));
 
@@ -94,7 +94,7 @@ Card.propTypes = {
   children: _propTypes.default.node,
   tokens: (0, _utils.getTokensPropType)('Card'),
   variant: _utils.variantProp.propType,
-  ..._propTypes2.a11yProps.types
+  ..._props.a11yProps.types
 };
 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,7 +19,7 @@ var _ThemeProvider = require("../ThemeProvider");
 
 var _utils = require("../utils");
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _CardBase = _interopRequireDefault(require("./CardBase"));
 
@@ -62,7 +62,7 @@ const PressableCardBase = /*#__PURE__*/(0, _react.forwardRef)(({
 
   const viewport = (0, _ViewportProvider.useViewport)();
 
-  const a11y = _propTypes2.a11yProps.select({ ...rest,
+  const a11y = _props.a11yProps.select({ ...rest,
     accessibilityRole
   });
 
@@ -139,7 +139,7 @@ PressableCardBase.propTypes = {
     allowFunction: true
   }),
   variant: _utils.variantProp.propType,
-  ..._propTypes2.a11yProps.types
+  ..._props.a11yProps.types
 };
 
 var _default = (0, _utils.withLinkRouter)(PressableCardBase);

package/lib/Checkbox/Checkbox.js

@@ -31,7 +31,7 @@ var _ThemeProvider = require("../ThemeProvider");
 
 var _utils = require("../utils");
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _useUniqueId = _interopRequireDefault(require("../utils/useUniqueId"));
 
@@ -200,7 +200,7 @@ const Checkbox = /*#__PURE__*/(0, _react.forwardRef)(({
     if ((event === null || event === void 0 ? void 0 : event.key) === ' ') handleChange(event);
   };
 
-  const accessibilityProps = _propTypes2.a11yProps.select(rest);
+  const accessibilityProps = _props.a11yProps.select(rest);
 
   const uniqueId = (0, _useUniqueId.default)('checkbox');
   const inputId = id ?? uniqueId;
@@ -273,7 +273,7 @@ const Checkbox = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 Checkbox.displayName = 'Checkbox';
-Checkbox.propTypes = { ..._propTypes2.a11yProps.propTypes,
+Checkbox.propTypes = { ..._props.a11yProps.propTypes,
 
   /**
    * Use `checked` for controlled Checkbox. For uncontrolled Checkbox, use the `defaultChecked` prop.

package/lib/Divider/Divider.js

@@ -30,8 +30,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; }
 
 /**
- * @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
  */
 
 /**