@thecb/components 9.3.0-beta.2 → 9.3.1-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "9.3.0-beta.2",
+  "version": "9.3.1-beta.0",
   "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,8 +95,7 @@ const Checkbox = ({
   checkboxMargin = "0 16px 0 0",
   extraStyles,
   textExtraStyles,
-  dataQa = null,
-  isRequired = false
+  dataQa = null
 }) => {
   const [focused, setFocused] = useState(false);
 
@@ -143,7 +142,6 @@ 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,13 +13,12 @@ const groupId = "props";
 export const checkbox = () => (
   <Checkbox
     variant={select(variantsLabel, variants, defaultValue, groupId)}
-    title={text("title", "Checkbox Title", "props")}
-    name={text("name", "Checkbox Name", "props")}
+    title={text("title", "Checkbox", "props")}
+    name={text("name", "Checkbox", "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,8 +10,7 @@ const CountryDropdown = ({
   fieldActions,
   showErrors,
   onChange,
-  dataQa = null,
-  isRequired = false
+  dataQa = null
 }) => (
   <FormSelect
     options={options}
@@ -23,7 +22,6 @@ const CountryDropdown = ({
     showErrors={showErrors}
     onChange={onChange}
     autocompleteValue="country-name"
-    isRequired={isRequired}
   />
 );
 export default CountryDropdown;

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

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

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

@@ -105,10 +105,8 @@ const Dropdown = ({
   ariaDescribedby,
   autocompleteValue, // browser autofill value, like country-name
   smoothScroll = true,
-  ariaInvalid = false,
-  isRequired = false
+  ariaInvalid = false
 }) => {
-  const required = options.required || isRequired;
   const [inputValue, setInputValue] = useState("");
   const [optionsState, setOptionsState] = useState([]);
   const [filteredOptions, setFilteredOptions] = useState([]);
@@ -298,8 +296,7 @@ const Dropdown = ({
         aria-labelledby={ariaLabelledby}
         aria-describedby={ariaDescribedby}
         aria-expanded={isOpen}
-        aria-required={required}
-        required={required}
+        aria-required={options.required}
         aria-invalid={ariaInvalid}
         background={isOpen ? themeValues.hoverColor : WHITE}
         borderRadius="2px"
@@ -331,6 +328,7 @@ const Dropdown = ({
         }}
         padding="12px"
         placeholder={getSelection()}
+        required={options.required}
         role="combobox"
         themeValues={themeValues}
         title={hasTitles ? getSelection() : null}
@@ -338,7 +336,6 @@ const Dropdown = ({
         tabIndex={0}
         value={inputValue}
         width="100%"
-        disabled={disabledValues.includes(inputValue)}
       />
       <IconWrapper open={isOpen} onClick={onClick}>
         <DropdownIcon />
@@ -353,7 +350,6 @@ 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,10 +116,8 @@ const FormInput = ({
   extraStyles,
   removeFromValue, // regex of characters to remove before setting value
   dataQa = null,
-  isRequired = false,
   ...props
 }) => {
-  const required = isRequired || props?.required;
   const [showPassword, setShowPassword] = useState(false);
   const { isMobile } = useContext(ThemeContext);
   const setValue = value => {
@@ -223,7 +221,6 @@ const FormInput = ({
             $extraStyles={extraStyles}
             data-qa={dataQa || labelTextWhenNoError}
             autoComplete={autocompleteValue}
-            required={required}
             {...props}
           />
         ) : (
@@ -250,7 +247,6 @@ const FormInput = ({
             $extraStyles={extraStyles}
             data-qa={dataQa || labelTextWhenNoError}
             autoComplete={autocompleteValue}
-            required={required}
             {...props}
           />
         )}

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

@@ -1,4 +1,4 @@
-import React, { useState, useMemo, useRef, useEffect } from "react";
+import React, { useState, useRef, useEffect } from "react";
 import Dropdown from "../dropdown";
 import Text from "../text";
 import { ERROR_COLOR } from "../../../constants/colors";
@@ -24,25 +24,10 @@ 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,
-  isRequired = false
+  widthFitOptions = 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)) {
@@ -60,8 +45,8 @@ const FormSelect = ({
   return (
     <SelectContainer
       ref={dropdownRef}
-      aria-role="group"
       disabled={disabled}
+      aria-disabled={disabled}
       data-qa={dataQa}
     >
       <Box padding="0" minWidth="100%">
@@ -76,15 +61,18 @@ const FormSelect = ({
               &::first-letter {
                 text-transform: uppercase;
               }`}
-            id={labelId(labelTextWhenNoError)}
+            id={createIdFromString(labelTextWhenNoError)}
           >
             {labelTextWhenNoError}
           </Text>
         </Cluster>
       </Box>
       <Dropdown
-        ariaLabelledby={labelId(labelTextWhenNoError)}
-        ariaDescribedby={descriptionId(field, labelTextWhenNoError)}
+        ariaLabelledby={createIdFromString(labelTextWhenNoError)}
+        ariaDescribedby={createIdFromString(
+          labelTextWhenNoError,
+          "error message"
+        )}
         maxHeight={dropdownMaxHeight}
         widthFitOptions={widthFitOptions}
         hasTitles={hasTitles}
@@ -106,7 +94,6 @@ const FormSelect = ({
         disabled={disabled}
         autocompleteValue={autocompleteValue}
         smoothScroll={smoothScroll}
-        isRequired={required}
       />
       <Stack direction="row" justify="space-between">
         <Text

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

@@ -12,7 +12,7 @@ const { mapStateToProps, mapDispatchToProps, reducer } = createFormState({
   }
 });
 const errorMessages = {
-  [required.error]: "This field is required."
+  [required.error]: "thing 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 Label"
+    labelTextWhenNoError="Form Select"
     errorMessages={errorMessages}
     options={options}
     field={props.fields.thing}

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

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

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

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

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

@@ -58,7 +58,6 @@ 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
@@ -82,7 +81,6 @@ const AddressForm = ({
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="address-line1"
           dataQa="Address"
-          isRequired={true}
         />
         <FormInput
           labelTextWhenNoError="Apt, Suite, Unit, Floor, etc. (Optional)"
@@ -92,7 +90,6 @@ const AddressForm = ({
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="address-line2"
           dataQa="Address Line 2"
-          isRequired={false}
         />
         <FormInput
           labelTextWhenNoError="City"
@@ -103,7 +100,6 @@ const AddressForm = ({
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="address-level2"
           dataQa="City"
-          isRequired={true}
         />
         <StateProvinceDropdown
           labelTextWhenNoError={isUS ? "State" : "State or Province"}
@@ -114,7 +110,6 @@ const AddressForm = ({
           showErrors={showErrors}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           dataQa="State or Province"
-          isRequired={true}
         />
         <FormInput
           isNum={isUS}
@@ -127,7 +122,6 @@ 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,7 +76,6 @@ const PaymentFormACH = ({
           showErrors={showErrors}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="name"
-          isRequired={true}
         />
         <FormInput
           labelTextWhenNoError="Routing number"
@@ -98,7 +97,6 @@ const PaymentFormACH = ({
             />
           )}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
-          isRequired={true}
         />
         <FormInput
           labelTextWhenNoError="Confirm routing number"
@@ -108,7 +106,6 @@ const PaymentFormACH = ({
           fieldActions={actions.fields.confirmRoutingNumber}
           showErrors={showErrors}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
-          isRequired={true}
           isNum
         />
         <FormInput
@@ -118,7 +115,6 @@ const PaymentFormACH = ({
           field={fields.accountNumber}
           fieldActions={actions.fields.accountNumber}
           showErrors={showErrors}
-          isRequired={true}
           isNum
           helperModal={() => (
             <AccountAndRoutingModal
@@ -136,7 +132,6 @@ const PaymentFormACH = ({
         <FormInput
           labelTextWhenNoError="Confirm account number"
           dataQa="Confirm account number"
-          isRequired={true}
           errorMessages={confirmAccountNumberErrors}
           field={fields.confirmAccountNumber}
           fieldActions={actions.fields.confirmAccountNumber}
@@ -147,7 +142,6 @@ const PaymentFormACH = ({
         {allowBankAccountType && (
           <FormSelect
             labelTextWhenNoError="Account type"
-            isRequired={true}
             dataQa="Account type"
             options={[
               { text: "Select account type", value: "" },
@@ -188,7 +182,6 @@ const PaymentFormACH = ({
                   showCheckbox={false}
                   description="View"
                   terms={termsContent}
-                  isRequired={true}
                 />
               </Cover>
             )}

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

@@ -98,7 +98,6 @@ const PaymentFormCard = ({
         {!hideZipCode && (
           <CountryDropdown
             labelTextWhenNoError="Country"
-            isRequired={true}
             errorMessages={countryErrorMessages}
             field={fields.country}
             onChange={value => {
@@ -122,7 +121,6 @@ const PaymentFormCard = ({
           showErrors={showErrors}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="cc-name"
-          isRequired={true}
         />
         <FormInput
           labelTextWhenNoError="Credit card number"
@@ -135,7 +133,6 @@ const PaymentFormCard = ({
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           isNum
           autocompleteValue="cc-number"
-          isRequired={true}
         />
         <FormInputRow
           breakpoint={isMobile ? "1000rem" : "21rem"}
@@ -153,7 +150,6 @@ const PaymentFormCard = ({
             isNum
             removeFromValue={/\//} // removes "/" from browser autofill
             autocompleteValue="cc-exp"
-            isRequired={true}
           />
           <FormInput
             labelTextWhenNoError="CVV"
@@ -170,7 +166,6 @@ const PaymentFormCard = ({
             }
             onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
             autocompleteValue="cc-csc"
-            isRequired={true}
           />
         </FormInputRow>
         {!hideZipCode && (
@@ -189,7 +184,6 @@ const PaymentFormCard = ({
               showErrors={showErrors}
               onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
               autocompleteValue="billing postal-code"
-              isRequired={true}
             />
           </Box>
         )}
@@ -211,7 +205,6 @@ const PaymentFormCard = ({
                   showCheckbox={false}
                   description="View"
                   terms={termsContent}
-                  isRequired={true}
                 />
               </Cover>
             )}

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

@@ -47,7 +47,8 @@ const RadioSection = ({
   initiallyOpen = true,
   openHeight = "auto",
   containerStyles = "",
-  ariaDescribedBy
+  ariaDescribedBy,
+  ariaLabel = "Please select an option."
 }) => {
   const handleKeyDown = (id, e) => {
     if (e?.keyCode === 13 || e?.keyCode === 32) {
@@ -105,7 +106,7 @@ const RadioSection = ({
       borderRadius="4px"
       extraStyles={containerStyles}
     >
-      <Stack childGap="0" role="radiogroup">
+      <Stack childGap="0" role="radiogroup" aria-label={ariaLabel}>
         {sections
           .filter(section => !section.hidden)
           .map(section => (
@@ -177,7 +178,6 @@ const RadioSection = ({
                                 : () => toggleOpenSection(section.id)
                             }
                             tabIndex="-1"
-                            required={section?.required}
                           />
                         </Box>
                       )}
@@ -198,7 +198,7 @@ const RadioSection = ({
                       <Cluster
                         childGap="0.5rem"
                         aria-label={section?.rightIconsLabel || null}
-                        role={section?.rightIconsRole || "group"}
+                        role={section?.rightIconsRole || null}
                       >
                         {section.rightIcons.map(icon => (
                           <RightIcon

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

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

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

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

package/src/components/molecules/terms-and-conditions/TermsAndConditionsControlV1.js

@@ -22,7 +22,6 @@ const TermsAndConditionsControlV1 = ({
           error={error}
           checked={isChecked}
           onChange={onCheck}
-          isRequired={true}
         />
         <Box padding="0 0 0 58px">
           <Stack>

package/src/components/molecules/terms-and-conditions/TermsAndConditionsControlV2.js

@@ -57,7 +57,6 @@ const TermsAndConditionsControlV2 = ({
               onChange={onCheck}
               checkboxMargin={checkboxMargin}
               extraStyles={`align-self: flex-start;`}
-              isRequired={true}
             />
           )}
           <Stack childGap="0.25rem" fullHeight>