Fix canceling Grid Editor during EditorOpenEvent (#11038)

Fixes #11002

3 files changed, 23 insertions, 1 deletions

diff --git a/server/src/main/java/com/vaadin/ui/components/grid/EditorImpl.java b/server/src/main/java/com/vaadin/ui/components/grid/EditorImpl.java
index d252cfed99..8f97e59ba9 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/EditorImpl.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/EditorImpl.java
@@ -148,8 +148,8 @@ public class EditorImpl<T> extends AbstractGridExtension<T>
                     return;
                 }
                 doClose();
-                doEdit(getData(key));
                 rpc.confirmBind(true);
+                doEdit(getData(key));
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
index 0e196b46ed..b00ba210f3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
@@ -804,6 +805,14 @@ public class GridBasics extends AbstractTestUIWithLog {
         editorMenu.addItem("Edit last row", menuItem -> grid.getEditor()
                 .editRow(grid.getDataCommunicator().getDataProviderSize() - 1));
 
+        editorMenu.addItem("Cancel next edit", menuItem -> {
+            AtomicReference<Registration> reference = new AtomicReference<>();
+            reference.set(grid.getEditor().addOpenListener(e -> {
+                e.getGrid().getEditor().cancel();
+                reference.get().remove();
+            }));
+        });
+
         editorMenu.addItem("Change save caption",
                 event -> grid.getEditor().setSaveCaption("ǝʌɐS"));
         editorMenu.addItem("Change cancel caption",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorTest.java
index 5dc4b42303..aeaf34d529 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorTest.java
@@ -239,6 +239,19 @@ public abstract class GridEditorTest extends GridBasicsTest {
                         .findElement(By.className("not-editable")).getText());
     }
 
+    @Test
+    public void testEditorCancelOnOpen() {
+        editRow(2);
+        getGridElement().sendKeys(Keys.ESCAPE);
+
+        selectMenuPath("Component", "Editor", "Cancel next edit");
+        getGridElement().getCell(2, 0).doubleClick();
+        assertEditorClosed();
+
+        editRow(2);
+        assertNoErrorNotifications();
+    }
+
     protected WebElement getSaveButton() {
         return getDriver().findElement(BY_EDITOR_SAVE);
     }