@telus-uds/components-base 1.52.0 → 1.54.0

package/lib-module/ExpandCollapse/Panel.js

@@ -2,6 +2,7 @@ import React, { forwardRef, useState } from 'react';
 import Animated from "react-native-web/dist/exports/Animated";
 import Platform from "react-native-web/dist/exports/Platform";
 import View from "react-native-web/dist/exports/View";
+import Text from "react-native-web/dist/exports/Text";
 import PropTypes from 'prop-types';
 import ABBPropTypes from 'airbnb-prop-types';
 import ExpandCollapseControl from './Control';
@@ -22,7 +23,50 @@ const selectContainerStyles = _ref => {
     paddingLeft: contentPaddingLeft,
     paddingRight: contentPaddingRight,
     paddingTop: contentPaddingTop,
-    paddingBottom: contentPaddingBottom
+    paddingBottom: contentPaddingBottom,
+    flex: 1
+  };
+};
+
+const selectTextStyles = _ref2 => {
+  let {
+    contentPanelFontSize,
+    contentPanelFontName,
+    contentPanelFontColor,
+    contentPanelFontWeight,
+    contentPanelLineHeight
+  } = _ref2;
+  return {
+    fontSize: contentPanelFontSize,
+    fontFamily: `${contentPanelFontName}${contentPanelFontWeight}normal`,
+    lineHeight: contentPanelFontSize * contentPanelLineHeight,
+    color: contentPanelFontColor
+  };
+};
+
+const selectContentPanelStyles = _ref3 => {
+  let {
+    contentPanelBackgroundColor,
+    contentPanelPaddingTop,
+    contentPanelPaddingBottom,
+    contentPanelPaddingLeft,
+    contentPanelPaddingRight,
+    contentPanelBorderWidth,
+    contentPanelBorderColor,
+    borderRadius,
+    marginBottom
+  } = _ref3;
+  return {
+    backgroundColor: contentPanelBackgroundColor,
+    paddingTop: contentPanelPaddingTop,
+    paddingBottom: contentPanelPaddingBottom,
+    paddingLeft: contentPanelPaddingLeft,
+    paddingRight: contentPanelPaddingRight,
+    borderWidth: contentPanelBorderWidth,
+    borderColor: contentPanelBorderColor,
+    borderStyle: 'solid',
+    borderRadius,
+    marginBottom
   };
 };
 /**
@@ -37,7 +81,7 @@ const selectContainerStyles = _ref => {
  */
 
 
