@thecb/components 9.0.0-beta.1 → 9.0.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "9.0.0-beta.1",
+  "version": "9.0.0-beta.11",
   "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,7 @@ const Checkbox = ({
   checkboxMargin = "0 16px 0 0",
   extraStyles,
   textExtraStyles,
-  dataQa = "Checkbox Label"
+  dataQa = null
 }) => {
   const [focused, setFocused] = useState(false);
 
@@ -130,9 +130,11 @@ const Checkbox = ({
             aria-describedby={error ? `${name}-error-message` : ""}
           />
           <StyledCheckbox
+            role="checkbox"
             error={error}
             disabled={disabled}
             checked={checked}
+            aria-checked={checked}
             focused={focused}
             defaultStyles={themeValues.defaultStyles}
             checkedStyles={themeValues.checkedStyles}

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

@@ -4,20 +4,20 @@ import FormSelect from "../form-select";
 import { options } from "./options";
 
 const CountryDropdown = ({
-  labelTextWhenNoError,
+  labelTextWhenNoError = "Country",
   errorMessages,
   field,
   fieldActions,
   showErrors,
   onChange,
-  dataQa = "Country Dropdown"
+  dataQa = null
 }) => (
   <FormSelect
     options={options}
     field={field}
     fieldActions={fieldActions}
     labelTextWhenNoError={labelTextWhenNoError}
-    dataQa={dataQa}
+    dataQa={dataQa || "CountryDropdown"}
     errorMessages={errorMessages}
     showErrors={showErrors}
     onChange={onChange}

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

@@ -26,7 +26,6 @@ const story = page({
 const CountryFormWrapper = ({ fields, actions }) => (
   <Box minHeight="300px">
     <CountryDropdown
-      labelTextWhenNoError="Country"
       errorMessages={errorMessages}
       options={options}
       field={fields.country}

package/src/components/atoms/display-box/DisplayBox.js

@@ -4,12 +4,7 @@ import { fallbackValues } from "./DisplayBox.theme";
 import { themeComponent } from "../../../util/themeUtils";
 import { RED } from "../../../constants/colors";
 
-const DisplayBox = ({
-  children,
-  themeValues,
-  showError,
-  dataQa = "DisplayBox"
-}) => (
+const DisplayBox = ({ children, themeValues, showError, dataQa = null }) => (
   <Box padding="0.5rem 0 1.5rem 0">
     <Box
       padding="1.5rem"

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

@@ -3,7 +3,6 @@ import { Box, Stack } from "../layouts";
 import Text from "../text";
 import {
   noop,
-  createIdFromString,
   inputDisabledStyle,
   inputPlaceholderTextStyle
 } from "../../../util/general";
@@ -290,13 +289,15 @@ const Dropdown = ({
         as="input"
         aria-multiline="false"
         autoComplete={autocompleteValue}
-        aria-controls={`${createIdFromString(ariaLabelledby)}_listbox`}
+        aria-controls={`${ariaLabelledby}_listbox`}
         aria-activedescendant="focused_option"
         aria-owns={`${ariaLabelledby}_listbox`}
         aria-haspopup="listbox"
         aria-labelledby={ariaLabelledby}
         aria-describedby={ariaDescribedby}
         aria-expanded={isOpen}
+        aria-required={options.required}
+        aria-invalid={ariaInvalid}
         background={isOpen ? themeValues.hoverColor : WHITE}
         borderRadius="2px"
         borderSize="1px"
@@ -307,6 +308,7 @@ const Dropdown = ({
             ? themeValues.selectedColor
             : GREY_CHATEAU
         }
+        dataQa={placeholder}
         extraStyles={
           disabled
             ? `${inputPlaceholderTextStyle}${inputDisabledStyle}`
@@ -326,6 +328,7 @@ const Dropdown = ({
         }}
         padding="12px"
         placeholder={getSelection()}
+        required={options.required}
         role="combobox"
         themeValues={themeValues}
         title={hasTitles ? getSelection() : null}
@@ -333,10 +336,6 @@ const Dropdown = ({
         tabIndex={0}
         value={inputValue}
         width="100%"
-        dataQa={placeholder}
-        required={options.required}
-        aria-required={options.required}
-        aria-invalid={ariaInvalid}
       />
       <IconWrapper open={isOpen} onClick={onClick}>
         <DropdownIcon />
@@ -383,8 +382,8 @@ const Dropdown = ({
                     data-qa={choice.text}
                     themeValues={themeValues}
                     title={hasTitles ? choice.text : null}
-                    onFocus={() => setFocusedRef(optionRefs.current[i])}
                     role="option"
+                    onFocus={() => setFocusedRef(optionRefs.current[i])}
                   >
                     <Text
                       variant="p"
@@ -396,14 +395,14 @@ const Dropdown = ({
                           : MINESHAFT_GREY
                       }
                       extraStyles={`padding-left: 16px; 
-                        cursor: ${
-                          disabledValues.includes(choice.value)
-                            ? "default"
-                            : "pointer"
-                        }; 
-                        white-space: nowrap; 
-                        overflow: hidden; 
-                        text-overflow: ellipsis;`}
+                      cursor: ${
+                        disabledValues.includes(choice.value)
+                          ? "default"
+                          : "pointer"
+                      }; 
+                      white-space: nowrap; 
+                      overflow: hidden; 
+                      text-overflow: ellipsis;`}
                     >
                       {choice.text}
                     </Text>

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

@@ -112,10 +112,10 @@ const FormInput = ({
   themeValues,
   background,
   customHeight,
-  autocompleteValue = "",
+  autocompleteValue = null,
   extraStyles,
   removeFromValue, // regex of characters to remove before setting value
-  dataQa,
+  dataQa = null,
   ...props
 }) => {
   const [showPassword, setShowPassword] = useState(false);
@@ -256,7 +256,6 @@ const FormInput = ({
         justify="space-between"
         aria-live="polite"
         aria-atomic={true}
-        data-qa={`${labelTextWhenNoError} error message`}
       >
         {(field.hasErrors && field.dirty) || (field.hasErrors && showErrors) ? (
           <Text

package/src/components/atoms/form-layouts/index.d.ts

@@ -23,9 +23,9 @@ export interface FormInputProps {
   themeValues?: object;
   background?: string;
   customHeight?: string;
-  autocompleteValue?: string;
+  autocompleteValue?: string | null;
   removeFromValue?: RegExp;
-  dataQa?: string;
+  dataQa?: string | null;
 }
 
 export const FormInput: React.FC<Expand<FormInputProps> &

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

@@ -21,9 +21,9 @@ const FormSelect = ({
   disabled,
   themeValues,
   hasTitles = false,
-  autocompleteValue = "", // browser autofill value, like country-name or address-level1 for state
+  autocompleteValue = null, // browser autofill value, like country-name
   smoothScroll = true, // whether the browser should animate scroll to selected item on first open
-  dataQa = "FormSelect"
+  dataQa = null
 }) => {
   const [open, setOpen] = useState(false);
   const dropdownRef = useRef(null);
@@ -42,7 +42,12 @@ const FormSelect = ({
   });
 
   return (
-    <SelectContainer ref={dropdownRef} disabled={disabled} data-qa={dataQa}>
+    <SelectContainer
+      ref={dropdownRef}
+      disabled={disabled}
+      aria-disabled={disabled}
+      data-qa={dataQa}
+    >
       <Box padding="0" minWidth="100%">
         <Cluster justify="space-between" align="center">
           <Text
@@ -62,8 +67,8 @@ const FormSelect = ({
         </Cluster>
       </Box>
       <Dropdown
-        ariaLabelledby={labelTextWhenNoError}
-        ariaDescribedBy={createIdFromString(
+        ariaLabelledby={createIdFromString(labelTextWhenNoError)}
+        ariaDescribedby={createIdFromString(
           labelTextWhenNoError,
           "error message"
         )}

package/src/components/atoms/form-select/index.d.ts

@@ -20,9 +20,9 @@ export interface FormSelectProps {
   disabledValues?: string[];
   themeValues?: object;
   hasTitles?: boolean;
-  autocompleteValue?: string;
+  autocompleteValue?: string | null;
   smoothScroll?: boolean;
-  dataQa?: string;
+  dataQa?: string | null;
 }
 
 export const FormSelect: React.FC<Expand<FormSelectProps> &

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

@@ -10,8 +10,7 @@ const FormStateDropdown = ({
   fieldActions,
   showErrors,
   countryCode,
-  autocompleteValue = "administrative-area",
-  dataQa = "StateProvinceDropdown"
+  autocompleteValue = null
 }) => {
   const placeholder =
     countryCode === "US" ? placeHolderOptionUS : placeHolderOption;
@@ -24,9 +23,7 @@ const FormStateDropdown = ({
       labelTextWhenNoError={labelTextWhenNoError}
       errorMessages={errorMessages}
       showErrors={showErrors}
-      aria-invalid={!!errorMessages?.length}
       autocompleteValue={autocompleteValue}
-      dataQa={dataQa}
     />
   );
 };

package/src/components/molecules/account-and-routing-modal/AccountAndRoutingModal.js

@@ -17,7 +17,7 @@ const AccountAndRoutingModal = ({
   content,
   imageType,
   themeValues,
-  dataQa = "AccountAndRoutingModal"
+  dataQa = null
 }) => (
   <Modal
     modalOpen={isOpen}
@@ -52,7 +52,6 @@ const AccountAndRoutingModal = ({
     }}
   >
     <Text
-      role="button"
       variant="pS"
       onClick={() => toggleOpen(true)}
       onKeyPress={e => e.key === "Enter" && toggleOpen(true)}

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

@@ -3,6 +3,7 @@ import { required, hasLength } from "redux-freeform";
 import StateProvinceDropdown from "../../atoms/state-province-dropdown";
 import Checkbox from "../../atoms/checkbox";
 import CountryDropdown from "../../atoms/country-dropdown";
+import { noop } from "../../../util/general";
 import { zipFormat } from "../../../util/formats";
 import {
   FormInput,
@@ -19,7 +20,8 @@ const AddressForm = ({
   handleSubmit = noop,
   showWalletCheckbox,
   saveToWallet,
-  walletCheckboxMarked
+  walletCheckboxMarked,
+  dataQa = null
 }) => {
   if (clearOnDismount) {
     useEffect(() => () => actions.form.clear(), []);
@@ -45,7 +47,12 @@ const AddressForm = ({
   const isUS = fields.country.rawValue === "US";
 
   return (
-    <FormContainer variant={variant} role="form" aria-label="Address">
+    <FormContainer
+      variant={variant}
+      role="form"
+      aria-label="Address"
+      dataQa={dataQa}
+    >
       <FormInputColumn>
         <CountryDropdown
           labelTextWhenNoError="Country"
@@ -73,7 +80,7 @@ const AddressForm = ({
           showErrors={showErrors}
           onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="address-line1"
-          dataQa="Address Line 1"
+          dataQa="Address"
         />
         <FormInput
           labelTextWhenNoError="Apt, Suite, Unit, Floor, etc. (Optional)"

package/src/components/molecules/modal/Modal.js

@@ -45,7 +45,7 @@ const Modal = ({
   isLoading,
   buttonExtraStyles,
   children,
-  dataQa = ""
+  dataQa = null
 }) => {
   const { isMobile } = useContext(ThemeContext);
   const modalContainerRef = useRef(null);

package/src/components/molecules/payment-details/PaymentDetails.js

@@ -13,6 +13,7 @@ import { displayCurrency } from "../../../util/general";
 import { themeComponent } from "../../../util/themeUtils";
 import CollapsibleSection from "../collapsible-section";
 
+import LoadingLine from "../../atoms/loading-line";
 import LabeledAmount from "../../atoms/labeled-amount";
 import LineItem from "../../atoms/line-item";
 import Title from "../../atoms/title";
@@ -120,22 +121,41 @@ const PaymentDetailsContent = ({
 );
 
 const LoadingDetails = () => (
-  <Box
-    padding="0"
-    background={GRECIAN_GREY}
-    borderRadius="4px"
-    minHeight="196px"
-  >
-    <Cover minHeight="196px" singleChild fillCenter>
-      <Center intrinsic>
-        <Box
-          padding="0"
-          extraStyles={`flex-grow: 1; display: flex; justify-content: center; align-items: center;`}
-        >
-          <Spinner size="100" centerSpinner />
-        </Box>
-      </Center>
-    </Cover>
+  <Box padding="0" minHeight="196px">
+    <Box
+      padding="0"
+      extraStyles={`position: absolute;
+        height: 200px;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;`}
+    >
+      <Spinner size="100" centerSpinner />
+    </Box>
+    <Stack childGap="16px">
+      <Cluster nowrap justify="space-between" align="start">
+        <LoadingLine exactWidth="110" height="27px" />
+        <LoadingLine exactWidth="60" height="27px" />
+      </Cluster>
+      <SolidDivider />
+      <Box padding="0.5rem 0">
+        <Cluster justify="space-between" align="start">
+          <LoadingLine exactWidth="80" height="27px" />
+          <LoadingLine exactWidth="60" height="27px" />
+        </Cluster>
+        <Box padding="4px 0" />
+        <Cluster justify="space-between" align="start">
+          <LoadingLine exactWidth="100" height="27px" />
+          <LoadingLine exactWidth="50" height="27px" />
+        </Cluster>
+      </Box>
+      <SolidDivider />
+      <Stack justify="space-between" direction="row">
+        <LoadingLine exactWidth="55" height="30px" />
+        <LoadingLine exactWidth="70" height="30px" />
+      </Stack>
+    </Stack>
   </Box>
 );
 

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

@@ -140,7 +140,7 @@ const PaymentFormCard = ({
         >
           <FormInput
             labelTextWhenNoError="Expiration date (MM/YY)"
-            dataQa="Expiration date"
+            dataQa="Expiration date (MM/YY)"
             errorMessages={expirationDateErrors}
             field={fields.expirationDate}
             fieldActions={actions.fields.expirationDate}

package/src/components/molecules/phone-form/PhoneForm.js

@@ -6,6 +6,7 @@ import {
   FormContainer,
   FormInputColumn
 } from "../../atoms/form-layouts";
+import { noop } from "../../../util/general";
 import Checkbox from "../../atoms/checkbox";
 import { phoneFormats, formatDelimiter } from "../../../util/formats";
 
@@ -41,6 +42,7 @@ const PhoneForm = ({
           onKeyUp={e => e.key === "Enter" && handleSubmit(e)}
           autocompleteValue="tel"
           dataQa="Phone number"
+          isNum={true}
         />
         {showWalletCheckbox && (
           <Checkbox

package/src/components/molecules/registration-form/RegistrationForm.js

@@ -60,6 +60,7 @@ const RegistrationForm = ({
         showErrors={showErrors}
         onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
         autocompleteValue="given-name"
+        dataQa="First name"
       />
       <FormInput
         labelTextWhenNoError="Last name"
@@ -69,6 +70,7 @@ const RegistrationForm = ({
         showErrors={showErrors}
         onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
         autocompleteValue="family-name"
+        dataQa="Last name"
       />
       <FormInput
         labelTextWhenNoError="Email address"
@@ -80,6 +82,7 @@ const RegistrationForm = ({
         type="email"
         isEmail
         autocompleteValue="email"
+        dataQa="Email address"
       />
       <FormInput
         labelTextWhenNoError="Password"
@@ -90,6 +93,7 @@ const RegistrationForm = ({
         onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
         type="password"
         autocompleteValue="new-password"
+        dataQa="Password"
       />
       <FormInput
         labelTextWhenNoError="Confirm password"
@@ -100,6 +104,7 @@ const RegistrationForm = ({
         onKeyDown={e => e.key === "Enter" && handleSubmit(e)}
         type="password"
         autocompleteValue="new-password"
+        dataQa="Confirm password"
       />
       <Box padding={isMobile ? "0" : "0.5rem 0 0"}>
         <PasswordRequirements password={fields.password} isMobile={isMobile} />

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

@@ -10,17 +10,15 @@ const TermsAndConditionsControlV1 = ({
   html,
   terms,
   error = false,
-  linkVariant,
-  dataQa = "TermsAndConditionsControlV1"
+  linkVariant
 }) => {
   const [showTerms, toggleShowTerms] = useState(false);
   return (
-    <DisplayBox dataQ={dataQa}>
+    <DisplayBox>
       <Stack>
         <Checkbox
           name="terms"
           title="Terms and Conditions"
-          dataQa="Terms and Conditions"
           error={error}
           checked={isChecked}
           onChange={onCheck}

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

@@ -26,8 +26,7 @@ const TermsAndConditionsControlV2 = ({
   modalVariant = "default",
   containerBackground = ATHENS_GREY,
   checkboxMargin = "4px 8px 4px 4px",
-  modalTitle = "Terms and Conditions",
-  dataQa = "TermsAndConditionsControlV2"
+  modalTitle = "Terms and Conditions"
 }) => {
   const [showTerms, toggleShowTerms] = useState(false);
   const standardBoxShadow = generateShadows().standard.base;
@@ -46,7 +45,6 @@ const TermsAndConditionsControlV2 = ({
       background={displayInline ? "transparent" : containerBackground}
       boxShadow={displayInline ? "none" : standardBoxShadow}
       borderRadius={displayInline ? "0" : "4px"}
-      dataQa={dataQa}
     >
       <Stack childGap="0">
         {html && <Box padding="0">{html}</Box>}

package/src/components/atoms/dropdown/index.d.ts

@@ -1,32 +0,0 @@
-import React from "react";
-import Expand from "../../../util/expand";
-
-export interface DropdownOption {
-  text: string;
-  value: string;
-}
-
-export interface DropdownProps {
-  placeholder?: string;
-  options?: DropdownOption[];
-  value?: string;
-  isOpen?: boolean;
-  isError?: boolean;
-  onSelect?: (event: React.SyntheticEvent<HTMLElement>) => void;
-  disabledValues?: string[];
-  onClick?: (event: React.MouseEvent<HTMLElement>) => void;
-  themeValues?: object;
-  maxHeight?: string;
-  widthFitOptions?: boolean;
-  disabled?: boolean;
-  hasTitles?: boolean;
-  autoEraseTypeAhead?: true;
-  ariaLabelledby?: string;
-  ariaDescribedby?: string;
-  autocompleteValue?: string;
-  smoothScroll?: boolean;
-  ariaInvalid?: boolean;
-}
-
-export const Dropdown: React.FC<Expand<DropdownProps> &
-  React.HTMLAttributes<HTMLElement>>;

package/src/components/atoms/state-province-dropdown/index.d.ts

@@ -1,26 +0,0 @@
-import React from "react";
-
-import {
-  ErrorMessageDictionary,
-  Field,
-  FieldActions,
-  FormSelectOption
-} from "../../../types/common";
-import Expand from "../../../util/expand";
-
-export interface StateProvinceDropdownProps {
-  labelTextWhenNoError?: string;
-  errorMessages?: ErrorMessageDictionary;
-  field?: Field;
-  fieldActions?: FieldActions;
-  options?: FormSelectOption[];
-  showErrors?: boolean;
-  countryCode?: string;
-  autocompleteValue?: string;
-  dataQa?: string;
-}
-
-export const StateProvinceDropdown: React.FC<Expand<
-  StateProvinceDropdownProps
-> &
-  React.HTMLAttributes<HTMLElement>>;