Lock vertical scrolling while editor row is open (#13334)

Change-Id: Iee614d21b900900c7d969eca964f5fef829c70f2

1 files changed, 3 insertions, 0 deletions

diff --git a/client/src/com/vaadin/client/ui/grid/EditorRow.java b/client/src/com/vaadin/client/ui/grid/EditorRow.java
index 65e0eab0c1..c57ae26ff3 100644
--- a/client/src/com/vaadin/client/ui/grid/EditorRow.java
+++ b/client/src/com/vaadin/client/ui/grid/EditorRow.java
@@ -24,6 +24,7 @@ import com.google.gwt.dom.client.TableRowElement;
 import com.google.gwt.event.dom.client.KeyCodes;
 import com.google.gwt.user.client.DOM;
 import com.vaadin.client.ui.grid.Escalator.AbstractRowContainer;
+import com.vaadin.client.ui.grid.ScrollbarBundle.Direction;
 import com.vaadin.shared.ui.grid.ScrollDestination;
 
 /**
@@ -105,6 +106,7 @@ public class EditorRow<T> {
                     "Cannot cancel edit: EditorRow is not in edit mode");
         }
         hideOverlay();
+        grid.getEscalator().setScrollLocked(Direction.VERTICAL, false);
         state = State.INACTIVE;
     }
 
@@ -132,6 +134,7 @@ public class EditorRow<T> {
     protected void show() {
         if (state == State.ACTIVATING) {
             state = State.ACTIVE;
+            grid.getEscalator().setScrollLocked(Direction.VERTICAL, true);
             showOverlay(grid.getEscalator().getBody().getRowElement(rowIndex));
         }
     }