@thecb/components 4.3.15 → 4.4.2

package/dist/index.cjs.js

@@ -6073,16 +6073,17 @@ var createUniqueId = function createUniqueId() {
 
 var safeChildren = function safeChildren(children) {
   var replacement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var unsafeValues = [false, undefined, NaN, null];
 
   if (children && children instanceof Array) {
     return children.map(function (child) {
-      return !child ? /*#__PURE__*/React__default.createElement(React.Fragment, {
+      return unsafeValues.includes(child) ? /*#__PURE__*/React__default.createElement(React.Fragment, {
         key: createUniqueId()
       }, replacement) : child;
     });
   }
 
-  return !children ? replacement : children;
+  return unsafeValues.includes(children) ? replacement : children;
 };
 var generateClickHandler = function generateClickHandler(form, handleErrors, submitForm) {
   return function (e) {
@@ -21632,6 +21633,7 @@ var Jumbo$1 = withWindowSize(Jumbo);
 
 var fontWeight$4 = {
   "default": "600",
+  pS: "600",
   p: "600",
   pL: "600",
   h6: "700"
@@ -21646,7 +21648,8 @@ var LabeledAmount = function LabeledAmount(_ref) {
       label = _ref.label,
       amount = _ref.amount,
       themeValues = _ref.themeValues,
-      as = _ref.as;
+      as = _ref.as,
+      extraStyles = _ref.extraStyles;
   var LabeledAmountText = variant === "h6" ? Heading$1 : Paragraph$1;
   return /*#__PURE__*/React__default.createElement(Stack, {
     direction: "row"
@@ -21654,12 +21657,12 @@ var LabeledAmount = function LabeledAmount(_ref) {
     variant: variant,
     as: as,
     weight: themeValues.fontWeight,
-    extraStyles: "text-align: start; flex: 3;"
+    extraStyles: "".concat(extraStyles, "; text-align: start; flex: 3;")
   }, label, ":"), /*#__PURE__*/React__default.createElement(LabeledAmountText, {
     variant: variant,
     as: as,
     weight: themeValues.fontWeight,
-    extraStyles: "text-align: end; flex: 1;"
+    extraStyles: "".concat(extraStyles, "; text-align: end; flex: 1;")
   }, amount));
 };
 
@@ -21671,7 +21674,7 @@ var weightTitle = {
 };
 var paragraphVariant = {
   "default": "pL",
-  small: "p"
+  small: "pS"
 };
 var fallbackValues$l = {
   weightTitle: weightTitle,
@@ -39011,43 +39014,53 @@ var Modal$1 = function Modal(_ref) {
 
 var fontSize$8 = {
   "default": "1.375rem",
-  largeTitle: "1.75rem"
+  largeTitle: "1.75rem",
+  small: "1.25rem"
 };
 var fontWeight$5 = {
   "default": "600",
-  largeTitle: "700"
+  largeTitle: "700",
+  small: "600"
 };
 var fontColor = {
   "default": CHARADE_GREY,
-  largeTitle: CHARADE_GREY
+  largeTitle: CHARADE_GREY,
+  small: CHARADE_GREY
 };
 var lineHeight$4 = {
   "default": "2rem",
-  largeTitle: "2rem"
+  largeTitle: "2rem",
+  small: "2rem"
 };
 var textAlign = {
   "default": "left",
-  largeTitle: "left"
+  largeTitle: "left",
+  small: "left"
 };
 var titleType = {
   "default": "h5",
-  largeTitle: "h1"
+  largeTitle: "h1",
+  small: "h6"
 };
 var titleSpacing = {
   "default": "0.5rem",
-  largeTitle: "1.125rem"
+  largeTitle: "1.125rem",
+  small: "0.5rem"
 };
 var boxShadow$1 = {
   "default": "0px 2px 14px 0px rgb(246, 246, 249), 0px 3px 8px 0px rgb(202, 206, 216)",
-  largeTitle: "0px 2px 14px 0px rgb(246, 246, 249), 0px 3px 8px 0px rgb(202, 206, 216)"
+  largeTitle: "0px 2px 14px 0px rgb(246, 246, 249), 0px 3px 8px 0px rgb(202, 206, 216)",
+  small: "0px 2px 14px 0px rgb(246, 246, 249), 0px 3px 8px 0px rgb(202, 206, 216)"
 };
 var borderRadius = {
   "default": "0.25rem",
-  largeTitle: "0.25rem"
+  largeTitle: "0.25rem",
+  small: "0.25rem"
 };
 var backgroundColor$6 = {
   "default": WHITE,
-  largeTitle: WHITE
+  largeTitle: WHITE,
+  small: WHITE
 };
 var fallbackValues$v = {
   fontSize: fontSize$8,
@@ -39075,7 +39088,7 @@ var Module = function Module(_ref) {
       variant = _ref$variant === void 0 ? "default" : _ref$variant,
       children = _ref.children;
   return /*#__PURE__*/React__default.createElement(React.Fragment, null, heading && /*#__PURE__*/React__default.createElement(Heading$1, {
-    variant: variant === "default" ? "h5" : "h2",
+    variant: variant === "small" ? "h6" : variant === "default" ? "h5" : "h2",
     weight: themeValues.fontWeight,
     color: themeValues.fontColor,
     margin: "".concat(spacing, " 0 ").concat(themeValues.titleSpacing, " 0"),
@@ -39902,11 +39915,11 @@ var lineItem = {
 };
 var labeledAmountSubtotal = {
   "default": "pL",
-  small: "p"
+  small: "pS"
 };
 var labeledAmountTotal = {
   "default": "h6",
-  small: "pL"
+  small: "p"
 };
 var fallbackValues$y = {
   backgroundColor: backgroundColor$8,
@@ -39920,6 +39933,7 @@ var PaymentDetailsContent = function PaymentDetailsContent(_ref) {
       feeElems = _ref.feeElems,
       subtotal = _ref.subtotal,
       total = _ref.total,
+      variant = _ref.variant,
       themeValues = _ref.themeValues;
   return /*#__PURE__*/React__default.createElement(Stack, {
     childGap: "16px"
@@ -39933,7 +39947,8 @@ var PaymentDetailsContent = function PaymentDetailsContent(_ref) {
     as: "h2",
     variant: themeValues.labeledAmountTotal,
     label: "Total",
-    amount: displayCurrency(total)
+    amount: displayCurrency(total),
+    extraStyles: variant === "small" && "font-weight: ".concat(FONT_WEIGHT_BOLD, ";")
   }));
 };
 
@@ -39978,6 +39993,8 @@ var PaymentDetails = function PaymentDetails(_ref4) {
       _fees = _ref4.fees,
       subtotal = _ref4.subtotal,
       total = _ref4.total,
+      _ref4$variant = _ref4.variant,
+      variant = _ref4$variant === void 0 ? "default" : _ref4$variant,
       _ref4$hideTitle = _ref4.hideTitle,
       hideTitle = _ref4$hideTitle === void 0 ? false : _ref4$hideTitle,
       _ref4$titleText = _ref4.titleText,
@@ -40043,13 +40060,15 @@ var PaymentDetails = function PaymentDetails(_ref4) {
     feeElems: feeElems,
     subtotal: subtotal,
     total: total,
-    themeValues: themeValues
+    themeValues: themeValues,
+    variant: variant
   })) : /*#__PURE__*/React__default.createElement(PaymentDetailsContent, {
     lineItemElems: lineItemElems,
     feeElems: feeElems,
     subtotal: subtotal,
     total: total,
-    themeValues: themeValues
+    themeValues: themeValues,
+    variant: variant
   });
   var title = hideTitle ? /*#__PURE__*/React__default.createElement(React.Fragment, null) : isCollapsible ? /*#__PURE__*/React__default.createElement(Box, {
     width: "100%",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "4.3.15",
+  "version": "4.4.2",
   "description": "Common lib for CityBase react components",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/components/atoms/labeled-amount/LabeledAmount.js

@@ -5,7 +5,14 @@ import { Stack } from "../layouts";
 import Heading from "../heading";
 import Paragraph from "../paragraph";
 
-const LabeledAmount = ({ variant = "pL", label, amount, themeValues, as }) => {
+const LabeledAmount = ({
+  variant = "pL",
+  label,
+  amount,
+  themeValues,
+  as,
+  extraStyles
+}) => {
   const LabeledAmountText = variant === "h6" ? Heading : Paragraph;
   return (
     <Stack direction="row">
@@ -13,7 +20,7 @@ const LabeledAmount = ({ variant = "pL", label, amount, themeValues, as }) => {
         variant={variant}
         as={as}
         weight={themeValues.fontWeight}
-        extraStyles="text-align: start; flex: 3;"
+        extraStyles={`${extraStyles}; text-align: start; flex: 3;`}
       >
         {label}:
       </LabeledAmountText>
@@ -21,7 +28,7 @@ const LabeledAmount = ({ variant = "pL", label, amount, themeValues, as }) => {
         variant={variant}
         as={as}
         weight={themeValues.fontWeight}
-        extraStyles="text-align: end; flex: 1;"
+        extraStyles={`${extraStyles}; text-align: end; flex: 1;`}
       >
         {amount}
       </LabeledAmountText>

package/src/components/atoms/labeled-amount/LabeledAmount.theme.js

@@ -1,5 +1,6 @@
 const fontWeight = {
   default: "600",
+  pS: "600",
   p: "600",
   pL: "600",
   h6: "700"

package/src/components/atoms/line-item/LineItem.theme.js

@@ -1,5 +1,5 @@
 const weightTitle = { default: "600", small: "400" };
-const paragraphVariant = { default: "pL", small: "p" };
+const paragraphVariant = { default: "pL", small: "pS" };
 
 export const fallbackValues = {
   weightTitle,

package/src/components/molecules/module/Module.js

@@ -16,7 +16,9 @@ const Module = ({
   <Fragment>
     {heading && (
       <Heading
-        variant={variant === "default" ? "h5" : "h2"}
+        variant={
+          variant === "small" ? "h6" : variant === "default" ? "h5" : "h2"
+        }
         weight={themeValues.fontWeight}
         color={themeValues.fontColor}
         margin={`${spacing} 0 ${themeValues.titleSpacing} 0`}

package/src/components/molecules/module/Module.theme.js

@@ -1,20 +1,38 @@
 import { WHITE, CHARADE_GREY } from "../../../constants/colors";
 
-const fontSize = { default: "1.375rem", largeTitle: "1.75rem" };
-const fontWeight = { default: "600", largeTitle: "700" };
-const fontColor = { default: CHARADE_GREY, largeTitle: CHARADE_GREY };
-const lineHeight = { default: "2rem", largeTitle: "2rem" };
-const textAlign = { default: "left", largeTitle: "left" };
-const titleType = { default: "h5", largeTitle: "h1" };
-const titleSpacing = { default: "0.5rem", largeTitle: "1.125rem" };
+const fontSize = {
+  default: "1.375rem",
+  largeTitle: "1.75rem",
+  small: "1.25rem"
+};
+const fontWeight = { default: "600", largeTitle: "700", small: "600" };
+const fontColor = {
+  default: CHARADE_GREY,
+  largeTitle: CHARADE_GREY,
+  small: CHARADE_GREY
+};
+const lineHeight = { default: "2rem", largeTitle: "2rem", small: "2rem" };
+const textAlign = { default: "left", largeTitle: "left", small: "left" };
+const titleType = { default: "h5", largeTitle: "h1", small: "h6" };
+const titleSpacing = {
+  default: "0.5rem",
+  largeTitle: "1.125rem",
+  small: "0.5rem"
+};
 const boxShadow = {
   default:
     "0px 2px 14px 0px rgb(246, 246, 249), 0px 3px 8px 0px rgb(202, 206, 216)",
   largeTitle:
+    "0px 2px 14px 0px rgb(246, 246, 249), 0px 3px 8px 0px rgb(202, 206, 216)",
+  small:
     "0px 2px 14px 0px rgb(246, 246, 249), 0px 3px 8px 0px rgb(202, 206, 216)"
 };
-const borderRadius = { default: "0.25rem", largeTitle: "0.25rem" };
-const backgroundColor = { default: WHITE, largeTitle: WHITE };
+const borderRadius = {
+  default: "0.25rem",
+  largeTitle: "0.25rem",
+  small: "0.25rem"
+};
+const backgroundColor = { default: WHITE, largeTitle: WHITE, small: WHITE };
 
 export const fallbackValues = {
   fontSize,

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

@@ -10,12 +10,14 @@ import LabeledAmount from "../../atoms/labeled-amount";
 import LineItem from "../../atoms/line-item";
 import Heading from "../../atoms/heading";
 import SolidDivider from "../../atoms/solid-divider";
+import { FONT_WEIGHT_BOLD } from "../../../constants/style_constants";
 
 const PaymentDetailsContent = ({
   lineItemElems,
   feeElems,
   subtotal,
   total,
+  variant,
   themeValues
 }) => (
   <Stack childGap="16px">
@@ -35,6 +37,7 @@ const PaymentDetailsContent = ({
       variant={themeValues.labeledAmountTotal}
       label="Total"
       amount={displayCurrency(total)}
+      extraStyles={variant === "small" && `font-weight: ${FONT_WEIGHT_BOLD};`}
     />
   </Stack>
 );
@@ -74,6 +77,7 @@ const PaymentDetails = ({
   fees: _fees,
   subtotal,
   total,
+  variant = "default",
   hideTitle = false,
   titleText = "Payment Details",
   initiallyOpen = false,
@@ -113,12 +117,12 @@ const PaymentDetails = ({
       <SolidDivider />
       <Box padding="8px" />
       <PaymentDetailsContent
-        {...{ lineItemElems, feeElems, subtotal, total, themeValues }}
+        {...{ lineItemElems, feeElems, subtotal, total, themeValues, variant }}
       />
     </Stack>
   ) : (
     <PaymentDetailsContent
-      {...{ lineItemElems, feeElems, subtotal, total, themeValues }}
+      {...{ lineItemElems, feeElems, subtotal, total, themeValues, variant }}
     />
   );
   const title = hideTitle ? (

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

@@ -1,7 +1,7 @@
 const backgroundColor = { default: "transparent", small: "transparent" };
 const lineItem = { default: "default", small: "small" };
-const labeledAmountSubtotal = { default: "pL", small: "p" };
-const labeledAmountTotal = { default: "h6", small: "pL" };
+const labeledAmountSubtotal = { default: "pL", small: "pS" };
+const labeledAmountTotal = { default: "h6", small: "p" };
 
 export const fallbackValues = {
   backgroundColor,

package/src/util/general.js

@@ -17,12 +17,17 @@ const createUniqueId = () =>
     .substr(2, 9);
 
 export const safeChildren = (children, replacement = []) => {
+  const unsafeValues = [false, undefined, NaN, null];
   if (children && children instanceof Array) {
     return children.map(child =>
-      !child ? <Fragment key={createUniqueId()}>{replacement}</Fragment> : child
+      unsafeValues.includes(child) ? (
+        <Fragment key={createUniqueId()}>{replacement}</Fragment>
+      ) : (
+        child
+      )
     );
   }
-  return !children ? replacement : children;
+  return unsafeValues.includes(children) ? replacement : children;
 };
 
 export const generateClickHandler = (form, handleErrors, submitForm) => e => {