-const ExpandCollapsePanel = /*#__PURE__*/forwardRef((_ref2, ref) => {
+const ExpandCollapsePanel = /*#__PURE__*/forwardRef((_ref4, ref) => {
   let {
     openIds = [],
     panelId,
@@ -49,8 +93,9 @@ const ExpandCollapsePanel = /*#__PURE__*/forwardRef((_ref2, ref) => {
     tokens,
     variant,
     controlRef,
+    content,
     ...rest
-  } = _ref2;
+  } = _ref4;
   const [containerHeight, setContainerHeight] = useState(null);
   const isExpanded = openIds.includes(panelId);
   const selectedProps = selectProps({ ...rest,
@@ -85,7 +130,13 @@ const ExpandCollapsePanel = /*#__PURE__*/forwardRef((_ref2, ref) => {
     tokens: themeTokens
   });
   const focusabilityProps = isExpanded ? {} : a11yProps.nonFocusableProps;
-  return /*#__PURE__*/_jsxs(View, {
+  return content ? /*#__PURE__*/_jsx(View, {
+    style: selectContentPanelStyles(themeTokens),
+    children: typeof children === 'string' ? /*#__PURE__*/_jsx(Text, {
+      style: selectTextStyles(themeTokens),
+      children: children
+    }) : children
+  }) : /*#__PURE__*/_jsxs(View, {
     ref: ref,
     style: themeTokens,
     children: [/*#__PURE__*/_jsx(ExpandCollapseControl, { ...selectedProps,
@@ -135,7 +186,7 @@ ExpandCollapsePanel.propTypes = { ...selectedSystemPropTypes,
    * Function to call on pressing the panel's control, which should open or close the panel.
    * If Panel is a direct child of `ExpandCollapse`, this prop will be provided by the ExpandCollapse parent.
    */
-  onToggle: PropTypes.func.isRequired,
+  onToggle: PropTypes.func,
 
   /**
    * Optional function to call on pressing the panel's control, in addition to opening or closing the panel.
@@ -149,9 +200,9 @@ ExpandCollapsePanel.propTypes = { ...selectedSystemPropTypes,
   children: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
 
   /**
-   * The content inside the always-visible control element that opens and closes the ExpandCollapse when pressed.
+   * The content inside the control element that opens and closes the ExpandCollapse when pressed.
    */
-  control: ExpandCollapseControl.propTypes.children.isRequired,
+  control: ExpandCollapseControl.propTypes.children,
 
   /**
    * Optional theme token overrides that may be passed to the ExpandCollapseControl element.
@@ -161,6 +212,11 @@ ExpandCollapsePanel.propTypes = { ...selectedSystemPropTypes,
   /**
    * An optional ref to be attached to the control
    */
-  controlRef: ABBPropTypes.ref()
+  controlRef: ABBPropTypes.ref(),
+
+  /**
+   * A boolean prop to determine if the panel is a content panel or not. If true, the panel will not have a control
+   */
+  content: PropTypes.bool
 };
 export default ExpandCollapsePanel;

package/lib-module/Modal/Modal.js

@@ -2,6 +2,7 @@ import React, { forwardRef } from 'react';
 import StyleSheet from "react-native-web/dist/exports/StyleSheet";
 import TouchableWithoutFeedback from "react-native-web/dist/exports/TouchableWithoutFeedback";
 import View from "react-native-web/dist/exports/View";
+import ScrollView from "react-native-web/dist/exports/ScrollView";
 import NativeModal from "react-native-web/dist/exports/Modal";
 import Platform from "react-native-web/dist/exports/Platform";
 import PropTypes from 'prop-types';
@@ -140,8 +141,8 @@ const Modal = /*#__PURE__*/forwardRef((_ref5, ref) => {
   return /*#__PURE__*/_jsx(NativeModal, {
     transparent: true,
     ...selectProps(rest),
-    children: /*#__PURE__*/_jsxs(View, {
-      style: [staticStyles.positioningContainer],
+    children: /*#__PURE__*/_jsxs(ScrollView, {
+      contentContainerStyle: [staticStyles.positioningContainer],
       ref: modalRef,
       children: [/*#__PURE__*/_jsx(View, {
         style: [staticStyles.sizingContainer, selectContainerStyles(themeTokens)],
@@ -230,7 +231,11 @@ const staticStyles = StyleSheet.create({
   modal: {
     maxHeight: '100%',
     // so that the modal can expand vertically up to the  sizing container's height (exclusive of its vertical padding)
-    overflow: 'auto'
+    ...Platform.select({
+      web: {
+        overflow: 'auto'
+      }
+    })
   },
   closeButtonContainer: {
     position: 'absolute',

package/lib-module/SkipLink/SkipLink.js

@@ -34,10 +34,19 @@ const selectStyles = _ref => {
 
 const selectTextStyles = _ref2 => {
   let {
-    color
+    color,
+    textLine,
+    fontName,
+    fontSize,
+    fontWeight,
+    lineHeight
   } = _ref2;
   return {
-    color
+    color,
+    textDecorationLine: textLine,
+    fontFamily: `${fontName}${fontWeight}normal`,
+    lineHeight: fontSize * lineHeight,
+    fontSize
   };
 };
 /**
@@ -110,9 +119,6 @@ const SkipLink = /*#__PURE__*/forwardRef((_ref3, ref) => {
     ...rest
   } = clickProps.toPressProps(rawRest);
   const getTokens = useThemeTokensCallback('SkipLink', tokens, variant);
-  const defaultTokens = getTokens();
-
-  const resolveLinkTokens = pressState => resolvePressableTokens(defaultTokens, pressState);
 
   const handlePress = event => {
     if (typeof onPress === 'function') onPress(event); // TODO - support native apps with something based on refs and/or setAccessibilityFocus
@@ -123,19 +129,17 @@ const SkipLink = /*#__PURE__*/forwardRef((_ref3, ref) => {
     accessibilityRole: "link",
     onPress: handlePress,
     href: href,
-    style: _ref4 => {
-      let {
-        focused: focus
-      } = _ref4;
-      const themeTokens = getTokens({
-        focus
-      });
+    style: pressableState => {
+      const themeTokens = resolvePressableTokens(getTokens, pressableState);
       const skipLinkStyle = selectStyles(themeTokens);
-      return [staticStyles.absolute, skipLinkStyle, !focus && staticStyles.hidden];
+      const {
+        focused
+      } = pressableState;
+      return [staticStyles.absolute, skipLinkStyle, !focused && staticStyles.hidden];
     },
     ...selectProps(rest),
-    children: pressState => {
-      const themeTokens = resolveLinkTokens(pressState);
+    children: pressableState => {
+      const themeTokens = resolvePressableTokens(getTokens, pressableState);
       const textStyles = selectTextStyles(themeTokens);
       return /*#__PURE__*/_jsx(Text, {
         style: [textStyles, staticStyles.baseline],

package/lib-module/ToggleSwitch/ToggleSwitch.js

@@ -14,36 +14,54 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, focusHandlerProps, pressProps, viewProps]); // We need to drop the icon before passing it to the `ButtonBase`, because it's
 // being handled separately in this case
 
-const selectButtonTokens = _ref => {
+const selectButtonTokens = (_ref, _ref2) => {
   let {
     icon: _,
     ...tokens
   } = _ref;
+  let {
+    trackHeight,
+    outerBorderGapButton
+  } = _ref2;
   return selectTokens('Button', { ...tokens,
     // Width tokens are applied to our inner track. Disable Button width token so it wraps our track width.
+    outerBorderGap: outerBorderGapButton,
+    height: trackHeight,
     width: null
   });
 }; // Map and rename icon-specific tokens to name used within Icon
 
 
-const selectIconTokens = _ref2 => {
+const selectIconTokens = _ref3 => {
   let {
     iconSize,
     iconColor
-  } = _ref2;
+  } = _ref3;
   return {
     size: iconSize,
     color: iconColor
   };
 };
 
-const selectTrackStyles = _ref3 => {
+const selectTrackSwitchStyles = _ref4 => {
+  let {
+    switchSize,
+    width,
+    trackHeight
+  } = _ref4;
+  return {
+    width,
+    height: Math.max(switchSize, trackHeight)
+  };
+};
+
+const selectTrackStyles = _ref5 => {
   let {
     trackBorderWidth,
     trackBorderColor,
     trackBorderRadius,
     width
-  } = _ref3;
+  } = _ref5;
   return {
     borderWidth: trackBorderWidth,
     borderColor: trackBorderColor,
@@ -52,7 +70,7 @@ const selectTrackStyles = _ref3 => {
   };
 };
 
-const selectSwitchStyles = _ref4 => {
+const selectSwitchStyles = _ref6 => {
   let {
     switchSize,
     switchColor,
@@ -60,8 +78,9 @@ const selectSwitchStyles = _ref4 => {
     switchBorderColor,
     switchBorderRadius,
     switchShadow
-  } = _ref4;
+  } = _ref6;
   return {
+    position: 'absolute',
     width: switchSize,
     height: switchSize,
     backgroundColor: switchColor,
@@ -78,23 +97,23 @@ const selectSwitchStyles = _ref4 => {
   };
 };
 
-const selectLabelStyles = _ref5 => {
+const selectLabelStyles = _ref7 => {
   let {
     labelMarginLeft
-  } = _ref5;
+  } = _ref7;
   return {
     marginLeft: labelMarginLeft
   };
 };
 
-const selectLabelTokens = _ref6 => {
+const selectLabelTokens = _ref8 => {
   let {
     labelColor,
     labelFontName,
     labelFontSize,
     labelFontWeight,
     labelLineHeight
-  } = _ref6;
+  } = _ref8;
   return {
     color: labelColor,
     fontName: labelFontName,
@@ -104,7 +123,7 @@ const selectLabelTokens = _ref6 => {
   };
 };
 
-const ToggleSwitch = /*#__PURE__*/forwardRef((_ref7, ref) => {
+const ToggleSwitch = /*#__PURE__*/forwardRef((_ref9, ref) => {
   let {
     copy = 'en',
     value,
@@ -119,7 +138,7 @@ const ToggleSwitch = /*#__PURE__*/forwardRef((_ref7, ref) => {
     accessibilityRole = 'switch',
     accessibilityLabel = label,
     ...rest
-  } = _ref7;
+  } = _ref9;
   const getTokens = useThemeTokensCallback('ToggleSwitch', tokens, variant);
   const themeTokens = getTokens();
   const {
@@ -133,13 +152,16 @@ const ToggleSwitch = /*#__PURE__*/forwardRef((_ref7, ref) => {
 
   const handlePress = event => setValue(!currentValue, event);
 
-  const getButtonTokens = buttonState => selectButtonTokens(getTokens(buttonState));
+  const getButtonTokens = buttonState => selectButtonTokens(getTokens(buttonState), getTokens(themeTokens));
 
   const uniqueId = useUniqueId('toggleSwitch');
   const inputId = id ?? uniqueId;
   return /*#__PURE__*/_jsxs(StackView, {
-    space: 2,
+    space: themeTokens.space,
     direction: "row",
+    tokens: {
+      alignItems: 'center'
+    },
     children: [Boolean(label) && /*#__PURE__*/_jsx(View, {
       style: [selectLabelStyles(themeTokens), staticStyles.containText],
       children: /*#__PURE__*/_jsx(InputLabel, {
@@ -167,24 +189,36 @@ const ToggleSwitch = /*#__PURE__*/forwardRef((_ref7, ref) => {
         const IconComponent = stateTokens.icon;
         const switchStyles = selectSwitchStyles(stateTokens);
         const trackStyles = selectTrackStyles(stateTokens);
-        const iconTokens = selectIconTokens(stateTokens); // If drag-slide support is needed, use a PanResponder and apply these to an Animated value.
+        const iconTokens = selectIconTokens(stateTokens);
+        const trackSwitchStyles = selectTrackSwitchStyles(stateTokens);
+        const {
+          switchSize,
+          trackHeight,
+          width,
+          trackBorderWidth
+        } = stateTokens; // If drag-slide support is needed, use a PanResponder and apply these to an Animated value.
         // Use translate transforms for smoothest non-thread-blocking animations and to allow drag.
+        // Two different translates depending on the switchSize and trackSize relationship.
 
-        const slideStart = 0;
-        const slideEnd = stateTokens.width - stateTokens.switchSize - stateTokens.trackBorderWidth * 2;
+        const isSwitchTallerThanTrack = switchSize >= trackHeight;
+        const slideStart = isSwitchTallerThanTrack ? 0 : trackBorderWidth;
+        const slideEnd = isSwitchTallerThanTrack ? width - switchSize : width - switchSize - trackBorderWidth;
         const switchOffset = buttonState.selected ? slideEnd : slideStart;
         const switchPositionStyle = {
           transform: [{
             translateX: switchOffset
           }]
         };
-        return /*#__PURE__*/_jsx(View, {
-          style: [staticStyles.track, trackStyles],
-          children: /*#__PURE__*/_jsx(View, {
+        return /*#__PURE__*/_jsxs(View, {
+          nativeID: "trackSwitch",
+          style: [trackSwitchStyles, staticStyles.trackSwitch],
+          children: [/*#__PURE__*/_jsx(View, {
+            style: [staticStyles.track, trackStyles]
+          }), /*#__PURE__*/_jsx(View, {
             style: [staticStyles.switch, switchStyles, switchPositionStyle],
             children: IconComponent && /*#__PURE__*/_jsx(IconComponent, { ...iconTokens
             })
-          })
+          })]
         });
       }
     })]
@@ -250,6 +284,10 @@ const staticStyles = StyleSheet.create({
   },
   containText: {
     flexShrink: 1
+  },
+  trackSwitch: {
+    flexDirection: 'row',
+    alignItems: 'center'
   }
 });
 export default ToggleSwitch;

package/lib-module/TooltipButton/TooltipButton.js

@@ -49,7 +49,9 @@ const TooltipButton = _ref3 => {
     icon: IconComponent
   } = themeTokens;
   return /*#__PURE__*/_jsx(View, {
-    style: applyOuterBorder(themeTokens),
+    style: [applyOuterBorder(themeTokens), themeTokens.outerBorderWidth && {
+      margin: -themeTokens.outerBorderWidth
+    }],
     ...selectProps(rest),
     children: /*#__PURE__*/_jsx(View, {
       style: selectInnerContainerStyles(themeTokens),

package/lib-module/Typography/Typography.js

@@ -54,7 +54,10 @@ const Typography = /*#__PURE__*/forwardRef((_ref2, ref) => {
     ...rest
   } = _ref2;
   const viewport = useViewport();
-  const themeTokens = useThemeTokens('Typography', tokens, variant, {
+  const {
+    superScriptFontSize,
+    ...themeTokens
+  } = useThemeTokens('Typography', tokens, variant, {
     viewport
   });
   const {
@@ -77,8 +80,13 @@ const Typography = /*#__PURE__*/forwardRef((_ref2, ref) => {
     if (typeof child === 'object' && ((child === null || child === void 0 ? void 0 : child.type) === 'sub' || (child === null || child === void 0 ? void 0 : child.type) === 'sup')) {
       var _child$props;
 
+      const childStyles = (child === null || child === void 0 ? void 0 : (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.style) || {};
+      const supFontSize = childStyles.fontSize ?? superScriptFontSize;
       const sanitizedChild = /*#__PURE__*/React.cloneElement(child, {
-        style: { ...(child === null || child === void 0 ? void 0 : (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.style),
+        style: { ...childStyles,
+          ...(supFontSize ? {
+            fontSize: supFontSize
+          } : {}),
           lineHeight: 0
         }
       });

package/package.json

@@ -11,13 +11,13 @@
     "@floating-ui/react-native": "^0.8.1",
     "@gorhom/portal": "^1.0.14",
     "@telus-uds/system-constants": "^1.2.1",
-    "@telus-uds/system-theme-tokens": "^2.35.0",
+    "@telus-uds/system-theme-tokens": "^2.37.0",
     "airbnb-prop-types": "^2.16.0",
     "lodash.debounce": "^4.0.8",
     "lodash.merge": "^4.6.2",
     "prop-types": "^15.7.2",
     "react-native-picker-select": "^8.0.4",
-    "semver": "7.3.5"
+    "semver": "7.5.2"
   },
   "description": "Base components",
   "devDependencies": {
@@ -72,5 +72,5 @@
   "standard-engine": {
     "skip": true
   },
-  "version": "1.52.0"
+  "version": "1.54.0"
 }

package/src/Button/ButtonBase.jsx

@@ -173,6 +173,13 @@ const selectWebOnlyStyles = (inactive, themeTokens, { accessibilityRole }) => {
   })
 }
 
+const selectButtonStyles = ({ textAlign }) => {
+  return {
+    flexDirection: 'row',
+    justifyContent: textAlign
+  }
+}
+
 const selectItemIconTokens = ({ color, iconColor, iconSize }) => ({
   size: iconSize,
   color: iconColor || color
@@ -237,6 +244,8 @@ const ButtonBase = forwardRef(
           const stretchStyles = themeTokens.width ? staticStyles.stretch : staticStyles.align
           const IconComponent = icon || themeTokens.icon
 
+          const rowStyles = selectButtonStyles(themeTokens)
+
           return (
             <View
               id={id}
@@ -249,7 +258,8 @@ const ButtonBase = forwardRef(
                   web: {
                     maxWidth: '100%', // ensure overflowing content wraps
                     // TODO: https://github.com/telus/universal-design-system/issues/487
-                    transition: 'background-color 200ms, border-color 200ms'
+                    transition: 'background-color 200ms, border-color 200ms',
+                    ...rowStyles
                   }
                 })
               ]}

package/src/Card/CardBase.jsx

@@ -1,6 +1,6 @@
 import React, { forwardRef } from 'react'
 import PropTypes from 'prop-types'
-import { View } from 'react-native'
+import { View, Platform } from 'react-native'
 
 import { applyShadowToken } from '../ThemeProvider'
 import { getTokensPropType } from '../utils'
@@ -20,20 +20,31 @@ const selectStyles = ({
   paddingRight,
   paddingTop,
   minWidth,
-  shadow
-}) => ({
-  flex,
-  backgroundColor,
-  borderColor,
-  borderRadius,
-  borderWidth,
-  paddingBottom,
-  paddingLeft,
-  paddingRight,
-  paddingTop,
-  minWidth,
-  ...applyShadowToken(shadow)
-})
+  shadow,
+  gradient
+}) => {
+  return {
+    flex,
+    backgroundColor,
+    borderColor,
+    borderRadius,
+    borderWidth,
+    paddingBottom,
+    paddingLeft,
+    paddingRight,
+    paddingTop,
+    minWidth,
+    ...applyShadowToken(shadow),
+    ...(gradient && Platform.OS === 'web'
+      ? {
+          backgroundImage: `linear-gradient(${gradient.angle}deg, ${gradient.stops[0].color}, ${gradient.stops[1].color})`,
+          backgroundOrigin: `border-box`,
+          boxShadow: `inset 0 1000px white`,
+          border: `${borderWidth}px solid transparent`
+        }
+      : {})
+  }
+}
 
 /**
  * A themeless base component for Card which components can apply theme tokens to. Not

package/src/Carousel/Carousel.jsx

@@ -204,7 +204,11 @@ const Carousel = React.forwardRef(
 
     const getCopy = useCopy({ dictionary, copy })
 
-    const childrenArray = unpackFragment(children)
+    let childrenArray = unpackFragment(children)
+    // if `Carousel` only has one `Carousel.Item`, convert this to a single-item array
+    if (!Array.isArray(childrenArray)) {
+      childrenArray = [childrenArray]
+    }
     const systemProps = selectProps({
       ...rest,
       accessibilityRole,
@@ -322,11 +326,14 @@ const Carousel = React.forwardRef(
     )
 
     const isSwipeAllowed = React.useCallback(() => {
+      if (childrenArray.length === 1) {
+        return false
+      }
       if (Platform.OS === 'web') {
         return !!(viewport === 'xs' || viewport === 'sm')
       }
       return true
-    }, [viewport])
+    }, [viewport, childrenArray.length])
 
     const panResponder = React.useMemo(
       () =>
@@ -477,7 +484,7 @@ const Carousel = React.forwardRef(
           {...systemProps}
           {...containerProps}
         >
-          {showPreviousNextNavigation && (
+          {showPreviousNextNavigation && childrenArray.length > 1 ? (
             <View
               style={selectPreviousNextNavigationButtonStyles(
                 previousNextNavigationButtonWidth,
@@ -500,7 +507,7 @@ const Carousel = React.forwardRef(
                 )}
               />
             </View>
-          )}
+          ) : null}
           {Boolean(skipLinkHref) && (
             <SkipLink ref={firstFocusRef} href={skipLinkHref}>
               {getCopyWithPlaceholders('skipLink')}
@@ -538,7 +545,7 @@ const Carousel = React.forwardRef(
               })}
             </Animated.View>
           </View>
-          {showPreviousNextNavigation && (
+          {showPreviousNextNavigation && childrenArray.length > 1 ? (
             <View
               style={selectPreviousNextNavigationButtonStyles(
                 previousNextNavigationButtonWidth,
@@ -561,7 +568,7 @@ const Carousel = React.forwardRef(
                 )}
               />
             </View>
-          )}
+          ) : null}
         </View>
         {showPanelNavigation ? activePanelNavigation : null}
       </CarouselProvider>