@vaadin/grid 23.0.2 → 23.0.5

package/package.json

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

package/src/vaadin-grid-column-resizing-mixin.js

@@ -57,7 +57,7 @@ export const ColumnResizingMixin = (superClass) =>
         const targetCell = columnRowCells.filter((cell) => cell._column === column)[0];
         // Resize the target column
         if (targetCell.offsetWidth) {
-          const style = window.getComputedStyle(targetCell);
+          const style = getComputedStyle(targetCell._content);
           const minWidth =
             10 +
             parseInt(style.paddingLeft) +

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 { TabindexMixin } from '@vaadin/component-base/src/tabindex-mixin.js';
 import { processTemplates } from '@vaadin/component-base/src/templates.js';
@@ -340,11 +340,6 @@ class Grid extends ElementMixin(
         value: isTouch
       },
 
-      /** @protected */
-      tabindex: {
-        value: undefined
-      },
-
       /**
        * If true, the grid's height is defined by its rows.
        *
@@ -473,23 +468,6 @@ class Grid extends ElementMixin(
     }
   }
 
-  /**
-   * Override an observer from `DisabledMixin` to not
-   * set `tabindex` on the grid when it is re-enabled.
-   *
-   * @param {boolean} disabled
-   * @param {boolean} oldDisabled
-   * @protected
-   * @override
-   */
-  _disabledChanged(disabled, oldDisabled) {
-    super._disabledChanged(disabled, oldDisabled);
-
-    if (oldDisabled) {
-      this.removeAttribute('tabindex');
-    }
-  }
-
   /** @private */
   __getBodyCellCoordinates(cell) {
     if (this.$.items.contains(cell) && cell.localName === 'td') {
@@ -685,13 +663,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);