Merge branch 'main' into chore/macos-hide-scrollbars

cloudscape-design · Feb 21, 2025 · 8175d31 · 8175d31
2 parents 4156fb5 + 22d7bca
commit 8175d31
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/icon/styles.scss b/src/icon/styles.scss
@@ -34,6 +34,7 @@
       .name-angle-right-double,
       .name-angle-right,
       .name-arrow-left,
+      .name-arrow-right,
       .name-caret-left-filled,
       .name-caret-right-filled,
       .name-audio-full,

diff --git a/src/mixed-line-bar-chart/__integ__/mixed-line-bar-chart.test.ts b/src/mixed-line-bar-chart/__integ__/mixed-line-bar-chart.test.ts
@@ -504,26 +504,31 @@ describe('Details popover', () => {
       await page.windowScrollTo({ top: 150 });
       const barChart = createWrapper().findBarChart();
       const barGroup = barChart.findBarGroups().get(1).toSelector();
-      await expect(page.getWindowScroll()).resolves.toEqual({ top: 150, left: 0 });
+      await expect(page.getWindowScroll().then(s => s.top)).resolves.toBe(150);
       await page.clickBarGroup(barGroup);
       await page.waitForVisible(barChart.findDetailPopover().toSelector());
       await expect(page.getText(barChart.findDetailPopover().findHeader().toSelector())).resolves.toContain('Apr 2023');
-      await expect(page.getWindowScroll()).resolves.toEqual({ top: 0, left: 0 });
+      await expect(page.getWindowScroll().then(s => s.top)).resolves.toBe(0);
     })
   );
 
-  // Skipped due to failures with WebdriverIO v9.
-  test.skip(
+  test(
     'does not scroll on hover',
     setupTest('#/light/bar-chart/drilldown', async page => {
       await page.setWindowSize({ width: 360, height: 650 });
       await page.windowScrollTo({ top: 150 });
       const barChart = createWrapper().findBarChart();
       const barGroup = barChart.findBarGroups().get(1).toSelector();
-      await expect(page.getWindowScroll()).resolves.toEqual({ top: 150, left: 0 });
+      await expect(page.getWindowScroll().then(s => s.top)).resolves.toBe(150);
       await page.hoverElement(barGroup);
+      await page.waitForVisible(barChart.findDetailPopover().toSelector());
       await expect(page.getText(barChart.findDetailPopover().findHeader().toSelector())).resolves.toContain('Apr 2023');
-      await expect(page.getWindowScroll()).resolves.toEqual({ top: 150, left: 0 });
+
+      // Explanation: when a series is hovered we expect no extra scroll, so the page's scroll should stay at 150px.
+      // However, Webdriver automatically performs scroll adjustments when hovering to make the element fit the screen,
+      // so we give it a small extra allowance.
+      await expect(page.getWindowScroll().then(s => s.top)).resolves.toBeGreaterThanOrEqual(150);
+      await expect(page.getWindowScroll().then(s => s.top)).resolves.toBeLessThan(250);
     })
   );