@telus-uds/components-base 1.0.1 → 1.3.0

package/generate-component-docs.js

@@ -0,0 +1,59 @@
+const fs = require('fs')
+const schema = require('@telus-uds/system-theme-tokens')
+const allExports = require('./src')
+
+const { a11yProps } = allExports
+const a11yPropTypes = Object.keys(a11yProps.types)
+
+const parseComponentDocs = (name, generated) => {
+  const { description } = generated // TODO parse markdown and split by heading
+  const props = {} // store derived prop data
+  const attributes = {
+    // any other computed attributes
+    acceptsRNA11yProps: a11yPropTypes.every((key) => key in generated.props)
+  }
+
+  Object.entries(generated.props).forEach(([propName, prop]) => {
+    if (prop.description?.includes('@ignore')) {
+      return // remove ignored props
+    }
+    if (attributes.acceptsRNA11yProps && a11yPropTypes.includes(propName)) {
+      return // remove a11y props if all supported (there are 30+, instead we have the above attribute to show this)
+    }
+
+    const out = { ...prop }
+
+    // check if this prop references the tokens schema
+    const tokensProp = out.type?.raw?.match(/getTokensPropType\('([A-z]+)'\)/)?.[1]
+    if (tokensProp) {
+      if (!schema.components[tokensProp]) {
+        throw new Error(`Unknown schema component reference: ${tokensProp} from component: ${name}`)
+      }
+      out.type = { ...out.type, raw: schema.components[tokensProp] }
+    }
+    props[propName] = out
+  })
+
+  return { docs: { description, props, attributes } }
+}
+
+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)
+
+    // check for second-level components e.g List.Item (can only be on a component)
+    Object.entries(exp).forEach(([subComponentName, prop]) => {
+      if (prop.__docgenInfo) {
+        components[name][subComponentName] = parseComponentDocs(subComponentName, prop.__docgenInfo)
+      }
+    })
+  }
+}, {})
+
+fs.writeFileSync('./component-docs.json', JSON.stringify({ schema, components }, null, 2))

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/ButtonBase.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _Pressable = _interopRequireDefault(require("react-native-web/dist/cjs/exports/Pressable"));
 
 var _View = _interopRequireDefault(require("react-native-web/dist/cjs/exports/View"));
