@telus-uds/components-base 1.49.0 → 1.51.0

package/lib/QuickLinksFeature/QuickLinksFeatureItem.js

@@ -56,6 +56,7 @@ const selectContainerStyle = _ref => {
   } = _ref;
   return {
     textAlign,
+    outline: 'red',
     width: contentMaxDimension,
     overflow: 'hidden'
   };
@@ -67,6 +68,15 @@ const selectImageContainerStyle = contentMaxDimension => ({
   justifyContent: 'center',
   alignItems: 'center'
 });
+
+const selectLinkToken = _ref2 => {
+  let {
+    outerBorderColor
+  } = _ref2;
+  return {
+    outerBorderColor
+  };
+};
 /**
  * Component export along with QuickLinksFeature to be used as children
  *
@@ -74,7 +84,7 @@ const selectImageContainerStyle = contentMaxDimension => ({
  */
 
 
-const QuickLinksFeatureItem = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) => {
+const QuickLinksFeatureItem = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
   let {
     tokens,
     variant,
@@ -82,52 +92,63 @@ const QuickLinksFeatureItem = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =
     imageAccessibilityLabel,
     imageSource,
     ...rest
-  } = _ref2;
+  } = _ref3;
   const viewport = (0, _ViewportProvider.useViewport)();
   const getTokens = (0, _ThemeProvider.useThemeTokensCallback)('QuickLinksFeatureItem', tokens, variant);
-  const [hover, setHover] = (0, _react.useState)(false);
-  const {
-    contentDirection,
-    contentSpace,
-    contentAlignItems,
-    contentMaxDimension,
-    imageDimension,
-    textAlign
-  } = getTokens({
-    viewport,
-    hover
-  });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Link.Link, {
     ref: ref,
-    tokens: state => {
-      setHover(state.hover);
-      return getTokens(state);
-    },
     ...selectProps(rest),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
-      style: selectContainerStyle({
+    tokens: state => selectLinkToken(getTokens(state)),
+    children: _ref4 => {
+      let {
+        hovered: hover,
+        pressed,
+        focused: focus
+      } = _ref4;
+      const {
+        contentDirection,
+        contentSpace,
+        contentAlignItems,
         contentMaxDimension,
-        textAlign
-      }),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_StackView.StackWrap, {
-        direction: contentDirection,
-        space: contentSpace,
-        tokens: {
-          alignItems: contentAlignItems
-        },
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
-          style: selectImageContainerStyle(contentMaxDimension),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Image.default, {
-            accessibilityIgnoresInvertColors: true,
-            imageAccessibilityLabel: imageAccessibilityLabel,
-            source: imageSource,
-            style: selectImageStyle(imageDimension)
-          })
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Text.default, {
-          children: children
-        })]
-      })
-    })
+        imageDimension,
+        textLine,
+        gap,
+        ...themeTokens
+      } = getTokens({
+        viewport,
+        hover,
+        pressed,
+        focus
+      });
+      const textStyle = { ...(0, _ThemeProvider.applyTextStyles)(themeTokens),
+        textDecorationLine: textLine
+      };
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
+        style: selectContainerStyle({ ...themeTokens,
+          contentMaxDimension
+        }),
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_StackView.StackWrap, {
+          direction: contentDirection,
+          space: contentSpace,
+          gap: gap,
+          tokens: {
+            alignItems: contentAlignItems
+          },
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
+            style: selectImageContainerStyle(contentMaxDimension),
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Image.default, {
+              accessibilityIgnoresInvertColors: true,
+              imageAccessibilityLabel: imageAccessibilityLabel,
+              source: imageSource,
+              style: selectImageStyle(imageDimension)
+            })
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Text.default, {
+            style: textStyle,
+            children: children
+          })]
+        })
+      });
+    }
   });
 });
 QuickLinksFeatureItem.displayName = 'QuickLinksFeatureItem';

package/lib/StepTracker/Step.js

