@thecb/components 11.8.0-beta.3 → 11.8.0-beta.4

package/package.json

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

package/src/components/atoms/alert/Alert.theme.js

@@ -1,8 +1,10 @@
 import {
   APRICOT_ORANGE,
+  INFO_BLUE,
   BLUSH_RED,
   HINT_GREEN,
   ZEST_ORANGE,
+  MATISSE_BLUE,
   RAZZMATAZZ_RED,
   EMERALD_GREEN,
   MUSTARD_YELLOW,
@@ -14,20 +16,18 @@ import {
   THUNDERBIRD_RED,
   HAZE_GREEN,
   ZODIAC_BLUE,
-  SCIENCE_BLUE,
-  LUCKY_POINT,
-  HAWKES_BLUE
+  SCIENCE_BLUE
 } from "../../../constants/colors";
 
 const background = {
-  info: `${HAWKES_BLUE}`,
+  info: `${INFO_BLUE}`,
   warn: `${APRICOT_ORANGE}`,
   error: `${BLUSH_RED}`,
   success: `${HINT_GREEN}`
 };
 
 const border = {
-  info: `${LUCKY_POINT}`,
+  info: `${MATISSE_BLUE}`,
   warn: `${ZEST_ORANGE}`,
   error: `${RAZZMATAZZ_RED}`,
   success: `${EMERALD_GREEN}`

package/src/components/molecules/payment-button-bar/PaymentButtonBar.js

@@ -31,15 +31,20 @@ const PaymentButtonBar = ({
 }) => {
   const { isMobile } = useContext(ThemeContext);
 
+  // cancel URLs are external (back to client system)
+  const handleCancel = () => {
+    window.location.href = cancelURL;
+  };
+
   const backButton =
     !!cancelURL && !!cancelText ? (
-      <ButtonWithLink
+      <ButtonWithAction
         text={cancelText}
-        url={cancelURL}
+        action={handleCancel}
         variant={backButtonVariant}
         extraStyles={isMobile && "flex-grow: 1"}
         dataQa={backButtonTestId || cancelText}
-        aria-labelledby={`${kebabCaseString(cancelText)}-button`}
+        aria-label={`${cancelText}, navigate back to previous site`}
         role="link"
       />
     ) : (
@@ -50,7 +55,7 @@ const PaymentButtonBar = ({
           action={backButtonAction}
           extraStyles={isMobile && "flex-grow: 1"}
           dataQa="Back"
-          aria-labelledby="back-button"
+          aria-label={"Back, navigate to previous page"}
           role="link"
         />
       )

package/src/components/molecules/tooltip/Tooltip.js

@@ -7,8 +7,8 @@ import ButtonWithAction from "../../atoms/button-with-action";
 import { noop } from "../../../util/general";
 import { ESCAPE } from "../../../constants/keyboard";
 import { fallbackValues } from "./Tooltip.theme";
-import IconAdd from "../../atoms/icons/IconAdd";
-import { BLACK } from "../../../constants/colors";
+import WarningIconXS from "../../atoms/icons/WarningIconXS";
+import { SELECTIVE_YELLOW } from "../../../constants/colors";
 
 const arrowBorder = (borderColor, direction, width = "8px") => {
   const angle = `${width} solid transparent`;
@@ -29,32 +29,36 @@ const Tooltip = ({
   triggerText = "",
   content = "",
   hasIconTrigger = false,
-  IconTrigger = IconAdd,
+  IconTrigger = WarningIconXS,
   iconHelpText = "",
-  tooltipID = 0,
-  extraStyles,
+  tooltipID = "tooltip-content",
+  extraStyles = "",
   textExtraStyles = "",
   minWidth = "250px",
   maxWidth = "300px",
   height = "auto",
-  position,
-  arrowPosition,
   arrowDirection = "down",
-  transform = "none",
+  arrowPosition = {
+    arrowTop: "auto",
+    arrowRight: "10px",
+    arrowBottom: "-8px",
+    arrowLeft: "auto"
+  },
+  position = {
+    top: "-110px",
+    right: "auto",
+    bottom: "auto",
+    left: "-225px"
+  },
+  iconColor = SELECTIVE_YELLOW,
   buttonExtraStyles,
   backgroundColor = "white",
   borderColor = "rgba(255, 255, 255, 0.85)",
-  tooltipExtraStyles
+  tooltipContentExtraStyles
 }) => {
   const { hoverColor, activeColor, tooltipTriggerColor } = themeValues;
-  const { top = "-110px", right = "auto", bottom = "auto", left = "-225px" } =
-    position ?? {};
-  const {
-    arrowTop = "auto",
-    arrowRight = "10px",
-    arrowBottom = "-8px",
-    arrowLeft = "auto"
-  } = arrowPosition ?? {};
+  const { top, right, bottom, left } = position ?? {};
+  const { arrowTop, arrowRight, arrowBottom, arrowLeft } = arrowPosition ?? {};
 
   const [tooltipOpen, setTooltipOpen] = useState(false);
 
@@ -89,8 +93,10 @@ const Tooltip = ({
       >
         {hasIconTrigger && (
           <>
-            <IconTrigger stroke={BLACK} />
-            <Box padding="0" srOnly>
+            <Box aria-label="Trigger Popover">
+              <IconTrigger color={iconColor} />
+            </Box>
+            <Box padding="0" srOnly aria-hidden="true">
               <Text>{iconHelpText}</Text>
             </Box>
           </>
@@ -107,6 +113,7 @@ const Tooltip = ({
         role="tooltip"
         minWidth={minWidth}
         maxWidth={maxWidth}
+        aria-hidden={!tooltipOpen}
         extraStyles={`
           display: ${tooltipOpen ? "block" : "none"}; 
           position: absolute; 
@@ -115,8 +122,7 @@ const Tooltip = ({
           bottom: ${bottom}; 
           left: ${left};
           height: ${height};
-          transform: ${transform};
-          ${tooltipExtraStyles};
+          ${tooltipContentExtraStyles};
           `}
       >
         <Paragraph>{content}</Paragraph>

package/src/components/molecules/tooltip/Tooltip.stories.js

@@ -1,6 +1,5 @@
 import Tooltip from "./Tooltip";
-import IconAdd from "../../atoms/icons/IconAdd";
-
+import WarningIconXS from "../../atoms/icons/WarningIconXS";
 export default {
   title: "Molecules/Tooltip",
   component: Tooltip,
@@ -13,7 +12,7 @@ export default {
     triggerText: "",
     content: "",
     hasIconTrigger: false,
-    IconTrigger: IconAdd,
+    IconTrigger: WarningIconXS,
     iconHelpText: "",
     tooltipID: 0,
     extraStyles: undefined,
@@ -59,7 +58,7 @@ export default {
         "The icon component to display. Requires hasIcon to be true.",
       table: {
         type: { summary: "React Component" },
-        defaultValue: { summary: "IconAdd" }
+        defaultValue: { summary: "WarningIconXS" }
       }
     },
     iconHelpText: {
@@ -186,7 +185,7 @@ export const BasicTooltip = {
 export const IconTooltip = {
   args: {
     hasIconTrigger: true,
-    IconTrigger: IconAdd,
+    IconTrigger: WarningIconXS,
     content:
       "Contact support at 1-800-CTY-VILL for help with your account balance."
   }

package/src/deprecated/icons/AlertInfoIcon.js

@@ -31,7 +31,7 @@ export const AlertInfoIcon = () => (
           </mask>
           <use
             id="background-2"
-            fill="#281978"
+            fill="#15749d"
             fillRule="nonzero"
             xlinkHref="#path-1"
           ></use>