fix: update horizontal scroll position on data change (#10192) (#10214)

vaadin-bot · ugur-vaadin · web-flow · commit e047a44e67ea · 2025-09-23T10:01:51.000+03:00
Co-authored-by: Ugur Saglam &lt;106508695+ugur-vaadin@users.noreply.github.com&gt;
diff --git a/packages/grid/src/vaadin-grid-mixin.js b/packages/grid/src/vaadin-grid-mixin.js
@@ -266,11 +266,14 @@ export const GridMixin = (superClass) =>
         reorderElements: true,
       });
 
-      new ResizeObserver(() =>
+      new ResizeObserver(() => {
         setTimeout(() => {
           this.__updateColumnsBodyContentHidden();
-        }),
-      ).observe(this.$.table);
+        });
+        // Updating data can change the visibility of the scroll bar. Therefore,
+        // the scroll position has to be recalculated.
+        this.__updateHorizontalScrollPosition();
+      }).observe(this.$.table);
 
       const minHeightObserver = new ResizeObserver(() =>
         setTimeout(() => {
diff --git a/packages/grid/test/frozen-columns.test.js b/packages/grid/test/frozen-columns.test.js
@@ -217,6 +217,31 @@ const frozenGridFixture = (frozen, frozenToEnd) => {
       expect(getComputedStyle(sizerCell).transform).to.equal('none');
     });
 
+    it('should update frozen-to-end positioning when scrollbar affects layout during data changes', async () => {
+      grid.style.width = '200px';
+      // Simulate a wide scrollbar like with Windows
+      const scrollbarWidth = 17;
+      const originalClientWidth = grid.$.table.clientWidth;
+      grid.$.table.style.width = `${originalClientWidth - scrollbarWidth}px`;
+      flushGrid(grid);
+      await nextRender();
+
+      const getFrozenToEndHeaderCell = () => getRowCells(getRows(grid.$.header)[0])[2];
+      const positionWithScrollbar = getFrozenToEndHeaderCell().getBoundingClientRect().x;
+
+      grid.items = Array.from({ length: 2 }, (_, i) => ({
+        foo: `foo${i}`,
+        bar: `bar${i}`,
+        baz: `baz${i}`,
+      }));
+      grid.$.table.style.width = `${originalClientWidth}px`;
+      flushGrid(grid);
+      await nextRender();
+
+      const positionAfterDataChange = getFrozenToEndHeaderCell().getBoundingClientRect().x;
+      expect(positionWithScrollbar).to.not.equal(positionAfterDataChange);
+    });
+
     ['header', 'body'].forEach((container) => {
       describe(container, () => {
         const defaultCellWidth = 100;
