@telus-uds/components-base 0.0.2-prerelease.4 → 0.0.2-prerelease.8

package/lib/Box/Box.js

@@ -1,15 +1,32 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { View, ScrollView } from 'react-native';
-import { useThemeTokens } from '../ThemeProvider';
-import { a11yProps, spacingProps, variantProp, getTokensPropType, useSpacingScale } from '../utils';
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _View = _interopRequireDefault(require("react-native-web/dist/cjs/exports/View"));
+
+var _ScrollView = _interopRequireDefault(require("react-native-web/dist/cjs/exports/ScrollView"));
+
+var _ThemeProvider = require("../ThemeProvider");
+
+var _utils = require("../utils");
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 /**
  * @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
  */
-
 const selectBoxStyles = tokens => {
   const styles = {
     backgroundColor: tokens.backgroundColor
@@ -102,40 +119,51 @@ const Box = ({
   variant,
   tokens,
   scroll,
+  testID,
   ...rest
 }) => {
-  const a11y = a11yProps.select(rest);
-  const themeTokens = useThemeTokens('Box', tokens, variant);
+  const props = { ..._utils.a11yProps.select(rest),
+    ..._utils.viewProps.select(rest)
+  };
+  const themeTokens = (0, _ThemeProvider.useThemeTokens)('Box', tokens, variant);
   const styles = {
-    paddingLeft: useSpacingScale(left),
-    paddingRight: useSpacingScale(right),
-    paddingTop: useSpacingScale(top),
-    paddingBottom: useSpacingScale(bottom),
+    paddingLeft: (0, _utils.useSpacingScale)(left),
+    paddingRight: (0, _utils.useSpacingScale)(right),
+    paddingTop: (0, _utils.useSpacingScale)(top),
+    paddingBottom: (0, _utils.useSpacingScale)(bottom),
     ...selectBoxStyles(themeTokens)
   };
 
   if (scroll) {
     const scrollProps = typeof scroll === 'object' ? scroll : {};
     scrollProps.contentContainerStyle = [styles, scrollProps.contentContainerStyle];
-    return /*#__PURE__*/React.createElement(ScrollView, Object.assign({}, scrollProps, a11y), children);
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ScrollView.default, { ...scrollProps,
+      ...props,
+      testID: testID,
+      children: children
+    });
   }
 
-  return /*#__PURE__*/React.createElement(View, Object.assign({}, a11y, {
-    style: styles
-  }), children);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, { ...props,
+    style: styles,
+    testID: testID,
+    children: children
+  });
 };
 
 Box.propTypes = {
-  space: spacingProps.types.spacingValue,
-  vertical: spacingProps.types.spacingValue,
-  horizontal: spacingProps.types.spacingValue,
-  bottom: spacingProps.types.spacingValue,
-  left: spacingProps.types.spacingValue,
-  right: spacingProps.types.spacingValue,
-  top: spacingProps.types.spacingValue,
-  scroll: PropTypes.oneOfType([PropTypes.bool, ScrollView.propTypes ? PropTypes.shape(ScrollView.propTypes) : PropTypes.object]),
-  variant: variantProp.propType,
-  tokens: getTokensPropType('Box'),
-  children: PropTypes.node.isRequired
+  space: _utils.spacingProps.types.spacingValue,
+  vertical: _utils.spacingProps.types.spacingValue,
+  horizontal: _utils.spacingProps.types.spacingValue,
+  bottom: _utils.spacingProps.types.spacingValue,
+  left: _utils.spacingProps.types.spacingValue,
+  right: _utils.spacingProps.types.spacingValue,
+  top: _utils.spacingProps.types.spacingValue,
+  scroll: _propTypes.default.oneOfType([_propTypes.default.bool, _ScrollView.default.propTypes ? _propTypes.default.shape(_ScrollView.default.propTypes) : _propTypes.default.object]),
+  variant: _utils.variantProp.propType,
+  tokens: (0, _utils.getTokensPropType)('Box'),
+  testID: _propTypes.default.string,
+  children: _propTypes.default.node.isRequired
 };
-export default Box;
+var _default = Box;
+exports.default = _default;

package/lib/Box/index.js

