@vaadin/grid 22.0.7 → 22.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/grid",
-  "version": "22.0.7",
+  "version": "22.0.10",
   "publishConfig": {
     "access": "public"
   },
@@ -40,19 +40,19 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/checkbox": "^22.0.7",
-    "@vaadin/component-base": "^22.0.7",
-    "@vaadin/text-field": "^22.0.7",
-    "@vaadin/vaadin-lumo-styles": "^22.0.7",
-    "@vaadin/vaadin-material-styles": "^22.0.7",
-    "@vaadin/vaadin-themable-mixin": "^22.0.7"
+    "@vaadin/checkbox": "^22.0.10",
+    "@vaadin/component-base": "^22.0.10",
+    "@vaadin/text-field": "^22.0.10",
+    "@vaadin/vaadin-lumo-styles": "^22.0.10",
+    "@vaadin/vaadin-material-styles": "^22.0.10",
+    "@vaadin/vaadin-themable-mixin": "^22.0.10"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/polymer-legacy-adapter": "^22.0.7",
+    "@vaadin/polymer-legacy-adapter": "^22.0.10",
     "@vaadin/testing-helpers": "^0.3.2",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "947d74491296ca746b360ecb5f5a8efd55ab2866"
+  "gitHead": "5977183ebfe56b017da471fd9162bb72e9ed477a"
 }

package/src/vaadin-grid-keyboard-navigation-mixin.js

@@ -91,6 +91,9 @@ export const KeyboardNavigationMixin = (superClass) =>
       this.addEventListener('mousedown', () => {
         this.toggleAttribute('navigating', false);
         this._isMousedown = true;
+
+        // Reset stored order when moving focus with mouse.
+        this._focusedColumnOrder = undefined;
       });
       this.addEventListener('mouseup', () => (this._isMousedown = false));
     }

package/src/vaadin-grid.js

@@ -7,7 +7,7 @@ import './vaadin-grid-column.js';
 import './vaadin-grid-styles.js';
 import { beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
-import { isAndroid, isFirefox, isIOS, isSafari, isTouch } from '@vaadin/component-base/src/browser-utils.js';
+import { isAndroid, isChrome, isFirefox, isIOS, isSafari, isTouch } from '@vaadin/component-base/src/browser-utils.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { processTemplates } from '@vaadin/component-base/src/templates.js';
 import { Virtualizer } from '@vaadin/component-base/src/virtualizer.js';
@@ -658,13 +658,16 @@ class Grid extends ElementMixin(
     // focusable slot wrapper, that is why cells are not focused with
     // mousedown. Workaround: listen for mousedown and focus manually.
     cellContent.addEventListener('mousedown', () => {
-      if (window.chrome) {
+      if (isChrome) {
         // Chrome bug: focusing before mouseup prevents text selection, see http://crbug.com/771903
-        const mouseUpListener = () => {
-          if (!cellContent.contains(this.getRootNode().activeElement)) {
+        const mouseUpListener = (event) => {
+          // If focus is on element within the cell content — respect it, do not change
+          const contentContainsFocusedElement = cellContent.contains(this.getRootNode().activeElement);
+          // Only focus if mouse is released on cell content itself
+          const mouseUpWithinCell = cellContent.contains(event.target);
+          if (!contentContainsFocusedElement && mouseUpWithinCell) {
             cell.focus();
           }
-          // If focus is in the cell content — respect it, do not change.
           document.removeEventListener('mouseup', mouseUpListener, true);
         };
         document.addEventListener('mouseup', mouseUpListener, true);