From ea24ab2e5298b1b4eea9e88fa2a07e8f90764655 Mon Sep 17 00:00:00 2001
From: Ugur Saglam <106508695+ugur-vaadin@users.noreply.github.com>
Date: Fri, 29 Nov 2024 11:00:58 +0200
Subject: [PATCH] fix: do not dispatch event on stopedit when editor loading
 (#8232)

---
 .../vaadin-grid-pro-inline-editing-mixin.js   |  2 +-
 .../test/keyboard-navigation.common.js        | 37 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/packages/grid-pro/src/vaadin-grid-pro-inline-editing-mixin.js b/packages/grid-pro/src/vaadin-grid-pro-inline-editing-mixin.js
index c0d7057279..0efcc20a51 100644
--- a/packages/grid-pro/src/vaadin-grid-pro-inline-editing-mixin.js
+++ b/packages/grid-pro/src/vaadin-grid-pro-inline-editing-mixin.js
@@ -401,7 +401,7 @@ export const InlineEditingMixin = (superClass) =>
       }
       const { cell, column, model } = this.__edited;
 
-      if (!shouldCancel) {
+      if (!shouldCancel && !this.hasAttribute('loading-editor')) {
         const editor = column._getEditorComponent(cell);
         if (editor) {
           const value = column._getEditorValue(editor);
diff --git a/packages/grid-pro/test/keyboard-navigation.common.js b/packages/grid-pro/test/keyboard-navigation.common.js
index 4c7414b309..6ca812b2d4 100644
--- a/packages/grid-pro/test/keyboard-navigation.common.js
+++ b/packages/grid-pro/test/keyboard-navigation.common.js
@@ -1,5 +1,5 @@
 import { expect } from '@vaadin/chai-plugins';
-import { fixtureSync, nextFrame } from '@vaadin/testing-helpers';
+import { aTimeout, fixtureSync, nextFrame } from '@vaadin/testing-helpers';
 import { sendKeys } from '@web/test-runner-commands';
 import sinon from 'sinon';
 import {
@@ -352,5 +352,40 @@ describe('keyboard navigation', () => {
       await sendKeys({ press: 'Escape' });
       expect(getContainerCellContent(grid.$.items, 0, 0).textContent).to.equal('0 foo');
     });
+
+    it('should not fire event when tabbed through cells with slow editor', async () => {
+      const itemPropertyChangedSpy = sinon.spy();
+      grid.addEventListener('item-property-changed', itemPropertyChangedSpy);
+
+      const column = grid.querySelector('vaadin-grid-pro-edit-column');
+
+      // Custom editor with delayed operations
+      column.editModeRenderer = (root, _, __) => {
+        if (!root.firstElementChild) {
+          const input = document.createElement('input');
+          let actualValue = '';
+          Object.defineProperty(input, 'value', {
+            async get() {
+              await aTimeout(100);
+              return actualValue;
+            },
+            async set(v) {
+              await aTimeout(100);
+              actualValue = v;
+            },
+          });
+          root.appendChild(input);
+        }
+      };
+
+      const firstCell = getContainerCell(grid.$.items, 0, 0);
+      dblclick(firstCell._content);
+
+      await sendKeys({ press: 'Tab' });
+      await sendKeys({ press: 'Tab' });
+      await nextFrame();
+
+      expect(itemPropertyChangedSpy.called).to.be.false;
+    });
   });
 });