@telus-uds/components-base 1.3.1 → 1.6.0

package/lib-module/ToggleSwitch/ToggleSwitch.js

@@ -7,11 +7,11 @@ import InputLabel from '../InputLabel';
 import ButtonBase from '../Button/ButtonBase';
 import StackView from '../StackView';
 import { useThemeTokensCallback, applyShadowToken } from '../ThemeProvider';
-import { a11yProps, getTokensPropType, selectTokens, pressProps, selectSystemProps, useUniqueId, variantProp, viewProps } from '../utils';
+import { a11yProps, focusHandlerProps, getTokensPropType, selectTokens, pressProps, selectSystemProps, useUniqueId, variantProp, viewProps } from '../utils';
 import { useInputValue } from '../utils/input';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, pressProps, viewProps]);
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, focusHandlerProps, pressProps, viewProps]);
 
 const selectButtonTokens = tokens => selectTokens('Button', { ...tokens,
   // Width tokens are applied to our inner track. Disable Button width token so it wraps our track width.
@@ -117,7 +117,7 @@ const ToggleSwitch = /*#__PURE__*/forwardRef(({
     space: 2,
     direction: "row",
     children: [Boolean(label) && /*#__PURE__*/_jsx(View, {
-      style: selectLabelStyles(themeTokens),
+      style: [selectLabelStyles(themeTokens), staticStyles.containText],
       children: /*#__PURE__*/_jsx(InputLabel, {
         forId: inputId,
         label: label,
@@ -219,6 +219,9 @@ const staticStyles = StyleSheet.create({
   switch: {
     alignItems: 'center',
     justifyContent: 'center'
+  },
+  containText: {
+    flexShrink: 1
   }
 });
 export default ToggleSwitch;

package/lib-module/ToggleSwitch/ToggleSwitchGroup.js

@@ -7,10 +7,10 @@ import Fieldset from '../Fieldset';
 import { getStackedContent } from '../StackView';
 import { useViewport } from '../ViewportProvider';
 import { useThemeTokens } from '../ThemeProvider';
-import { a11yProps, getTokensPropType, pressProps, selectSystemProps, variantProp, viewProps } from '../utils/props';
-import { useMultipleInputValues } from '../utils/input';
+import { a11yProps, containUniqueFields, focusHandlerProps, getTokensPropType, selectSystemProps, useMultipleInputValues, variantProp, viewProps } from '../utils';
 import { jsx as _jsx } from "react/jsx-runtime";
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, pressProps, viewProps]);
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps]);
+const [selectItemProps, selectedItemPropTypes] = selectSystemProps([a11yProps, focusHandlerProps, viewProps]);
 const ToggleSwitchGroup = /*#__PURE__*/forwardRef(({
   variant,
   tokens,
@@ -57,13 +57,20 @@ const ToggleSwitchGroup = /*#__PURE__*/forwardRef(({
     ...rest
   });
   const itemA11yRole = selectedProps.accessibilityRole === 'radiogroup' ? 'radio' : 'switch';
+  const uniqueFields = ['id', 'label'];
+
+  if (!containUniqueFields(items, uniqueFields)) {
+    throw new Error(`ToggleSwitchGroup items must have unique ${uniqueFields.join(', ')}`);
+  }
+
   const toggleSwitches = items.map(({
     label,
     id = label,
     accessibilityLabel = label,
     onChange: itemOnChange,
     ref: itemRef,
-    tooltip: itemTooltip
+    tooltip: itemTooltip,
+    ...itemRest
   }, index) => {
     const isSelected = currentValues.includes(id);
 
@@ -89,7 +96,8 @@ const ToggleSwitchGroup = /*#__PURE__*/forwardRef(({
       inactive: inactive,
       label: label,
       tooltip: itemTooltip,
-      ...itemA11y
+      ...itemA11y,
+      ...selectItemProps(itemRest)
     }, id);
   });
   return /*#__PURE__*/_jsx(Fieldset, {
@@ -123,7 +131,8 @@ ToggleSwitchGroup.propTypes = { ...selectedSystemPropTypes,
   /**
    * The options a user may select
    */
-  items: PropTypes.arrayOf(PropTypes.shape({
+  items: PropTypes.arrayOf(PropTypes.shape({ ...selectedItemPropTypes,
+
     /**
      * The text displayed to the user on the label.
      */

package/lib-module/utils/containUniqueFields.js

@@ -0,0 +1,26 @@
+// Returns true if there are no duplicate values of the fields listed
+// in the `fields` array across the objects in the `items` array, false
+// otherwise.
+// Note that if a value of a field in an item is not set, it will be
+// excluded from comparison.
+const containUniqueFields = (items, fields) => {
+  const map = [];
+  const itemsHaveDuplicateFields = items.some(item => fields.some(field => {
+    if (!map[field]) {
+      map[field] = [];
+    }
+
+    if (!item[field]) {
+      // We exclude empty values from comparison
+      return false;
+    } // Duplicate found!
+
+
+    if (map[field][item[field]]) return true;
+    map[field][item[field]] = true;
+    return false;
+  }));
+  return !itemsHaveDuplicateFields;
+};
+
+export default containUniqueFields;

package/lib-module/utils/index.js

@@ -12,4 +12,5 @@ export { default as useResponsiveProp } from './useResponsiveProp';
 export * from './useResponsiveProp';
 export { default as useUniqueId } from './useUniqueId';
 export { default as withLinkRouter } from './withLinkRouter';
-export * from './ssr';
+export * from './ssr';
+export { default as containUniqueFields } from './containUniqueFields';

package/lib-module/utils/props/handlerProps.js

@@ -0,0 +1,59 @@
+import PropTypes from 'prop-types';
+export const focusHandlerProps = {
+  types: {
+    /**
+     * onBlur handler
+     */
+    onBlur: PropTypes.func,
+
+    /**
+     * onFocus handler
+     */
+    onFocus: PropTypes.func
+  },
+  select: ({
+    onBlur,
+    onFocus
+  }) => ({
+    onBlur,
+    onFocus
+  })
+};
+export const textInputHandlerProps = {
+  types: {
+    /**
+     * onChange handler
+     */
+    onChange: PropTypes.func,
+
+    /**
+     * onChangeText handler
+     */
+    onChangeText: PropTypes.func,
+
+    /**
+     * onSubmit handler
+     */
+    onSubmit: PropTypes.func,
+
+    /**
+     * onSubmitEditing handler
+     */
+    onSubmitEditing: PropTypes.func
+  },
+  select: ({
+    onChange,
+    onChangeText,
+    onSubmit,
+    onSubmitEditing
+  }) => ({
+    onChange,
+    onChangeText,
+    onSubmit,
+    onSubmitEditing
+  })
+};
+export default {
+  focusHandlerProps,
+  textInputHandlerProps
+};

package/lib-module/utils/props/index.js

@@ -1,4 +1,5 @@
 export * from './tokens';
+export * from './handlerProps';
 export { default as a11yProps } from './a11yProps';
 export { default as clickProps } from './clickProps';
 export { default as copyPropTypes } from './copyPropTypes';

package/lib-module/utils/props/inputSupportsProps.js

@@ -38,17 +38,15 @@ export default {
     hintPosition,
     feedback,
     tooltip,
-    validation,
-    ...rest
+    validation
   }) => ({
-    props: {
+    supportsProps: {
       label,
       hint,
       hintPosition,
       feedback,
       tooltip,
       validation
-    },
-    ...rest
+    }
   })
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telus-uds/components-base",
-  "version": "1.3.1",
+  "version": "1.6.0",
   "description": "Base components",
   "keywords": [
     "base"
@@ -22,14 +22,14 @@
   },
   "scripts": {
     "test": "jest",
-    "lint": "telus-standard",
-    "lint:fix": "telus-standard --fix",
+    "lint": "yarn --cwd ../.. lint:path --color packages/components-base",
+    "lint:fix": "yarn --cwd ../.. lint:path --fix packages/components-base",
     "format": "prettier --write .",
     "build": "yarn build:code && yarn build:docs",
     "build:main": "babel src -d lib",
     "build:module": "babel src -d lib-module --env-name module",
     "build:code": "yarn build:main && yarn build:module",
-    "build:docs": "babel-node --plugins=react-docgen-alpha generate-component-docs.js",
+    "build:docs": "babel-node --plugins=@nearform/babel-plugin-react-docgen generate-component-docs.js",
     "storybook": "start-storybook",
     "dev": "yarn build:code --watch",
     "release": "standard-version"
@@ -59,7 +59,7 @@
   "dependencies": {
     "airbnb-prop-types": "^2.16.0",
     "@telus-uds/system-constants": "^1.0.2",
-    "@telus-uds/system-theme-tokens": "^1.2.2",
+    "@telus-uds/system-theme-tokens": "^1.5.0",
     "lodash.debounce": "^4.0.8",
     "lodash.merge": "^4.6.2",
     "prop-types": "^15.7.2",

package/src/Button/ButtonBase.jsx

@@ -6,8 +6,9 @@ import { applyTextStyles, applyShadowToken, applyOuterBorder } from '../ThemePro
 import buttonPropTypes from './propTypes'
 import {
   a11yProps,
-  getCursorStyle,
   clickProps,
+  focusHandlerProps,
+  getCursorStyle,
   linkProps,
   resolvePressableState,
   resolvePressableTokens,
@@ -17,7 +18,12 @@ import {
   withLinkRouter
 } from '../utils'
 
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, linkProps, viewProps])
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([
+  a11yProps,
+  focusHandlerProps,
+  linkProps,
+  viewProps
+])
 
 const getOuterBorderOffset = ({ outerBorderGap = 0, outerBorderWidth = 0 }) =>
   outerBorderGap + outerBorderWidth

package/src/Button/ButtonGroup.jsx

@@ -9,17 +9,25 @@ import { useViewport } from '../ViewportProvider'
 import { useThemeTokens, useThemeTokensCallback } from '../ThemeProvider'
 import {
   a11yProps,
+  containUniqueFields,
+  focusHandlerProps,
   pressProps,
   getTokensPropType,
   selectSystemProps,
   selectTokens,
+  useMultipleInputValues,
   variantProp,
   viewProps
-} from '../utils/props'
-import { useMultipleInputValues } from '../utils/input'
+} from '../utils'
 import { getPressHandlersWithArgs } from '../utils/pressability'
 
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, pressProps, viewProps])
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+const [selectItemProps, selectedItemPropTypes] = selectSystemProps([
+  a11yProps,
+  focusHandlerProps,
+  pressProps,
+  viewProps
+])
 
 const ButtonGroup = forwardRef(
   (
@@ -61,6 +69,11 @@ const ButtonGroup = forwardRef(
     })
     const itemA11yRole = systemProps.accessibilityRole === 'radiogroup' ? 'radio' : 'checkbox'
 
+    const uniqueFields = ['id', 'label']
+    if (!containUniqueFields(items, uniqueFields)) {
+      throw new Error(`ButtonGroup items must have unique ${uniqueFields.join(', ')}`)
+    }
+
     return (
       <StackWrap
         {...systemProps}
@@ -69,41 +82,44 @@ const ButtonGroup = forwardRef(
         tokens={stackTokens}
         ref={ref}
       >
-        {items.map(({ label, id = label, accessibilityLabel, ref: itemRef }, index) => {
-          const isSelected = currentValues.includes(id)
+        {items.map(
+          ({ label, id = label, accessibilityLabel, ref: itemRef, ...itemRest }, index) => {
+            const isSelected = currentValues.includes(id)
 
-          // Pass an object of relevant component state as first argument for any passed-in press handlers
-          const pressHandlers = getPressHandlersWithArgs(rest, [{ id, label, currentValues }])
+            // Pass an object of relevant component state as first argument for any passed-in press handlers
+            const pressHandlers = getPressHandlersWithArgs(rest, [{ id, label, currentValues }])
 
-          const handlePress = (event) => {
-            if (pressHandlers.onPress) pressHandlers.onPress()
-            toggleOneValue(id, event)
-          }
+            const handlePress = (event) => {
+              if (pressHandlers.onPress) pressHandlers.onPress(event)
+              toggleOneValue(id, event)
+            }
 
-          const itemA11y = {
-            accessibilityState: { checked: isSelected },
-            accessibilityRole: itemA11yRole,
-            accessibilityLabel,
-            ...a11yProps.getPositionInSet(items.length, index)
-          }
+            const itemA11y = {
+              accessibilityState: { checked: isSelected },
+              accessibilityRole: itemA11yRole,
+              accessibilityLabel,
+              ...a11yProps.getPositionInSet(items.length, index)
+            }
 
-          // Ensure button is direct child of group as MacOS voiceover only applies "X of Y" to
-          // "radio" if it's a direct child of "radiogroup", even if aria-posinset etc exists
-          return (
-            <ButtonBase
-              ref={itemRef}
-              key={id}
-              {...pressHandlers}
-              onPress={handlePress}
-              tokens={getButtonTokens}
-              selected={isSelected}
-              inactive={inactive}
-              {...itemA11y}
-            >
-              {label}
-            </ButtonBase>
-          )
-        })}
+            // Ensure button is direct child of group as MacOS voiceover only applies "X of Y" to
+            // "radio" if it's a direct child of "radiogroup", even if aria-posinset etc exists
+            return (
+              <ButtonBase
+                ref={itemRef}
+                key={id}
+                {...pressHandlers}
+                onPress={handlePress}
+                tokens={getButtonTokens}
+                selected={isSelected}
+                inactive={inactive}
+                {...itemA11y}
+                {...selectItemProps(itemRest)}
+              >
+                {label}
+              </ButtonBase>
+            )
+          }
+        )}
       </StackWrap>
     )
   }
@@ -124,6 +140,7 @@ ButtonGroup.propTypes = {
    */
   items: PropTypes.arrayOf(
     PropTypes.shape({
+      ...selectedItemPropTypes,
       /**
        * The text displayed to the user in the button, describing this option,
        * passed to the button as its child.

package/src/Card/PressableCardBase.jsx

@@ -7,6 +7,7 @@ import { applyOuterBorder, validateThemeTokens } from '../ThemeProvider'
 import {
   a11yProps,
   clickProps,
+  focusHandlerProps,
   getTokenNames,
   getTokensSetPropType,
   linkProps,
@@ -20,7 +21,11 @@ import {
 } from '../utils'
 import CardBase from './CardBase'
 
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([
+  a11yProps,
+  focusHandlerProps,
+  viewProps
+])
 
 const tokenKeys = [
   ...getTokenNames('Card'),

package/src/Checkbox/Checkbox.jsx

@@ -9,6 +9,7 @@ import StackView from '../StackView'
 import { applyShadowToken, applyTextStyles, useThemeTokensCallback } from '../ThemeProvider'
 import {
   a11yProps,
+  focusHandlerProps,
   getTokensPropType,
   selectSystemProps,
   useInputValue,
@@ -17,7 +18,11 @@ import {
 } from '../utils'
 import useUniqueId from '../utils/useUniqueId'
 
-const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([
+  a11yProps,
+  focusHandlerProps,
+  viewProps
+])
 
 const selectInputStyles = (
   {
@@ -179,32 +184,38 @@ const Checkbox = forwardRef(
             {({ focused: focus, hovered: hover, pressed }) => {
               const { icon: IconComponent, ...stateTokens } = getTokens({ focus, hover, pressed })
               const iconTokens = selectIconTokens(stateTokens)
+              const labelStyles = selectLabelStyles(stateTokens)
+              const alignWithLabel = label
+                ? [staticStyles.alignWithLabel, { height: labelStyles.lineHeight }]
+                : null
 
               return (
                 <View style={staticStyles.container}>
-                  <View
-                    style={StyleSheet.flatten([
-                      staticStyles.defaultInputStyles,
-                      selectInputStyles(stateTokens, isChecked)
-                    ])}
-                    testID="Checkbox-Input"
-                  >
-                    {/* Add a real input on Web, skip on native platforms */}
-                    <CheckboxInput
-                      checked={isChecked}
-                      defaultChecked={defaultChecked}
-                      disabled={inactive}
-                      id={inputId}
-                      isControlled={isControlled}
-                      name={name}
-                      value={value}
-                    />
-                    {isChecked && IconComponent && (
-                      <IconComponent {...iconTokens} testID="Checkbox-Icon" />
-                    )}
+                  <View style={alignWithLabel}>
+                    <View
+                      style={[
+                        staticStyles.defaultInputStyles,
+                        selectInputStyles(stateTokens, isChecked)
+                      ]}
+                      testID="Checkbox-Input"
+                    >
+                      {/* Add a real input on Web, skip on native platforms */}
+                      <CheckboxInput
+                        checked={isChecked}
+                        defaultChecked={defaultChecked}
+                        disabled={inactive}
+                        id={inputId}
+                        isControlled={isControlled}
+                        name={name}
+                        value={value}
+                      />
+                      {isChecked && IconComponent && (
+                        <IconComponent {...iconTokens} testID="Checkbox-Icon" />
+                      )}
+                    </View>
                   </View>
                   {Boolean(label) && (
-                    <Text style={selectLabelStyles(stateTokens)}>
+                    <Text style={labelStyles}>
                       <CheckboxLabel forId={inputId}>{label}</CheckboxLabel>
                     </Text>
                   )}
@@ -285,5 +296,6 @@ export default Checkbox
 const staticStyles = StyleSheet.create({
   wrapper: { backgroundColor: 'transparent' },
   container: { flexDirection: 'row', alignItems: 'center' },
-  defaultInputStyles: { alignItems: 'center', justifyContent: 'center' }
+  defaultInputStyles: { alignItems: 'center', justifyContent: 'center' },
+  alignWithLabel: { alignSelf: 'flex-start', justifyContent: 'center' }
 })

package/src/Checkbox/CheckboxGroup.jsx

@@ -4,11 +4,27 @@ import ABBPropTypes from 'airbnb-prop-types'
 
 import { useViewport } from '../ViewportProvider'
 import { useThemeTokens } from '../ThemeProvider'
-import { getTokensPropType, useMultipleInputValues, variantProp } from '../utils'
+import {
+  a11yProps,
+  containUniqueFields,
+  focusHandlerProps,
+  getTokensPropType,
+  selectSystemProps,
+  useMultipleInputValues,
+  variantProp,
+  viewProps
+} from '../utils'
 import { getStackedContent } from '../StackView'
 import Checkbox from './Checkbox'
 import Fieldset from '../Fieldset'
 
+const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps])
+const [selectItemProps, selectedItemPropTypes] = selectSystemProps([
+  a11yProps,
+  focusHandlerProps,
+  viewProps
+])
+
 /**
  * A group of Checkboxs that behave as a fieldset. Use when users select any number of choices from options.
  *
@@ -73,7 +89,8 @@ const CheckboxGroup = forwardRef(
       onChange,
       readOnly,
       name: inputGroupName,
-      inactive
+      inactive,
+      ...rest
     },
     ref
   ) => {
@@ -89,27 +106,37 @@ const CheckboxGroup = forwardRef(
       onChange,
       readOnly: readOnly || inactive
     })
-    const checkboxes = items.map(({ label, id, onChange: itemOnChange, ref: itemRef }, index) => {
-      const checkboxId = id || `Checkbox[${index}]`
-      const handleChange = (newCheckedState, event) => {
-        if (typeof itemOnChange === 'function') itemOnChange(newCheckedState, event)
-        toggleOneValue(checkboxId, event)
+
+    const uniqueFields = ['id', 'label']
+    if (!containUniqueFields(items, uniqueFields)) {
+      throw new Error(`CheckboxGroup items must have unique ${uniqueFields.join(', ')}`)
+    }
+
+    const checkboxes = items.map(
+      ({ label, id, onChange: itemOnChange, ref: itemRef, ...itemRest }, index) => {
+        const checkboxId = id || `Checkbox[${index}]`
+        const handleChange = (newCheckedState, event) => {
+          if (typeof itemOnChange === 'function') itemOnChange(newCheckedState, event)
+          toggleOneValue(checkboxId, event)
+        }
+
+        return (
+          <Checkbox
+            ref={itemRef}
+            key={checkboxId}
+            id={checkboxId}
+            checked={currentValues.includes(checkboxId)}
+            onChange={handleChange}
+            inactive={inactive}
+            label={label}
+            name={inputGroupName}
+            tokens={radioTokens}
+            variant={variant}
+            {...selectItemProps(itemRest)}
+          />
+        )
       }
-      return (
-        <Checkbox
-          ref={itemRef}
-          key={checkboxId}
-          id={checkboxId}
-          checked={currentValues.includes(checkboxId)}
-          onChange={handleChange}
-          inactive={inactive}
-          label={label}
-          name={inputGroupName}
-          tokens={radioTokens}
-          variant={variant}
-        />
-      )
-    })
+    )
 
     return (
       <Fieldset
@@ -122,6 +149,7 @@ const CheckboxGroup = forwardRef(
         feedback={feedback}
         inactive={inactive}
         validation={validation}
+        {...selectProps(rest)}
       >
         {getStackedContent(checkboxes, { space, direction: 'column' })}
       </Fieldset>
@@ -131,6 +159,7 @@ const CheckboxGroup = forwardRef(
 CheckboxGroup.displayName = 'CheckboxGroup'
 
 CheckboxGroup.propTypes = {
+  ...selectedSystemPropTypes,
   /**
    * Optional theme token overrides for the outer CheckboxGroup component
    */
@@ -148,6 +177,7 @@ CheckboxGroup.propTypes = {
    */
   items: PropTypes.arrayOf(
     PropTypes.exact({
+      ...selectedItemPropTypes,
       label: PropTypes.string,
       id: PropTypes.string,
       onChange: PropTypes.func,

package/src/ExpandCollapse/Panel.jsx

@@ -74,8 +74,8 @@ const ExpandCollapsePanel = forwardRef(
     }
 
     const onContainerLayout = (event) => {
-      if (containerHeight === null) {
-        const { layout: { height = 0 } = {} } = event.nativeEvent
+      const { layout: { height = 0 } = {} } = event.nativeEvent
+      if (Platform.OS === 'web' || (Platform.OS !== 'web' && containerHeight === null)) {
         setContainerHeight(height)
       }
     }
@@ -104,14 +104,14 @@ const ExpandCollapsePanel = forwardRef(
         >
           {control}
         </ExpandCollapseControl>
-        <View style={overflowContainerStyles} {...focusabilityProps}>
-          <Animated.View
-            onLayout={onContainerLayout}
-            style={[staticStyles.itemsContainer, animatedStyles]}
-          >
+        <Animated.View
+          style={[overflowContainerStyles, animatedStyles, staticStyles.itemsContainer]}
+          {...focusabilityProps}
+        >
+          <View onLayout={onContainerLayout}>
             <View style={selectContainerStyles(themeTokens)}>{children}</View>
-          </Animated.View>
-        </View>
+          </View>
+        </Animated.View>
       </View>
     )
   }