@@ -17,7 +19,7 @@ var _Platform = _interopRequireDefault(require("react-native-web/dist/cjs/export
 
 var _utils = require("../ThemeProvider/utils");
 
-var _propTypes = _interopRequireDefault(require("./propTypes"));
+var _propTypes2 = _interopRequireDefault(require("./propTypes"));
 
 var _utils2 = require("../utils");
 
@@ -170,18 +172,23 @@ const selectWebOnlyStyles = (inactive, themeTokens, {
 };
 
 const ButtonBase = /*#__PURE__*/(0, _react.forwardRef)(({
+  id,
   href,
   hrefAttrs,
   children,
-  onPress,
   tokens = {},
   disabled = false,
   // alias for inactive
   inactive = disabled,
   selected = false,
   dataSet,
-  ...rest
+  ...rawRest
 }, ref) => {
+  const {
+    onPress,
+    ...rest
+  } = _utils2.clickProps.toPressProps(rawRest);
+
   const extraButtonState = {
     inactive,
     selected
@@ -217,6 +224,7 @@ const ButtonBase = /*#__PURE__*/(0, _react.forwardRef)(({
 
       const stretchStyles = themeTokens.width ? staticStyles.stretch : staticStyles.align;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
+        id: id,
         style: [containerStyles, borderStyles, stretchStyles, staticStyles.row, _Platform.default.select({
           web: {
             maxWidth: '100%',
@@ -235,10 +243,15 @@ const ButtonBase = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 ButtonBase.displayName = 'ButtonBase';
-ButtonBase.propTypes = { ..._utils2.a11yProps.types,
-  ..._propTypes.default,
+ButtonBase.propTypes = {
+  id: _propTypes.default.string,
+  ..._utils2.a11yProps.types,
+  ..._propTypes2.default,
   ..._utils2.linkProps.types
 };
+ButtonBase.defaultProps = {
+  id: undefined
+};
 
 const staticStyles = _StyleSheet.default.create({
   row: {
@@ -265,5 +278,6 @@ const staticStyles = _StyleSheet.default.create({
   }
 });
 
-var _default = ButtonBase;
+var _default = (0, _utils2.withLinkRouter)(ButtonBase);
+
 exports.default = _default;

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"));
 
@@ -52,13 +52,17 @@ const PressableCardBase = /*#__PURE__*/(0, _react.forwardRef)(({
   inactive,
   href,
   hrefAttrs,
-  onPress,
   accessibilityRole = href ? 'link' : undefined,
-  ...rest
+  ...rawRest
 }, ref) => {
+  const {
+    onPress,
+    ...rest
+  } = _utils.clickProps.toPressProps(rawRest);
+
   const viewport = (0, _ViewportProvider.useViewport)();
 
-  const a11y = _propTypes2.a11yProps.select({ ...rest,
+  const a11y = _props.a11yProps.select({ ...rest,
     accessibilityRole
   });
 
@@ -135,7 +139,9 @@ PressableCardBase.propTypes = {
     allowFunction: true
   }),
   variant: _utils.variantProp.propType,
-  ..._propTypes2.a11yProps.types
+  ..._props.a11yProps.types
 };
-var _default = PressableCardBase;
+
+var _default = (0, _utils.withLinkRouter)(PressableCardBase);
+
 exports.default = _default;

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"));
 
@@ -43,8 +43,6 @@ 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; }
 
-// @todo move `LabelContent` outside of the `InputLabel` and fix
-// the issue with the cursor not being pointer on Web
 const selectInputStyles = ({
   iconBackgroundColor,
   inputBorderColor,
@@ -202,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;
@@ -275,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
  */
 
 /**

package/lib/FlexGrid/FlexGrid.js

@@ -35,9 +35,11 @@ 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]);
 /**
  * A mobile-first flexbox grid.
  */
+
 const FlexGrid = /*#__PURE__*/(0, _react.forwardRef)(({
   limitWidth = true,
   gutter = true,
@@ -86,8 +88,7 @@ const FlexGrid = /*#__PURE__*/(0, _react.forwardRef)(({
   }
 
   const props = { ...(0, _utils.getA11yPropsFromHtmlTag)(tag, accessibilityRole),
-    ..._utils.a11yProps.select(rest),
-    ..._utils.viewProps.select(rest)
+    ...selectProps(rest)
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_GutterContext.default.Provider, {
     value: gutter,
@@ -113,8 +114,7 @@ const styles = _StyleSheet.default.create({
   }
 });
 
-FlexGrid.propTypes = { ..._utils.a11yProps.propTypes,
-  ..._utils.viewProps.types,
+FlexGrid.propTypes = { ...selectedSystemPropTypes,
 
   /**
    * Whether or not to give the grid a fixed width. This also centres the grid horizontally.

package/lib/FlexGrid/helpers/index.js

@@ -8,11 +8,8 @@ exports.default = void 0;
 const applyInheritance = sizes => {
   let prevSize;
   return sizes.map((size, index) => {
-    if (size) {
-      prevSize = size;
-    }
-
     if (size !== undefined) {
+      prevSize = size;
       return size;
     }
 

package/lib/IconButton/IconButton.js

@@ -21,7 +21,7 @@ var _ThemeProvider = require("../ThemeProvider");
 
 var _utils = require("../utils");
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _Icon = _interopRequireDefault(require("../Icon"));
 
@@ -83,11 +83,15 @@ const IconButton = /*#__PURE__*/(0, _react.forwardRef)(({
   icon: IconComponent,
   href,
   hrefAttrs,
-  onPress,
   accessibilityRole = href ? 'link' : 'button',
-  ...rest
+  ...rawRest
 }, ref) => {
-  const a11y = _propTypes2.a11yProps.select({ ...rest,
+  const {
+    onPress,
+    ...rest
+  } = _utils.clickProps.toPressProps(rawRest);
+
+  const a11y = _props.a11yProps.select({ ...rest,
     accessibilityRole
   });
 
@@ -121,7 +125,7 @@ const IconButton = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 IconButton.displayName = 'IconButton';
-IconButton.propTypes = { ..._propTypes2.a11yProps.types,
+IconButton.propTypes = { ..._props.a11yProps.types,
   variant: _utils.variantProp.propType,
   tokens: (0, _utils.getTokensPropType)('IconButton'),
   icon: _propTypes.default.elementType.isRequired,
@@ -136,5 +140,6 @@ const staticStyles = _StyleSheet.default.create({
   }
 });
 
-var _default = IconButton;
+var _default = (0, _utils.withLinkRouter)(IconButton);
+
 exports.default = _default;

package/lib/Link/LinkBase.js

@@ -15,10 +15,12 @@ var _Platform = _interopRequireDefault(require("react-native-web/dist/cjs/export
 
 var _StyleSheet = _interopRequireDefault(require("react-native-web/dist/cjs/exports/StyleSheet"));
 
-var _propTypes2 = require("../utils/propTypes");
+var _props = require("../utils/props");
 
 var _pressability = require("../utils/pressability");
 
+var _utils = require("../utils");
+
 var _InlinePressable = _interopRequireDefault(require("./InlinePressable"));
 
 var _ThemeProvider = require("../ThemeProvider");
@@ -120,7 +122,6 @@ const selectIconTokens = ({
 
 const LinkBase = /*#__PURE__*/(0, _react.forwardRef)(({
   href,
-  onPress,
   icon,
   iconPosition = icon ? 'left' : undefined,
   iconProps,
@@ -129,17 +130,22 @@ const LinkBase = /*#__PURE__*/(0, _react.forwardRef)(({
   children,
   accessibilityRole = 'link',
   dataSet,
-  ...props
+  ...rawRest
 }, ref) => {
+  const {
+    onPress,
+    ...props
+  } = _props.clickProps.toPressProps(rawRest);
+
   const {
     hrefAttrs,
     rest
-  } = _propTypes2.hrefAttrsProp.bundle(props);
+  } = _props.hrefAttrsProp.bundle(props);
 
-  const linkPropSet = _propTypes2.linkProps.select({
+  const linkPropSet = _props.linkProps.select({
     accessibilityRole,
     href,
-    onPress: _propTypes2.linkProps.handleHref({
+    onPress: _props.linkProps.handleHref({
       href,
       onPress
     }),
@@ -189,10 +195,10 @@ const LinkBase = /*#__PURE__*/(0, _react.forwardRef)(({
   });
 });
 LinkBase.displayName = 'LinkBase';
-LinkBase.propTypes = { ..._propTypes2.a11yProps.types,
-  ..._propTypes2.linkProps.types,
-  tokens: (0, _propTypes2.getTokensPropType)('Link'),
-  variant: _propTypes2.variantProp.propType,
+LinkBase.propTypes = { ..._props.a11yProps.types,
+  ..._props.linkProps.types,
+  tokens: (0, _props.getTokensPropType)('Link'),
+  variant: _props.variantProp.propType,
 
   /**
    * Optional variant that may be passed down to the link's icon if there is one
@@ -214,7 +220,7 @@ LinkBase.propTypes = { ..._propTypes2.a11yProps.types,
    * On Web if href is passed, React Native Web maps this object's props to
    * `rel`, `target` and `download` attrs.
    */
-  hrefAttrs: _propTypes.default.shape(_propTypes2.hrefAttrsProp.types)
+  hrefAttrs: _propTypes.default.shape(_props.hrefAttrsProp.types)
 };
 
 const staticStyles = _StyleSheet.default.create({
@@ -231,5 +237,6 @@ const staticStyles = _StyleSheet.default.create({
   }
 });
 
-var _default = LinkBase;
+var _default = (0, _utils.withLinkRouter)(LinkBase);
+
 exports.default = _default;