@telus-uds/components-base 3.8.0 → 3.9.0

package/lib/esm/Validator/Validator.js

@@ -37,7 +37,7 @@ const Validator = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
     supportsProps
   } = selectProps(rest);
   const strValidation = supportsProps.validation;
-  const [individualCodes, setIndividualCodes] = React.useState({});
+  const [, setIndividualCodes] = React.useState({});
   const [text, setText] = React.useState(value);
   const validatorsLength = 6;
   const prefix = 'code';
@@ -55,64 +55,85 @@ const Validator = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
   const [codeReferences, singleCodes] = React.useMemo(() => {
     const codes = [];
     const valueCodes = {};
-    for (let i = 0; validatorsLength && i < validatorsLength; i += 1) {
+    Array.from({
+      length: validatorsLength
+    }, (_, i) => {
       codes[prefix + i] = /*#__PURE__*/React.createRef();
       valueCodes[prefix + i] = '';
       valueCodes[prefix + i + sufixValidation] = '';
-    }
+      return null;
+    });
     return [codes, valueCodes];
-  }, []);
-  const handleSingleCodes = (codeId, val, validation) => {
+  }, [validatorsLength, prefix, sufixValidation]);
+  const handleSingleCodes = React.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.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.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.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,
@@ -120,65 +141,115 @@ const Validator = /*#__PURE__*/React.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.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__*/_jsx(View, {
+      if (!codeInputProps.validation) {
+        delete codeInputProps.validation;
+      }
+      return /*#__PURE__*/_jsx(View, {
         style: staticStyles.codeInputWidth,
         children: /*#__PURE__*/_jsx(TextInput, {
           ...codeInputProps
         })
-      }, codeId));
-    }
-    return components;
+      }, codeId);
+    });
   };
   React.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.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.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.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.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.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__*/_jsx(InputSupports, {
     ...supportsProps,
     feedbackProps: {

package/lib/package.json

@@ -12,7 +12,7 @@
     "@gorhom/portal": "^1.0.14",
     "@react-native-picker/picker": "^2.9.0",
     "@telus-uds/system-constants": "^3.0.0",
-    "@telus-uds/system-theme-tokens": "^4.6.0",
+    "@telus-uds/system-theme-tokens": "^4.7.0",
     "airbnb-prop-types": "^2.16.0",
     "css-mediaquery": "^0.1.2",
     "expo-document-picker": "^13.0.1",
@@ -84,6 +84,6 @@
   "standard-engine": {
     "skip": true
   },
-  "version": "3.8.0",
+  "version": "3.9.0",
   "types": "types/index.d.ts"
 }

package/package.json

@@ -12,7 +12,7 @@
     "@gorhom/portal": "^1.0.14",
     "@react-native-picker/picker": "^2.9.0",
     "@telus-uds/system-constants": "^3.0.0",
-    "@telus-uds/system-theme-tokens": "^4.6.0",
+    "@telus-uds/system-theme-tokens": "^4.7.0",
     "airbnb-prop-types": "^2.16.0",
     "css-mediaquery": "^0.1.2",
     "expo-document-picker": "^13.0.1",
@@ -84,6 +84,6 @@
   "standard-engine": {
     "skip": true
   },
-  "version": "3.8.0",
+  "version": "3.9.0",
   "types": "types/index.d.ts"
 }

package/src/MultiSelectFilter/ModalOverlay.jsx

@@ -50,6 +50,7 @@ const staticStyles = StyleSheet.create({
 
 const selectContainerStyle = (enableFullscreen, themeTokens) => ({
   borderColor: themeTokens.borderColor,
+  backgroundColor: themeTokens.backgroundColor,
   ...Platform.select({
     web: {
       position: enableFullscreen ? 'fixed' : 'absolute'
@@ -99,7 +100,7 @@ const ModalOverlay = React.forwardRef(
       maxHeight: maxHeightSize
     }
 
-    const { closeIcon: CloseIconComponent } = themeTokens
+    const { closeIcon: CloseIconComponent, backgroundColor } = themeTokens
 
     const getCopy = useCopy({ dictionary, copy })
     const closeLabel = getCopy('closeButton')
@@ -117,7 +118,7 @@ const ModalOverlay = React.forwardRef(
             selectContainerStyle(enableFullscreen, themeTokens)
           ]}
         >
-          <Card tokens={staticStyles.card}>
+          <Card tokens={{ ...staticStyles.card, backgroundColor }}>
             <View
               style={[
                 staticStyles.closeButtonContainer,

package/src/MultiSelectFilter/MultiSelectFilter.jsx

@@ -139,6 +139,7 @@ const MultiSelectFilter = React.forwardRef(
       buttonBackgroundColor,
       iconColorSelected,
       buttonBackgroundColorSelected,
+      containerBorderColor,
       ...restTokens
     } = useThemeTokens(
       'MultiSelectFilter',
@@ -270,7 +271,7 @@ const MultiSelectFilter = React.forwardRef(
         <Row>
           <View>
             <Typography tokens={{ ...headerStyles, lineHeight: headerLineHeight }}>
-              {getCopy('filterByLabel').replace(/%\{filterCategory\}/g, label.toLowerCase())}
+              {getCopy('filterByLabel').replace(/%\{filterCategory\}/g, label)}
             </Typography>
           </View>
         </Row>
@@ -286,7 +287,7 @@ const MultiSelectFilter = React.forwardRef(
         )}
         <Spacer space={4} />
         <View style={styles.options}>
-          <ScrollView onLayout={handleScrollViewLayout}>
+          <ScrollView onLayout={handleScrollViewLayout} style={styles.scrollContainer}>
             <Row distribute="between" onLayout={handleRowLayout}>
               {[...Array(colSize).keys()].map((i) => (
                 <Col xs={TOTAL_COLUMNS / colSize} key={i}>
@@ -306,16 +307,14 @@ const MultiSelectFilter = React.forwardRef(
 
     const controlsContent = (
       <>
-        {isScrolling ? (
+        {isScrolling && (
           <Divider
             tokens={{
               color: dividerColor
             }}
-            space={4}
           />
-        ) : (
-          <Spacer space={4} />
         )}
+        <Spacer space={4} />
         <View style={selectControlsTokens(restTokens)}>
           <Row horizontalAlign={buttonDirection === 'column' ? 'center' : 'start'}>
             <StackView
@@ -368,7 +367,8 @@ const MultiSelectFilter = React.forwardRef(
             minWidth={windowWidth}
             tokens={{
               ...tokens,
-              maxWidth: true
+              maxWidth: true,
+              borderColor: containerBorderColor
             }}
             copy={copy}
             isReady={isReady}
@@ -397,7 +397,8 @@ const MultiSelectFilter = React.forwardRef(
             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}
@@ -430,6 +431,9 @@ const styles = StyleSheet.create({
   },
   options: {
     flex: 1
+  },
+  scrollContainer: {
+    padding: 1
   }
 })
 

package/src/ToggleSwitch/ToggleSwitch.jsx

@@ -77,6 +77,18 @@ const selectSwitchStyles = ({
   })
 })
 
+const selectMobileTokens = (tokens) => ({
+  ...Platform.select({
+    web: {},
+    default: {
+      switchSize: tokens?.mobileSwitchSize,
+      trackHeight: tokens?.mobileTrackHeight,
+      width: tokens?.mobileWidth,
+      trackBorderWidth: tokens?.mobileTrackBorderWidth
+    }
+  })
+})
+
 const selectLabelStyles = ({ labelMarginLeft }) => ({ marginLeft: labelMarginLeft })
 const selectLabelTokens = ({
   labelColor,
@@ -123,7 +135,10 @@ const ToggleSwitch = React.forwardRef(
 
     const handlePress = (event) => setValue(!currentValue, event)
     const getButtonTokens = (buttonState) =>
-      selectButtonTokens(getTokens(buttonState), getTokens(themeTokens))
+      selectButtonTokens(
+        getTokens(buttonState, selectMobileTokens(themeTokens)),
+        getTokens(themeTokens, selectMobileTokens(themeTokens))
+      )
     const uniqueId = useUniqueId('toggleSwitch')
     const inputId = id ?? uniqueId
 
@@ -157,7 +172,7 @@ const ToggleSwitch = React.forwardRef(
           {...selectProps(rest)}
         >
           {(buttonState) => {
-            const stateTokens = getTokens(buttonState)
+            const stateTokens = getTokens(buttonState, selectMobileTokens(themeTokens))
             const IconComponent = stateTokens.icon
             const switchStyles = selectSwitchStyles(stateTokens)
             const trackStyles = selectTrackStyles(stateTokens)