@telus-uds/components-base 3.8.0 → 3.10.0

package/lib/cjs/Validator/Validator.js

@@ -44,7 +44,7 @@ const Validator = /*#__PURE__*/_react.default.forwardRef((_ref2, ref) => {
     supportsProps
   } = selectProps(rest);
   const strValidation = supportsProps.validation;
-  const [individualCodes, setIndividualCodes] = _react.default.useState({});
+  const [, setIndividualCodes] = _react.default.useState({});
   const [text, setText] = _react.default.useState(value);
   const validatorsLength = 6;
   const prefix = 'code';
@@ -62,64 +62,85 @@ const Validator = /*#__PURE__*/_react.default.forwardRef((_ref2, ref) => {
   const [codeReferences, singleCodes] = _react.default.useMemo(() => {
     const codes = [];
     const valueCodes = {};
-    for (let i = 0; validatorsLength && i < validatorsLength; i += 1) {
+    Array.from({
+      length: validatorsLength
+    }, (_, i) => {
       codes[prefix + i] = /*#__PURE__*/_react.default.createRef();
       valueCodes[prefix + i] = '';
       valueCodes[prefix + i + sufixValidation] = '';
-    }
+      return null;
+    });
     return [codes, valueCodes];
-  }, []);
-  const handleSingleCodes = (codeId, val, validation) => {
+  }, [validatorsLength, prefix, sufixValidation]);
+  const handleSingleCodes = _react.default.useCallback((codeId, val, validation) => {
     singleCodes[codeId] = val;
     singleCodes[codeId + sufixValidation] = validation;
-    /* eslint-disable no-unused-expressions */
-    setIndividualCodes({
-      ...individualCodes,
+    setIndividualCodes(prev => ({
+      ...prev,
       [codeId]: val
-    });
-  };
-  const changeDataMasking = boxElement => {
+    }));
+  }, [singleCodes, sufixValidation]);
+  const changeDataMasking = _react.default.useCallback(boxElement => {
     let charMasking = '';
     const element = boxElement;
-    if (mask && mask.length === 1) charMasking = mask;else if (mask && mask.length > 1) charMasking = mask.substring(0, 1);
-    if (charMasking) element.value = charMasking;
-  };
-  const handleChangeCode = () => {
-    let code = '';
-    for (let i = 0; i < validatorsLength; i += 1) code += singleCodes[prefix + i];
-    if (typeof onChange === 'function') onChange(code, singleCodes);
-  };
-  const handleChangeCodeValues = (event, codeId, nextIndex) => {
+    if (mask && mask.length === 1) {
+      charMasking = mask;
+    } else if (mask && mask.length > 1) {
+      charMasking = mask.substring(0, 1);
+    }
+    if (charMasking && element) {
+      element.value = charMasking;
+    }
+  }, [mask]);
+  const handleChangeCode = _react.default.useCallback(() => {
+    const code = Array.from({
+      length: validatorsLength
+    }, (_, i) => singleCodes[prefix + i] || '').join('');
+    if (typeof onChange === 'function') {
+      onChange(code, singleCodes);
+    }
+  }, [validatorsLength, singleCodes, prefix, onChange]);
+  const handleChangeCodeValues = _react.default.useCallback((event, codeId, nextIndex) => {
     const codeElement = codeReferences[codeId]?.current;
     const val = event.nativeEvent?.value || event.target?.value;
-    if (Number(val).toString() === 'NaN') {
-      codeElement.value = singleCodes[codeId] ?? '';
-      return;
+
+    // Only allow numeric characters and limit to single digit
+    const numericOnly = val.replace(/\D/g, '').substring(0, 1);
+    if (codeElement && codeElement.value) {
+      codeElement.value = numericOnly;
     }
-    handleSingleCodes(codeId, codeElement?.value ?? singleCodes[codeId], 'success');
+    handleSingleCodes(codeId, numericOnly, numericOnly ? 'success' : '');
     handleChangeCode();
     if (nextIndex === validatorsLength) {
-      codeElement.blur();
+      codeElement?.blur();
       changeDataMasking(codeElement);
       return;
     }
-    if (codeElement?.value?.length > 0) {
-      codeReferences[prefix + nextIndex].current.focus();
+    if (numericOnly.length > 0) {
+      const nextElement = codeReferences[prefix + nextIndex]?.current;
+      nextElement?.focus();
       changeDataMasking(codeElement);
     }
-  };
+  }, [codeReferences, handleSingleCodes, handleChangeCode, validatorsLength, changeDataMasking, prefix]);
   const handleKeyPress = (event, currentIndex, previousIndex) => {
-    if (!(event.keyCode === 8 || event.code === 'Backspace')) return;
+    if (!(event.keyCode === 8 || event.code === 'Backspace')) {
+      return;
+    }
     if (currentIndex > 0) {
-      codeReferences[prefix + currentIndex].current.value = '';
-      codeReferences[prefix + previousIndex].current.focus();
+      const currentElement = codeReferences[prefix + currentIndex]?.current;
+      const previousElement = codeReferences[prefix + previousIndex]?.current;
+      if (currentElement && currentElement.value) {
+        currentElement.value = '';
+      }
+      previousElement?.focus();
     }
     handleSingleCodes(prefix + currentIndex, '', '');
     handleChangeCode();
   };
   const getCodeComponents = () => {
-    const components = [];
-    for (let i = 0; validatorsLength && i < validatorsLength; i += 1) {
+    return Array.from({
+      length: validatorsLength
+    }, (_, i) => {
       const codeId = prefix + i;
       const codeInputProps = {
         nativeID: codeId,
@@ -127,65 +148,115 @@ const Validator = /*#__PURE__*/_react.default.forwardRef((_ref2, ref) => {
         ref: codeReferences[codeId] ?? null,
         validation: strValidation || singleCodes[codeId + sufixValidation],
         tokens: selectCodeTextInputTokens(themeTokens),
-        onFocus: () => codeReferences[codeId]?.current?.select() ?? null,
+        onFocus: () => {
+          const element = codeReferences[codeId]?.current;
+          if (_Platform.default.OS === 'web' && element?.select) {
+            return element.select() ?? null;
+          }
+          if (element?.focus) {
+            return element.focus() ?? null;
+          }
+          return null;
+        },
         onKeyPress: event => handleKeyPress(event, i, i - 1),
         onMouseOver: handleMouseOver,
         onMouseOut: handleMouseOut,
         inactive
       };
-      codeInputProps.validation || delete codeInputProps.validation;
-      components.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
+      if (!codeInputProps.validation) {
+        delete codeInputProps.validation;
+      }
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_View.default, {
         style: staticStyles.codeInputWidth,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextInput.TextInput, {
           ...codeInputProps
         })
-      }, codeId));
-    }
-    return components;
+      }, codeId);
+    });
   };
   _react.default.useEffect(() => {
-    /* eslint-disable no-unused-expressions */
-    if (Number(value).toString() !== 'NaN') setText(value);
+    if (Number(value).toString() !== 'NaN') {
+      setText(value);
+    }
   }, [value]);
