feat(switch): enhances Switch component to allow inline variant in ne…

…w validation redesign
Sage · Nov 4, 2024 · baf4ac5 · baf4ac5
1 parent cc39891
commit baf4ac5
Show file tree

Hide file tree

Showing 17 changed files with 663 additions and 75 deletions.
diff --git a/src/__internal__/checkable-input/checkable-input.style.ts b/src/__internal__/checkable-input/checkable-input.style.ts
@@ -2,10 +2,11 @@ import styled, { css } from "styled-components";
 
 import FieldHelpStyle from "../field-help/field-help.style";
 import { FieldLineStyle } from "../form-field/form-field.style";
-import HiddenCheckableInputStyle from "./hidden-checkable-input.style";
 import LabelStyle, { StyledLabelContainer } from "../label/label.style";
-import StyledHelp from "../../components/help/help.style";
 import StyledValidationIcon from "../validations/validation-icon.style";
+import StyledHelp from "../../components/help/help.style";
+
+import HiddenCheckableInputStyle from "./hidden-checkable-input.style";
 
 const StyledCheckableInput = styled.div`
   display: inline-block;
@@ -30,6 +31,8 @@ const StyledCheckableInputWrapper = styled.div<StyledCheckableInputWrapperProps>
     labelInline,
     reverse,
   }) => css`
+    width: 100% !important;
+
     ${FieldLineStyle} {
       display: flex;
     }
@@ -105,6 +108,7 @@ const StyledCheckableInputWrapper = styled.div<StyledCheckableInputWrapperProps>
     css`
       ${StyledCheckableInput} {
         width: ${inputWidth}% !important;
+        min-width: 67px;
       }
     `}
 

diff --git a/src/__internal__/label/label.component.tsx b/src/__internal__/label/label.component.tsx
@@ -38,6 +38,8 @@ export interface LabelProps
   className?: string;
   /** Sets aria-label for label element */
   "aria-label"?: string;
