@telus-uds/components-web 2.12.0 → 2.14.0

package/lib-module/VideoPicker/VideoPickerThumbnail.js

@@ -4,7 +4,7 @@ import StyleSheet from "react-native-web/dist/exports/StyleSheet";
 import PropTypes from 'prop-types';
 import { viewports } from '@telus-uds/system-constants';
 import styled from 'styled-components';
-import { StackView, Typography, useViewport, horizontalScrollUtils, useThemeTokens } from '@telus-uds/components-base';
+import { StackView, Typography, useViewport, horizontalScrollUtils, useThemeTokensCallback } from '@telus-uds/components-base';
 import { getTimestamp } from '../shared/VideoSplash/helpers';
 import { VideoPropType, RefPropType } from './videoPropType';
 import VideoSplash from '../shared/VideoSplash/VideoSplash';
@@ -42,37 +42,45 @@ const createReactNativeStyles = _ref => {
   });
 };
 
-const VideoThumbnail = /*#__PURE__*/styled.div.withConfig({
-  displayName: "VideoPickerThumbnail__VideoThumbnail",
+const ImageContainer = /*#__PURE__*/styled.div.withConfig({
+  displayName: "VideoPickerThumbnail__ImageContainer",
   componentId: "components-web__sc-1glxurq-0"
-})(["position:relative;width:", ";flex-shrink:0;* button{display:none;}&::before{content:'';display:block;padding-bottom:56.25%;}&::after{content:'';border:", "px solid;border-color:", ";border-radius:", "px;position:absolute;top:0;left:0;right:0;bottom:0;}& > div{border-radius:", "px;}"], props => props.layout === 'vertical' ? '100%' : '144px', _ref2 => {
+})(["padding:", ";border:", ";border-radius:", "px;"], props => `${props.outerBorderGap}px`, props => `${props.outerBorderWidth}px solid ${props.outerBorderColor}`, _ref2 => {
   let {
-    borderWidth
+    outerBorderRadius
   } = _ref2;
-  return borderWidth;
-}, _ref3 => {
+  return outerBorderRadius;
+});
+const VideoThumbnail = /*#__PURE__*/styled.div.withConfig({
+  displayName: "VideoPickerThumbnail__VideoThumbnail",
+  componentId: "components-web__sc-1glxurq-1"
+})(["position:relative;width:", ";flex-shrink:0;* button{display:none;}&::before{content:'';display:block;padding-bottom:56.25%;}&::after{content:'';border:", "px solid;border-color:", ";border-radius:", "px;position:absolute;top:0;left:0;right:0;bottom:0;}& > div{border-radius:", "px;}"], props => props.layout === 'vertical' ? '100%' : '144px', _ref3 => {
   let {
-    isPlaying,
-    borderColor
+    borderWidth
   } = _ref3;
-  return isPlaying ? borderColor : 'transparent';
+  return borderWidth;
 }, _ref4 => {
   let {
-    borderRadius
+    borderColor
   } = _ref4;
-  return borderRadius;
+  return borderColor;
 }, _ref5 => {
   let {
     borderRadius
   } = _ref5;
   return borderRadius;
+}, _ref6 => {
+  let {
+    borderRadius
+  } = _ref6;
+  return borderRadius;
 });
 const ThumbnailTitleContainer = /*#__PURE__*/styled.div.withConfig({
   displayName: "VideoPickerThumbnail__ThumbnailTitleContainer",
-  componentId: "components-web__sc-1glxurq-1"
+  componentId: "components-web__sc-1glxurq-2"
 })(["display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;"]);
 
-const VideoPickerThumbnail = _ref6 => {
+const VideoPickerThumbnail = _ref7 => {
   let {
     videoPlayerRef,
     selectedVideoId,
@@ -83,56 +91,59 @@ const VideoPickerThumbnail = _ref6 => {
     itemPositions,
     index,
     width = '100%'
-  } = _ref6;
+  } = _ref7;
   const viewport = useViewport();
-  const {
-    titleColor,
-    subTitleColor,
-    ...themeTokens
-  } = useThemeTokens('VideoPickerThumbnail');
-  const rnStyles = createReactNativeStyles(themeTokens);
+  const getTokens = useThemeTokensCallback('VideoPickerThumbnail', {}, {});
   const {
     timestamp
   } = getTimestamp(video.videoLength, video.copy);
   const isPlaying = selectedVideoId === video.videoId;
 
-  const renderThumbnailImage = () => /*#__PURE__*/_jsx(VideoThumbnail, { ...themeTokens,
-    isPlaying: isPlaying,
-    layout: layout,
-    children: /*#__PURE__*/_jsx(VideoSplash, {
-      simpleMode: true,
-      poster: video.posterSrc || `https://img.youtube.com/vi/${video.videoId}/maxresdefault.jpg`,
-      videoLength: video.videoLength,
-      copy: video.copy
-    })
-  });
+  const renderThumbnailImage = themeTokens => {
+    return /*#__PURE__*/_jsx(VideoThumbnail, { ...themeTokens,
+      isPlaying: isPlaying,
+      layout: layout,
+      children: /*#__PURE__*/_jsx(VideoSplash, {
+        simpleMode: true,
+        poster: video.posterSrc || `https://img.youtube.com/vi/${video.videoId}/maxresdefault.jpg`,
+        videoLength: video.videoLength,
+        copy: video.copy
+      })
+    });
+  };
 
-  const renderThumbnailInfo = () => /*#__PURE__*/_jsxs(StackView, {
-    space: 2,
-    tokens: {
-      flexShrink: 1
-    },
-    children: [/*#__PURE__*/_jsx(ThumbnailTitleContainer, {
-      viewport: viewport,
-      children: /*#__PURE__*/_jsx(Typography, {
+  const renderThumbnailInfo = _ref8 => {
+    let {
+      titleColor,
+      subTitleColor
+    } = _ref8;
+    return /*#__PURE__*/_jsxs(StackView, {
+      space: 2,
+      tokens: {
+        flexShrink: 1
+      },
+      children: [/*#__PURE__*/_jsx(ThumbnailTitleContainer, {
+        viewport: viewport,
+        children: /*#__PURE__*/_jsx(Typography, {
+          variant: {
+            bold: true
+          },
+          tokens: {
+            color: titleColor
+          },
+          children: video.title
+        })
+      }), viewport !== viewports.xs && /*#__PURE__*/_jsx(Typography, {
         variant: {
-          bold: true
+          size: 'micro'
         },
         tokens: {
-          color: isPlaying ? titleColor : 'none'
+          color: subTitleColor
         },
-        children: video.title
-      })
-    }), viewport !== viewports.xs && /*#__PURE__*/_jsx(Typography, {
-      variant: {
-        size: 'micro'
-      },
-      tokens: {
-        color: subTitleColor
-      },
-      children: timestamp
-    })]
-  });
+        children: timestamp
+      })]
+    });
+  };
 
   const handleLayout = itemPositions !== undefined ? getItemPositionLayoutHandler(itemPositions.positions, index) : undefined;
 
@@ -155,14 +166,45 @@ const VideoPickerThumbnail = _ref6 => {
     accessibilityState: {
       checked: isPlaying
     },
-    style: [rnStyles.container, layout === 'horizontal' && rnStyles.horizontal, isFramed && rnStyles.framed, isFramed && index > 0 && rnStyles.framedLine, {
-      width
-    }],
-    children: /*#__PURE__*/_jsxs(StackView, {
-      space: layout === 'vertical' ? 2 : 3,
-      direction: layout === 'vertical' ? 'column' : 'row',
-      children: [renderThumbnailImage(), renderThumbnailInfo()]
-    })
+    style: _ref9 => {
+      let {
+        hovered: hover,
+        focused: focus,
+        pressed
+      } = _ref9;
+      const themeTokens = getTokens({
+        hover,
+        focus,
+        pressed,
+        selected: isPlaying
+      });
+      const rnStyles = createReactNativeStyles(themeTokens);
+      return [rnStyles.container, layout === 'horizontal' && rnStyles.horizontal, isFramed && rnStyles.framed, isFramed && index > 0 && rnStyles.framedLine, {
+        width
+      }, {
+        outline: 'none'
+      }];
+    },
+    children: _ref10 => {
+      let {
+        hovered: hover,
+        focused: focus,
+        pressed
+      } = _ref10;
+      const themeTokens = getTokens({
+        hover,
+        focus,
+        pressed,
+        selected: isPlaying
+      });
+      return /*#__PURE__*/_jsxs(StackView, {
+        space: layout === 'vertical' ? 2 : 3,
+        direction: layout === 'vertical' ? 'column' : 'row',
+        children: [/*#__PURE__*/_jsx(ImageContainer, { ...themeTokens,
+          children: renderThumbnailImage(themeTokens)
+        }), renderThumbnailInfo(themeTokens)]
+      });
+    }
   }, video.videoId);
 };
 

package/lib-module/VideoPicker/VideoSlider.js

@@ -30,7 +30,7 @@ const VideoSlider = _ref => {
     setContainerWidth(width);
   };
 
-  const itemsGap = 24; // '4' on spacing scale
+  const itemsGap = 32; // '5' on spacing scale
 
   const itemsCount = viewport === 'lg' || viewport === 'xl' ? 4 : 3;
   const itemGapPortioned = (itemsCount - 1) * itemsGap / itemsCount;
@@ -40,7 +40,7 @@ const VideoSlider = _ref => {
   );
 
   const content = /*#__PURE__*/_jsx(StackView, {
-    space: 4,
+    space: 5,
     direction: "row",
     accessibilityRole: "radiogroup",
     tokens: {

package/package.json

@@ -5,14 +5,14 @@
   ],
   "dependencies": {
     "@gorhom/portal": "^1.0.14",
-    "@telus-uds/components-base": "1.53.0",
-    "@telus-uds/system-constants": "^1.2.1",
+    "@telus-uds/components-base": "1.55.0",
+    "@telus-uds/system-constants": "^1.3.0",
     "fscreen": "^1.2.0",
     "lodash.omit": "^4.5.0",
     "react-dates": "^21.8.0",
     "react-helmet-async": "^1.3.0",
     "react-moment-proptypes": "^1.8.1",
-    "@telus-uds/system-theme-tokens": "^2.36.0",
+    "@telus-uds/system-theme-tokens": "^2.38.0",
     "prop-types": "^15.7.2",
     "lodash.throttle": "^4.1.1",
     "react-youtube": "^10.1.0",
@@ -63,5 +63,5 @@
     "skip": true
   },
   "types": "types/index.d.ts",
-  "version": "2.12.0"
+  "version": "2.14.0"
 }

package/src/Autocomplete/Loading.jsx

@@ -1,15 +1,12 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { Box, StackView, Typography } from '@telus-uds/components-base'
+import { Box, StackView } from '@telus-uds/components-base'
 import Spinner from '../Spinner'
 
 const Loading = ({ label }) => (
   <Box space={3}>
     <StackView direction="row" space={2} tokens={{ alignItems: 'center' }}>
-      <Spinner inline={true} show={true} size="small" />
-      <Typography variant={{ size: 'small' }} accessibilityLiveRegion="polite">
-        {label}
-      </Typography>
+      <Spinner inline={true} show={true} label={label} labelPosition="right" />
     </StackView>
   </Box>
 )

package/src/Autocomplete/dictionary.js

@@ -1,12 +1,12 @@
 export default {
   en: {
     hasResults: 'Some results are available',
-    loading: 'Loading suggestions...',
+    loading: 'Searching...',
     noResults: 'No results found'
   },
   fr: {
     hasResults: 'Quelques suggestions sont disponible',
-    loading: 'Chargement en cours...',
+    loading: 'Recherche...',
     noResults: 'Aucun résultat trouvé'
   }
 }

package/src/Badge/Badge.jsx

@@ -42,7 +42,8 @@ const Badge = ({ children, tokens, variant = {}, ...rest }) => {
     paddingTop,
     paddingBottom,
     fontName,
-    fontWeight
+    fontWeight,
+    fontSize
   } = useThemeTokens('Badge', tokens, variant)
 
   const semanticGradient = gradient && transformGradient(gradient)
@@ -56,6 +57,12 @@ const Badge = ({ children, tokens, variant = {}, ...rest }) => {
     background = semanticGradient
   }
 
+  const fontSizeMapping = {
+    12: 'micro',
+    14: 'small',
+    16: 'h6'
+  }
+
   return (
     <BadgeContainer
       isOutlineOffer={isOutlineOffer}
@@ -69,7 +76,12 @@ const Badge = ({ children, tokens, variant = {}, ...rest }) => {
       border={`${borderWidth}px solid ${borderColor}`}
       {...selectProps(rest)}
     >
-      <Typography tokens={{ fontName, fontWeight, color }}>{children}</Typography>
+      <Typography
+        tokens={{ fontName, fontWeight, color }}
+        variant={{ size: fontSizeMapping[fontSize] }}
+      >
+        {children}
+      </Typography>
     </BadgeContainer>
   )
 }

package/src/DatePicker/DatePicker.jsx

@@ -1,4 +1,4 @@
-import React, { forwardRef, useState } from 'react'
+import React, { forwardRef, useEffect, useState } from 'react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
 import momentPropTypes from 'react-moment-proptypes'
@@ -15,6 +15,7 @@ import {
   applyTextStyles
 } from '@telus-uds/components-base'
 import moment from 'moment'
+import { isUndefined } from 'lodash'
 import CalendarContainer from './CalendarContainer'
 import dictionary from './dictionary'
 import { htmlAttrs } from '../utils'
@@ -43,6 +44,7 @@ const getResponsiveCircleSize = (inline = false, viewport = 'md') => {
 
   return responsiveCircleSize
 }
+
 const MonthCenterContainer = styled.div({
   display: 'flex',
   justifyContent: 'center'
@@ -104,6 +106,16 @@ const DatePicker = forwardRef(
     const [isFocused, setIsFocused] = useState(false)
     const [isClickedInside, setIsClickedInside] = useState(false)
     const getCopy = useCopy({ dictionary, copy })
+    useEffect(() => {
+      /**
+       * `date` could be passed as `null` to reset the value so explicitly
+       * checking for not being `undefined`
+       */
+      if (!isUndefined(date) && !moment(date).isSame(inputDate)) {
+        setInputDate(date)
+        setInputText(date instanceof moment ? date.format(dateFormat) : '')
+      }
+    }, [date, inputDate])
     const onFocusChange = ({ focused }) => {
       if (!isClickedInside) {
         setIsFocused(focused)
@@ -132,6 +144,7 @@ const DatePicker = forwardRef(
     const onChange = (value) => {
       setInputDate(value)
       setInputText(value.format(dateFormat))
+      setIsFocused(false)
       if (onDateChange) onDateChange(value)
     }
     const onChangeInput = (value) => {

package/src/NavigationBar/NavigationSubMenu.jsx

@@ -1,6 +1,6 @@
 import React, { useRef } from 'react'
 import PropTypes from 'prop-types'
-import { Icon, Spacer, useResponsiveProp, useThemeTokens } from '@telus-uds/components-base'
+import { Icon, useResponsiveProp, useThemeTokens } from '@telus-uds/components-base'
 import NavigationItem from './NavigationItem'
 import Listbox from '../Listbox'
 import useOverlaidPosition from '../utils/useOverlaidPosition'
@@ -61,12 +61,11 @@ const NavigationSubMenu = ({
       >
         {({ textStyles }) => [
           children,
-          <Spacer key={`${id}_spacer`} space={1} direction="row" />,
           <Icon
             key={`${id}_icon`}
             icon={icoMenu}
-            variant={{ size: 'small' }}
-            tokens={{ color: textStyles[0]?.color, size: textStyles[0]?.fontSize }}
+            variant={{ size: 'micro' }}
+            tokens={{ color: textStyles[0]?.color }}
           />
         ]}
       </NavigationItem>

package/src/QuantitySelector/QuantitySelector.jsx

@@ -1,7 +1,6 @@
 import React, { useState } from 'react'
 import PropTypes from 'prop-types'
 import {
-  getThemeTokens,
   Box,
   TextInput,
   Spacer,
@@ -9,13 +8,12 @@ import {
   InputLabel,
   useInputValue,
   useCopy,
-  useThemeTokens,
-  useTheme
+  useThemeTokensCallback
 } from '@telus-uds/components-base'
 
-import IconButton from '../IconButton'
-import { InputField, InputWrapper, LeftButtonWrapper, RightButtonWrapper } from './styles'
+import { InputField, InputWrapper } from './styles'
 import defaultDictionary from './dictionary'
+import SideButton from './SideButton'
 
 const { isNaN } = Number
 
@@ -28,6 +26,7 @@ const QuantitySelector = ({
   minNumber,
   maxNumber,
   defaultValue,
+  value,
   label,
   hint,
   hintPosition,
@@ -40,13 +39,8 @@ const QuantitySelector = ({
   tokens,
   testID
 }) => {
-  const {
-    components: { QuantitySelector: componentTheme }
-  } = useTheme()
-
-  const { leftIcon, rightIcon, padding } = useThemeTokens('QuantitySelector', tokens, variant)
+  const { disabled } = variant
   const [error, setError] = useState('')
-  const { alternative } = variant
   const getCopy = useCopy({ dictionary, copy })
 
   const getValidatedNumber = (numberToEvaluate) => {
@@ -58,16 +52,14 @@ const QuantitySelector = ({
     return numberToEvaluate
   }
 
-  const initialValue = getValidatedNumber(defaultValue)
-
   const { currentValue: number, setValue: setNumber } = useInputValue({
-    value: undefined,
-    initialValue,
+    value: getValidatedNumber(value),
+    initialValue: getValidatedNumber(defaultValue),
     onChange
   })
 
-  const isDecreaseEnabled = !isNumber(minNumber) || number > minNumber
-  const isIncreaseEnabled = !isNumber(maxNumber) || number < maxNumber
+  const isDecreaseEnabled = (!disabled && !isNumber(minNumber)) || number > minNumber
+  const isIncreaseEnabled = (!disabled && !isNumber(maxNumber)) || number < maxNumber
   const inputValue = isNumber(number) ? number.toString() : ''
 
   const updateNumber = (newNumber, originalInputEvent) => {
@@ -101,24 +93,34 @@ const QuantitySelector = ({
       />
     ) : null
 
+  const getTokens = useThemeTokensCallback('QuantitySelector', tokens, variant)
+
   const renderTextInput = () => (
     <TextInput
       nativeID={id}
       value={inputValue}
+      defaultValue={defaultValue}
       tokens={(textInputState) => {
-        const { inputBorderColor, inputBackgroundColor } = getThemeTokens(
-          componentTheme,
-          tokens,
-          variant,
-          textInputState
-        )
-
+        const {
+          inputWidth,
+          inputBorderWidth,
+          inputBorderColor,
+          textColor,
+          inputBackgroundColor,
+          ...rest
+        } = getTokens({
+          ...textInputState
+        })
         return {
-          borderRadius: 0,
-          margin: 0,
-          padding: 0,
+          ...rest,
+          order: 1,
+          borderWidth: inputBorderWidth,
+          backgroundColor: inputBackgroundColor,
+          color: textColor,
+          width: inputWidth,
           borderColor: inputBorderColor,
-          backgroundColor: inputBackgroundColor
+          borderRadius: 0,
+          outerBorderWidth: 0
         }
       }}
       onChange={inputChangeHandler}
@@ -133,58 +135,34 @@ const QuantitySelector = ({
     />
   )
 
-  const getButtonTokens = (isEnabled) => (buttonState) => {
-    const disabled = !isEnabled
-    const { ...buttonTokens } = getThemeTokens(componentTheme, tokens, variant, {
-      ...buttonState,
-      disabled
-    })
-
-    return {
-      ...buttonTokens,
-      outerBorderGap: 0,
-      padding
-    }
-  }
-
-  const renderLeftButton = () => {
-    return (
-      <IconButton
-        icon={leftIcon}
-        tokens={getButtonTokens(isDecreaseEnabled)}
-        onPress={(event) => updateNumber(number - 1, event)}
-        onDoubleClick={(event) => updateNumber(number - 1, event)}
-        accessibilityLabel={getCopy('accessibility').decreaseButton}
-        accessibilityDisabled={!isDecreaseEnabled}
-      />
-    )
-  }
-
-  const renderRightButton = () => (
-    <IconButton
-      icon={rightIcon}
-      tokens={getButtonTokens(isIncreaseEnabled)}
-      onPress={() => updateNumber(number + 1)}
-      onDoubleClick={() => updateNumber(number + 1)}
-      accessibilityLabel={getCopy('accessibility').increaseButton}
-      accessibilityDisabled={!isIncreaseEnabled}
-    />
-  )
-
   return (
     <Box space={2} testID={testID}>
       {renderLabel()}
       <Spacer space={2} />
       <InputWrapper>
-        <InputField className={`${alternative ? 'alternative' : ''}`}>
-          {renderTextInput()}
-        </InputField>
-        <RightButtonWrapper className={`${alternative ? 'alternative' : ''}`}>
-          {renderRightButton()}
-        </RightButtonWrapper>
-        <LeftButtonWrapper className={`${alternative ? 'alternative' : ''}`}>
-          {renderLeftButton()}
-        </LeftButtonWrapper>
+        <InputField>{renderTextInput()}</InputField>
+        <div style={{ order: 0 }}>
+          <SideButton
+            isEnabled={isDecreaseEnabled}
+            onPress={() => updateNumber(number - 1)}
+            onDoubleClick={() => updateNumber(number - 1)}
+            tokens={tokens}
+            variant={{ decrease: true, ...variant }}
+            accessibilityLabel={getCopy('accessibility').decreaseButton}
+            accessibilityDisabled={!isDecreaseEnabled}
+          />
+        </div>
+        <div style={{ order: 2 }}>
+          <SideButton
+            isEnabled={isIncreaseEnabled}
+            onPress={() => updateNumber(number + 1)}
+            onDoubleClick={() => updateNumber(number + 1)}
+            accessibilityLabel={getCopy('accessibility').increaseButton}
+            accessibilityDisabled={!isIncreaseEnabled}
+            tokens={tokens}
+            variant={{ increase: true, ...variant }}
+          />
+        </div>
       </InputWrapper>
       {error ? (
         <Box vertical={2}>
@@ -230,6 +208,11 @@ QuantitySelector.propTypes = {
    * The default value of the input field
    */
   defaultValue: PropTypes.number,
+  /**
+   * If the input's state is to be controlled by a parent component, use this prop
+   * together with the `onChange` to pass down and update the lifted state.
+   */
+  value: PropTypes.number,
   /**
    * The label of the input field
    */
@@ -262,7 +245,8 @@ QuantitySelector.propTypes = {
    */
   copy: PropTypes.oneOfType([PropTypes.oneOf(['en', 'fr'])]),
   variant: PropTypes.exact({
-    alternative: PropTypes.bool
+    alternative: PropTypes.bool,
+    disabled: PropTypes.bool
   }),
   tokens: PropTypes.oneOf([PropTypes.object, PropTypes.func]),
   /**