@thecb/components 11.6.5-beta.1 → 11.6.6-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "11.6.5-beta.1",
+  "version": "11.6.6-beta.0",
   "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/atoms/button-with-action/ButtonWithAction.theme.js

@@ -7,13 +7,11 @@ const {
   SAPPHIRE_BLUE,
   PEACOCK_BLUE,
   MANATEE_GREY,
-  LUCKY_POINT,
+  MATISSE_BLUE,
   HINT_GREEN,
   SEA_GREEN,
   RASPBERRY,
-  ERROR_COLOR,
-  LUCKY_POINT_DARK,
-  HAWKES_BLUE
+  ERROR_COLOR
 } = colors;
 
 const { LINK_TEXT_DECORATION } = styleConstants;
@@ -88,13 +86,13 @@ const padding = {
 
 const color = {
   primary: WHITE,
-  secondary: LUCKY_POINT,
-  back: LUCKY_POINT,
+  secondary: MATISSE_BLUE,
+  back: MATISSE_BLUE,
   smallPrimary: WHITE,
-  smallSecondary: LUCKY_POINT,
-  smallGhost: LUCKY_POINT,
-  ghost: LUCKY_POINT,
-  tertiary: LUCKY_POINT,
+  smallSecondary: MATISSE_BLUE,
+  smallGhost: MATISSE_BLUE,
+  ghost: MATISSE_BLUE,
+  tertiary: MATISSE_BLUE,
   danger: WHITE,
   dangerSecondary: ERROR_COLOR,
   whitePrimary: WHITE,
@@ -189,10 +187,10 @@ const textDecoration = {
 };
 
 const backgroundColor = {
-  primary: LUCKY_POINT,
+  primary: MATISSE_BLUE,
   secondary: TRANSPARENT,
   back: TRANSPARENT,
-  smallPrimary: LUCKY_POINT,
+  smallPrimary: MATISSE_BLUE,
   smallSecondary: TRANSPARENT,
   smallGhost: TRANSPARENT,
   ghost: TRANSPARENT,
@@ -206,11 +204,11 @@ const backgroundColor = {
 };
 
 const border = {
-  primary: "2px solid " + LUCKY_POINT,
-  secondary: "2px solid " + LUCKY_POINT,
-  back: "2px solid " + LUCKY_POINT,
-  smallPrimary: "2px solid " + LUCKY_POINT,
-  smallSecondary: "2px solid " + LUCKY_POINT,
+  primary: "2px solid " + MATISSE_BLUE,
+  secondary: "2px solid " + MATISSE_BLUE,
+  back: "2px solid " + MATISSE_BLUE,
+  smallPrimary: "2px solid " + MATISSE_BLUE,
+  smallSecondary: "2px solid " + MATISSE_BLUE,
   smallGhost: "none",
   ghost: "none",
   tertiary: "none",
@@ -223,11 +221,11 @@ const border = {
 };
 
 const hoverBackgroundColor = {
-  primary: LUCKY_POINT_DARK,
-  secondary: HAWKES_BLUE,
+  primary: SAPPHIRE_BLUE,
+  secondary: "#DBEAF0",
   back: TRANSPARENT,
-  smallPrimary: LUCKY_POINT_DARK,
-  smallSecondary: HAWKES_BLUE,
+  smallPrimary: SAPPHIRE_BLUE,
+  smallSecondary: "#DBEAF0",
   smallGhost: TRANSPARENT,
   ghost: TRANSPARENT,
   tertiary: TRANSPARENT,
@@ -240,11 +238,11 @@ const hoverBackgroundColor = {
 };
 
 const hoverBorderColor = {
-  primary: LUCKY_POINT_DARK,
-  secondary: LUCKY_POINT,
+  primary: SAPPHIRE_BLUE,
+  secondary: MATISSE_BLUE,
   back: "#DCEAF1",
-  smallPrimary: LUCKY_POINT_DARK,
-  smallSecondary: LUCKY_POINT,
+  smallPrimary: SAPPHIRE_BLUE,
+  smallSecondary: MATISSE_BLUE,
   smallGhost: TRANSPARENT,
   ghost: TRANSPARENT,
   tertiary: TRANSPARENT,
@@ -258,13 +256,13 @@ const hoverBorderColor = {
 
 const hoverColor = {
   primary: WHITE,
-  secondary: LUCKY_POINT,
-  back: LUCKY_POINT,
+  secondary: SAPPHIRE_BLUE,
+  back: SAPPHIRE_BLUE,
   smallPrimary: WHITE,
-  smallSecondary: LUCKY_POINT,
-  smallGhost: LUCKY_POINT,
-  ghost: LUCKY_POINT,
-  tertiary: LUCKY_POINT,
+  smallSecondary: SAPPHIRE_BLUE,
+  smallGhost: SAPPHIRE_BLUE,
+  ghost: SAPPHIRE_BLUE,
+  tertiary: SAPPHIRE_BLUE,
   danger: WHITE,
   dangerSecondary: "#B10541",
   whitePrimary: WHITE,
@@ -274,11 +272,11 @@ const hoverColor = {
 };
 
 const activeBackgroundColor = {
-  primary: LUCKY_POINT_DARK,
-  secondary: adjustHexColor(HAWKES_BLUE, 10, "darken"),
+  primary: PEACOCK_BLUE,
+  secondary: "#B8D5E1",
   back: TRANSPARENT,
-  smallPrimary: LUCKY_POINT_DARK,
-  smallSecondary: adjustHexColor(HAWKES_BLUE, 10, "darken"),
+  smallPrimary: PEACOCK_BLUE,
+  smallSecondary: "#B8D5E1",
   smallGhost: TRANSPARENT,
   ghost: TRANSPARENT,
   tertiary: TRANSPARENT,
@@ -291,11 +289,11 @@ const activeBackgroundColor = {
 };
 
 const activeBorderColor = {
-  primary: adjustHexColor(LUCKY_POINT_DARK, 10, "darken"),
-  secondary: LUCKY_POINT,
+  primary: PEACOCK_BLUE,
+  secondary: MATISSE_BLUE,
   back: PEACOCK_BLUE,
-  smallPrimary: adjustHexColor(LUCKY_POINT_DARK, 10, "darken"),
-  smallSecondary: LUCKY_POINT,
+  smallPrimary: PEACOCK_BLUE,
+  smallSecondary: MATISSE_BLUE,
   smallGhost: TRANSPARENT,
   ghost: TRANSPARENT,
   tertiary: TRANSPARENT,
@@ -309,7 +307,7 @@ const activeBorderColor = {
 
 const activeColor = {
   primary: WHITE,
-  secondary: LUCKY_POINT,
+  secondary: MATISSE_BLUE,
   back: PEACOCK_BLUE,
   smallPrimary: WHITE,
   smallSecondary: PEACOCK_BLUE,

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

@@ -1,12 +1,12 @@
 import {
-  HAWKES_BLUE,
-  LUCKY_POINT,
-  LUCKY_POINT_DARK
+  HOVER_LIGHT_BLUE,
+  MATISSE_BLUE,
+  MATISSE_BLUE_DARK
 } from "../../../constants/colors";
 
-const selectedColor = `${LUCKY_POINT}`;
-const hoverColor = `${HAWKES_BLUE}`;
-const focusColor = `${LUCKY_POINT_DARK}`;
+const selectedColor = `${MATISSE_BLUE}`;
+const hoverColor = `${HOVER_LIGHT_BLUE}`;
+const focusColor = `${MATISSE_BLUE_DARK}`;
 
 export const fallbackValues = {
   selectedColor,

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

@@ -2,7 +2,7 @@ import styled from "styled-components";
 import {
   GHOST_GREY,
   ERROR_COLOR,
-  LUCKY_POINT
+  MATISSE_BLUE
 } from "../../../constants/colors";
 import { FONT_WEIGHT_REGULAR } from "../../../constants/style_constants";
 
@@ -41,7 +41,7 @@ export const SelectField = styled.select`
   box-shadow: none;
 
   &:focus {
-    border: 1px solid ${LUCKY_POINT};
+    border: 1px solid ${MATISSE_BLUE};
   }
 `;
 

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

@@ -6,14 +6,11 @@ import {
   MINESHAFT_GREY,
   DUSTY_GREY,
   GREY_CHATEAU,
-  ATHENS_GREY,
-  LUCKY_POINT,
-  LUCKY_POINT_DARK,
-  HAWKES_BLUE
+  ATHENS_GREY
 } from "../../../constants/colors";
 import { FONT_WEIGHT_REGULAR } from "../../../constants/style_constants";
 
-const linkColor = { default: `${LUCKY_POINT}`, disabled: `${LUCKY_POINT}` };
+const linkColor = { default: `${MATISSE_BLUE}`, disabled: `${MATISSE_BLUE}` };
 const formBackgroundColor = {
   default: `${WHITE}`,
   disabled: `${WHITE}`,
@@ -36,7 +33,7 @@ const fontWeight = {
   disabled: `${FONT_WEIGHT_REGULAR}`
 };
 const hoverFocusStyles = {
-  default: `color: ${LUCKY_POINT_DARK}; outline: none; text-decoration: underline;  `,
+  default: `color: #0E506D; outline: none; text-decoration: underline;  `,
   disabled: `color: #6D717E;`
 };
 

package/src/components/atoms/icons/PeriscopeFailedIcon.js

@@ -131,7 +131,7 @@ const PeriscopeFailedIcon = () => {
           <g transform="translate(132 195)">
             <g transform="translate(288 64)">
               <path
-                fill="#281978"
+                fill="#15749D"
                 fillOpacity="0.3"
                 d="M302.247 310.746c36.612 0 66.292 6.549 66.292 14.627S338.86 340 302.247 340c-36.613 0-66.292-6.55-66.292-14.627 0-8.078 29.68-14.627 66.292-14.627zM65.904 208.318c6.071 0 11.057 4.655 11.608 10.6a6.983 6.983 0 014.09-1.321c3.885 0 7.034 3.159 7.034 7.055 0 3.818-3.022 6.926-6.798 7.051l-.237.004H49.756c-4.548 0-8.234-3.696-8.234-8.256 0-4.56 3.686-8.257 8.234-8.257 1.848 0 3.549.618 4.923 1.65 1.378-4.919 5.88-8.526 11.225-8.526zm195.894-57.546c16.134 0 29.213 13.097 29.213 29.254 0 16.157-13.08 29.254-29.213 29.254-16.134 0-29.214-13.097-29.214-29.254 0-16.157 13.08-29.254 29.214-29.254zm80.899 0c16.134 0 29.213 13.097 29.213 29.254 0 16.157-13.08 29.254-29.213 29.254-16.135 0-29.214-13.097-29.214-29.254 0-16.157 13.08-29.254 29.214-29.254zm-80.899 22.503c-5.514 0-10.317 3.673-12.173 9.018a3.377 3.377 0 002.077 4.297 3.37 3.37 0 004.29-2.08l.16-.42c1.027-2.474 3.233-4.064 5.646-4.064 2.547 0 4.863 1.771 5.805 4.484l.12.302a3.37 3.37 0 004.17 1.778 3.377 3.377 0 002.077-4.297c-1.855-5.345-6.658-9.018-12.172-9.018zm80.9 0c-5.515 0-10.318 3.673-12.174 9.018a3.377 3.377 0 002.077 4.297 3.37 3.37 0 004.29-2.08l.16-.42c1.027-2.474 3.233-4.064 5.646-4.064 2.547 0 4.863 1.771 5.805 4.484l.12.302a3.37 3.37 0 004.17 1.778 3.377 3.377 0 002.077-4.297c-1.855-5.345-6.659-9.018-12.172-9.018zM519.99 12.426c12.578 0 22.908 9.642 24.048 21.958a14.473 14.473 0 018.471-2.737c8.049 0 14.575 6.544 14.575 14.617 0 7.966-6.358 14.445-14.262 14.612l-.313.003H486.54c-9.42 0-17.057-7.658-17.057-17.106 0-9.446 7.637-17.104 17.057-17.104 3.83 0 7.352 1.281 10.2 3.418 2.855-10.189 12.179-17.66 23.252-17.66zM170.591 0c6.61 0 12.239 4.15 14.476 9.99a6.571 6.571 0 011.792-.252c2.114 0 3.994.996 5.208 2.543a9.767 9.767 0 014.028-.872c5.431 0 9.833 4.414 9.833 9.86 0 5.354-4.254 9.712-9.557 9.858l-.276.004h-42.442c-5.43 0-9.833-4.415-9.833-9.861 0-5.447 4.403-9.861 9.833-9.861.666 0 1.315.068 1.942.194C157.345 4.93 163.386 0 170.59 0z"
               ></path>
@@ -154,7 +154,7 @@ const PeriscopeFailedIcon = () => {
                   filter="url(#periscope-failed-filter-2)"
                   xlinkHref="#periscope-failed-path-1"
                 ></use>
-                <use fill="#281978" xlinkHref="#periscope-failed-path-1"></use>
+                <use fill="#15749D" xlinkHref="#periscope-failed-path-1"></use>
               </g>
               <g transform="translate(0 96.764)">
                 <g>

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/constants/colors.d.ts

@@ -65,7 +65,6 @@ export const ROYAL_BLUE_VIVID: Color;
 export const ASTRAL_BLUE: Color;
 export const SAPPHIRE_BLUE: Color;
 export const PEACOCK_BLUE: Color;
-export const HAWKES_BLUE: Color;
 
 // GREEN
 export const FOREST_GREEN: Color;
@@ -97,9 +96,6 @@ export const FANTASY_RED: Color;
 export const COSMOS_RED: Color;
 export const BLUSH_RED: Color;
 
-// PURPLE
-export const LUCKY_POINT: Color;
-
 export const ERROR_COLOR: Color;
 export const ERROR_BACKGROUND_COLOR: Color;
 

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>