Skip to content

Commit 277ee20

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/packages/grid/examples/css-grid/nanoid-3.3.8
2 parents c944d34 + a022b9a commit 277ee20

File tree

4 files changed

+63
-33
lines changed

4 files changed

+63
-33
lines changed

.github/workflows/issue-triage-strategic-adopter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
Mesh|Aspera|Blueworks Live|OpenPages|Databand\.ai|Cognos
2727
Analytics|Sterling B2B Integration SaaS|Sterling Order & Inventory
2828
Management|Supply Chain Intelligence Suite|TRIRIGA Application
29-
Suite|QRadar SOAR|Guardium Insights|Verify on Cloud)\b
29+
Suite|QRadar SOAR|Guardium Insights|Verify on Cloud|DataPower)\b
3030
flags: g
3131
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1
3232
if: ${{ steps.regex-match.outputs.match != '' }}

NotificationCallout.figma.tsx

Lines changed: 0 additions & 30 deletions
This file was deleted.

e2e/components/Popover/Popover-test.e2e.js

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
'use strict';
99

10-
const { test } = require('@playwright/test');
10+
const { test, expect } = require('@playwright/test');
1111
const { themes } = require('../../test-utils/env');
1212
const { snapshot } = require('../../test-utils/snapshot');
1313
const { snapshotStory, visitStory } = require('../../test-utils/storybook');
@@ -42,6 +42,21 @@ test.describe('Popover', () => {
4242
await page.evaluate(() => {
4343
window.scrollBy(-500, 0); // Scroll 500px to the left
4444
});
45+
46+
await expect
47+
.poll(
48+
async () => {
49+
const scrollPosition = await page.evaluate(() => {
50+
return window.scrollX;
51+
});
52+
return scrollPosition;
53+
},
54+
{
55+
timeout: 2000,
56+
}
57+
)
58+
.toBe(1376);
59+
4560
await snapshot(page, {
4661
component: 'popover',
4762
story: 'experimental-auto-align-left',
@@ -60,6 +75,21 @@ test.describe('Popover', () => {
6075
await page.evaluate(() => {
6176
window.scrollBy(500, 0); // Scroll 500px to the right
6277
});
78+
79+
await expect
80+
.poll(
81+
async () => {
82+
const scrollPosition = await page.evaluate(() => {
83+
return window.scrollX;
84+
});
85+
return scrollPosition;
86+
},
87+
{
88+
timeout: 2000,
89+
}
90+
)
91+
.toBe(2376);
92+
6393
await snapshot(page, {
6494
component: 'popover',
6595
story: 'experimental-auto-align-right',
@@ -78,6 +108,21 @@ test.describe('Popover', () => {
78108
await page.evaluate(() => {
79109
window.scrollBy(0, -350); // Scroll 350px to the top
80110
});
111+
112+
await expect
113+
.poll(
114+
async () => {
115+
const scrollPosition = await page.evaluate(() => {
116+
return window.scrollY;
117+
});
118+
return scrollPosition;
119+
},
120+
{
121+
timeout: 2000,
122+
}
123+
)
124+
.toBe(1806);
125+
81126
await snapshot(page, {
82127
component: 'popover',
83128
story: 'experimental-auto-align-top',
@@ -96,6 +141,21 @@ test.describe('Popover', () => {
96141
await page.evaluate(() => {
97142
window.scrollBy(0, 350); // Scroll 350px to the bottom
98143
});
144+
145+
await expect
146+
.poll(
147+
async () => {
148+
const scrollPosition = await page.evaluate(() => {
149+
return window.scrollY;
150+
});
151+
return scrollPosition;
152+
},
153+
{
154+
timeout: 2000,
155+
}
156+
)
157+
.toBe(2506);
158+
99159
await snapshot(page, {
100160
component: 'popover',
101161
story: 'experimental-auto-align-bottom',

packages/react/src/components/Search/Search.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ const Search = React.forwardRef<HTMLInputElement, SearchProps>(function Search(
229229
{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events */}
230230
<div
231231
aria-label={onExpand ? 'button' : undefined}
232-
aria-labelledby={onExpand ? uniqueId : undefined}
232+
aria-labelledby={onExpand ? searchId : undefined}
233233
role={onExpand ? 'button' : undefined}
234234
className={`${prefix}--search-magnifier`}
235235
onClick={onExpand}

0 commit comments

Comments
 (0)