Merge branch 'main' into 17525_toggle_a11y

carbon-design-system · Dec 10, 2024 · e070530 · e070530
2 parents d895310 + a022b9a
commit e070530
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 33 deletions.
diff --git a/.github/workflows/issue-triage-strategic-adopter.yml b/.github/workflows/issue-triage-strategic-adopter.yml
@@ -26,7 +26,7 @@ jobs:
             Mesh|Aspera|Blueworks Live|OpenPages|Databand\.ai|Cognos
             Analytics|Sterling B2B Integration SaaS|Sterling Order & Inventory
             Management|Supply Chain Intelligence Suite|TRIRIGA Application
-            Suite|QRadar SOAR|Guardium Insights|Verify on Cloud)\b
+            Suite|QRadar SOAR|Guardium Insights|Verify on Cloud|DataPower)\b
           flags: g
       - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1
         if: ${{ steps.regex-match.outputs.match != '' }}

diff --git a/NotificationCallout.figma.tsx b/NotificationCallout.figma.tsx
diff --git a/e2e/components/Popover/Popover-test.e2e.js b/e2e/components/Popover/Popover-test.e2e.js
@@ -7,7 +7,7 @@
 
 'use strict';
 
-const { test } = require('@playwright/test');
+const { test, expect } = require('@playwright/test');
 const { themes } = require('../../test-utils/env');
 const { snapshot } = require('../../test-utils/snapshot');
 const { snapshotStory, visitStory } = require('../../test-utils/storybook');
@@ -42,6 +42,21 @@ test.describe('Popover', () => {
         await page.evaluate(() => {
           window.scrollBy(-500, 0); // Scroll 500px to the left
         });
+
+        await expect
+          .poll(
+            async () => {
+              const scrollPosition = await page.evaluate(() => {
+                return window.scrollX;
+              });
+              return scrollPosition;
+            },
+            {
+              timeout: 2000,
+            }
+          )
+          .toBe(1376);
+
         await snapshot(page, {
           component: 'popover',
           story: 'experimental-auto-align-left',
@@ -60,6 +75,21 @@ test.describe('Popover', () => {
         await page.evaluate(() => {
           window.scrollBy(500, 0); // Scroll 500px to the right
         });
+
+        await expect
+          .poll(
+            async () => {
+              const scrollPosition = await page.evaluate(() => {
+                return window.scrollX;
+              });
+              return scrollPosition;
+            },
+            {
+              timeout: 2000,
+            }
+          )
+          .toBe(2376);
+
         await snapshot(page, {
           component: 'popover',
           story: 'experimental-auto-align-right',
@@ -78,6 +108,21 @@ test.describe('Popover', () => {
         await page.evaluate(() => {
           window.scrollBy(0, -350); // Scroll 350px to the top
         });
+
+        await expect
+          .poll(
+            async () => {
+              const scrollPosition = await page.evaluate(() => {
+                return window.scrollY;
+              });
+              return scrollPosition;
+            },
+            {
+              timeout: 2000,
+            }
+          )
+          .toBe(1806);
+
         await snapshot(page, {
           component: 'popover',
           story: 'experimental-auto-align-top',
@@ -96,6 +141,21 @@ test.describe('Popover', () => {
         await page.evaluate(() => {
           window.scrollBy(0, 350); // Scroll 350px to the bottom
         });
+
+        await expect
+          .poll(
+            async () => {
+              const scrollPosition = await page.evaluate(() => {
+                return window.scrollY;
+              });
+              return scrollPosition;
+            },
+            {
+              timeout: 2000,
+            }
+          )
+          .toBe(2506);
+
         await snapshot(page, {
           component: 'popover',
           story: 'experimental-auto-align-bottom',

diff --git a/packages/react/src/components/Search/Search.tsx b/packages/react/src/components/Search/Search.tsx
@@ -229,7 +229,7 @@ const Search = React.forwardRef<HTMLInputElement, SearchProps>(function Search(
       {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events */}
       <div
         aria-label={onExpand ? 'button' : undefined}
-        aria-labelledby={onExpand ? uniqueId : undefined}
+        aria-labelledby={onExpand ? searchId : undefined}
         role={onExpand ? 'button' : undefined}
         className={`${prefix}--search-magnifier`}
         onClick={onExpand}