@@ -96,17 +96,18 @@ const selectKnobStyles = (_ref4, isCompleted, isCurrent) => {
     height: knobSize,
     width: knobSize,
     ...(isCompleted && {
-      backgroundColor: knobCompletedBackgroundColor,
-      borderColor: knobCompletedBorderColor,
-      paddingLeft: knobCompletedPaddingLeft,
-      paddingTop: knobCompletedPaddingTop
-    }),
-    ...(isCurrent && {
       backgroundColor: knobCurrentBackgroundColor,
       borderColor: knobCurrentBorderColor,
       borderWidth: knobCurrentBorderWidth,
       paddingLeft: knobCurrentPaddingLeft,
       paddingTop: knobCurrentPaddingTop
+    }),
+    ...(isCurrent && {
+      backgroundColor: knobCompletedBackgroundColor,
+      borderColor: knobCompletedBorderColor,
+      borderWidth: knobCurrentBorderWidth,
+      paddingLeft: knobCompletedPaddingLeft,
+      paddingTop: knobCompletedPaddingTop
     })
   };
 };
@@ -128,7 +129,26 @@ const selectLabelContainerStyles = _ref5 => {
   };
 };
 
-const selectLabelStyles = (_ref6, themeOptions, isCurrent) => {
+const selectStepLabelStyles = (_ref6, themeOptions, isCurrent) => {
+  let {
+    stepLabelColor,
+    labelCurrentColor,
+    stepLabelFontWeight,
+    stepLabelFontSize,
+    stepLabelFontName,
+    stepLabelLineHeight
+  } = _ref6;
+  return (0, _ThemeProvider.applyTextStyles)({
+    color: isCurrent ? labelCurrentColor : stepLabelColor,
+    fontSize: stepLabelFontSize,
+    lineHeight: stepLabelLineHeight,
+    fontWeight: stepLabelFontWeight,
+    fontName: stepLabelFontName,
+    themeOptions
+  });
+};
+
+const selectLabelStyles = (_ref7, themeOptions, isCurrent) => {
   let {
     labelColor,
     labelCurrentColor,
@@ -137,7 +157,7 @@ const selectLabelStyles = (_ref6, themeOptions, isCurrent) => {
     labelFontWeight,
     labelFontName,
     labelLineHeight
-  } = _ref6;
+  } = _ref7;
   return (0, _ThemeProvider.applyTextStyles)({
     color: isCurrent ? labelCurrentColor : labelColor,
     fontSize: labelFontSize,
@@ -164,7 +184,7 @@ const getStepTestID = (isCompleted, isCurrent) => {
  */
 
 
-const Step = _ref7 => {
+const Step = _ref8 => {
   let {
     label,
     name,
@@ -173,11 +193,12 @@ const Step = _ref7 => {
     stepIndex = 0,
     tokens,
     ...rest
-  } = _ref7;
+  } = _ref8;
   const {
     completedIcon,
     showStepLabel,
     showStepName,
+    textStepTrackerLabel,
     ...themeTokens
   } = tokens;
   const isFirst = stepIndex === 0;
@@ -211,11 +232,11 @@ const Step = _ref7 => {
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_View.default, {
         style: [staticStyles.knob, selectKnobStyles(themeTokens, isCompleted, isCurrent)],
         testID: getStepTestID(isCompleted, isCurrent),
-        children: [isCompleted && completedIcon && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Icon.default, {
+        children: [(isCompleted && completedIcon || isCurrent && !completedIcon) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
+          style: selectCurrentInnerStyles(themeTokens)
+        }), isCurrent && completedIcon && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Icon.default, {
           icon: completedIcon,
           tokens: selectCompletedIconTokens(themeTokens)
-        }), isCurrent && /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
-          style: selectCurrentInnerStyles(themeTokens)
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
         style: [staticStyles.connector, !isLast && selectConnectorStyles(themeTokens, isCompleted)]
@@ -223,7 +244,7 @@ const Step = _ref7 => {
     }), showStepLabel && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_View.default, {
       style: [staticStyles.stepLabelContainer, selectLabelContainerStyles(tokens)],
       children: [showStepName && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Text.default, {
-        style: [staticStyles.centeredText, selectLabelStyles(tokens, themeOptions, isCurrent)],
+        style: [staticStyles.centeredText, selectStepLabelStyles(tokens, themeOptions, isCurrent)],
         children: name
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_StackView.default, {
         direction: "row",

package/lib/StepTracker/StepTracker.js

@@ -131,13 +131,16 @@ const StepTracker = /*#__PURE__*/(0, _react.forwardRef)((_ref4, ref) => {
   } = (0, _ThemeProvider.useThemeTokens)('StepTracker', tokens, variant, {
     viewport
   });
+  const {
+    textStepTrackerLabel
+  } = themeTokens;
   const getCopy = (0, _useCopy.default)({
     dictionary,
     copy
   });
-  const stepTrackerLabel = showStepTrackerLabel ? getCopy('stepTrackerLabel').replace('%{stepNumber}', current < steps.length ? current + 1 : steps.length).replace('%{stepCount}', steps.length).replace('%{stepLabel}', current < steps.length ? steps[current] : steps[steps.length - 1]) : '';
+  const stepTrackerLabel = showStepTrackerLabel ? (typeof copy === 'string' ? getCopy(textStepTrackerLabel ?? 1).stepTrackerLabel : getCopy('stepTrackerLabel')).replace('%{stepNumber}', current < steps.length ? current + 1 : steps.length).replace('%{stepCount}', steps.length).replace('%{stepLabel}', current < steps.length ? steps[current] : steps[steps.length - 1]) : '';
 
-  const getStepLabel = index => themeTokens.showStepLabel ? getCopy('stepLabel').replace('%{stepNumber}', index + 1) : '';
+  const getStepLabel = index => themeTokens.showStepLabel ? (typeof copy === 'string' ? getCopy(textStepTrackerLabel ?? 1).stepLabel : getCopy('stepLabel')).replace('%{stepNumber}', index + 1) : '';
 
   const {
     themeOptions

package/lib/StepTracker/dictionary.js

@@ -6,12 +6,32 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = {
   en: {
-    stepLabel: 'Step %{stepNumber}',
-    stepTrackerLabel: 'Step %{stepNumber} of %{stepCount}: %{stepLabel}'
+    1: {
+      stepLabel: 'Step %{stepNumber}',
+      stepTrackerLabel: 'Step %{stepNumber} of %{stepCount}: %{stepLabel}'
+    },
+    2: {
+      stepLabel: '%{stepNumber}.',
+      stepTrackerLabel: 'Step %{stepNumber} of %{stepCount}: %{stepLabel}'
+    },
+    3: {
+      stepLabel: 'Step %{stepNumber}',
+      stepTrackerLabel: 'Step %{stepNumber} of %{stepCount}: %{stepLabel}'
+    }
   },
   fr: {
-    stepLabel: 'Étape %{stepNumber}',
-    stepTrackerLabel: 'Étape %{stepNumber} sur %{stepCount}: %{stepLabel}'
+    1: {
+      stepLabel: 'Étape %{stepNumber}',
+      stepTrackerLabel: 'Étape %{stepNumber} sur %{stepCount}: %{stepLabel}'
+    },
+    2: {
+      stepLabel: '%{stepNumber}.',
+      stepTrackerLabel: 'Étape %{stepNumber} sur %{stepCount}: %{stepLabel}'
+    },
+    3: {
+      stepLabel: 'Étape %{stepNumber}',
+      stepTrackerLabel: 'Étape %{stepNumber} sur %{stepCount}: %{stepLabel}'
+    }
   }
 };
 exports.default = _default;

package/lib/TextInput/TextInput.js

@@ -62,21 +62,23 @@ const TextInput = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
       validation: supportsProps.validation
     }
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InputSupports.default, {
-    nativeID: nativeID,
-    ...supportsProps,
-    children: _ref2 => {
-      let {
-        inputId,
-        ...propsFromInputSupports
-      } = _ref2;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextInputBase.default, {
-        ref: ref,
-        nativeID: inputId,
-        ...propsFromInputSupports,
-        ...inputProps
-      });
-    }
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_InputSupports.default, {
+      nativeID: nativeID,
+      ...supportsProps,
+      children: _ref2 => {
+        let {
+          inputId,
+          ...propsFromInputSupports
+        } = _ref2;
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextInputBase.default, {
+          ref: ref,
+          nativeID: inputId,
+          ...propsFromInputSupports,
+          ...inputProps
+        });
+      }
+    }), rest.children]
   });
 });
 TextInput.displayName = 'TextInput';

package/lib/ThemeProvider/ThemeProvider.js

@@ -45,6 +45,11 @@ const ThemeProvider = _ref => {
     themeOptions = {}
   } = _ref;
   const [theme, setTheme] = (0, _react.useState)(defaultTheme);
+  (0, _react.useEffect)(() => {
+    if (theme.metadata.name !== defaultTheme.metadata.name) {
+      setTheme(defaultTheme);
+    }
+  }, [theme.metadata.name, defaultTheme]);
   const appliedThemeOptions = { ...defaultThemeOptions,
     ...themeOptions
   }; // Validate the theme tokens version on every render.
@@ -67,7 +72,8 @@ ThemeProvider.propTypes = {
   children: _propTypes.default.node.isRequired,
   defaultTheme: _propTypes.default.shape({
     metadata: _propTypes.default.shape({
-      themeTokensVersion: _propTypes.default.string.isRequired
+      themeTokensVersion: _propTypes.default.string.isRequired,
+      name: _propTypes.default.string.isRequired
     }).isRequired
   }).isRequired,
 

package/lib-module/Link/LinkBase.js

@@ -201,7 +201,7 @@ const LinkBase = /*#__PURE__*/forwardRef((_ref6, ref) => {
         },
         children: /*#__PURE__*/_jsx(Text, {
           style: [textStyles, blockTextStyles, staticStyles.baseline],
-          children: children
+          children: typeof children === 'function' ? children(linkState) : children
         })
       });
     }

package/lib-module/MultiSelectFilter/ModalOverlay.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import View from "react-native-web/dist/exports/View";
 import StyleSheet from "react-native-web/dist/exports/StyleSheet";
 import { Portal } from '@gorhom/portal';
-import { selectTokens, useCopy, copyPropTypes, getTokensPropType, variantProp } from '../utils';
+import { useCopy, copyPropTypes, getTokensPropType, variantProp } from '../utils';
 import { useViewport } from '../ViewportProvider';
 import { useThemeTokens } from '../ThemeProvider';
 import dictionary from './dictionary';
@@ -16,7 +16,6 @@ const staticStyles = StyleSheet.create({
     flex: 1,
     // Grow to maxWidth when possible, shrink when not possible
     position: 'absolute',
-    height: 330,
     zIndex: 10000 // Position on top of all the other overlays, including backdrops and modals
 
   },
@@ -62,6 +61,11 @@ const ModalOverlay = /*#__PURE__*/forwardRef((_ref3, ref) => {
   let {
     children,
     isReady = false,
+    maxHeight,
+    maxHeightSize,
+    maxWidthSize,
+    minHeight,
+    minWidth,
     overlaidPosition,
     onLayout,
     variant,
@@ -74,9 +78,18 @@ const ModalOverlay = /*#__PURE__*/forwardRef((_ref3, ref) => {
     viewport,
     maxWidth: false
   });
+  const containerWidthHeight = {
+    minWidth,
+    minHeight,
+    ...(tokens.maxWidth && maxWidthSize && {
+      maxWidth: maxWidthSize
+    }),
+    ...(maxHeight && maxHeightSize && {
+      maxHeight: maxHeightSize
+    })
+  };
   const {
-    closeIcon: CloseIconComponent,
-    maxWidth
+    closeIcon: CloseIconComponent
   } = themeTokens;
   const getCopy = useCopy({
     dictionary,
@@ -87,9 +100,7 @@ const ModalOverlay = /*#__PURE__*/forwardRef((_ref3, ref) => {
     children: /*#__PURE__*/_jsx(View, {
       ref: ref,
       onLayout: onLayout,
-      style: [overlaidPosition, {
-        minWidth: maxWidth
-      }, staticStyles.positioner, !isReady && staticStyles.hidden],
+      style: [overlaidPosition, containerWidthHeight, staticStyles.positioner, !isReady && staticStyles.hidden],
       children: /*#__PURE__*/_jsxs(Card, {
         tokens: selectPaddingContainerStyles(themeTokens),
         children: [/*#__PURE__*/_jsx(View, {
@@ -98,8 +109,7 @@ const ModalOverlay = /*#__PURE__*/forwardRef((_ref3, ref) => {
             onPress: onClose,
             icon: CloseIconComponent,
             accessibilityRole: "button",
-            accessibilityLabel: closeLabel,
-            tokens: selectTokens('IconButton', themeTokens, 'close')
+            accessibilityLabel: closeLabel
           })
         }), children]
       })
@@ -115,6 +125,12 @@ ModalOverlay.propTypes = {
     left: PropTypes.number,
     width: PropTypes.number
   }),
+  minWidth: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  minHeight: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  maxHeightSize: PropTypes.number,
+  maxWidthSize: PropTypes.number,
+  maxHeight: PropTypes.bool,
+  maxWidth: PropTypes.bool,
   onLayout: PropTypes.func,
   variant: variantProp.propType,
   tokens: getTokensPropType('Modal'),