fix: avoid an unnecessary focus call

vaadin · Nov 8, 2023 · 9fa0038 · 9fa0038
1 parent bca0100
commit 9fa0038
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/packages/grid-pro/src/vaadin-grid-pro-edit-column-mixin.js b/packages/grid-pro/src/vaadin-grid-pro-edit-column-mixin.js
@@ -268,7 +268,13 @@ export const GridProEditColumnMixin = (superClass) =>
       editor._grid = this._grid;
 
       this._focusEditor(editor);
-      requestAnimationFrame(() => this._focusEditor(editor));
+      requestAnimationFrame(() => {
+        // Ensure editor is focused after an animation frame
+        const editorIsFocused = editor.contains(editor.getRootNode().activeElement);
+        if (!editorIsFocused) {
+          this._focusEditor(editor);
+        }
+      });
     }
 
     /**