Merge branch 'master' into fix-multi-button-overflow

Sage · Dec 19, 2024 · a303bdd · a303bdd
2 parents e215c21 + e4ae8f0
commit a303bdd
Show file tree

Hide file tree

Showing 86 changed files with 410 additions and 2,401 deletions.
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
@@ -58,19 +58,6 @@ const globalTypes = {
       ],
     },
   },
-  focusRedesign: {
-    name: "Double focus style",
-    description: "Toggle the focus styling redesign",
-    defaultValue: "on",
-    toolbar: {
-      icon: "eye",
-      title: "Focus redesign",
-      items: [
-        { value: "on", title: "On" },
-        { value: "off", title: "Off" },
-      ],
-    },
-  },
   ...globalThemeProvider,
 };
 

diff --git a/.storybook/withThemeProvider.js b/.storybook/withThemeProvider.js
@@ -11,15 +11,8 @@ const themes = [noTheme, sageTheme].reduce((themesObject, theme) => {
   return themesObject;
 }, {});
 
-const render = (
-  Story,
-  themeName,
-  focusRedesignOptOut,
-) => (
-  <CarbonProvider
-    theme={themes[themeName]}
-    focusRedesignOptOut={focusRedesignOptOut}
-  >
+const render = (Story, themeName) => (
+  <CarbonProvider theme={themes[themeName]}>
     <Story themeName={themeName} />
   </CarbonProvider>
 );
@@ -58,11 +51,7 @@ const withThemeProvider = makeDecorator({
           {Object.keys(themes).map((themeName) => (
             <div key={themeName}>
               <h3>{themeName}</h3>
-              {render(
-                Story,
-                themeName,
-                context.globals.focusRedesign === "off",
-              )}
+              {render(Story, themeName)}
             </div>
           ))}
         </Wrapper>
@@ -74,7 +63,6 @@ const withThemeProvider = makeDecorator({
       isChromaticBuild && chromaticTheme
         ? chromaticTheme
         : context.globals.theme,
-      context.globals.focusRedesign === "off",
     );
   },
 });

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [146.0.0](https://github.com/Sage/carbon/compare/v145.0.0...v146.0.0) (2024-12-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* The `focusRedesignOptOut` feature flag has been removed completely. If passed to
+the `CarbonProvider` it will need to be removed, if consumers are also relying on previous
+focus styling this will also no longer be available.
+
+### Features
+
+* remove focusRedesignOptOut feature flag ([fdcfc6b](https://github.com/Sage/carbon/commit/fdcfc6bd818fc19207bc5748b33ff9b55e00d73f))
+
 ## [145.0.0](https://github.com/Sage/carbon/compare/v144.22.1...v145.0.0) (2024-12-17)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "145.0.0",
+  "version": "146.0.0",
   "description": "A library of reusable React components for easily building user interfaces.",
   "files": [
     "lib",

diff --git a/playwright/index.tsx b/playwright/index.tsx
@@ -9,7 +9,6 @@ import "../src/style/fonts.css";
 import * as dateLocales from "./support/date-fns-locales";
 
 export type HooksConfig = {
-  focusRedesignOptOut?: boolean;
   validationRedesignOptIn?: boolean;
   theme?: string;
   localeName?: keyof typeof dateLocales;
@@ -42,15 +41,13 @@ const mountedTheme = (theme: string) => {
 // Setup required providers on mounted component before running test. See https://playwright.dev/docs/test-components#hooks
 beforeMount<HooksConfig>(async ({ App, hooksConfig }) => {
   const {
-    focusRedesignOptOut,
     theme = "sage",
     localeName,
     validationRedesignOptIn,
   } = hooksConfig || {};
   return (
     <CarbonProvider
       theme={mountedTheme(theme)}
-      focusRedesignOptOut={focusRedesignOptOut}
       validationRedesignOptIn={validationRedesignOptIn}
     >
       <GlobalStyle />

diff --git a/src/__internal__/input-icon-toggle/input-icon-toggle.style.ts b/src/__internal__/input-icon-toggle/input-icon-toggle.style.ts
@@ -3,10 +3,6 @@ import sizes from "../input/input-sizes.style";
 import { ValidationProps } from "../validations";
 import addFocusStyling from "../../style/utils/add-focus-styling";
 
-const oldFocusStyling = `
-  outline: solid 3px var(--colorsSemanticFocus500);
-`;
-
 export interface InputIconToggleStyleProps extends ValidationProps {
   size?: "small" | "medium" | "large";
   disabled?: boolean;
@@ -51,16 +47,9 @@ const InputIconToggleStyle = styled.span.attrs(
       cursor: default;
     `}
 
-  ${({ theme }) =>
-    `
     &:focus {
-      ${
-        !theme.focusRedesignOptOut
-          ? addFocusStyling()
-          : /* istanbul ignore next */ oldFocusStyling
-      }
-    }  
-  `}
+    ${addFocusStyling()}
+  }
 `;
 
 export default InputIconToggleStyle;
diff --git a/src/__internal__/input/input-presentation.style.ts b/src/__internal__/input/input-presentation.style.ts
@@ -6,10 +6,6 @@ import { InputContextProps } from "../input-behaviour";
 import { CarbonProviderProps } from "../../components/carbon-provider";
 import addFocusStyling from "../../style/utils/add-focus-styling";
 
-const oldFocusStyling = `
-  outline: solid 3px var(--colorsSemanticFocus500);
-`;
-
 export const StyledInputPresentationContainer = styled.div<
   Pick<CommonInputPresentationProps, "inputWidth" | "maxWidth">
 >`
@@ -118,13 +114,11 @@ const InputPresentationStyle = styled.div<
       cursor: not-allowed;
     `}
 
-    ${({ hasFocus, theme }) =>
+    ${({ hasFocus }) =>
     hasFocus &&
     css`
       & {
-        ${!theme.focusRedesignOptOut
-          ? addFocusStyling()
-          : /* istanbul ignore next */ oldFocusStyling}
+        ${addFocusStyling()}
         z-index: 2;
       }
     `}

diff --git a/src/__internal__/validations/validation-icon.style.ts b/src/__internal__/validations/validation-icon.style.ts
@@ -11,10 +11,6 @@ const validationIconTypes = {
   warning: "var(--colorsSemanticCaution500)",
 };
 
-const oldFocusStyling = `
-  outline: solid 2px var(--colorsSemanticFocus500);
-`;
-
 type ValidationType = "error" | "warning" | "info";
 
 const ValidationIconStyle = styled.span<
@@ -40,10 +36,7 @@ const ValidationIconStyle = styled.span<
   }
 
   ${StyledIcon}:focus {
-    ${({ theme }) =>
-      !theme.focusRedesignOptOut
-        ? addFocusStyling()
-        : /* istanbul ignore next */ oldFocusStyling}
+    ${addFocusStyling()}
   }
 
   ${margin}

diff --git a/src/components/accordion/accordion.pw.tsx b/src/components/accordion/accordion.pw.tsx
@@ -10,7 +10,6 @@ import {
 import {
   positionOfElement,
   getRotationAngle,
-  checkGoldenOutline,
   assertCssValueIsApproximately,
   getStyle,
   expectEventWasCalledOnce,
@@ -22,7 +21,6 @@ import {
   ACCORDION_REMOVE_CONTENT,
 } from "../../../playwright/components/accordion/locators";
 import { SIZE, CHARACTERS } from "../../../playwright/support/constants";
-import { HooksConfig } from "../../../playwright";
 
 import {
   AccordionComponent,
@@ -45,42 +43,23 @@ import { additionalButton as splitAdditionalButtons } from "../../../playwright/
 
 const testData = [CHARACTERS.DIACRITICS, CHARACTERS.SPECIALCHARACTERS];
 
-test.describe("when focused", () => {
-  // TODO: Skipped due to flaky focus behaviour. To review in FE-6428
-  test.skip("should have the expected styling when the focusRedesignOptOut is false", async ({
-    mount,
-    page,
-  }) => {
-    await mount(<AccordionComponent />);
-    const elementLocator = accordionTitleContainer(page);
-    const element = await elementLocator;
-    await element.focus();
-    await expect(elementLocator).toHaveCSS(
-      "box-shadow",
-      "rgb(255, 188, 25) 0px 0px 0px 3px, rgba(0, 0, 0, 0.9) 0px 0px 0px 6px",
-    );
-    await expect(elementLocator).toHaveCSS(
-      "outline",
-      "rgba(0, 0, 0, 0) solid 3px",
-    );
-  });
-
-  // TODO: Skipped due to flaky focus behaviour. To review in FE-6428
-  test.skip("should have the expected styling when the focusRedesignOptOut is true", async ({
-    mount,
-    page,
-  }) => {
-    await mount<HooksConfig>(<AccordionComponent />, {
-      hooksConfig: { focusRedesignOptOut: true },
-    });
-    const elementLocator = accordionTitleContainer(page);
-    const element = await elementLocator;
-    await element.focus();
-    await expect(elementLocator).toHaveCSS(
-      "outline",
-      "rgb(255, 188, 25) solid 3px",
-    );
-  });
+// TODO: Skipped due to flaky focus behaviour. To review in FE-6428
+test.skip("should have the expected styling when focused", async ({
+  mount,
+  page,
+}) => {
+  await mount(<AccordionComponent />);
+  const elementLocator = accordionTitleContainer(page);
+  const element = await elementLocator;
+  await element.focus();
+  await expect(elementLocator).toHaveCSS(
+    "box-shadow",
+    "rgb(255, 188, 25) 0px 0px 0px 3px, rgba(0, 0, 0, 0.9) 0px 0px 0px 6px",
+  );
+  await expect(elementLocator).toHaveCSS(
+    "outline",
+    "rgba(0, 0, 0, 0) solid 3px",
+  );
 });
 
 test.describe("should render Accordion component", () => {
@@ -476,28 +455,7 @@ test.describe("should render Accordion component", () => {
 });
 
 test.describe("should render Accordion Grouped component", () => {
-  test("should move through all grouped accordions using ArrowDown key and check focus when focusRedesignOptOut is true", async ({
-    mount,
-    page,
-  }) => {
-    await mount<HooksConfig>(<AccordionGroupComponent />, {
-      hooksConfig: { focusRedesignOptOut: true },
-    });
-
-    await accordionTitleContainer(page).nth(0).focus();
-    await checkGoldenOutline(accordionTitleContainer(page).nth(0));
-    await expect(accordionTitleContainer(page).nth(0)).toBeVisible();
-
-    await accordionTitleContainer(page).nth(0).press("ArrowDown");
-    await checkGoldenOutline(accordionTitleContainer(page).nth(1));
-    await expect(accordionTitleContainer(page).nth(1)).toBeVisible();
-
-    await accordionTitleContainer(page).nth(1).press("ArrowDown");
-    await checkGoldenOutline(accordionTitleContainer(page).nth(2));
-    await expect(accordionTitleContainer(page).nth(2)).toBeVisible();
-  });
-
-  test("should move through all grouped accordions using ArrowDown key and check focus when focusRedesignOptOut is false", async ({
+  test("should move through all grouped accordions using ArrowDown key and check focus", async ({
     mount,
     page,
   }) => {
@@ -525,23 +483,7 @@ test.describe("should render Accordion Grouped component", () => {
     await expect(accordionTitleContainer(page).nth(2)).toBeVisible();
   });
 
-  test("should move to the last grouped accordion using End key and check it is focused when focusRedesignOptOut is true", async ({
-    mount,
-    page,
-  }) => {
-    await mount<HooksConfig>(<AccordionGroupComponent />, {
-      hooksConfig: { focusRedesignOptOut: true },
-    });
-
-    await accordionTitleContainer(page).nth(0).focus();
-
-    await accordionTitleContainer(page).nth(0).press("End");
-
-    await checkGoldenOutline(accordionTitleContainer(page).nth(2));
-    await expect(accordionTitleContainer(page).nth(2)).toBeVisible();
-  });
-
-  test("should move to the last grouped accordion using End key and check it is focused when focusRedesignOptOut is false", async ({
+  test("should move to the last grouped accordion using End key and check it is focused", async ({
     mount,
     page,
   }) => {
@@ -558,23 +500,7 @@ test.describe("should render Accordion Grouped component", () => {
     await expect(accordionTitleContainer(page).nth(2)).toBeVisible();
   });
 
-  test("should move to the first grouped accordion using Home key and check it is focused when focusRedesignOptOut is true", async ({
-    mount,
-    page,
-  }) => {
-    await mount<HooksConfig>(<AccordionGroupComponent />, {
-      hooksConfig: { focusRedesignOptOut: true },
-    });
-
-    await accordionTitleContainer(page).nth(2).focus();
-
-    await accordionTitleContainer(page).nth(2).press("Home");
-
-    await checkGoldenOutline(accordionTitleContainer(page).nth(0));
-    await expect(accordionTitleContainer(page).nth(2)).toBeVisible();
-  });
-
-  test("should move to the first grouped accordion using Home key and check it is focused when focusRedesignOptOut is false", async ({
+  test("should move to the first grouped accordion using Home key and check it is focused", async ({
     mount,
     page,
   }) => {

diff --git a/src/components/accordion/accordion.style.ts b/src/components/accordion/accordion.style.ts
@@ -146,18 +146,13 @@ interface StyledAccordionTitleContainerProps {
   variant?: "standard" | "subtle";
 }
 
-const oldFocusStyling = `
-  outline: solid 3px var(--colorsSemanticFocus500);
-`;
-
 const StyledAccordionTitleContainer = styled.div<StyledAccordionTitleContainerProps>`
   ${({
     buttonHeading,
     buttonWidth,
     iconAlign,
     size,
     hasButtonProps,
-    theme,
     isExpanded,
     variant,
   }) => css`
@@ -177,9 +172,7 @@ const StyledAccordionTitleContainer = styled.div<StyledAccordionTitleContainerPr
     z-index: 1;
 
     &:focus {
-      ${!theme.focusRedesignOptOut
-        ? addFocusStyling()
-        : /* istanbul ignore next */ oldFocusStyling}
+      ${addFocusStyling()}
     }
 
     ${variant === "subtle" &&