@telus-uds/components-web 2.10.0 → 2.12.0

package/src/BlockQuote/BlockQuote.jsx

@@ -110,7 +110,19 @@ const BlockQuote = ({
       )
     }
 
-    return <Typography tokens={{ color, fontWeight: '500' }}>{link}</Typography>
+    return (
+      <Typography
+        tokens={{
+          color,
+          fontName: linkFontName,
+          fontSize: linkFontSize,
+          fontWeight: linkFontWeight,
+          lineHeight: linkLineHeight
+        }}
+      >
+        {link}
+      </Typography>
+    )
   }
 
   const renderQuote = () => {

package/src/Card/Card.jsx

@@ -23,18 +23,22 @@ import FullBleedContent, {
 const selectCardBaseTokens = ({
   backgroundColor,
   borderColor,
+  gradient,
   borderWidth,
   borderRadius,
   shadow,
   minWidth
-}) => ({
-  backgroundColor,
-  borderColor,
-  borderWidth,
-  borderRadius,
-  shadow,
-  minWidth
-})
+}) => {
+  return {
+    backgroundColor,
+    borderColor,
+    gradient,
+    borderWidth,
+    borderRadius,
+    shadow,
+    minWidth
+  }
+}
 
 // Passes React Native-oriented system props through UDS Card
 const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])

package/src/DatePicker/DatePicker.jsx

@@ -91,6 +91,7 @@ const DatePicker = forwardRef(
       tokens,
       variant = {},
       validation,
+      disabled,
       ...rest
     },
     ref