-
-  /* eslint-disable react-hooks/exhaustive-deps */
   _react.default.useEffect(() => {
-    for (let i = 0; i < validatorsLength; i += 1) {
-      if (mask && text[i]) codeReferences[prefix + i].current.value = mask;else codeReferences[prefix + i].current.value = text[i] ?? '';
+    Array.from({
+      length: validatorsLength
+    }, (_, i) => {
+      const element = codeReferences[prefix + i]?.current;
+      if (element && element.value !== undefined) {
+        if (mask && text[i]) {
+          element.value = mask;
+        } else {
+          element.value = text[i] ?? '';
+        }
+      }
       handleSingleCodes(prefix + i, text[i] ?? '', text[i] ? 'success' : '');
-    }
-  }, [text]);
-
-  /* eslint-disable react-hooks/exhaustive-deps */
+      return null;
+    });
+  }, [text, mask, validatorsLength, prefix, codeReferences, handleSingleCodes]);
   _react.default.useEffect(() => {
     const handlePasteCode = event => {
+      event.preventDefault();
+
+      // Clear current state first
       setText('');
+
+      // Clear all individual input fields and their state
+      Array.from({
+        length: validatorsLength
+      }, (_, i) => {
+        const element = codeReferences[prefix + i]?.current;
+        if (element && element.value !== undefined) {
+          element.value = '';
+        }
+        handleSingleCodes(prefix + i, '', '');
+        return null;
+      });
       const clipBoardText = event.clipboardData.getData('text');
-      if (Number(clipBoardText).toString() !== 'NaN') setText(clipBoardText);
+
+      // Validate that input contains only digits and truncate to 6 characters
+      const numericOnly = clipBoardText.replace(/\D/g, '').substring(0, validatorsLength);
+      if (numericOnly.length > 0) {
+        setText(numericOnly);
+      }
     };
     const handleCopy = event => {
-      let clipBoardText = '';
-      for (let i = 0; i < validatorsLength; i += 1) singleCodes[prefix + i] && (clipBoardText += singleCodes[prefix + i]);
+      const clipBoardText = Array.from({
+        length: validatorsLength
+      }, (_, i) => singleCodes[prefix + i] || '').join('');
       event.clipboardData.setData('text/plain', clipBoardText);
       event.preventDefault();
     };
     if (_Platform.default.OS === 'web') {
-      for (let i = 0; i < validatorsLength; i += 1) {
-        codeReferences[prefix + i].current.addEventListener('paste', handlePasteCode);
-        codeReferences[prefix + i].current.addEventListener('copy', handleCopy);
-        codeReferences[prefix + i].current.addEventListener('input', event => handleChangeCodeValues(event, prefix + i, i + 1));
-      }
+      Array.from({
+        length: validatorsLength
+      }, (_, i) => {
+        const element = codeReferences[prefix + i]?.current;
+        if (element && typeof element.addEventListener === 'function') {
+          element.addEventListener('paste', handlePasteCode);
+          element.addEventListener('copy', handleCopy);
+          element.addEventListener('input', event => handleChangeCodeValues(event, prefix + i, i + 1));
+        }
+        return null;
+      });
     }
     return () => {
-      if (_Platform.default.oldValue === 'web') {
-        for (let i = 0; i < validatorsLength; i += 1) {
-          codeReferences[prefix + i]?.current?.removeEventListener('paste', handlePasteCode);
-          codeReferences[prefix + i]?.current?.removeEventListener('copy', handleCopy);
-          codeReferences[prefix + i]?.current?.removeEventListener('input', event => handleChangeCodeValues(event, prefix + i, i + 1));
-        }
+      if (_Platform.default.OS === 'web') {
+        Array.from({
+          length: validatorsLength
+        }, (_, i) => {
+          const element = codeReferences[prefix + i]?.current;
+          if (element && typeof element.removeEventListener === 'function') {
+            element.removeEventListener('paste', handlePasteCode);
+            element.removeEventListener('copy', handleCopy);
+            element.removeEventListener('input', event => handleChangeCodeValues(event, prefix + i, i + 1));
+          }
+          return null;
+        });
       }
     };
-  }, []);
+  }, [validatorsLength, prefix, codeReferences, handleChangeCodeValues, handleSingleCodes, singleCodes]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InputSupports.default, {
     ...supportsProps,
     feedbackProps: {

package/lib/esm/Autocomplete/Autocomplete.js

@@ -401,7 +401,10 @@ const dictionaryContentShape = PropTypes.shape({
 Autocomplete.propTypes = {
   ...selectedSystemPropTypes,
   /**
-   * Can be used to provide a function that renders a custom input:
+   * Can be used to provide a function that renders a custom input.
+   *
+   * @example
+   * ```jsx
    * <Autocomplete items={items} value={currentValue}>
    *   {({ inputId, inputRef, onChange, onKeyPress, readOnly, tokens, value }) => (
    *     <Search
@@ -415,6 +418,7 @@ Autocomplete.propTypes = {
    *     />
    *   )}
    * </Autocomplete>
+   * ```
    */
   children: PropTypes.func,
   tokens: getTokensPropType('Autocomplete'),

package/lib/esm/Button/ButtonBase.js

@@ -17,7 +17,23 @@ const getOuterBorderOffset = _ref => {
   } = _ref;
   return outerBorderGap + outerBorderWidth;
 };
-const selectOuterContainerStyles = _ref2 => {
+const selectFlexAndWidthStyles = _ref2 => {
+  let {
+    width,
+    flex
+  } = _ref2;
+  const styles = {};
+  if (width !== undefined && width !== null) {
+    styles.width = width;
+  }
+  if (width === '100%') {
+    styles.flex = 1;
+  } else if (flex !== undefined && flex !== null) {
+    styles.flex = flex;
+  }
+  return styles;
+};
+const selectOuterContainerStyles = _ref3 => {
   let {
     opacity,
     outerBorderColor,
@@ -25,7 +41,7 @@ const selectOuterContainerStyles = _ref2 => {
     outerBorderGap,
     borderRadius,
     outerBackgroundColor
-  } = _ref2;
+  } = _ref3;
   return {
     ...Platform.select({
       native: {
@@ -42,13 +58,13 @@ const selectOuterContainerStyles = _ref2 => {
     })
   };
 };
-const selectOuterSizeStyles = _ref3 => {
+const selectOuterSizeStyles = _ref4 => {
   let {
     outerBorderGap,
     outerBorderWidth,
     width,
     height
-  } = _ref3;
+  } = _ref4;
   // The inner container's bounding box is the bounding box of the button overall
   // so this many device pixels will sit outside of the overall bounding box
   const outerBorderOffset = getOuterBorderOffset({
@@ -93,7 +109,7 @@ const selectOuterSizeStyles = _ref3 => {
   sizeStyles.height = height;
   return sizeStyles;
 };
-const selectInnerContainerStyles = _ref4 => {
+const selectInnerContainerStyles = _ref5 => {
   let {
     backgroundColor,
     paddingLeft,
@@ -107,14 +123,14 @@ const selectInnerContainerStyles = _ref4 => {
     borderTopWidth,
     borderBottomWidth,
     minWidth
-  } = _ref4;
+  } = _ref5;
   // Subtract border width from padding so overall button width/height doesn't
   // jump around if the border width changes (avoiding NaN and negative padding)
-  const offsetBorder = _ref5 => {
+  const offsetBorder = _ref6 => {
     let {
       value,
       borderSize = borderWidth
-    } = _ref5;
+    } = _ref6;
     return typeof value === 'number' && typeof borderSize === 'number' ? Math.max(0, value - borderSize) : value;
   };
   return {
@@ -139,7 +155,7 @@ const selectInnerContainerStyles = _ref4 => {
     ...applyShadowToken(shadow)
   };
 };
-const selectBorderStyles = _ref6 => {
+const selectBorderStyles = _ref7 => {
   let {
     borderColor,
     borderWidth,
@@ -148,7 +164,7 @@ const selectBorderStyles = _ref6 => {
     borderRightWidth,
     borderTopWidth,
     borderBottomWidth
-  } = _ref6;
+  } = _ref7;
   return {
     borderColor,
     borderWidth,
@@ -159,7 +175,7 @@ const selectBorderStyles = _ref6 => {
     borderBottomWidth
   };
 };
-const selectTextStyles = (_ref7, themeOptions) => {
+const selectTextStyles = (_ref8, themeOptions) => {
   let {
     fontSize,
     color,
@@ -169,7 +185,7 @@ const selectTextStyles = (_ref7, themeOptions) => {
     textAlign,
     textLine,
     textLineStyle
-  } = _ref7;
+  } = _ref8;
   return applyTextStyles({
     fontSize,
     color,
@@ -182,10 +198,10 @@ const selectTextStyles = (_ref7, themeOptions) => {
     textDecorationStyle: textLineStyle
   });
 };
-const selectWebOnlyStyles = (inactive, themeTokens, _ref8) => {
+const selectWebOnlyStyles = (inactive, themeTokens, _ref9) => {
   let {
     accessibilityRole
-  } = _ref8;
+  } = _ref9;
   return Platform.select({
     web: {
       // if it would overflow the container, wraps instead
@@ -198,27 +214,27 @@ const selectWebOnlyStyles = (inactive, themeTokens, _ref8) => {
     default: {}
   });
 };
-const selectButtonStyles = _ref9 => {
+const selectButtonStyles = _ref10 => {
   let {
     textAlign
-  } = _ref9;
+  } = _ref10;
   return {
     flexDirection: 'row',
     justifyContent: textAlign
   };
 };
-const selectItemIconTokens = _ref10 => {
+const selectItemIconTokens = _ref11 => {
   let {
     color,
     iconColor,
     iconSize
-  } = _ref10;
+  } = _ref11;
   return {
     size: iconSize,
     color: iconColor || color
   };
 };
-const ButtonBase = /*#__PURE__*/React.forwardRef((_ref11, ref) => {
+const ButtonBase = /*#__PURE__*/React.forwardRef((_ref12, ref) => {
   let {
     id,
     href,
@@ -233,7 +249,7 @@ const ButtonBase = /*#__PURE__*/React.forwardRef((_ref11, ref) => {
     iconPosition = icon ? 'left' : undefined,
     iconProps,
     ...rawRest
-  } = _ref11;
+  } = _ref12;
   const {
     onPress,
     ...rest
@@ -247,7 +263,9 @@ const ButtonBase = /*#__PURE__*/React.forwardRef((_ref11, ref) => {
   const systemProps = selectProps(rest);
   const getPressableStyle = pressableState => {
     const themeTokens = resolveButtonTokens(pressableState);
-    return [staticStyles.row, selectWebOnlyStyles(inactive, themeTokens, systemProps), selectOuterContainerStyles(themeTokens), selectOuterSizeStyles(themeTokens)];
+    // Only apply flex and width styles when they are explicitly set (e.g., from ButtonGroup with width: 'equal') to not to affect other use cases
+    const flexAndWidthStyles = themeTokens.width === '100%' && themeTokens.flex === 1 ? selectFlexAndWidthStyles(themeTokens) : {};
+    return [staticStyles.row, selectWebOnlyStyles(inactive, themeTokens, systemProps), selectOuterContainerStyles(themeTokens), ...(Object.keys(flexAndWidthStyles).length > 0 ? [flexAndWidthStyles] : []), selectOuterSizeStyles(themeTokens)];
   };
   const {
     themeOptions

package/lib/esm/Button/ButtonGroup.js

@@ -12,6 +12,15 @@ import { getPressHandlersWithArgs } from '../utils/pressability';
 import { jsx as _jsx } from "react/jsx-runtime";
 const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps]);
 const [selectItemProps, selectedItemPropTypes] = selectSystemProps([a11yProps, focusHandlerProps, pressProps, viewProps]);
+const getStackWrapTokens = variant => {
+  return Platform.select({
+    web: {
+      justifyContent: variant?.width === 'equal' ? 'space-evenly' : 'flex-start',
+      width: variant?.width === 'equal' ? '100%' : 'auto'
+    },
+    default: {}
+  });
+};
 const ButtonGroup = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
     variant,
@@ -44,7 +53,12 @@ const ButtonGroup = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   const themeTokens = useThemeTokens('ButtonGroup', tokens, variant, {
     viewport
   });
-  const stackTokens = selectTokens('StackView', themeTokens);
+  const themeStackTokens = selectTokens('StackView', themeTokens);
+  const variantStackTokens = getStackWrapTokens(variant);
+  const stackTokens = {
+    ...themeStackTokens,
+    ...variantStackTokens
+  };
   const {
     direction,
     space,
@@ -54,7 +68,15 @@ const ButtonGroup = /*#__PURE__*/React.forwardRef((_ref, ref) => {
     padding,
     gap
   } = themeTokens;
-  const getButtonTokens = useThemeTokensCallback('ButtonGroupItem', tokens, variant);
+  const themeButtonTokensCallback = useThemeTokensCallback('ButtonGroupItem', tokens, variant);
+  const getButtonTokens = state => {
+    const themeButtonTokens = themeButtonTokensCallback(state);
+    return {
+      ...themeButtonTokens,
+      width: variant?.width === 'equal' ? '100%' : 'auto',
+      flex: variant?.width === 'equal' ? 1 : undefined
+    };
+  };
   const {
     currentValues,
     toggleOneValue
@@ -97,7 +119,7 @@ const ButtonGroup = /*#__PURE__*/React.forwardRef((_ref, ref) => {
       padding,
       ...(Platform.OS === 'web' ? {
         gap,
-        width: 'fit-content'
+        width: variant?.width === 'equal' ? '100%' : 'fit-content'
       } : {
         alignSelf: 'flex-start'
       })

package/lib/esm/MultiSelectFilter/ModalOverlay.js

@@ -56,6 +56,7 @@ const staticStyles = StyleSheet.create({
 });
 const selectContainerStyle = (enableFullscreen, themeTokens) => ({
   borderColor: themeTokens.borderColor,
+  backgroundColor: themeTokens.backgroundColor,
   ...Platform.select({
     web: {
       position: enableFullscreen ? 'fixed' : 'absolute'
@@ -107,7 +108,8 @@ const ModalOverlay = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
     maxHeight: maxHeightSize
   };
   const {
-    closeIcon: CloseIconComponent
+    closeIcon: CloseIconComponent,
+    backgroundColor
   } = themeTokens;
   const getCopy = useCopy({
     dictionary,
@@ -120,7 +122,10 @@ const ModalOverlay = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
       onLayout: onLayout,
       style: [overlaidPosition, containerWidthHeight, staticStyles.positioner, !isReady && staticStyles.hidden, selectContainerStyle(enableFullscreen, themeTokens)],
       children: /*#__PURE__*/_jsxs(Card, {
-        tokens: staticStyles.card,
+        tokens: {
+          ...staticStyles.card,
+          backgroundColor
+        },
         children: [/*#__PURE__*/_jsx(View, {
           style: [staticStyles.closeButtonContainer, selectCloseButtonContainerStyles(themeTokens)],
           children: /*#__PURE__*/_jsx(IconButton, {

package/lib/esm/MultiSelectFilter/MultiSelectFilter.js

@@ -135,6 +135,7 @@ const MultiSelectFilter = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
     buttonBackgroundColor,
     iconColorSelected,
     buttonBackgroundColorSelected,
+    containerBorderColor,
     ...restTokens
   } = useThemeTokens('MultiSelectFilter', tokens, {
     ...variant,
@@ -280,7 +281,7 @@ const MultiSelectFilter = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
             ...headerStyles,
             lineHeight: headerLineHeight
           },
-          children: getCopy('filterByLabel').replace(/%\{filterCategory\}/g, label.toLowerCase())
+          children: getCopy('filterByLabel').replace(/%\{filterCategory\}/g, label)
         })
       })
     }), subtitle && /*#__PURE__*/_jsxs(_Fragment, {
@@ -301,6 +302,7 @@ const MultiSelectFilter = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
       style: styles.options,
       children: /*#__PURE__*/_jsx(ScrollView, {
         onLayout: handleScrollViewLayout,
+        style: styles.scrollContainer,
         children: /*#__PURE__*/_jsx(Row, {
           distribute: "between",
           onLayout: handleRowLayout,
@@ -319,12 +321,11 @@ const MultiSelectFilter = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
     })]
   });
   const controlsContent = /*#__PURE__*/_jsxs(_Fragment, {
-    children: [isScrolling ? /*#__PURE__*/_jsx(Divider, {
+    children: [isScrolling && /*#__PURE__*/_jsx(Divider, {
       tokens: {
         color: dividerColor
-      },
-      space: 4
-    }) : /*#__PURE__*/_jsx(Spacer, {
+      }
+    }), /*#__PURE__*/_jsx(Spacer, {
       space: 4
     }), /*#__PURE__*/_jsx(View, {
       style: selectControlsTokens(restTokens),
@@ -381,7 +382,8 @@ const MultiSelectFilter = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
       minWidth: windowWidth,
       tokens: {
         ...tokens,
-        maxWidth: true
+        maxWidth: true,
+        borderColor: containerBorderColor
       },
       copy: copy,
       isReady: isReady,
@@ -407,7 +409,8 @@ const MultiSelectFilter = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
       minWidth: minWidth,
       tokens: {
         ...tokens,
-        maxWidth: items.length > MAX_ITEMS_THRESHOLD ? true : maxWidth
+        maxWidth: items.length > MAX_ITEMS_THRESHOLD ? true : maxWidth,
+        borderColor: containerBorderColor
       },
       copy: copy,
       isReady: isReady,
@@ -435,6 +438,9 @@ const styles = StyleSheet.create({
   },
   options: {
     flex: 1
+  },
+  scrollContainer: {
+    padding: 1
   }
 });
 

package/lib/esm/ToggleSwitch/ToggleSwitch.js

@@ -94,6 +94,17 @@ const selectSwitchStyles = _ref6 => {
     })
   };
 };
+const selectMobileTokens = tokens => ({
+  ...Platform.select({
+    web: {},
+    default: {
+      switchSize: tokens?.mobileSwitchSize,
+      trackHeight: tokens?.mobileTrackHeight,
+      width: tokens?.mobileWidth,
+      trackBorderWidth: tokens?.mobileTrackBorderWidth
+    }
+  })
+});
 const selectLabelStyles = _ref7 => {
   let {
     labelMarginLeft
@@ -146,7 +157,7 @@ const ToggleSwitch = /*#__PURE__*/React.forwardRef((_ref9, ref) => {
     onChange
   });
   const handlePress = event => setValue(!currentValue, event);
-  const getButtonTokens = buttonState => selectButtonTokens(getTokens(buttonState), getTokens(themeTokens));
+  const getButtonTokens = buttonState => selectButtonTokens(getTokens(buttonState, selectMobileTokens(themeTokens)), getTokens(themeTokens, selectMobileTokens(themeTokens)));
   const uniqueId = useUniqueId('toggleSwitch');
   const inputId = id ?? uniqueId;
   return /*#__PURE__*/_jsxs(StackView, {
@@ -179,7 +190,7 @@ const ToggleSwitch = /*#__PURE__*/React.forwardRef((_ref9, ref) => {
       onPress: handlePress,
       ...selectProps(rest),
       children: buttonState => {
-        const stateTokens = getTokens(buttonState);
+        const stateTokens = getTokens(buttonState, selectMobileTokens(themeTokens));
         const IconComponent = stateTokens.icon;
         const switchStyles = selectSwitchStyles(stateTokens);
         const trackStyles = selectTrackStyles(stateTokens);