@telus-uds/components-base 1.54.0 → 1.56.0

package/src/Carousel/CarouselTabs/CarouselTabsPanel.jsx

@@ -17,11 +17,6 @@ const CarouselTabsPanel = forwardRef(({ items }, ref) => {
   const firstTabRef = useRef()
   const [isInverse, setIsInverse] = useState(false)
 
-  // TODO: figure out a better cross-brand way to specify subcomponent variants.
-  // For now, this picks an Allium variant, and does nothing in brands that lack it.
-  // See similar comment in Carousel and https://github.com/telus/universal-design-system/issues/1549
-  const dividerVariant = { decorative: true }
-
   const lastTabSelected = activeIndex === items.length - 1
 
   // Get current select tab style
@@ -30,6 +25,11 @@ const CarouselTabsPanel = forwardRef(({ items }, ref) => {
     setIsInverse(selectedVariantIsInverse?.inverse)
   }, [items, activeIndex])
 
+  // TODO: figure out a better cross-brand way to specify subcomponent variants.
+  // For now, this picks an Allium variant, and does nothing in brands that lack it.
+  // See similar comment in Carousel and https://github.com/telus/universal-design-system/issues/1549
+  const dividerVariant = { decorative: true, inverse: isInverse }
+
   return (
     <View style={selectTabPanelStyle()}>
       <StackView direction="row" space={3} divider={{ variant: dividerVariant }} ref={ref}>

package/src/Carousel/CarouselThumbnail.jsx

@@ -2,14 +2,25 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { Pressable, Image } from 'react-native'
 import { useCarousel } from './CarouselContext'
+import { useThemeTokensCallback } from '../ThemeProvider'
+import { useViewport } from '../ViewportProvider'
+
+const selectPressableTokens = ({ borderColor, borderRadius, borderWidth, margin, padding }) => ({
+  borderColor,
+  borderRadius,
+  borderWidth,
+  margin,
+  padding
+})
 
 /**
  * `Carousel.Thumbnail` is used to wrap the content of an individual slide and is suppsoed to be the
  * only top-level component passed to the `Carousel`
  */
 const CarouselThumbnail = ({ accessibilityLabel, alt, index, src }) => {
-  const { activeIndex, itemLabel, totalItems, getCopyWithPlaceholders, goTo, themeTokens } =
-    useCarousel()
+  const { activeIndex, itemLabel, totalItems, getCopyWithPlaceholders, goTo } = useCarousel()
+  const getThumbnailTokens = useThemeTokensCallback('CarouselThumbnail')
+  const viewport = useViewport()
   const thumbnailTitle =
     alt ??
     getCopyWithPlaceholders('stepTrackerLabel')
@@ -21,32 +32,17 @@ const CarouselThumbnail = ({ accessibilityLabel, alt, index, src }) => {
     // Allow using the spacebar for navigation
     if (event?.key === ' ') goTo(index)
   }
-  const {
-    thumbnailBorderColor,
-    thumbnailBorderRadius,
-    thumbnailBorderWidth,
-    thumbnailMargin,
-    thumbnailPadding,
-    thumbnailSelectedBorderColor,
-    thumbnailSelectedBorderWidth,
-    thumbnailSize
-  } = themeTokens
+  const { borderWidth, padding, selectedBorderColor, selectedBorderWidth, size } =
+    getThumbnailTokens({ viewport })
   const styles = {
-    pressable: {
-      borderColor: thumbnailBorderColor,
-      borderRadius: thumbnailBorderRadius,
-      borderWidth: thumbnailBorderWidth,
-      margin: thumbnailMargin,
-      padding: thumbnailPadding
-    },
     image: {
-      height: thumbnailSize,
-      width: thumbnailSize
+      height: size,
+      width: size
     },
     selected: {
-      borderColor: thumbnailSelectedBorderColor,
-      borderWidth: thumbnailSelectedBorderWidth,
-      padding: thumbnailPadding - thumbnailSelectedBorderWidth + thumbnailBorderWidth
+      borderColor: selectedBorderColor,
+      borderWidth: selectedBorderWidth,
+      padding: padding - selectedBorderWidth + borderWidth
     }
   }
 
@@ -55,7 +51,17 @@ const CarouselThumbnail = ({ accessibilityLabel, alt, index, src }) => {
       key={src}
       onKeyDown={handleKeyDown}
       onPress={handlePress}
-      style={[styles.pressable, index === activeIndex && styles.selected]}
+      style={({ hovered, pressed, focused }) => {
+        const pressableStyles = selectPressableTokens(
+          getThumbnailTokens({
+            hover: hovered,
+            pressed,
+            focus: focused
+          })
+        )
+
+        return [pressableStyles, index === activeIndex && styles.selected]
+      }}
     >
       <Image
         accessibilityIgnoresInvertColors

package/src/Carousel/CarouselThumbnailNavigation.jsx

@@ -4,19 +4,24 @@ import { View } from 'react-native'
 import { useCarousel } from './CarouselContext'
 import CarouselThumbnail from './CarouselThumbnail'
 import { StackWrap } from '../StackView'
+import { useThemeTokens } from '../ThemeProvider'
+import { useViewport } from '../ViewportProvider'
 
 const CarouselThumbnailNavigation = forwardRef(({ thumbnails = [] }, ref) => {
-  const { totalItems, themeTokens } = useCarousel()
+  const viewport = useViewport()
+  const { alignItems } = useThemeTokens('CarouselThumbnail', {}, { viewport })
+  const { totalItems } = useCarousel()
   if (thumbnails.length !== totalItems) {
     throw new Error('Thumbnail set provided does not match the number of slides in the carousel')
   }
-  const { thumbnailContainerPaddingTop, thumbnailMargin } = themeTokens
+  const { containerPaddingTop: thumbnailContainerPaddingTop, margin: thumbnailMargin } =
+    useThemeTokens('CarouselThumbnail')
   const stackWrapTokens = {
     justifyContent: 'flex-start'
   }
   const containerStyles = {
     justifyContent: 'center',
-    alignItems: 'center',
+    alignItems,
     paddingTop: thumbnailContainerPaddingTop - thumbnailMargin
   }
 

package/src/IconButton/IconButton.jsx

@@ -22,27 +22,71 @@ const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, vie
 
 const selectOuterStyle = ({
   backgroundColor,
-  borderRadius,
   outerBorderWidth,
   outerBorderColor,
   outerBorderGap,
+  borderRadius,
+  borderTopLeftRadius,
+  borderTopRightRadius,
+  borderBottomLeftRadius,
+  borderBottomRightRadius,
   shadow
 }) => [
   {
     backgroundColor,
     ...applyShadowToken(shadow),
-    ...applyOuterBorder({ borderRadius, outerBorderWidth, outerBorderColor, outerBorderGap }),
+    ...applyOuterBorder({
+      borderRadius,
+      borderTopLeftRadius,
+      borderTopRightRadius,
+      borderBottomLeftRadius,
+      borderBottomRightRadius,
+      outerBorderWidth,
+      outerBorderColor,
+      outerBorderGap
+    }),
     ...Platform.select({ web: { outline: 'none', display: 'inline-flex' } })
   },
   staticStyles.outer
 ]
 
-const selectInnerStyle = ({ borderColor, borderWidth = 0, borderRadius, padding = 0 }) => ({
+const calculatePadding = (padding, borderWidth) => padding && Math.max(0, padding - borderWidth) // Stable size as border changes
+
+const selectInnerStyle = ({
+  borderColor,
+  borderWidth,
+  borderTopLeftRadius,
+  borderTopRightRadius,
+  borderBottomLeftRadius,
+  borderBottomRightRadius,
+  borderRadius,
+  padding = 0,
+  borderTopWidth,
+  borderRightWidth,
+  borderBottomWidth,
+  borderLeftWidth,
+  paddingLeft,
+  paddingRight,
+  paddingTop,
+  paddingBottom
+}) => ({
   // Inner borders animate with the icon and should be treated like a themable feature of the icon
   borderColor,
   borderRadius,
   borderWidth,
-  padding: Math.max(0, padding - borderWidth) // Stable size as border changes
+  borderTopLeftRadius,
+  borderTopRightRadius,
+  borderBottomLeftRadius,
+  borderBottomRightRadius,
+  borderTopWidth,
+  borderRightWidth,
+  borderBottomWidth,
+  borderLeftWidth,
+  padding: calculatePadding(padding, borderWidth),
+  paddingLeft: calculatePadding(paddingLeft, borderLeftWidth),
+  paddingRight: calculatePadding(paddingRight, borderRightWidth),
+  paddingTop: calculatePadding(paddingTop, borderTopWidth),
+  paddingBottom: calculatePadding(paddingBottom, borderBottomWidth)
 })
 
 /**
@@ -90,7 +134,7 @@ const IconButton = forwardRef(
           return (
             <View style={selectInnerStyle(themeTokens)}>
               <Icon
-                icon={IconComponent}
+                icon={IconComponent || themeTokens.icon}
                 title={selectedProps.accessibilityLabel}
                 tokens={selectTokens('Icon', themeTokens, 'icon')}
                 variant={variant}
@@ -111,7 +155,7 @@ IconButton.propTypes = {
   /**
    * Defines the icon to be rendered
    */
-  icon: PropTypes.elementType.isRequired,
+  icon: PropTypes.elementType,
   /**
    * URL to navigate to when the `Iconbutton` is pressed
    */

package/src/InputLabel/InputLabel.jsx

@@ -86,7 +86,10 @@ const InputLabel = forwardRef(
             <View
               style={[
                 staticStyles.tooltipAlign,
-                { height: themeTokens.fontSize * themeTokens.lineHeight }
+                {
+                  height: themeTokens.fontSize * themeTokens.lineHeight,
+                  color: themeTokens.color
+                }
               ]}
             >
               <Tooltip content={tooltip} copy={copy} />

package/src/Link/LinkBase.jsx

@@ -36,9 +36,9 @@ const selectOuterBorderStyles = ({
         ...applyOuterBorder({
           outerBorderColor,
           outerBorderWidth,
-          outerBorderGap,
-          borderRadius
-        })
+          outerBorderGap
+        }),
+        borderRadius
       }
     : {}
 
@@ -156,7 +156,6 @@ const LinkBase = forwardRef(
           const themeTokens = resolveLinkTokens(linkState)
           const outerBorderStyles = selectOuterBorderStyles(themeTokens)
           const decorationStyles = selectDecorationStyles(themeTokens)
-
           return [
             outerBorderStyles,
             blockLeftStyle,

package/src/Select/Select.jsx

@@ -119,7 +119,8 @@ const selectIconTokens = ({ iconSize, iconColor }) => ({
 })
 
 const selectIconContainerStyles = ({ paddingRight, paddingBottom }) => ({
-  paddingRight,
+  paddingRight: paddingRight + 4,
+  marginRight: -4,
   paddingBottom
 })
 
@@ -134,7 +135,7 @@ const selectValidationIconContainerStyles = ({
   paddingRight = 0,
   paddingBottom
 }) => ({
-  paddingRight: icon ? paddingRight + iconSize : paddingRight,
+  paddingRight: icon ? paddingRight + iconSize + 4 : paddingRight,
   ...(Platform.OS === 'android'
     ? {
         paddingBottom: paddingBottom + ANDROID_VALIDATION_ICON_CONTAINER_OFFSET

package/src/ThemeProvider/utils/styles.js

@@ -147,6 +147,13 @@ export function verticalAlignRow(verticalAlign, reverse = false) {
   }
 }
 
+const calculateBorderRadius = (borderRadius, outerBorderGap, outerBorderWidth) => {
+  if (borderRadius) {
+    return borderRadius + outerBorderGap + outerBorderWidth
+  }
+
+  return null
+}
 /**
  * Use on an outer container to create an outer border with an optional gap around it
  * that matches the border radius of any inner border.
@@ -155,11 +162,31 @@ export const applyOuterBorder = ({
   outerBorderColor,
   outerBorderWidth = 0,
   outerBorderGap = 0,
-  borderRadius = 0
+  borderRadius,
+  borderTopLeftRadius,
+  borderTopRightRadius,
+  borderBottomLeftRadius,
+  borderBottomRightRadius
 }) => ({
   margin: 0 - outerBorderWidth - outerBorderGap,
   padding: outerBorderGap,
-  borderRadius: borderRadius + outerBorderGap + outerBorderWidth,
+  borderRadius: calculateBorderRadius(borderRadius, outerBorderGap, outerBorderWidth),
+  borderTopLeftRadius: calculateBorderRadius(borderTopLeftRadius, outerBorderGap, outerBorderWidth),
+  borderTopRightRadius: calculateBorderRadius(
+    borderTopRightRadius,
+    outerBorderGap,
+    outerBorderWidth
+  ),
+  borderBottomLeftRadius: calculateBorderRadius(
+    borderBottomLeftRadius,
+    outerBorderGap,
+    outerBorderWidth
+  ),
+  borderBottomRightRadius: calculateBorderRadius(
+    borderBottomRightRadius,
+    outerBorderGap,
+    outerBorderWidth
+  ),
   borderWidth: outerBorderWidth,
   borderColor: outerBorderColor
 })

package/src/TooltipButton/TooltipButton.jsx

@@ -7,7 +7,11 @@ import Icon from '../Icon'
 
 const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
 
-const selectInnerContainerStyles = ({ borderRadius, width }) => ({ borderRadius, width })
+const selectInnerContainerStyles = ({ borderRadius, width, backgroundColor }) => ({
+  borderRadius,
+  width,
+  backgroundColor
+})
 
 const selectIconTokens = ({ iconSize, iconColor, iconScale = 1 }) => ({
   size: iconSize,