Merge pull request #3813 from carbon-design-system/fix-firefox-appswi…

…tcher-focus fix(appswitcher): firefox focus
carbon-design-system · Jul 10, 2023 · d799de7 · d799de7
2 parents 52d0c89 + bb0689b
commit d799de7
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/...rc/components/SuiteHeader/SuiteHeaderAppSwitcher/MultiWorkspaceSuiteHeaderAppSwitcher.jsx b/...rc/components/SuiteHeader/SuiteHeaderAppSwitcher/MultiWorkspaceSuiteHeaderAppSwitcher.jsx
@@ -192,7 +192,7 @@ const MultiWorkspaceSuiteHeaderAppSwitcher = ({
     selectedWorkspace?.name ?? selectedWorkspace?.id ?? mergedI18n.selectWorkspace;
 
   return (
-    <ul data-testid={testId} className={baseClassName}>
+    <ul data-testid={testId} className={baseClassName} tabIndex={tabIndex}>
       {!isWorkspacesView ? (
         <>
           {workspaces?.length > 1 ? (

diff --git a/packages/react/src/components/SuiteHeader/SuiteHeaderAppSwitcher/SuiteHeaderAppSwitcher.jsx b/packages/react/src/components/SuiteHeader/SuiteHeaderAppSwitcher/SuiteHeaderAppSwitcher.jsx
@@ -97,7 +97,7 @@ const SuiteHeaderAppSwitcher = ({
   const tabIndex = isExpanded ? 0 : -1;
 
   return (
-    <ul data-testid={testId} className={baseClassName}>
+    <ul data-testid={testId} className={baseClassName} tabIndex={tabIndex}>
       <li className={`${baseClassName}--nav-link`}>
         {allApplicationsLink ? (
           <>

diff --git a/...SuiteHeaderAppSwitcher/__snapshots__/MultiWorkspaceSuiteHeaderAppSwitcher.story.storyshot b/...SuiteHeaderAppSwitcher/__snapshots__/MultiWorkspaceSuiteHeaderAppSwitcher.story.storyshot
@@ -15,6 +15,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
     <ul
       className="iot--suite-header-app-switcher-multiworkspace"
       data-testid="multi-workspace-suite-header-app-switcher"
+      tabIndex={-1}
     >
       <p>
         Select a workspace
@@ -189,6 +190,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
     <ul
       className="iot--suite-header-app-switcher-multiworkspace"
       data-testid="multi-workspace-suite-header-app-switcher"
+      tabIndex={-1}
     >
       <li
         className="bx--side-nav__item bx--side-nav__item--large"
@@ -458,6 +460,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
     <ul
       className="iot--suite-header-app-switcher-multiworkspace"
       data-testid="multi-workspace-suite-header-app-switcher"
+      tabIndex={-1}
     >
       <p>
         Select a workspace
@@ -632,6 +635,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
     <ul
       className="iot--suite-header-app-switcher-multiworkspace"
       data-testid="multi-workspace-suite-header-app-switcher"
+      tabIndex={-1}
     >
       <li
         className="bx--side-nav__item bx--side-nav__item--large"
@@ -837,6 +841,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
     <ul
       className="iot--suite-header-app-switcher-multiworkspace"
       data-testid="multi-workspace-suite-header-app-switcher"
+      tabIndex={-1}
     >
       <p>
         Workspace
@@ -1157,6 +1162,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
     <ul
       className="iot--suite-header-app-switcher-multiworkspace"
       data-testid="multi-workspace-suite-header-app-switcher"
+      tabIndex={-1}
     >
       <p>
         Workspace
@@ -1406,6 +1412,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
     <ul
       className="iot--suite-header-app-switcher-multiworkspace"
       data-testid="multi-workspace-suite-header-app-switcher"
+      tabIndex={-1}
     >
       <li
         className="bx--side-nav__item bx--side-nav__item--large"

diff --git a/...s/SuiteHeader/SuiteHeaderAppSwitcher/__snapshots__/SuiteHeaderAppSwitcher.story.storyshot b/...s/SuiteHeader/SuiteHeaderAppSwitcher/__snapshots__/SuiteHeaderAppSwitcher.story.storyshot
@@ -79,6 +79,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
     <ul
       className="iot--suite-header-app-switcher"
       data-testid="suite-header-app-switcher"
+      tabIndex={-1}
     >
       <li
         className="iot--suite-header-app-switcher--nav-link"
@@ -178,6 +179,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
     <ul
       className="iot--suite-header-app-switcher"
       data-testid="suite-header-app-switcher"
+      tabIndex={-1}
     >
       <li
         className="iot--suite-header-app-switcher--nav-link"

diff --git a/.../react/src/components/SuiteHeader/__snapshots__/MultiWorkspaceSuiteHeader.story.storyshot b/.../react/src/components/SuiteHeader/__snapshots__/MultiWorkspaceSuiteHeader.story.storyshot
@@ -639,6 +639,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Select a workspace
@@ -1444,6 +1445,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="bx--side-nav__item bx--side-nav__item--large"
@@ -2285,6 +2287,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Workspace
@@ -3155,6 +3158,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Workspace
@@ -4524,6 +4528,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Workspace
@@ -5491,6 +5496,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Workspace
@@ -6481,6 +6487,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Workspace
@@ -7390,6 +7397,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Workspace
@@ -8780,6 +8788,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Workspace
@@ -10268,6 +10277,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Workspace
@@ -11148,6 +11158,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Select a workspace
@@ -11953,6 +11964,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="bx--side-nav__item bx--side-nav__item--large"
@@ -12794,6 +12806,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <p>
                       Workspace
@@ -13674,6 +13687,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher-multiworkspace"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="bx--side-nav__item bx--side-nav__item--large"

diff --git a/packages/react/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot b/packages/react/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot
@@ -662,6 +662,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="iot--suite-header-app-switcher--nav-link"
@@ -1878,6 +1879,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="iot--suite-header-app-switcher--nav-link"
@@ -2666,6 +2668,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="iot--suite-header-app-switcher--nav-link"
@@ -3503,6 +3506,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="iot--suite-header-app-switcher--nav-link"
@@ -4264,6 +4268,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="iot--suite-header-app-switcher--nav-link"
@@ -5539,6 +5544,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="iot--suite-header-app-switcher--nav-link"
@@ -6879,6 +6885,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="iot--suite-header-app-switcher--nav-link"
@@ -7611,6 +7618,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   <ul
                     className="iot--suite-header-app-switcher"
                     data-testid="suite-header-app-switcher"
+                    tabIndex={-1}
                   >
                     <li
                       className="iot--suite-header-app-switcher--nav-link"