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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "12.1.0-beta.1",
+  "version": "12.1.0-beta.11",
   "description": "Common lib for CityBase react components",
   "main": "dist/index.cjs.js",
   "typings": "dist/index.d.ts",
@@ -9,7 +9,9 @@
   "scripts": {
     "storybook": "storybook dev -p 6006",
     "build": "rollup -cm",
-    "build-storybook": "storybook build"
+    "build-storybook": "storybook build",
+    "sync": "./scripts/sync-to-project.sh",
+    "publish-beta": "./scripts/publish-beta.sh"
   },
   "repository": {
     "type": "git",

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

@@ -110,6 +110,7 @@ const Checkbox = forwardRef(
       checkboxExtraStyles,
       hasIconOverride = false,
       icon: Icon,
+      customAriaLabel,
       ...rest
     },
     ref
@@ -122,9 +123,16 @@ const Checkbox = forwardRef(
       }
     };
 
-    const titleId = title ? `checkboxlabel-${name}` : undefined;
-    const ariaLabelledById = labelledById ?? titleId;
-    const ariaLabel = ariaLabelledById ? undefined : name;
+    const normalizeName = name ? name.replace(/\s+/g, "-") : "";
+    const checkboxId = `checkbox-${normalizeName}`;
+    const titleId = title ? `checkboxlabel-${normalizeName}` : undefined;
+    const ariaLabelledById = customAriaLabel
+      ? undefined
+      : labelledById ?? titleId;
+    const ariaLabel = ariaLabelledById ? undefined : customAriaLabel ?? name;
+    const errorMessageNormalized = error
+      ? `${normalizeName}-error-message`
+      : undefined;
 
     return (
       <Box
@@ -137,7 +145,7 @@ const Checkbox = forwardRef(
         aria-invalid={error}
         aria-label={ariaLabel}
         aria-labelledby={ariaLabelledById}
-        aria-describedby={error ? `${name}-error-message` : undefined}
+        aria-describedby={errorMessageNormalized}
         onFocus={() => setFocused(true)}
         onBlur={() => setFocused(false)}
         onKeyDown={e => handleClick(e, onChange)}
@@ -155,7 +163,7 @@ const Checkbox = forwardRef(
         <CheckboxLabelContainer data-qa={dataQa}>
           <CheckboxContainer data-qa="Checkbox">
             <HiddenCheckbox
-              id={`checkbox-${name}`}
+              id={checkboxId}
               disabled={disabled}
               name={name}
               checked={checked}

package/src/components/atoms/nav-footer/NavFooter.js

@@ -20,8 +20,8 @@ const NavFooter = ({
     minWidth="100%"
     extraStyles={
       isMobile
-        ? `overflow: hidden;`
-        : `height: ${footerMinHeight}; > * { height: 100%; };`
+        ? ``
+        : `min-height: ${footerMinHeight}; > * { min-height: 100%; };`
     }
     {...rest}
   >

package/src/components/molecules/partial-amount-form/PartialAmountField.js

@@ -39,7 +39,7 @@ const PartialAmountField = ({
               variant={themeValues.detailVariant}
               weight="400"
             >
-              {lineItem.subDescription} payment amount
+              {lineItem.subDescription}
             </Detail>
           </Box>
         </Stack>
@@ -53,7 +53,6 @@ const PartialAmountField = ({
       placeholder="$0.00"
       formatter={moneyFormat}
       isNum
-      isRequired
       decorator={
         <Text variant="p">
           Amount owed:{"  "}

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

@@ -14,7 +14,6 @@ import {
 } from "../../atoms/form-layouts";
 import AccountAndRoutingModal from "../account-and-routing-modal";
 import { noop } from "../../../util/general";
-import { Cluster, Cover } from "../../atoms/layouts";
 import TermsAndConditions from "../terms-and-conditions";
 
 const PaymentFormACH = ({
@@ -172,29 +171,42 @@ const PaymentFormACH = ({
             hidden={hideDefaultPayment}
           />
         )}
-        {(showWalletCheckbox || showTerms) && (
-          <Cluster childGap={"4px"} align="center">
-            {showWalletCheckbox && (
-              <Checkbox
-                name="bank checkbox"
-                dataQa="Save checking account to wallet"
-                title="Save checking account to wallet."
-                checked={walletCheckboxMarked}
-                onChange={saveToWallet}
-              />
-            )}
-            {showTerms && (
-              <Cover singleChild>
-                <TermsAndConditions
-                  version="v2"
-                  showCheckbox={false}
-                  description="View"
-                  terms={termsContent}
-                  initialFocusSelector={".modal-close-button"}
-                />
-              </Cover>
-            )}
-          </Cluster>
+        {showWalletCheckbox && (
+          <Checkbox
+            name="bank checkbox"
+            dataQa="Save checking account to wallet"
+            customAriaLabel="Save checking account to wallet (optional)."
+            title={
+              <>
+                Save checking account to wallet (optional).{" "}
+                {showTerms && (
+                  <span
+                    onClick={e => e.stopPropagation()}
+                    style={{ display: "inline" }}
+                  >
+                    <TermsAndConditions
+                      version="v2"
+                      showCheckbox={false}
+                      description="View "
+                      terms={termsContent}
+                      initialFocusSelector={".modal-close-button"}
+                    />
+                  </span>
+                )}
+              </>
+            }
+            checked={walletCheckboxMarked}
+            onChange={saveToWallet}
+          />
+        )}
+        {!showWalletCheckbox && showTerms && (
+          <TermsAndConditions
+            version="v2"
+            showCheckbox={false}
+            description="View "
+            terms={termsContent}
+            initialFocusSelector=".modal-close-button"
+          />
         )}
       </FormInputColumn>
     </FormContainer>

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

@@ -196,29 +196,42 @@ const PaymentFormCard = ({
             />
           </Box>
         )}
-        {(showWalletCheckbox || showTerms) && (
-          <Cluster childGap={"4px"} align="center">
-            {showWalletCheckbox && (
-              <Checkbox
-                name="credit card checkbox"
-                dataQa="Save credit card to wallet"
-                title="Save credit card to wallet."
-                checked={walletCheckboxMarked}
-                onChange={saveToWallet}
-              />
-            )}
-            {showTerms && (
-              <Cover singleChild>
-                <TermsAndConditions
-                  version="v2"
-                  showCheckbox={false}
-                  description="View"
-                  terms={termsContent}
-                  initialFocusSelector={".modal-close-button"}
-                />
-              </Cover>
-            )}
-          </Cluster>
+        {showWalletCheckbox && (
+          <Checkbox
+            name="bank checkbox"
+            dataQa="Save credit card to wallet"
+            customAriaLabel="Save credit card to wallet (optional)."
+            title={
+              <>
+                Save credit card to wallet (optional).{" "}
+                {showTerms && (
+                  <span
+                    onClick={e => e.stopPropagation()}
+                    style={{ display: "inline" }}
+                  >
+                    <TermsAndConditions
+                      version="v2"
+                      showCheckbox={false}
+                      description="View "
+                      terms={termsContent}
+                      initialFocusSelector={".modal-close-button"}
+                    />
+                  </span>
+                )}
+              </>
+            }
+            checked={walletCheckboxMarked}
+            onChange={saveToWallet}
+          />
+        )}
+        {!showWalletCheckbox && showTerms && (
+          <TermsAndConditions
+            version="v2"
+            showCheckbox={false}
+            description="View "
+            terms={termsContent}
+            initialFocusSelector=".modal-close-button"
+          />
         )}
       </FormInputColumn>
     </FormContainer>

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

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import styled from "styled-components";
 import Checkbox from "../../atoms/checkbox";
 import { Box, Stack, Cluster } from "../../atoms/layouts";
 import Text from "../../atoms/text";
@@ -12,6 +13,15 @@ import { generateShadows } from "../../../util/generateShadows";
 import { useScrollTo } from "../../../hooks";
 
 const TermsAndConditionsTitleDivId = "terms-and-conditions-title";
+const InlineTermsWrapper = styled.span`
+  display: inline;
+  > div {
+    display: inline;
+  }
+  .modal-trigger {
+    display: inline !important;
+  }
+`;
 
 const TermsAndConditionsControlV2 = ({
   showCheckbox = true,
@@ -42,6 +52,25 @@ const TermsAndConditionsControlV2 = ({
     }
   };
 
+  if (!showCheckbox && displayInline) {
+    return (
+      <InlineTermsWrapper id={TermsAndConditionsTitleDivId}>
+        {description && <Text color={CHARADE_GREY}>{description}</Text>}
+        {terms && (
+          <TermsAndConditionsModal
+            link={linkText}
+            terms={terms}
+            isOpen={showTerms}
+            toggleOpen={toggleTerms}
+            linkVariant={modalVariant}
+            title={modalTitle}
+            initialFocusSelector={initialFocusSelector}
+          />
+        )}
+      </InlineTermsWrapper>
+    );
+  }
+
   return (
     <Box
       padding={displayInline ? "0" : "1.5rem"}