+  /** Whether this component is shown against a dark background */
+  isDarkBackground?: boolean;
 }
 
 const shouldDisplayValidationIcon = ({
@@ -70,6 +72,7 @@ export const Label = ({
   htmlFor,
   info,
   inline,
+  isDarkBackground = false,
   isRequired,
   labelId,
   optional,
@@ -165,6 +168,7 @@ export const Label = ({
         isRequired={isRequired}
         as={as}
         aria-label={ariaLabel}
+        isDarkBackground={isDarkBackground}
       >
         {children}
       </StyledLabel>

diff --git a/src/__internal__/label/label.style.ts b/src/__internal__/label/label.style.ts
@@ -5,10 +5,16 @@ export interface StyledLabelProps {
   disabled?: boolean;
   /** Flag to configure component as mandatory */
   isRequired?: boolean;
+  /** Flag to determine whether to use colours for dark backgrounds */
+  isDarkBackground?: boolean;
 }
 
 const StyledLabel = styled.label<StyledLabelProps>`
-  color: var(--colorsUtilityYin090);
+  ${({ isDarkBackground }) => css`
+    color: ${isDarkBackground
+      ? "var(--colorsUtilityYang100)"
+      : "var(--colorsUtilityYin090)"};
+  `}
   display: block;
   font-weight: var(--fontWeights500);
 

diff --git a/src/__internal__/label/label.test.tsx b/src/__internal__/label/label.test.tsx
@@ -168,3 +168,21 @@ test("renders with expected styles when `inline` is true and `align` is 'left'",
     justifyContent: "flex-start",
   });
 });
+
+// coverage
+test("renders with dark background styles when `isDarkBackground` is true", () => {
+  render(<Label isDarkBackground>foo</Label>);
+
+  expect(screen.getByTestId("label-container").childNodes[0]).toHaveStyle({
+    color: "var(--colorsUtilityYang100)",
+  });
+});
+
+// coverage
+test("renders with normal styles when `isDarkBackground` is false", () => {
+  render(<Label isDarkBackground={false}>foo</Label>);
+
+  expect(screen.getByTestId("label-container").childNodes[0]).toHaveStyle({
+    color: "var(--colorsUtilityYin090)",
+  });
+});
diff --git a/src/__internal__/validation-message/validation-message.component.tsx b/src/__internal__/validation-message/validation-message.component.tsx
@@ -10,12 +10,15 @@ export interface ValidationMessageProps {
   /** Indicate that warning has occurred
   Pass string to display hint with warning */
   warning?: boolean | string;
+  /** Whether this component resides on a dark background */
+  isDarkBackground?: boolean;
 }
 
 const ValidationMessage = ({
   error,
   validationId,
   warning,
+  isDarkBackground,
 }: ValidationMessageProps) => {
   const validation = error || warning;
   const isStringValidation = typeof validation === "string";
@@ -25,6 +28,7 @@ const ValidationMessage = ({
       id={validationId}
       isWarning={!!(!error && warning)}
       data-role="validation-message"
+      isDarkBackground={isDarkBackground}
     >
       {validation}
     </StyledValidationMessage>

diff --git a/src/__internal__/validation-message/validation-message.style.ts b/src/__internal__/validation-message/validation-message.style.ts
@@ -2,17 +2,21 @@ import styled, { css } from "styled-components";
 
 interface StyledValidationMessageProps {
   isWarning?: boolean;
+  isDarkBackground?: boolean;
 }
 
 const StyledValidationMessage = styled.p<StyledValidationMessageProps>`
-  ${({ isWarning }) => css`
-    color: ${isWarning
-      ? "var(--colorsSemanticCaution600)"
-      : "var(--colorsSemanticNegative500)"};
-    font-weight: ${isWarning ? "normal" : "500"};
-    margin-top: 0px;
-    margin-bottom: 8px;
-  `}
+  ${({ isWarning, isDarkBackground }) => {
+    const darkBgColour = isDarkBackground
+      ? "var(--colorsSemanticNegative450)"
+      : "var(--colorsSemanticNegative500)";
+    return css`
+      color: ${isWarning ? "var(--colorsSemanticCaution600)" : darkBgColour};
+      font-weight: ${isWarning ? "normal" : "500"};
+      margin-top: 0px;
+      margin-bottom: 8px;
+    `;
+  }}
 `;
 
 export default StyledValidationMessage;
diff --git a/src/__internal__/validation-message/validation-message.test.tsx b/src/__internal__/validation-message/validation-message.test.tsx
@@ -43,3 +43,21 @@ test("sets the 'id' attribute to the value of the `validationId` prop", () => {
   const validationMessage = screen.getByTestId("validation-message");
   expect(validationMessage).toHaveAttribute("id", "foo");
 });
+
+// coverage
+test("renders with the correct colour when `isDarkBackground` is true", () => {
+  render(<ValidationMessage error="error" isDarkBackground />);
+
+  expect(screen.getByTestId("validation-message")).toHaveStyle({
+    color: "var(--colorsSemanticNegative450)",
+  });
+});
+
+// coverage
+test("renders with the correct colour when `isDarkBackground` is false", () => {
+  render(<ValidationMessage error="error" isDarkBackground={false} />);
+
+  expect(screen.getByTestId("validation-message")).toHaveStyle({
+    color: "var(--colorsSemanticNegative500)",
+  });
+});
diff --git a/src/components/switch/__internal__/switch-slider-panel.style.ts b/src/components/switch/__internal__/switch-slider-panel.style.ts
@@ -1,29 +1,37 @@
 import styled, { css } from "styled-components";
 
-import StyledLoader from "../../loader/loader.style";
-import StyledLoaderSquare from "../../loader/loader-square.style";
 import { SwitchProps } from "../switch.component";
+import StyledLoaderSquare from "../../loader/loader-square.style";
+import StyledLoader from "../../loader/loader.style";
 
 export interface SwitchSliderPanelProps {
   isLoading?: boolean;
   size?: SwitchProps["size"];
+  isDarkBackground?: boolean;
 }
 
 const SwitchSliderPanel = styled.div`
-  ${({ isLoading, size }: SwitchSliderPanelProps) => css`
+  ${({ isLoading, size, isDarkBackground }: SwitchSliderPanelProps) => css`
     border: 0;
-    color: var(--colorsActionMinorYang100);
+    color: ${isDarkBackground
+      ? "var(--colorsUtilityYin100)"
+      : "var(--colorsActionMinorYang100)"};
     margin: auto;
     position: absolute;
     left: 0;
 
     &[type="on"] {
+      color: ${isDarkBackground
+        ? "var(--colorsUtilityYin100)"
+        : "var(--colorsUtilityYang100)"};
       margin-left: 9px;
       padding-right: ${size === "large" ? "43px" : "27px"};
     }
 
     &[type="off"] {
-      color: var(--colorsActionMinor500);
+      color: ${isDarkBackground
+        ? "var(--colorsUtilityYang100)"
+        : "var(--colorsActionMinor500)"};
       margin-right: 9px;
       padding-left: ${size === "large" ? "43px" : "27px"};
     }

diff --git a/src/components/switch/__internal__/switch-slider-panel.test.tsx b/src/components/switch/__internal__/switch-slider-panel.test.tsx
@@ -71,3 +71,21 @@ describe("when the theme is set to sageTheme", () => {
     );
   });
 });
+
+// coverage
+test("renders with normal styles when `isDarkBackground` is false", () => {
+  render(<Switch onChange={() => {}} isDarkBackground={false} />);
+
+  const switchPanel = screen.getByTestId("slider-panel");
+
+  expect(switchPanel).toHaveStyleRule("color: var(--colorsActionMinorYang100)");
+});
+
+// coverage
+test("renders with dark background styles when `isDarkBackground` is true", () => {
+  render(<Switch onChange={() => {}} isDarkBackground />);
+
+  const switchPanel = screen.getByTestId("slider-panel");
+
+  expect(switchPanel).toHaveStyleRule("color: var(--colorsUtilityYin100)");
+});
diff --git a/src/components/switch/__internal__/switch-slider.component.tsx b/src/components/switch/__internal__/switch-slider.component.tsx
@@ -13,6 +13,7 @@ export interface SwitchSliderProps extends ValidationProps {
   loading?: boolean;
   size?: "small" | "large";
   useValidationIcon?: boolean;
+  isDarkBackground?: boolean;
 }
 
 const SwitchSlider = ({
@@ -24,6 +25,7 @@ const SwitchSlider = ({
   warning,
   info,
   useValidationIcon,
+  isDarkBackground,
 }: SwitchSliderProps) => {
   const locale = useLocale();
   const onText = locale.switch.on();
@@ -45,13 +47,15 @@ const SwitchSlider = ({
     error,
     warning,
     info,
+    isDarkBackground,
   };
 
   const sliderPanelStyleProps = {
     isLoading: loading,
     size,
     type: checked ? "on" : "off",
     disabled,
+    isDarkBackground,
   };
 
   const loaderProps = {

diff --git a/src/components/switch/__internal__/switch-slider.style.ts b/src/components/switch/__internal__/switch-slider.style.ts
@@ -1,17 +1,19 @@
 import styled, { css } from "styled-components";
 
-import SwitchSliderPanel from "./switch-slider-panel.style";
 import StyledValidationIcon from "../../../__internal__/validations/validation-icon.style";
-import { SwitchSliderProps } from "./switch-slider.component";
 import baseTheme, { ThemeObject } from "../../../style/themes/base";
 
+import SwitchSliderPanel from "./switch-slider-panel.style";
+import { SwitchSliderProps } from "./switch-slider.component";
+
 interface StyledSwitchSliderProps
   extends Pick<
     SwitchSliderProps,
     "checked" | "disabled" | "size" | "error" | "warning"
   > {
   isLoading?: boolean;
   theme?: Partial<ThemeObject>;
+  isDarkBackground?: boolean;
 }
 
 const StyledSwitchSlider = styled.div`
@@ -23,6 +25,7 @@ const StyledSwitchSlider = styled.div`
     error,
     warning,
     theme,
+    isDarkBackground,
   }: StyledSwitchSliderProps) => css`
     display: flex;
     font-size: 12px;
@@ -39,14 +42,22 @@ const StyledSwitchSlider = styled.div`
       theme?.roundedCornersOptOut ? "90px" : "var(--borderRadius400)"
     };
     border-style: solid;
-    border-color: var(--colorsActionMinor400);
+    border-color: ${
+      isDarkBackground
+        ? "var(--colorsUtilityYang100)"
+        : "var(--colorsActionMinor400)"
+    };
     border-width: var(--borderWidth200);
     box-sizing: border-box;
     margin-top: ${size === "large" ? "-47px" : "-28px"};
     align-items: center;
 
     &::before {
-      background-color: var(--colorsActionMinor400);
+      background-color: ${
+        isDarkBackground
+          ? "var(--colorsUtilityYang100)"
+          : "var(--colorsActionMinor400)"
+      };
       bottom: 4px;
       content: "";
       height: ${size === "large" ? "var(--spacing400)" : "var(--spacing200)"};
@@ -61,15 +72,19 @@ const StyledSwitchSlider = styled.div`
     ${
       checked &&
       css`
-        background-color: var(--colorsActionMinor500);
+        background-color: ${isDarkBackground
+          ? "var(--colorsUtilityYang100)"
+          : "var(--colorsActionMinor500)"};
         border-color: var(--colorsActionMinorTransparent);
 
         &::before {
           margin-left: calc(
             100% -
               ${size === "large" ? "var(--spacing500)" : "var(--spacing300)"}
           );
-          background-color: var(--colorsActionMinorYang100);
+          background-color: ${isDarkBackground
+            ? "var(--colorsUtilityYin100)"
+            : "var(--colorsActionMinorYang100)"};
         }
       `
     }

diff --git a/src/components/switch/__internal__/switch-slider.test.tsx b/src/components/switch/__internal__/switch-slider.test.tsx
@@ -134,3 +134,30 @@ test("when `size` is large and the consumer has opted out of rounded corners sty
 
   expect(switchPanel).toHaveStyle("border-radius: 30px");
 });
+
+// coverage
+test("renders with normal styles when `isDarkBackground` is false", () => {
+  render(<SwitchSlider isDarkBackground={false} />);
+
+  const switchPanel = screen.getByTestId("slider");
+
+  expect(switchPanel).toHaveStyleRule("color: var(--colorsActionMinorYang100)");
+});
+
+// coverage
+test("renders with dark background styles when `isDarkBackground` is true", () => {
+  render(<SwitchSlider isDarkBackground />);
+
+  const switchPanel = screen.getByTestId("slider");
+
+  expect(switchPanel).toHaveStyleRule("color: var(--colorsUtilityYin100)");
+});
+
+// coverage
+test("renders with dark background styles when `isDarkBackground` is true and checked is true", () => {
+  render(<SwitchSlider isDarkBackground checked />);
+
+  const switchPanel = screen.getByTestId("slider");
+
+  expect(switchPanel).toHaveStyleRule("color: var(--colorsUtilityYang100)");
+});