@telus-uds/components-base 1.5.0 → 1.7.0

package/lib/utils/props/textProps.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _Platform = _interopRequireDefault(require("react-native-web/dist/cjs/exports/Platform"));
+
+var _getPropSelector = _interopRequireDefault(require("./getPropSelector"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// These are the props accepted specifically on React Native (Web) `Text` elements.
+// They are generally concerned with the behaviour of multiline text.
+const crossPlatform = {
+  /**
+   * Truncates text after this many lines with an ellipsis at the end.
+   * On native, ellipsis behaviour may be changed with `ellipsizeMode` prop.
+   */
+  numberOfLines: _propTypes.default.number,
+
+  /**
+   * Default is true on web and false on native
+   */
+  selectable: _propTypes.default.bool
+};
+/**
+ * See React Native docs for latest details on these.
+ * https://reactnative.dev/docs/text
+ */
+
+const nativeOnly = {
+  ellipsizeMode: _propTypes.default.string,
+  maxFontSizeMultiplier: _propTypes.default.number,
+  minimumFontScale: _propTypes.default.number,
+  onTextLayout: _propTypes.default.func,
+  suppressHighlighting: _propTypes.default.bool,
+  textBreakStrategy: _propTypes.default.string
+};
+/**
+ * These set HTML attributes of the same name.
+ */
+
+const webOnly = {
+  dir: _propTypes.default.oneOf(['auto', 'ltr', 'rtl']),
+  lang: _propTypes.default.string
+};
+var _default = {
+  /**
+   * Set of prop types specific to React Native and React Native Web `Text`,
+   * which largely revolve around the behaviour of multiline non-pressable text.
+   */
+  types: { ...crossPlatform,
+    ...webOnly,
+    ...nativeOnly
+  },
+
+  /**
+   * Filters a props object, returning only props specific to `Text` elements
+   * on the current platform. Does not include props applicable to `Text` and `View`.
+   */
+  select: (0, _getPropSelector.default)({ ...crossPlatform,
+    ..._Platform.default.select({
+      web: webOnly,
+      default: nativeOnly
+    })
+  })
+};
+exports.default = _default;

package/lib-module/Button/ButtonBase.js

@@ -6,9 +6,9 @@ import StyleSheet from "react-native-web/dist/exports/StyleSheet";
 import Platform from "react-native-web/dist/exports/Platform";
 import { applyTextStyles, applyShadowToken, applyOuterBorder } from '../ThemeProvider/utils';
 import buttonPropTypes from './propTypes';
-import { a11yProps, getCursorStyle, clickProps, linkProps, resolvePressableState, resolvePressableTokens, selectSystemProps, viewProps, wrapStringsInText, withLinkRouter } from '../utils';
+import { a11yProps, clickProps, focusHandlerProps, getCursorStyle, linkProps, resolvePressableState, resolvePressableTokens, selectSystemProps, viewProps, wrapStringsInText, withLinkRouter } from '../utils';
 import { jsx as _jsx } from "react/jsx-runtime";
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, linkProps, viewProps]);
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, focusHandlerProps, linkProps, viewProps]);
 
 const getOuterBorderOffset = ({
   outerBorderGap = 0,

package/lib-module/Button/ButtonGroup.js

@@ -6,11 +6,11 @@ import ButtonBase from './ButtonBase';
 import { StackWrap } from '../StackView';
 import { useViewport } from '../ViewportProvider';
 import { useThemeTokens, useThemeTokensCallback } from '../ThemeProvider';
-import { a11yProps, pressProps, getTokensPropType, selectSystemProps, selectTokens, variantProp, viewProps } from '../utils/props';
-import { useMultipleInputValues } from '../utils/input';
+import { a11yProps, containUniqueFields, focusHandlerProps, pressProps, getTokensPropType, selectSystemProps, selectTokens, useMultipleInputValues, variantProp, viewProps } from '../utils';
 import { getPressHandlersWithArgs } from '../utils/pressability';
 import { jsx as _jsx } from "react/jsx-runtime";
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, pressProps, viewProps]);
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps]);
+const [selectItemProps, selectedItemPropTypes] = selectSystemProps([a11yProps, focusHandlerProps, pressProps, viewProps]);
 const ButtonGroup = /*#__PURE__*/forwardRef(({
   variant,
   tokens,
@@ -53,6 +53,12 @@ const ButtonGroup = /*#__PURE__*/forwardRef(({
     ...rest
   });
   const itemA11yRole = systemProps.accessibilityRole === 'radiogroup' ? 'radio' : 'checkbox';
+  const uniqueFields = ['id', 'label'];
+
+  if (!containUniqueFields(items, uniqueFields)) {
+    throw new Error(`ButtonGroup items must have unique ${uniqueFields.join(', ')}`);
+  }
+
   return /*#__PURE__*/_jsx(StackWrap, { ...systemProps,
     space: space,
     direction: direction,
@@ -62,7 +68,8 @@ const ButtonGroup = /*#__PURE__*/forwardRef(({
       label,
       id = label,
       accessibilityLabel,
-      ref: itemRef
+      ref: itemRef,
+      ...itemRest
     }, index) => {
       const isSelected = currentValues.includes(id); // Pass an object of relevant component state as first argument for any passed-in press handlers
 
@@ -73,7 +80,7 @@ const ButtonGroup = /*#__PURE__*/forwardRef(({
       }]);
 
       const handlePress = event => {
-        if (pressHandlers.onPress) pressHandlers.onPress();
+        if (pressHandlers.onPress) pressHandlers.onPress(event);
         toggleOneValue(id, event);
       };
 
@@ -95,6 +102,7 @@ const ButtonGroup = /*#__PURE__*/forwardRef(({
         selected: isSelected,
         inactive: inactive,
         ...itemA11y,
+        ...selectItemProps(itemRest),
         children: label
       }, id);
     })
@@ -114,7 +122,8 @@ ButtonGroup.propTypes = { ...selectedSystemPropTypes,
   /**
    * The options a user may select
    */
-  items: PropTypes.arrayOf(PropTypes.shape({
+  items: PropTypes.arrayOf(PropTypes.shape({ ...selectedItemPropTypes,
+
     /**
      * The text displayed to the user in the button, describing this option,
      * passed to the button as its child.

package/lib-module/Card/PressableCardBase.js

@@ -4,10 +4,10 @@ import Pressable from "react-native-web/dist/exports/Pressable";
 import Platform from "react-native-web/dist/exports/Platform";
 import { useViewport } from '../ViewportProvider';
 import { applyOuterBorder, validateThemeTokens } from '../ThemeProvider';
-import { a11yProps, clickProps, getTokenNames, getTokensSetPropType, linkProps, resolvePressableState, resolvePressableTokens, selectSystemProps, selectTokens, variantProp, viewProps, withLinkRouter } from '../utils';
+import { a11yProps, clickProps, focusHandlerProps, getTokenNames, getTokensSetPropType, linkProps, resolvePressableState, resolvePressableTokens, selectSystemProps, selectTokens, variantProp, viewProps, withLinkRouter } from '../utils';
 import CardBase from './CardBase';
 import { jsx as _jsx } from "react/jsx-runtime";
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps]);
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, focusHandlerProps, viewProps]);
 const tokenKeys = [...getTokenNames('Card'), // Outer border tokens. TODO: centralise common token sets like these as part of
 // https://github.com/telus/universal-design-system/issues/782
 'outerBorderColor', 'outerBorderWidth', 'outerBorderGap'];

package/lib-module/Checkbox/Checkbox.js

@@ -10,11 +10,11 @@ import CheckboxLabel from '../InputLabel/LabelContent';
 import Feedback from '../Feedback';
 import StackView from '../StackView';
 import { applyShadowToken, applyTextStyles, useThemeTokensCallback } from '../ThemeProvider';
-import { a11yProps, getTokensPropType, selectSystemProps, useInputValue, variantProp, viewProps } from '../utils';
+import { a11yProps, focusHandlerProps, getTokensPropType, selectSystemProps, useInputValue, variantProp, viewProps } from '../utils';
 import useUniqueId from '../utils/useUniqueId';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps]);
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, focusHandlerProps, viewProps]);
 
 const selectInputStyles = ({
   iconBackgroundColor,
@@ -204,24 +204,31 @@ const Checkbox = /*#__PURE__*/forwardRef(({
             pressed
           });
           const iconTokens = selectIconTokens(stateTokens);
+          const labelStyles = selectLabelStyles(stateTokens);
+          const alignWithLabel = label ? [staticStyles.alignWithLabel, {
+            height: labelStyles.lineHeight
+          }] : null;
           return /*#__PURE__*/_jsxs(View, {
             style: staticStyles.container,
-            children: [/*#__PURE__*/_jsxs(View, {
-              style: StyleSheet.flatten([staticStyles.defaultInputStyles, selectInputStyles(stateTokens, isChecked)]),
-              testID: "Checkbox-Input",
-              children: [/*#__PURE__*/_jsx(CheckboxInput, {
-                checked: isChecked,
-                defaultChecked: defaultChecked,
-                disabled: inactive,
-                id: inputId,
-                isControlled: isControlled,
-                name: name,
-                value: value
-              }), isChecked && IconComponent && /*#__PURE__*/_jsx(IconComponent, { ...iconTokens,
-                testID: "Checkbox-Icon"
-              })]
+            children: [/*#__PURE__*/_jsx(View, {
+              style: alignWithLabel,
+              children: /*#__PURE__*/_jsxs(View, {
+                style: [staticStyles.defaultInputStyles, selectInputStyles(stateTokens, isChecked)],
+                testID: "Checkbox-Input",
+                children: [/*#__PURE__*/_jsx(CheckboxInput, {
+                  checked: isChecked,
+                  defaultChecked: defaultChecked,
+                  disabled: inactive,
+                  id: inputId,
+                  isControlled: isControlled,
+                  name: name,
+                  value: value
+                }), isChecked && IconComponent && /*#__PURE__*/_jsx(IconComponent, { ...iconTokens,
+                  testID: "Checkbox-Icon"
+                })]
+              })
             }), Boolean(label) && /*#__PURE__*/_jsx(Text, {
-              style: selectLabelStyles(stateTokens),
+              style: labelStyles,
               children: /*#__PURE__*/_jsx(CheckboxLabel, {
                 forId: inputId,
                 children: label
@@ -317,5 +324,9 @@ const staticStyles = StyleSheet.create({
   defaultInputStyles: {
     alignItems: 'center',
     justifyContent: 'center'
+  },
+  alignWithLabel: {
+    alignSelf: 'flex-start',
+    justifyContent: 'center'
   }
 });

package/lib-module/Checkbox/CheckboxGroup.js

@@ -3,10 +3,13 @@ import PropTypes from 'prop-types';
 import ABBPropTypes from 'airbnb-prop-types';
 import { useViewport } from '../ViewportProvider';
 import { useThemeTokens } from '../ThemeProvider';
-import { getTokensPropType, useMultipleInputValues, variantProp } from '../utils';
+import { a11yProps, containUniqueFields, focusHandlerProps, getTokensPropType, selectSystemProps, useMultipleInputValues, variantProp, viewProps } from '../utils';
 import { getStackedContent } from '../StackView';
 import Checkbox from './Checkbox';
 import Fieldset from '../Fieldset';
+import { jsx as _jsx } from "react/jsx-runtime";
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps]);
+const [selectItemProps, selectedItemPropTypes] = selectSystemProps([a11yProps, focusHandlerProps, viewProps]);
 /**
  * A group of Checkboxs that behave as a fieldset. Use when users select any number of choices from options.
  *
@@ -55,7 +58,6 @@ import Fieldset from '../Fieldset';
  * ```
  */
 
-import { jsx as _jsx } from "react/jsx-runtime";
 const CheckboxGroup = /*#__PURE__*/forwardRef(({
   tokens,
   radioTokens,
@@ -71,7 +73,8 @@ const CheckboxGroup = /*#__PURE__*/forwardRef(({
   onChange,
   readOnly,
   name: inputGroupName,
-  inactive
+  inactive,
+  ...rest
 }, ref) => {
   const viewport = useViewport();
   const {
@@ -89,11 +92,18 @@ const CheckboxGroup = /*#__PURE__*/forwardRef(({
     onChange,
     readOnly: readOnly || inactive
   });
+  const uniqueFields = ['id', 'label'];
+
+  if (!containUniqueFields(items, uniqueFields)) {
+    throw new Error(`CheckboxGroup items must have unique ${uniqueFields.join(', ')}`);
+  }
+
   const checkboxes = items.map(({
     label,
     id,
     onChange: itemOnChange,
-    ref: itemRef
+    ref: itemRef,
+    ...itemRest
   }, index) => {
     const checkboxId = id || `Checkbox[${index}]`;
 
@@ -111,7 +121,8 @@ const CheckboxGroup = /*#__PURE__*/forwardRef(({
       label: label,
       name: inputGroupName,
       tokens: radioTokens,
-      variant: variant
+      variant: variant,
+      ...selectItemProps(itemRest)
     }, checkboxId);
   });
   return /*#__PURE__*/_jsx(Fieldset, {
@@ -124,6 +135,7 @@ const CheckboxGroup = /*#__PURE__*/forwardRef(({
     feedback: feedback,
     inactive: inactive,
     validation: validation,
+    ...selectProps(rest),
     children: getStackedContent(checkboxes, {
       space,
       direction: 'column'
@@ -131,7 +143,8 @@ const CheckboxGroup = /*#__PURE__*/forwardRef(({
   });
 });
 CheckboxGroup.displayName = 'CheckboxGroup';
-CheckboxGroup.propTypes = {
+CheckboxGroup.propTypes = { ...selectedSystemPropTypes,
+
   /**
    * Optional theme token overrides for the outer CheckboxGroup component
    */
@@ -150,7 +163,7 @@ CheckboxGroup.propTypes = {
   /**
    * Array of objects containing specifics for each Checkbox to be rendered in the group.
    */
-  items: PropTypes.arrayOf(PropTypes.exact({
+  items: PropTypes.arrayOf(PropTypes.exact({ ...selectedItemPropTypes,
     label: PropTypes.string,
     id: PropTypes.string,
     onChange: PropTypes.func,

package/lib-module/ExpandCollapse/Panel.js

@@ -64,12 +64,13 @@ const ExpandCollapsePanel = /*#__PURE__*/forwardRef(({
   };
 
   const onContainerLayout = event => {
-    if (containerHeight === null) {
-      const {
-        layout: {
-          height = 0
-        } = {}
-      } = event.nativeEvent;
+    const {
+      layout: {
+        height = 0
+      } = {}
+    } = event.nativeEvent;
+
+    if (Platform.OS === 'web' || Platform.OS !== 'web' && containerHeight === null) {
       setContainerHeight(height);
     }
   };
@@ -94,12 +95,11 @@ const ExpandCollapsePanel = /*#__PURE__*/forwardRef(({
       tokens: controlTokens,
       onPress: handleControlPress,
       children: control
-    }), /*#__PURE__*/_jsx(View, {
-      style: overflowContainerStyles,
+    }), /*#__PURE__*/_jsx(Animated.View, {
+      style: [overflowContainerStyles, animatedStyles, staticStyles.itemsContainer],
       ...focusabilityProps,
-      children: /*#__PURE__*/_jsx(Animated.View, {
+      children: /*#__PURE__*/_jsx(View, {
         onLayout: onContainerLayout,
-        style: [staticStyles.itemsContainer, animatedStyles],
         children: /*#__PURE__*/_jsx(View, {
           style: selectContainerStyles(themeTokens),
           children: children

package/lib-module/FlexGrid/Col/Col.js

@@ -22,6 +22,7 @@ const Col = /*#__PURE__*/forwardRef(({
   mdOffset,
   lgOffset,
   xlOffset,
+  flex,
   ...viewProps
 }, ref) => {
   const gutter = useContext(GutterContext);
@@ -95,8 +96,11 @@ const Col = /*#__PURE__*/forwardRef(({
     paddingLeft: gutter ? 16 : 0,
     paddingRight: gutter ? 16 : 0
   };
-  let hidingStyles = {};
-  const shown = Platform.OS === 'web' ? 'block' : 'flex';
+  let hidingStyles = {}; // TODO: consider setting this to always 'flex' in a major release.
+  // `display: block` is invalid in native apps.
+  // See https://telusdigital.atlassian.net/browse/UDS1-92
+
+  const shown = !flex && Platform.OS === 'web' ? 'block' : 'flex';
 
   if (viewPort === viewports.xs) {
     hidingStyles = {
@@ -260,6 +264,12 @@ Col.propTypes = {
    *
    * Accepts a `PropType.string` following the [responsive prop](#/Layout?id=responsive) structure.
    */
-  horizontalAlign: responsiveProps.getTypeOptionallyByViewport(PropTypes.oneOf(['left', 'center', 'right']))
+  horizontalAlign: responsiveProps.getTypeOptionallyByViewport(PropTypes.oneOf(['left', 'center', 'right'])),
+
+  /**
+   * (web only) Stretches the column to fill vertical space using `display: flex`.
+   * In native apps, FlexGrid.Col behaves as if this is always true (as do all `View`s).
+   */
+  flex: PropTypes.bool
 };
 export default Col;

package/lib-module/FlexGrid/Row/Row.js

@@ -86,25 +86,31 @@ const Row = /*#__PURE__*/forwardRef(({
   const viewPort = useViewport();
   const reverseLevel = applyInheritance([xsReverse, smReverse, mdReverse, lgReverse, xlReverse]);
   let flexDirection = '';
+  let flexWrap = '';
 
   if (viewPort === viewports.xs) {
     flexDirection = reverseLevel[0] ? 'row-reverse' : 'row';
+    flexWrap = reverseLevel[0] ? 'wrap-reverse' : 'wrap';
   }
 
   if (viewPort === viewports.sm) {
     flexDirection = reverseLevel[1] ? 'row-reverse' : 'row';
+    flexWrap = reverseLevel[1] ? 'wrap-reverse' : 'wrap';
   }
 
   if (viewPort === viewports.md) {
     flexDirection = reverseLevel[2] ? 'row-reverse' : 'row';
+    flexWrap = reverseLevel[2] ? 'wrap-reverse' : 'wrap';
   }
 
   if (viewPort === viewports.lg) {
     flexDirection = reverseLevel[3] ? 'row-reverse' : 'row';
+    flexWrap = reverseLevel[3] ? 'wrap-reverse' : 'wrap';
   }
 
   if (viewPort === viewports.xl) {
     flexDirection = reverseLevel[4] ? 'row-reverse' : 'row';
+    flexWrap = reverseLevel[4] ? 'wrap-reverse' : 'wrap';
   }
 
   return /*#__PURE__*/_jsx(View, {
@@ -112,6 +118,7 @@ const Row = /*#__PURE__*/forwardRef(({
     ...rest,
     style: [styles.row, {
       flexDirection,
+      flexWrap,
       ...horizontalAlignStyles(horizontalAlign),
       ...verticalAlignStyles(verticalAlign),
       ...distributeStyles(distribute)
@@ -128,8 +135,7 @@ const styles = StyleSheet.create({
     flexGrow: 0,
     flexShrink: 1,
     flexBasis: 'auto',
-    flexDirection: 'row',
-    flexWrap: 'wrap'
+    flexDirection: 'row'
   }
 });
 Row.propTypes = {

package/lib-module/InputLabel/InputLabel.js

@@ -9,6 +9,7 @@ import LabelContent from './LabelContent';
 import Tooltip from '../Tooltip';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps]);
 
 const selectLabelStyles = tokens => applyTextStyles(selectTokens('Typography', tokens));
@@ -47,25 +48,29 @@ const InputLabel = /*#__PURE__*/forwardRef(({
   const themeTokens = useThemeTokens('InputLabel', tokens, variant);
   const hasTooltip = tooltip !== undefined;
   const isHintInline = hintPosition === 'inline';
-  return /*#__PURE__*/_jsxs(View, {
-    ref: ref,
-    style: [staticStyles.container, !isHintInline && staticStyles.containerWithHintBelow],
-    ...selectProps(rest),
-    children: [/*#__PURE__*/_jsx(Text, {
-      style: [selectLabelStyles(themeTokens), selectGapStyles(themeTokens), staticStyles.label],
-      children: /*#__PURE__*/_jsx(LabelContent, {
-        forId: forId,
-        children: label
-      })
-    }), hint && isHintInline && /*#__PURE__*/_jsx(Text, {
-      style: [selectHintStyles(themeTokens), hasTooltip && selectGapStyles(themeTokens)],
-      nativeID: hintId,
-      children: hint
-    }), hasTooltip && /*#__PURE__*/_jsx(View, {
-      style: staticStyles.tooltipAlign,
-      children: /*#__PURE__*/_jsx(Tooltip, {
-        content: tooltip
-      })
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsxs(View, {
+      ref: ref,
+      style: staticStyles.container,
+      ...selectProps(rest),
+      children: [/*#__PURE__*/_jsx(Text, {
+        style: [selectLabelStyles(themeTokens), selectGapStyles(themeTokens), staticStyles.label],
+        children: /*#__PURE__*/_jsx(LabelContent, {
+          forId: forId,
+          children: label
+        })
+      }), hint && isHintInline && /*#__PURE__*/_jsx(Text, {
+        style: [selectHintStyles(themeTokens), hasTooltip && selectGapStyles(themeTokens), staticStyles.label],
+        nativeID: hintId,
+        children: hint
+      }), hasTooltip && /*#__PURE__*/_jsx(View, {
+        style: [staticStyles.tooltipAlign, {
+          height: themeTokens.fontSize * themeTokens.lineHeight
+        }],
+        children: /*#__PURE__*/_jsx(Tooltip, {
+          content: tooltip
+        })
+      })]
     }), hint && !isHintInline && /*#__PURE__*/_jsx(Text, {
       style: [selectHintStyles(themeTokens), staticStyles.hintBelow],
       nativeID: hintId,
@@ -111,21 +116,19 @@ InputLabel.propTypes = { ...selectedSystemPropTypes,
 export default InputLabel;
 const staticStyles = StyleSheet.create({
   container: {
-    display: 'flex',
+    flexShrink: 1,
     flexDirection: 'row',
     alignItems: 'baseline'
   },
-  containerWithHintBelow: {
-    flexWrap: 'wrap'
-  },
   label: {
-    flexShrink: 0
+    flexShrink: 1
   },
   hintBelow: {
     flexBasis: '100%',
     flexShrink: 0
   },
   tooltipAlign: {
-    alignSelf: 'center'
+    alignSelf: 'flex-start',
+    justifyContent: 'center'
   }
 });

package/lib-module/Link/LinkBase.js

@@ -35,13 +35,9 @@ Platform.OS === 'web' ? {
 } : {};
 
 const selectTextStyles = ({
-  color,
-  textLine,
-  textLineStyle
+  color
 }) => ({
   color,
-  textDecorationLine: textLine,
-  textDecorationStyle: textLineStyle,
   ...Platform.select({
     web: {
       // TODO: https://github.com/telus/universal-design-system/issues/487
@@ -62,6 +58,22 @@ const selectBlockStyles = ({
   fontName: blockFontName
 });
 
+const selectDecorationStyles = ({
+  color,
+  textLine,
+  textLineStyle
+}) => ({
+  color,
+  textDecorationLine: textLine,
+  textDecorationStyle: textLineStyle,
+  ...Platform.select({
+    web: {
+      // TODO: https://github.com/telus/universal-design-system/issues/487
+      transition: 'color 200ms'
+    }
+  })
+});
+
 const selectIconTokens = ({
   color,
   iconSize,
@@ -138,8 +150,9 @@ const LinkBase = /*#__PURE__*/forwardRef(({
     style: linkState => {
       const themeTokens = resolveLinkTokens(linkState);
       const outerBorderStyles = selectOuterBorderStyles(themeTokens);
+      const decorationStyles = selectDecorationStyles(themeTokens);
       const hasIcon = Boolean(icon || themeTokens.icon);
-      return [outerBorderStyles, blockLeftStyle, hasIcon && staticStyles.rowContainer];
+      return [outerBorderStyles, blockLeftStyle, decorationStyles, hasIcon && staticStyles.rowContainer];
     },
     children: linkState => {
       const themeTokens = resolveLinkTokens(linkState);

package/lib-module/Link/TextButton.js

@@ -1,5 +1,3 @@
-var _TextButton$propTypes;
-
 import React, { forwardRef } from 'react';
 import PropTypes from 'prop-types';
 import { useThemeTokensCallback } from '../ThemeProvider';
@@ -16,8 +14,6 @@ const TextButton = /*#__PURE__*/forwardRef(({
   children,
   variant,
   tokens,
-  // TODO: this may need to use `link` role on Web in the case of being passed both `href` and
-  // `onPress` in an omniplatform app that uses React Navigation's useLinkProps for internal nav.
   accessibilityRole = 'button',
   ...linkProps
 }, ref) => {
@@ -34,10 +30,5 @@ const TextButton = /*#__PURE__*/forwardRef(({
 TextButton.displayName = 'TextButton';
 TextButton.propTypes = { ...LinkBase.propTypes,
   onPress: PropTypes.func.isRequired
-}; // Remove incompatible Link prop (if this build includes propTypes)
-// TODO: test if this works with web navigation in omniplatform React Navigation
-// https://github.com/telus/universal-design-system/issues/665
-// eslint-disable-next-line react/forbid-foreign-prop-types
-
-if ((_TextButton$propTypes = TextButton.propTypes) !== null && _TextButton$propTypes !== void 0 && _TextButton$propTypes.href) delete TextButton.propTypes.href;
+};
 export default TextButton;