@thecb/components 9.2.2-beta.3 → 9.2.3-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "9.2.2-beta.3",
+  "version": "9.2.3-beta.3",
   "description": "Common lib for CityBase react components",
   "main": "dist/index.cjs.js",
   "typings": "dist/index.d.ts",

package/src/components/atoms/checkbox/Checkbox.js

@@ -95,7 +95,8 @@ const Checkbox = ({
   checkboxMargin = "0 16px 0 0",
   extraStyles,
   textExtraStyles,
-  dataQa = null
+  dataQa = null,
+  isRequired = false
 }) => {
   const [focused, setFocused] = useState(false);
 
@@ -142,6 +143,7 @@ const Checkbox = ({
             disabledStyles={themeValues.disabledStyles}
             disabledCheckedStyles={themeValues.disabledCheckedStyles}
             focusedStyles={themeValues.focusedStyles}
+            aria-required={isRequired}
           >
             <CheckboxIcon
               viewBox="0 0 24 24"

package/src/components/atoms/checkbox/Checkbox.stories.js

@@ -13,12 +13,13 @@ const groupId = "props";
 export const checkbox = () => (
   <Checkbox
     variant={select(variantsLabel, variants, defaultValue, groupId)}
-    title={text("title", "Checkbox", "props")}
-    name={text("name", "Checkbox", "props")}
+    title={text("title", "Checkbox Title", "props")}
+    name={text("name", "Checkbox Name", "props")}
     checked={boolean("checked", false, "props")}
     error={boolean("error", false, "props")}
     disabled={boolean("disabled", false, "props")}
     focused={boolean("focused", false, "props")}
+    isRequired={boolean("isRequired", true, "props")}
   />
 );
 

package/src/components/atoms/country-dropdown/CountryDropdown.js

@@ -10,7 +10,8 @@ const CountryDropdown = ({
   fieldActions,
   showErrors,
   onChange,
-  dataQa = null
+  dataQa = null,
+  isRequired = false
 }) => (
   <FormSelect
     options={options}
@@ -22,6 +23,7 @@ const CountryDropdown = ({
     showErrors={showErrors}
     onChange={onChange}
     autocompleteValue="country-name"
+    isRequired={isRequired}
   />
 );
 export default CountryDropdown;

package/src/components/atoms/country-dropdown/CountryDropdown.stories.js

@@ -30,6 +30,7 @@ const CountryFormWrapper = ({ fields, actions }) => (
       options={options}
       field={fields.country}
       fieldActions={actions.fields.country}
+      isRequired={true}
     />
   </Box>
 );

package/src/components/atoms/dropdown/Dropdown.js

@@ -133,8 +133,10 @@ const Dropdown = ({
   ariaDescribedby,
   autocompleteValue, // browser autofill value, like country-name
   smoothScroll = true,
-  ariaInvalid = false
+  ariaInvalid = false,
+  isRequired = false
 }) => {
+  const required = options.required || isRequired;
   const [inputValue, setInputValue] = useState("");
   const [optionsState, setOptionsState] = useState([]);
   const [filteredOptions, setFilteredOptions] = useState([]);
@@ -262,11 +264,13 @@ const Dropdown = ({
   useEffect(() => {
     if (autoEraseTypeAhead) {
       clearTimeout(timer);
-      setTimer(setTimeout(() => setInputValue(""), 20000));
+      setTimer(setTimeout(() => setInputValue(""), 3000));
     }
     setFilteredOptions(
-      options.filter(option =>
-        option.value.toLowerCase().match(inputValue.toLowerCase())
+      options.filter(
+        option =>
+          option.value.toLowerCase().startsWith(inputValue.toLowerCase()) ||
+          option.text.toLowerCase().startsWith(inputValue.toLowerCase())
       )
     );
   }, [inputValue]);
@@ -299,7 +303,7 @@ const Dropdown = ({
     <Box
       padding="0"
       background={isOpen ? themeValues.hoverColor : WHITE}
-      extraStyles={`position: relative; margin-bottom: 1rem;`}
+      extraStyles={`position: relative;`}
       minWidth="100%"
       onClick={() => {
         if (!isOpen) {
@@ -322,7 +326,7 @@ const Dropdown = ({
         aria-labelledby={ariaLabelledby}
         aria-describedby={ariaDescribedby}
         aria-expanded={isOpen}
-        aria-required={options.required}
+        aria-required={required}
         aria-invalid={ariaInvalid}
         background={isOpen ? themeValues.hoverColor : WHITE}
         borderRadius="2px"
@@ -354,7 +358,6 @@ const Dropdown = ({
         }}
         padding="12px"
         placeholder={getSelection()}
-        required={options.required}
         role="combobox"
         themeValues={themeValues}
         title={hasTitles ? getSelection() : null}
@@ -362,6 +365,8 @@ const Dropdown = ({
         tabIndex={0}
         value={inputValue}
         width="100%"
+        /* Non-semantic elements need the aria-* version of the attribute */
+        aria-disabled={disabledValues.includes(inputValue)}
       />
       <IconWrapper open={isOpen} onClick={onClick}>
         <DropdownIcon />
@@ -376,6 +381,7 @@ const Dropdown = ({
             tabIndex={0}
             role="listbox"
             id={`${ariaLabelledby}_listbox`}
+            required={required}
           >
             <Stack childGap="0" as="ul">
               {filteredOptions.map((choice, i) => {

package/src/components/atoms/form-layouts/FormInput.js

@@ -116,6 +116,7 @@ const FormInput = ({
   extraStyles,
   removeFromValue, // regex of characters to remove before setting value
   dataQa = null,
+  isRequired = false,
   ...props
 }) => {
   const [showPassword, setShowPassword] = useState(false);
@@ -221,6 +222,7 @@ const FormInput = ({
             $extraStyles={extraStyles}
             data-qa={dataQa || labelTextWhenNoError}
             autoComplete={autocompleteValue}
+            required={isRequired}
             {...props}
           />
         ) : (
@@ -247,6 +249,7 @@ const FormInput = ({
             $extraStyles={extraStyles}
             data-qa={dataQa || labelTextWhenNoError}
             autoComplete={autocompleteValue}
+            required={isRequired}
             {...props}
           />
         )}

package/src/components/atoms/form-select/FormSelect.js

@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect } from "react";
+import React, { useState, useMemo, useRef, useEffect } from "react";
 import Dropdown from "../dropdown";
 import Text from "../text";
 import { ERROR_COLOR } from "../../../constants/colors";
@@ -24,10 +24,25 @@ const FormSelect = ({
   autocompleteValue, // browser autofill value, like country-name
   smoothScroll = true, // whether the browser should animate scroll to selected item on first open
   dataQa = null,
-  widthFitOptions = false
+  widthFitOptions = false,
+  isRequired = false
 }) => {
   const [open, setOpen] = useState(false);
   const dropdownRef = useRef(null);
+  const required = options?.required || isRequired;
+
+  const labelId = useMemo(
+    () => labelTextWhenNoError => createIdFromString(labelTextWhenNoError),
+    [labelTextWhenNoError]
+  );
+
+  const descriptionId = useMemo(
+    () => (field, labelTextWhenNoError) =>
+      field.hasErrors && field.dirty
+        ? labelId(labelTextWhenNoError) + "error-message"
+        : "",
+    [field, labelTextWhenNoError]
+  );
 
   const handleClickAway = event => {
     if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
@@ -45,8 +60,8 @@ const FormSelect = ({
   return (
     <SelectContainer
       ref={dropdownRef}
+      aria-role="group"
       disabled={disabled}
-      aria-disabled={disabled}
       data-qa={dataQa}
     >
       <Box padding="0" minWidth="100%">
@@ -61,18 +76,15 @@ const FormSelect = ({
               &::first-letter {
                 text-transform: uppercase;
               }`}
-            id={createIdFromString(labelTextWhenNoError)}
+            id={labelId(labelTextWhenNoError)}
           >
             {labelTextWhenNoError}
           </Text>
         </Cluster>
       </Box>
       <Dropdown
-        ariaLabelledby={createIdFromString(labelTextWhenNoError)}
-        ariaDescribedby={createIdFromString(
-          labelTextWhenNoError,
-          "error message"
-        )}
+        ariaLabelledby={labelId(labelTextWhenNoError)}
+        ariaDescribedby={descriptionId(field, labelTextWhenNoError)}
         maxHeight={dropdownMaxHeight}
         widthFitOptions={widthFitOptions}
         hasTitles={hasTitles}
@@ -94,6 +106,7 @@ const FormSelect = ({
         disabled={disabled}
         autocompleteValue={autocompleteValue}
         smoothScroll={smoothScroll}
+        isRequired={required}
       />
       <Stack direction="row" justify="space-between">
         {(field.hasErrors && field.dirty) || (field.hasErrors && showErrors) ? (

package/src/components/atoms/form-select/FormSelect.stories.js

@@ -12,7 +12,7 @@ const { mapStateToProps, mapDispatchToProps, reducer } = createFormState({
   }
 });
 const errorMessages = {
-  [required.error]: "thing is required"
+  [required.error]: "This field is required."
 };
 const options = [
   { value: "", text: "choose name" },
@@ -34,7 +34,7 @@ const story = page({
 const FormWrapper = props => (
   <FormSelect
     autocompleteValue={props.autocompleteValue}
-    labelTextWhenNoError="Form Select"
+    labelTextWhenNoError="Form Select Label"
     errorMessages={errorMessages}
     options={options}
     field={props.fields.thing}

package/src/components/atoms/radio-button-with-label/RadioButtonWithLabel.js

@@ -18,7 +18,7 @@ const Circle = styled.div`
   flex-shrink: 0;
   margin-right: 8px;
   width: 1.5rem;
-  height 1.5rem;
+  height: 1.5rem;
   border: ${({ inactiveBorderColor }) => `1px solid ${inactiveBorderColor}`};
   border-radius: 50%;
   box-sizing: border-box;
@@ -30,21 +30,24 @@ const Circle = styled.div`
     display: block;
     background: ${({ activeColor }) => activeColor};
     border-radius: 50%;
-    transform: scale(0);  
-  }  
+    transform: scale(0);
+  }
 `;
 
 const InputAndLabelContainer = styled(Cluster)`
   overflow: visible;
+
   ${HiddenRadioInput}:checked + label ${Circle}:after {
     transform: scale(0.85);
     transition: transform 0.15s;
   }
+
   ${HiddenRadioInput}:checked + label ${Circle} {
-    border: ${({ activeColor }) => `1px solid ${activeColor};`}
+    border: ${({ activeColor }) => "1px solid " + activeColor};
   }
-  ${HiddenRadioInput}:focus + label ${Circle} { {
-    box-shadow: ${({ activeColor }) => `0px 0px 2px 1px ${activeColor};`}
+
+  ${HiddenRadioInput}:focus + label ${Circle} {
+    box-shadow: ${({ activeColor }) => "0px 0px 2px 1px " + activeColor};
   }
 `;
 

package/src/components/atoms/state-province-dropdown/StateProvinceDropdown.js

@@ -9,11 +9,13 @@ const FormStateDropdown = ({
   field,
   fieldActions,
   showErrors,
-  countryCode
+  countryCode,
+  isRequired = false
 }) => {
   const placeholder =
     countryCode === "US" ? placeHolderOptionUS : placeHolderOption;
   const options = [placeholder, ...getOptions(countryCode)];
+
   return (
     <FormSelect
       options={options}
@@ -23,6 +25,7 @@ const FormStateDropdown = ({
       errorMessages={errorMessages}
       showErrors={showErrors}
       autocompleteValue="address-level1"
+      isRequired={isRequired}
     />
   );
 };

package/src/components/atoms/state-province-dropdown/StateProvinceDropdown.stories.js

@@ -39,6 +39,7 @@ const FormWrapper = ({
     countryCode={countryCode}
     labelTextWhenNoError={labelTextWhenNoError}
     showErrors={showErrors}
+    isRequired={true}
   />
 );
 

package/src/components/molecules/address-form/AddressForm.js

@@ -58,6 +58,7 @@ const AddressForm = ({
           labelTextWhenNoError="Country"
           errorMessages={countryErrorMessages}
           field={fields.country}
+          isRequired={true}
           onChange={value => {
             actions.fields.country.set(value);
             // temporary measure to not dirty fields until
@@ -81,6 +82,7 @@ const AddressForm = ({
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="address-line1"
           dataQa="Address"
+          isRequired={true}
         />
         <FormInput
           labelTextWhenNoError="Apt, Suite, Unit, Floor, etc. (Optional)"
@@ -90,6 +92,7 @@ const AddressForm = ({
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="address-line2"
           dataQa="Address Line 2"
+          isRequired={false}
         />
         <FormInput
           labelTextWhenNoError="City"
@@ -100,6 +103,7 @@ const AddressForm = ({
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="address-level2"
           dataQa="City"
+          isRequired={true}
         />
         <StateProvinceDropdown
           labelTextWhenNoError={isUS ? "State" : "State or Province"}
@@ -110,6 +114,7 @@ const AddressForm = ({
           showErrors={showErrors}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           dataQa="State or Province"
+          isRequired={true}
         />
         <FormInput
           isNum={isUS}
@@ -122,6 +127,7 @@ const AddressForm = ({
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="postal-code"
           dataQa="Zip code"
+          isRequired={true}
         />
         {showWalletCheckbox && (
           <Checkbox

package/src/components/molecules/payment-form-ach/PaymentFormACH.js

@@ -76,6 +76,7 @@ const PaymentFormACH = ({
           showErrors={showErrors}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="name"
+          isRequired={true}
         />
         <FormInput
           labelTextWhenNoError="Routing number"
@@ -97,6 +98,7 @@ const PaymentFormACH = ({
             />
           )}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
+          isRequired={true}
         />
         <FormInput
           labelTextWhenNoError="Confirm routing number"
@@ -106,6 +108,7 @@ const PaymentFormACH = ({
           fieldActions={actions.fields.confirmRoutingNumber}
           showErrors={showErrors}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
+          isRequired={true}
           isNum
         />
         <FormInput
@@ -115,6 +118,7 @@ const PaymentFormACH = ({
           field={fields.accountNumber}
           fieldActions={actions.fields.accountNumber}
           showErrors={showErrors}
+          isRequired={true}
           isNum
           helperModal={() => (
             <AccountAndRoutingModal
@@ -132,6 +136,7 @@ const PaymentFormACH = ({
         <FormInput
           labelTextWhenNoError="Confirm account number"
           dataQa="Confirm account number"
+          isRequired={true}
           errorMessages={confirmAccountNumberErrors}
           field={fields.confirmAccountNumber}
           fieldActions={actions.fields.confirmAccountNumber}
@@ -142,6 +147,7 @@ const PaymentFormACH = ({
         {allowBankAccountType && (
           <FormSelect
             labelTextWhenNoError="Account type"
+            isRequired={true}
             dataQa="Account type"
             options={[
               { text: "Select account type", value: "" },

package/src/components/molecules/payment-form-card/PaymentFormCard.js

@@ -98,6 +98,7 @@ const PaymentFormCard = ({
         {!hideZipCode && (
           <CountryDropdown
             labelTextWhenNoError="Country"
+            isRequired={true}
             errorMessages={countryErrorMessages}
             field={fields.country}
             onChange={value => {
@@ -121,8 +122,10 @@ const PaymentFormCard = ({
           showErrors={showErrors}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="cc-name"
+          isRequired={true}
         />
         <FormInput
+          isRequired={true}
           labelTextWhenNoError="Credit card number"
           dataQa="Credit card number"
           errorMessages={creditCardNumberErrors}
@@ -150,6 +153,7 @@ const PaymentFormCard = ({
             isNum
             removeFromValue={/\//} // removes "/" from browser autofill
             autocompleteValue="cc-exp"
+            isRequired={true}
           />
           <FormInput
             labelTextWhenNoError="CVV"
@@ -166,6 +170,7 @@ const PaymentFormCard = ({
             }
             onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
             autocompleteValue="cc-csc"
+            isRequired={true}
           />
         </FormInputRow>
         {!hideZipCode && (
@@ -184,6 +189,7 @@ const PaymentFormCard = ({
               showErrors={showErrors}
               onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
               autocompleteValue="billing postal-code"
+              isRequired={true}
             />
           </Box>
         )}

package/src/components/molecules/radio-group/RadioGroup.js

@@ -7,7 +7,7 @@ import { noop } from "../../../util/general";
 
 const DefaultHeading = styled.div`
   font-size: 0.875rem;
-  color: ${colors.CHARADE_GREY}
+  color: ${colors.CHARADE_GREY};
   margin: 0;
   padding: 8px 0px;
 `;

package/src/components/molecules/radio-section/RadioSection.js

@@ -177,6 +177,7 @@ const RadioSection = ({
                                 : () => toggleOpenSection(section.id)
                             }
                             tabIndex="-1"
+                            required={section?.required}
                           />
                         </Box>
                       )}

package/src/components/molecules/radio-section/RadioSection.stories.js

@@ -49,9 +49,10 @@ const sections = [
     title: "New Card",
     content: <p>The form to add a credit card would go here.</p>,
     rightIconsLabel: cardIconsLabel,
-    rightIcons: cardIcons
+    rightIcons: cardIcons,
+    required: true
   },
-  { id: "bar", title: "Bar", content: <div>Content 1</div> },
+  { id: "bar", title: "Bar", content: <div>Content 1</div>, required: true },
   { id: "baz", title: "Baz", content: <div>Content 2</div> }
 ];
 

package/src/components/molecules/radio-section/radio-button/RadioButton.js

@@ -19,7 +19,8 @@ const RadioButton = ({
   ariaDescribedBy = "",
   themeValues,
   ariaLabelledBy = "",
-  ariaLabel = null
+  ariaLabel = null,
+  required = false
 }) => {
   const buttonBorder = {
     onFocused: {
@@ -90,6 +91,8 @@ const RadioButton = ({
         type="radio"
         id={`radio-${name}`}
         disabled={disabled}
+        required={required}
+        aria-required={required}
         onClick={toggleRadio}
         aria-describedby={ariaDescribedBy}
         tabIndex="-1"