From 1db391038597687ed01406d7b7f466205d634f39 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Tue, 17 Jul 2018 12:13:08 +0300
Subject: Fix Grid resetting row height on resize (#11056)

(cherry picked from commit 7979160)
---
 client/src/main/java/com/vaadin/client/widgets/Grid.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index 7b013f8d87..fd32ca8243 100755
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -9146,7 +9146,12 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
             }
 
             if (getEscalatorInnerHeight() != autoColumnWidthsRecalculator.lastCalculatedInnerHeight) {
-                resetSizesFromDom();
+                Scheduler.get().scheduleFinally(() -> {
+                    // Trigger re-calculation of all row positions.
+                    RowContainer.BodyRowContainer body = getEscalator()
+                            .getBody();
+                    body.setDefaultRowHeight(body.getDefaultRowHeight());
+                });
             }
 
             // Vertical resizing could make editor positioning invalid so it
-- 
cgit v1.2.3