@vaadin/vaadin-grid 5.9.4 → 5.9.5

package/package.json

@@ -15,7 +15,7 @@
   "repository": "vaadin/vaadin-grid",
   "homepage": "https://vaadin.com/components",
   "name": "@vaadin/vaadin-grid",
-  "version": "5.9.4",
+  "version": "5.9.5",
   "main": "vaadin-grid.js",
   "author": "Vaadin Ltd",
   "license": "Apache-2.0",

package/src/vaadin-grid.js

@@ -325,7 +325,7 @@ class GridElement extends
   }
 
   static get version() {
-    return '5.9.4';
+    return '5.9.5';
   }
 
   static get observers() {
@@ -336,6 +336,12 @@ class GridElement extends
 
   static get properties() {
     return {
+      /** @private */
+      _chrome: {
+        type: Boolean,
+        value: /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor)
+      },
+
       /** @private */
       _safari: {
         type: Boolean,
@@ -601,13 +607,16 @@ class GridElement extends
     // 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 (this._chrome) {
         // 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 = event.composedPath().indexOf(cellContent) >= 0;
+          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);