@@ -110,20 +111,22 @@ const DatePicker = forwardRef(
       setIsClickedInside(false)
     }
     const handleFocus = (event) => {
-      if (event.target.tagName === 'INPUT') {
+      if (event.target.tagName === 'INPUT' && !disabled) {
         setIsFocused(true)
       }
     }
     const handleMouseDown = (event) => {
-      if (event.target.tagName === 'INPUT') {
-        setIsClickedInside(true)
-        setIsFocused(true)
-      } else if (event.target.tagName === 'path') {
-        // needed to handle the case where the user clicks on the tooltip icon
-        setIsClickedInside(true)
-        event.stopPropagation()
-      } else {
-        event.stopPropagation()
+      if (!disabled) {
+        if (event.target.tagName === 'INPUT') {
+          setIsClickedInside(true)
+          setIsFocused(true)
+        } else if (event.target.tagName === 'path') {
+          // needed to handle the case where the user clicks on the tooltip icon
+          setIsClickedInside(true)
+          event.stopPropagation()
+        } else {
+          event.stopPropagation()
+        }
       }
     }
     const onChange = (value) => {
@@ -253,9 +256,11 @@ const DatePicker = forwardRef(
               label={dictionary[copy]?.roleDescription ?? label}
               value={inputText}
               validation={validation}
+              inactive={disabled}
             >
               <SingleDatePicker
                 date={inputDate}
+                disabled={disabled}
                 onDateChange={onChange}
                 focused={isFocused}
                 onFocusChange={onFocusChange}
@@ -347,7 +352,11 @@ DatePicker.propTypes = {
   /**
    * Use to visually mark an input as valid or invalid.
    */
-  validation: PropTypes.oneOf(['error', 'success'])
+  validation: PropTypes.oneOf(['error', 'success']),
+  /**
+   * Disable the input which will not open the calendar picker
+   */
+  disabled: PropTypes.bool
 }
 
 DatePicker.defaultProps = {
@@ -361,7 +370,8 @@ DatePicker.defaultProps = {
   hintPosition: 'inline',
   tooltip: undefined,
   onDateChange: () => {},
-  validation: undefined
+  validation: undefined,
+  disabled: false
 }
 
 export default DatePicker

package/src/ExpandCollapseMini/ExpandCollapseMini.jsx

@@ -1,12 +1,9 @@
 import React, { forwardRef } from 'react'
 import PropTypes from 'prop-types'
-import { ExpandCollapse, useThemeTokens } from '@telus-uds/components-base'
+import { ExpandCollapse } from '@telus-uds/components-base'
 import ExpandCollapseMiniControl from './ExpandCollapseMiniControl'
 
 const ExpandCollapseMini = forwardRef(({ children, onToggle, tokens, ...rest }, ref) => {
-  const { variant } = rest
-  const { borderWidth } = useThemeTokens('ExpandCollapseMini', tokens, variant)
-
   const handleChange = (openPanels, event) => {
     if (typeof onToggle === 'function') {
       const isOpen = openPanels.length > 0
@@ -15,13 +12,19 @@ const ExpandCollapseMini = forwardRef(({ children, onToggle, tokens, ...rest },
   }
 
   return (
-    <ExpandCollapse tokens={{ borderWidth }} onChange={handleChange}>
+    <ExpandCollapse onChange={handleChange}>
       {(expandProps) => (
         <ExpandCollapse.Panel
           {...expandProps}
           panelId="ExpandCollapseMiniPanel"
           variant={{ mini: true }}
-          controlTokens={{ icon: null }}
+          controlTokens={{
+            // Remove unwanted look and feel from ExpandCollapse(background pressed, focus border and text underline)
+            icon: null,
+            borderColor: 'transparent',
+            textLine: 'none',
+            backgroundColor: 'transparent'
+          }}
           // TODO refactor
           // eslint-disable-next-line react/no-unstable-nested-components
           control={(pressableState) => (

package/src/ExpandCollapseMini/ExpandCollapseMiniControl.jsx

@@ -13,6 +13,13 @@ const presentationOnly = {
   focusable: false // Stop RNW from setting tabIndex={0}: focus goes to Control only
 }
 
+const selectLinkTokens = ({ color, textLine, lineHeight, fontSize }) => ({
+  color,
+  textLine,
+  blockLineHeight: lineHeight,
+  blockFontSize: fontSize
+})
+
 const ExpandCollapseMiniControl = ({
   pressableState,
   collapseTitle,
@@ -22,9 +29,15 @@ const ExpandCollapseMiniControl = ({
   variant = {},
   ...rest
 }) => {
-  const { expanded, hover } = pressableState || {}
-
-  const { size, icon } = useThemeTokens('ExpandCollapseMiniControl', tokens, variant, { expanded })
+  const { expanded, hover, focus } = pressableState || {}
+  // we only want focus outline when focusing, if user is pressing we don't want the border.
+  const { outerBorderColor } = useThemeTokens('Link', {}, {}, { focus })
+  const { size, icon, ...themeTokens } = useThemeTokens(
+    'ExpandCollapseMiniControl',
+    tokens,
+    variant,
+    { expanded, focus }
+  )
 
   // Choose hover styles when any part of Control is hoverred
   const appearance = { ...variant, hover }
@@ -45,7 +58,11 @@ const ExpandCollapseMiniControl = ({
       variant={appearance}
       icon={icon}
       iconPosition={iconPosition}
-      tokens={(linkState) => ({ ...getTokens(linkState), outerBorderWidth: 0 })}
+      tokens={(linkState) => ({
+        ...getTokens(linkState),
+        ...selectLinkTokens(themeTokens),
+        outerBorderColor
+      })}
       {...presentationOnly}
       {...selectProps(rest)}
     >

package/src/Footnote/FootnoteLink.jsx

@@ -123,8 +123,7 @@ FootnoteLink.propTypes = {
 }
 
 FootnoteLink.defaultProps = {
-  copy: 'en',
-  fontSize: 'smaller'
+  copy: 'en'
 }
 
 export default FootnoteLink

package/src/Listbox/GroupControl.jsx

@@ -1,64 +1,81 @@
 import React from 'react'
 import styled from 'styled-components'
 import PropTypes from 'prop-types'
-import { Icon, Spacer, useThemeTokens } from '@telus-uds/components-base'
+import { Icon, Spacer, useThemeTokens, useListboxContext } from '@telus-uds/components-base'
 
-const StyledControlWrapper = styled.div(({ focus, tokens }) => ({
-  fontFamily: `${tokens.groupFontName}${tokens.groupFontWeight}normal`,
-  fontSize: tokens.groupFontSize,
-  color: tokens.groupColor,
-  textDecoration: tokens.itemTextDecoration,
-  backgroundColor: tokens.groupBackgroundColor,
-  outline: tokens.itemOutline,
-  width: '100%',
-  display: 'flex',
-  justifyContent: 'space-between',
-  ...(focus
-    ? {
-        border: `${tokens.groupBorderWidth} solid ${tokens.groupBorderColor}`,
-        borderRadius: tokens.groupBorderRadius,
-        paddingLeft: `calc(${tokens.groupPaddingLeft}px - ${tokens.groupBorderWidth}px)`,
-        paddingRight: `calc(${tokens.groupPaddingRight}px - ${tokens.groupBorderWidth}px)`,
-        paddingTop: `calc(${tokens.groupPaddingTop}px - ${tokens.groupBorderWidth}px)`,
-        paddingBottom: `calc(${tokens.groupPaddingBottom}px - ${tokens.groupBorderWidth}px)`
-      }
-    : {
-        paddingLeft: tokens.groupPaddingLeft,
-        paddingRight: tokens.groupPaddingRight,
-        paddingTop: tokens.groupPaddingTop,
-        paddingBottom: tokens.groupPaddingBottom
-      })
-}))
+const StyledControlWrapper = styled.div(
+  ({
+    groupFontName,
+    groupFontWeight,
+    groupFontSize,
+    groupColor,
+    groupBackgroundColor,
+    groupBorderColor,
+    groupBorderWidth,
+    groupBorderRadius,
+    groupPaddingLeft,
+    groupPaddingRight,
+    groupPaddingTop,
+    groupPaddingBottom,
+    itemTextDecoration,
+    itemOutline,
+    groupHeight
+  }) => ({
+    fontFamily: `${groupFontName}${groupFontWeight}normal`,
+    fontSize: groupFontSize,
+    color: groupColor,
+    textDecoration: itemTextDecoration,
+    backgroundColor: groupBackgroundColor,
+    outline: itemOutline,
+    width: '100%',
+    height: groupHeight,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    boxSizing: 'border-box',
+    border: `${groupBorderWidth}px solid ${groupBorderColor}`,
+    borderRadius: groupBorderRadius,
+    paddingLeft: groupPaddingLeft - groupBorderWidth,
+    paddingRight: groupPaddingRight - groupBorderWidth,
+    paddingTop: groupPaddingTop - groupBorderWidth,
+    paddingBottom: groupPaddingBottom - groupBorderWidth
+  })
+)
 
-const GroupControl = ({ expanded, pressed, hover, focus, current, label }) => {
+const GroupControl = ({ expanded, pressed, hover, focus, label, id }) => {
+  const { selectedId, setSelectedId } = useListboxContext()
   const tokens = useThemeTokens(
-    'ListBox',
+    'Listbox',
     {},
     {},
     {
       expanded,
       pressed,
       hover,
-      current,
+      current: selectedId === id && id !== undefined,
       focus
     }
   )
 
   return (
-    <StyledControlWrapper {...{ focus, tokens }}>
+    <StyledControlWrapper onClick={() => setSelectedId(id)} {...tokens}>
       {label}
       <Spacer space={1} direction="row" />
-      <Icon icon={tokens.groupIcon} variant={{ size: 'micro' }} />
+      <Icon
+        icon={tokens.groupIcon}
+        tokens={{ color: tokens.groupColor }}
+        variant={{ size: 'micro' }}
+      />
     </StyledControlWrapper>
   )
 }
 
 GroupControl.propTypes = {
+  id: PropTypes.string,
   expanded: PropTypes.bool,
   pressed: PropTypes.bool,
   hover: PropTypes.bool,
   focus: PropTypes.bool,
-  current: PropTypes.bool,
   label: PropTypes.string
 }
 

package/src/Listbox/Listbox.jsx

@@ -1,11 +1,15 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
-import { ExpandCollapse, withLinkRouter } from '@telus-uds/components-base'
+import {
+  ExpandCollapse,
+  useThemeTokens,
+  withLinkRouter,
+  ListboxContext
+} from '@telus-uds/components-base'
 import ListboxGroup from './ListboxGroup'
 import ListboxItem from './ListboxItem'
 import DropdownOverlay from './ListboxOverlay'
-import resolveItemSelection from '../NavigationBar/resolveItemSelection'
 
 const StyledList = styled.ul({
   margin: 0,
@@ -26,12 +30,18 @@ const Listbox = ({
   items = [],
   firstItemRef = null, // focus will be moved to this one once within the menu
   parentRef = null, // to return focus to after leaving the last menu item
-  selectedId,
+  selectedId: defaultSelectedId,
   LinkRouter,
   itemRouterProps,
-  onClose
+  onClose,
+  variant,
+  tokens
 }) => {
-  const initialOpen = getInitialOpen(items, selectedId)
+  const initialOpen = getInitialOpen(items, defaultSelectedId)
+
+  const [selectedId, setSelectedId] = useState(defaultSelectedId)
+
+  const { minHeight, minWidth } = useThemeTokens('Listbox', variant, tokens)
 
   // We need to keep track of each item's ref in order to be able to
   // focus on a specific item via keyboard navigation
@@ -78,53 +88,52 @@ const Listbox = ({
   }, [onClose, handleKeydown])
 
   return (
-    <ExpandCollapse initialOpen={initialOpen} maxOpen={1}>
-      {(expandProps) => (
-        <StyledList role="listbox">
-          {items.map((item, index) => {
-            const { id, label, items: nestedItems } = item
-            const { itemId, selected } = resolveItemSelection(
-              { id, label, items: nestedItems },
-              selectedId
-            )
+    <ListboxContext.Provider value={{ selectedId, setSelectedId }}>
+      <ExpandCollapse initialOpen={initialOpen} maxOpen={1}>
+        {(expandProps) => (
+          <StyledList role="listbox" style={{ minHeight, minWidth }}>
+            {items.map((item, index) => {
+              const { id, label, items: nestedItems } = item
+              const itemId = id ?? label
 
-            // Give `firstItemRef` to the first focusable item
-            const itemRef =
-              (index === 0 && !itemId !== selectedId) || (index === 1 && items[0].id === selectedId)
-                ? firstItemRef
-                : (ref) => {
-                    itemRefs.current[index] = ref
-                    return ref
-                  }
+              // Give `firstItemRef` to the first focusable item
+              const itemRef =
+                (index === 0 && !itemId !== selectedId) ||
+                (index === 1 && items[0].id === selectedId)
+                  ? firstItemRef
+                  : (ref) => {
+                      itemRefs.current[index] = ref
+                      return ref
+                    }
 
-            return nestedItems ? (
-              <ListboxGroup
-                {...item}
-                selectedId={selectedId}
-                key={itemId}
-                expandProps={expandProps}
-                LinkRouter={LinkRouter}
-                itemRouterProps={itemRouterProps}
-                prevItemRef={itemRefs.current[index - 1] ?? null}
-                nextItemRef={itemRefs.current[index + 1] ?? null}
-                ref={itemRef}
-              />
-            ) : (
-              <ListboxItem
-                {...item}
-                selected={selected}
-                key={itemId}
-                LinkRouter={LinkRouter}
-                itemRouterProps={itemRouterProps}
-                prevItemRef={itemRefs.current[index - 1] ?? null}
-                nextItemRef={itemRefs.current[index + 1] ?? null}
-                ref={itemRef}
-              />
-            )
-          })}
-        </StyledList>
-      )}
-    </ExpandCollapse>
+              return nestedItems ? (
+                <ListboxGroup
+                  {...item}
+                  expandProps={expandProps}
+                  LinkRouter={LinkRouter}
+                  itemRouterProps={itemRouterProps}
+                  prevItemRef={itemRefs.current[index - 1] ?? null}
+                  nextItemRef={itemRefs.current[index + 1] ?? null}
+                  ref={itemRef}
+                  key={itemId}
+                />
+              ) : (
+                <ListboxItem
+                  {...item}
+                  key={itemId}
+                  id={itemId}
+                  LinkRouter={LinkRouter}
+                  itemRouterProps={itemRouterProps}
+                  prevItemRef={itemRefs.current[index - 1] ?? null}
+                  nextItemRef={itemRefs.current[index + 1] ?? null}
+                  ref={itemRef}
+                />
+              )
+            })}
+          </StyledList>
+        )}
+      </ExpandCollapse>
+    </ListboxContext.Provider>
   )
 }
 

package/src/Listbox/ListboxGroup.jsx

@@ -1,7 +1,7 @@
 /* eslint-disable react/require-default-props */
 import React, { forwardRef } from 'react'
 import PropTypes from 'prop-types'
-import { ExpandCollapse, withLinkRouter } from '@telus-uds/components-base'
+import { ExpandCollapse, withLinkRouter, useListboxContext } from '@telus-uds/components-base'
 import styled from 'styled-components'
 import ListboxItem from './ListboxItem'
 import GroupControl from './GroupControl'
@@ -31,7 +31,6 @@ const ListboxGroup = forwardRef(
       id,
       label,
       items,
-      selectedId,
       LinkRouter,
       linkRouterProps,
       expandProps,
@@ -41,8 +40,9 @@ const ListboxGroup = forwardRef(
     },
     ref
   ) => {
-    // TODO: implement keyboard navigation via refs for grouped items separately here
+    const { selectedId } = useListboxContext()
 
+    // TODO: implement keyboard navigation via refs for grouped items separately here
     return (
       <StyledGroupWrapper role="option">
         <ExpandCollapse.Panel
@@ -52,34 +52,49 @@ const ListboxGroup = forwardRef(
             paddingLeft: 'none',
             paddingRight: 'none',
             paddingTop: 'none',
-            paddingBottom: 'none'
+            paddingBottom: 'none',
+            backgroundColor: 'transparent',
+            borderColor: 'transparent',
+            textLine: 'none',
+            borderWidth: 0
           }}
           // TODO refactor
           // eslint-disable-next-line react/no-unstable-nested-components
-          control={(controlProps) => <GroupControl {...controlProps} label={label} />}
+          control={(controlProps) => (
+            <GroupControl id={id ?? label} {...controlProps} label={label} />
+          )}
           {...expandProps}
           tokens={{
             contentPaddingLeft: 'none',
             contentPaddingRight: 'none',
             contentPaddingTop: 'none',
-            contentPaddingBottom: 'none'
+            contentPaddingBottom: 'none',
+            borderColor: 'transparent',
+            borderRadius: 0,
+            borderWidth: 0,
+            marginBottom: 0
           }}
           controlRef={ref}
         >
           <StyledList>
-            {items.map((item, index) => (
-              <ListboxItem
-                key={item.label}
-                {...item}
-                selected={item.id === selectedId}
-                isChild
-                LinkRouter={LinkRouter}
-                linkRouterProps={linkRouterProps}
-                {...(index === 0 && { prevItemRef })}
-                {...(index === items.length - 1 && { nextItemRef })}
-                {...(index === items.length - 1 && { onBlur: onLastItemBlur })}
-              />
-            ))}
+            {items.map((item, index) => {
+              return (
+                <ListboxItem
+                  key={item.label}
+                  id={item.id ?? item.label}
+                  {...item}
+                  selected={
+                    (item.id && item.id === selectedId) || (item.label && item.label === selectedId)
+                  }
+                  isChild
+                  LinkRouter={LinkRouter}
+                  linkRouterProps={linkRouterProps}
+                  {...(index === 0 && { prevItemRef })}
+                  {...(index === items.length - 1 && { nextItemRef })}
+                  {...(index === items.length - 1 && { onBlur: onLastItemBlur })}
+                />
+              )
+            })}
           </StyledList>
         </ExpandCollapse.Panel>
       </StyledGroupWrapper>