@@ -1,2 +1,13 @@
-import Box from './Box';
-export default Box;
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _Box = _interopRequireDefault(require("./Box"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = _Box.default;
+exports.default = _default;

package/lib/Button/Button.js

@@ -1,16 +1,44 @@
-import React from 'react';
-import ButtonBase from './ButtonBase';
-import buttonPropTypes from './propTypes';
-import { a11yProps } from '../utils/propTypes';
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _ButtonBase = _interopRequireDefault(require("./ButtonBase"));
+
+var _propTypes = _interopRequireWildcard(require("./propTypes"));
+
+var _ThemeProvider = require("../ThemeProvider");
+
+var _propTypes2 = require("../utils/propTypes");
+
+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); }
+
+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; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const Button = ({
   accessibilityRole = 'button',
+  tokens,
+  variant,
   ...props
-}) => /*#__PURE__*/React.createElement(ButtonBase, Object.assign({}, props, {
-  accessibilityRole: accessibilityRole
-}));
+}) => {
+  const getTokens = (0, _ThemeProvider.useThemeTokensCallback)('Button', tokens, variant);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ButtonBase.default, { ...props,
+    tokens: getTokens,
+    accessibilityRole: accessibilityRole
+  });
+};
 
-Button.propTypes = { ...a11yProps.types,
-  ...buttonPropTypes
+Button.propTypes = { ..._propTypes2.a11yProps.types,
+  ..._propTypes.default,
+  children: _propTypes.textAndA11yText
 };
-export default Button;
+var _default = Button;
+exports.default = _default;

package/lib/Button/ButtonBase.js

@@ -1,17 +1,29 @@
-import React from 'react';
-import { Pressable, Text, View, StyleSheet, Platform } from 'react-native';
-import { useThemeTokensCallback } from '../ThemeProvider';
-import { applyTextStyles, applyShadowToken } from '../ThemeProvider/utils';
-import buttonPropTypes from './propTypes';
-import { a11yProps, hrefAttrsProp, linkProps } from '../utils/propTypes';
+"use strict";
 
-const getCursorStyle = (inactive, accessibilityRole) => {
-  if (inactive) return 'not-allowed'; // These roles should result in cursor: pointer but don't in current RNW releases
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
 
-  if (['checkbox', 'radio', 'switch'].includes(accessibilityRole)) return 'pointer'; // For everything else, let React Native Web figure it out internally
+var _react = _interopRequireDefault(require("react"));
 
-  return undefined;
-};
+var _Pressable = _interopRequireDefault(require("react-native-web/dist/cjs/exports/Pressable"));
+
+var _View = _interopRequireDefault(require("react-native-web/dist/cjs/exports/View"));
+
+var _StyleSheet = _interopRequireDefault(require("react-native-web/dist/cjs/exports/StyleSheet"));
+
+var _Platform = _interopRequireDefault(require("react-native-web/dist/cjs/exports/Platform"));
+
+var _utils = require("../ThemeProvider/utils");
+
+var _propTypes = _interopRequireDefault(require("./propTypes"));
+
+var _utils2 = require("../utils");
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const getOuterBorderOffset = ({
   outerBorderGap = 0,
@@ -19,31 +31,29 @@ const getOuterBorderOffset = ({
 }) => outerBorderGap + outerBorderWidth;
 
 const selectOuterContainerStyles = ({
+  alignSelf,
   opacity,
   outerBorderColor,
   outerBorderWidth,
-  outerBorderGap = 0,
-  outerBorderRadius = 0,
+  outerBorderGap,
+  borderRadius,
   outerBackgroundColor
 }) => ({
-  padding: outerBorderGap,
-  borderWidth: outerBorderWidth,
-  borderColor: outerBorderColor,
-  borderRadius: outerBorderRadius + outerBorderGap,
+  alignSelf,
   backgroundColor: outerBackgroundColor,
-  opacity
+  opacity,
+  ...(0, _utils.applyOuterBorder)({
+    outerBorderGap,
+    outerBorderWidth,
+    outerBorderColor,
+    borderRadius
+  })
 });
 
 const selectOuterWidthStyles = ({
   outerBorderGap,
   outerBorderWidth,
-  width,
-  // TODO: make margin the responsibility of a parent
-  // https://github.com/telus/universal-design-system/issues/525
-  marginTop = 0,
-  marginBottom = 0,
-  marginLeft = 0,
-  marginRight = 0
+  width
 }) => {
   // The inner container's bounding box is the bounding box of the button overall
   // so this many device pixels will sit outside of the overall bounding box
@@ -51,23 +61,15 @@ const selectOuterWidthStyles = ({
     outerBorderGap,
     outerBorderWidth
   });
-  const widthStyles = {
-    marginTop: marginTop - outerBorderOffset,
-    marginBottom: marginBottom - outerBorderOffset,
-    marginLeft: marginLeft - outerBorderOffset,
-    marginRight: marginRight - outerBorderOffset
-  };
+  const widthStyles = {};
 
   if (!width) {
     return { ...widthStyles,
       // Wrap content, stopping a flex parent's default align-items: stretch stretching focus ring beyond content
-      ...Platform.select({
+      ..._Platform.default.select({
+        // width: fit-content isn't supported on Firefox; can't cascade props like CSS `width: fit-content; width: --moz-fit-content;`
         web: {
-          width: 'fit-content'
-        },
-        // No fit-content or inline-block in RN. TODO: we might need to provide a prop to allow flex-end or center
-        native: {
-          alignSelf: 'flex-start'
+          display: 'inline-flex'
         }
       })
     };
@@ -80,8 +82,8 @@ const selectOuterWidthStyles = ({
   } // Ensure the negative margin doesn't make element off-centre
 
 
-  if (Platform.OS === 'web') {
-    widthStyles.width = `calc(${width} + ${outerBorderOffset * 2}px)`;
+  if (_Platform.default.OS === 'web') {
+    widthStyles.width = "calc(".concat(width, " + ").concat(outerBorderOffset * 2, "px)");
     return widthStyles;
   } // Can't use calc() on native but (unlike on web) flexGrow fills the container width here
 
@@ -104,7 +106,8 @@ const selectInnerContainerStyles = ({
   paddingTop,
   paddingBottom,
   shadow,
-  borderWidth
+  borderWidth,
+  minWidth
 }) => {
   // Subtract border width from padding so overall button width/height doesn't
   // jump around if the border width changes (avoiding NaN and negative padding)
@@ -116,7 +119,8 @@ const selectInnerContainerStyles = ({
     paddingTop: offsetBorder(paddingTop),
     paddingBottom: offsetBorder(paddingBottom),
     backgroundColor,
-    ...applyShadowToken(shadow)
+    minWidth,
+    ...(0, _utils.applyShadowToken)(shadow)
   };
 };
 
@@ -137,7 +141,7 @@ const selectTextStyles = ({
   fontName,
   fontWeight,
   textAlign
-}) => applyTextStyles({
+}) => (0, _utils.applyTextStyles)({
   fontSize,
   color,
   lineHeight,
@@ -148,104 +152,111 @@ const selectTextStyles = ({
 
 const selectWebOnlyStyles = (inactive, themeTokens, {
   accessibilityRole
-}) => Platform.OS === 'web' ? {
-  // if it would overflow the container, wraps instead
-  maxWidth: `calc(100% + ${getOuterBorderOffset(themeTokens) * 2}px)`,
-  cursor: getCursorStyle(inactive, accessibilityRole),
-  outline: 'none' // removes the default browser :focus outline
-
-} : {};
+}) => {
+  return _Platform.default.select({
+    web: {
+      // if it would overflow the container, wraps instead
+      maxWidth: "calc(100% + ".concat(getOuterBorderOffset(themeTokens) * 2, "px)"),
+      outline: 'none',
+      // removes the default browser :focus outline
+      ...(0, _utils2.getCursorStyle)(inactive, accessibilityRole)
+    },
+    default: {}
+  });
+};
 
 const ButtonBase = ({
   href,
   hrefAttrs,
   children,
-  variant,
   onPress,
-  tokens,
+  tokens = {},
   disabled = false,
   // alias for inactive
   inactive = disabled,
   selected = false,
   ...rest
 }) => {
-  const getTokens = useThemeTokensCallback('Button', tokens, variant);
-
-  const getButtonState = ({
-    pressed,
-    focused,
-    hovered
-  }) => ({
-    pressed,
-    focus: focused,
-    hover: hovered,
+  const extraButtonState = {
     inactive,
     selected
-  });
+  };
 
-  const getTokensByPressableState = pressableState => getTokens(getButtonState(pressableState));
+  const resolveButtonTokens = pressableState => (0, _utils2.resolvePressableTokens)(tokens, pressableState, extraButtonState);
 
-  const a11y = a11yProps.select(rest);
+  const a11y = _utils2.a11yProps.select(rest);
 
   const getPressableStyle = pressableState => {
-    const themeTokens = getTokensByPressableState(pressableState);
-    return [staticStyles.wrapper, selectWebOnlyStyles(inactive, themeTokens, a11y), selectOuterContainerStyles(themeTokens), selectOuterWidthStyles(themeTokens)];
+    const themeTokens = resolveButtonTokens(pressableState);
+    return [staticStyles.row, selectWebOnlyStyles(inactive, themeTokens, a11y), selectOuterContainerStyles(themeTokens), selectOuterWidthStyles(themeTokens)];
   };
 
-  const handlePress = linkProps.handleHref({
-    href,
-    onPress
-  });
-  return /*#__PURE__*/React.createElement(Pressable, Object.assign({
-    onPress: handlePress,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Pressable.default, {
+    href: href,
+    onPress: _utils2.linkProps.handleHref({
+      href,
+      onPress
+    }),
     style: getPressableStyle,
     disabled: inactive,
-    href: href
-  }, hrefAttrsProp.spread(hrefAttrs), a11y), pressableState => {
-    const themeTokens = getTokensByPressableState(pressableState);
-    const containerStyles = selectInnerContainerStyles(themeTokens);
-    const borderStyles = selectBorderStyles(themeTokens);
-    const textStyles = { ...selectTextStyles(themeTokens),
-      ...Platform.select({
-        // TODO: https://github.com/telus/universal-design-system/issues/487
-        web: {
-          transition: 'color 200ms'
-        }
-      })
-    }; // If the container has a width set, fill it instead of sizing from content.
-    // If in future we support text alignments other than center, add here.
+    hrefAttrs: hrefAttrs,
+    ...a11y,
+    children: pressableState => {
+      const themeTokens = resolveButtonTokens(pressableState);
+      const containerStyles = selectInnerContainerStyles(themeTokens);
+      const borderStyles = selectBorderStyles(themeTokens);
+      const textStyles = [selectTextStyles(themeTokens), staticStyles.text]; // If the container has a width set, fill it instead of sizing from content.
+      // If in future we support text alignments other than center, add here.
 
-    const stretchStyles = !!themeTokens.width && staticStyles.center;
-    return /*#__PURE__*/React.createElement(View, {
-      style: [containerStyles, borderStyles, stretchStyles, Platform.select({
-        web: {
-          maxWidth: '100%',
-          // ensure overflowing content wraps
-          // TODO: https://github.com/telus/universal-design-system/issues/487
-          transition: 'background-color 200ms, border-color 200ms'
-        }
-      })]
-    }, typeof children === 'function' ? children({ ...getButtonState(pressableState),
-      textStyles
-    }) : /*#__PURE__*/React.createElement(Text, {
-      style: textStyles
-    }, children));
+      const stretchStyles = themeTokens.width ? staticStyles.stretch : staticStyles.align;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
+        style: [containerStyles, borderStyles, stretchStyles, staticStyles.row, _Platform.default.select({
+          web: {
+            maxWidth: '100%',
+            // ensure overflowing content wraps
+            // TODO: https://github.com/telus/universal-design-system/issues/487
+            transition: 'background-color 200ms, border-color 200ms'
+          }
+        })],
+        children: (0, _utils2.wrapStringsInText)(typeof children === 'function' ? children({ ...(0, _utils2.resolvePressableState)(pressableState, extraButtonState),
+          textStyles
+        }) : children, {
+          style: textStyles
+        })
+      });
+    }
   });
 };
 
-ButtonBase.propTypes = { ...a11yProps.types,
-  ...buttonPropTypes,
-  ...linkProps.types
+ButtonBase.propTypes = { ..._utils2.a11yProps.types,
+  ..._propTypes.default,
+  ..._utils2.linkProps.types
 };
-const staticStyles = StyleSheet.create({
-  wrapper: {
-    flexDirection: 'row' // ensures alignSelf is horizontal
 
+const staticStyles = _StyleSheet.default.create({
+  row: {
+    // Apply all button alignment horizontally; no vertical stacking within a button
+    flexDirection: 'row'
   },
-  center: {
+  text: {
+    flexGrow: 1,
+    // On native but not web, flexShrink here wraps text prematurely
+    ..._Platform.default.select({
+      // TODO: https://github.com/telus/universal-design-system/issues/487
+      web: {
+        transition: 'color 200ms'
+      }
+    })
+  },
+  align: {
+    alignItems: 'center'
+  },
+  stretch: {
     flex: 1,
     alignItems: 'center',
     justifyContent: 'center'
   }
 });
-export default ButtonBase;
+
+var _default = ButtonBase;
+exports.default = _default;