@vaadin/vaadin-grid 5.9.2 → 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.2",
+  "version": "5.9.5",
   "main": "vaadin-grid.js",
   "author": "Vaadin Ltd",
   "license": "Apache-2.0",
@@ -44,16 +44,12 @@
     "@vaadin/vaadin-element-mixin": "^2.4.1"
   },
   "resolutions": {
-"@webcomponents/webcomponentsjs": "2.0.0",
+    "@webcomponents/webcomponentsjs": "2.0.0",
     "inherits": "2.0.3",
     "samsam": "1.1.3",
     "supports-color": "3.1.2",
     "type-detect": "1.0.0"
   },
-  "scripts": {
-    "generate-typings": "gen-typescript-declarations --outDir . --verify",
-    "test": "wct --npm"
-  },
   "devDependencies": {
     "@web-padawan/gen-typescript-declarations": "^1.6.2",
     "web-component-tester": "6.9.2",
@@ -73,5 +69,9 @@
     "@vaadin/vaadin-demo-helpers": "^3.1.0",
     "@webcomponents/webcomponentsjs": "^2.0.0",
     "wct-browser-legacy": "^1.0.1"
+  },
+  "scripts": {
+    "generate-typings": "gen-typescript-declarations --outDir . --verify",
+    "test": "wct --npm"
   }
 }

package/src/vaadin-grid-column.js

@@ -368,7 +368,9 @@ export const ColumnBaseMixin = superClass => class ColumnBaseMixin extends super
   _setFooterTemplateOrRenderer(footerTemplate, footerRenderer, footerCell) {
     if ((footerTemplate || footerRenderer) && footerCell) {
       this.__setColumnTemplateOrRenderer(footerTemplate, footerRenderer, [footerCell]);
-      this._grid.__updateHeaderFooterRowVisibility(footerCell.parentElement);
+      if (this._grid) {
+        this._grid.__updateHeaderFooterRowVisibility(footerCell.parentElement);
+      }
     }
   }
 
@@ -482,7 +484,7 @@ export const ColumnBaseMixin = superClass => class ColumnBaseMixin extends super
       }
     }
 
-    if (headerCell) {
+    if (headerCell && this._grid) {
       this._grid.__updateHeaderFooterRowVisibility(headerCell.parentElement);
     }
   }

package/src/vaadin-grid-disabled-mixin.d.ts

@@ -0,0 +1,34 @@
+/**
+ * DO NOT EDIT
+ *
+ * This file was automatically generated by
+ *   https://github.com/Polymer/tools/tree/master/packages/gen-typescript-declarations
+ *
+ * To modify these typings, edit the source file(s):
+ *   src/vaadin-grid-disabled-mixin.js
+ */
+
+
+// tslint:disable:variable-name Describing an API that's defined elsewhere.
+// tslint:disable:no-any describes the API as best we are able today
+
+export {DisabledMixin};
+
+declare function DisabledMixin<T extends new (...args: any[]) => {}>(base: T): T & DisabledMixinConstructor;
+
+interface DisabledMixinConstructor {
+  new(...args: any[]): DisabledMixin;
+}
+
+export {DisabledMixinConstructor};
+
+interface DisabledMixin {
+  disabled: boolean|null|undefined;
+  _disabledChanged(disabled: any): void;
+
+  /**
+   * Overrides the default element `click` method in order to prevent
+   * firing the `click` event when the element is disabled.
+   */
+  click(): void;
+}

package/src/vaadin-grid-disabled-mixin.js

@@ -0,0 +1,43 @@
+/**
+@license
+Copyright (c) 2017 Vaadin Ltd.
+This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+*/
+/**
+ * @polymerMixin
+ */
+export const DisabledMixin = superClass => class DisabledMixin extends superClass {
+  static get properties() {
+    return {
+      disabled: {
+        type: Boolean,
+        value: false,
+        observer: '_disabledChanged',
+        reflectToAttribute: true
+      }
+    };
+  }
+
+  /** @protected */
+  _disabledChanged(disabled) {
+    if (disabled) {
+      this.setAttribute('tabindex', '-1');
+      this.setAttribute('aria-disabled', 'true');
+    } else {
+      this.removeAttribute('tabindex');
+      this.removeAttribute('aria-disabled');
+    }
+  }
+
+  /**
+   * Overrides the default element `click` method in order to prevent
+   * firing the `click` event when the element is disabled.
+   * @protected
+   * @override
+   */
+  click() {
+    if (!this.disabled) {
+      super.click();
+    }
+  }
+};

package/src/vaadin-grid-selection-mixin.js

@@ -80,11 +80,7 @@ export const SelectionMixin = superClass => class SelectionMixin extends superCl
 
   /** @private */
   _selectedItemsChanged(e) {
-    if (this.$.items.children.length && (e.path === 'selectedItems' || e.path === 'selectedItems.splices')) {
-      Array.from(this.$.items.children).forEach(row => {
-        this._updateItem(row, row._item);
-      });
-    }
+    this._assignModels();
   }
 
   /** @private */

package/src/vaadin-grid-styles.js

@@ -31,6 +31,11 @@ VaadinGridStyles.appendChild(
       display: none !important;
     }
 
+    :host([disabled]) {
+      pointer-events: none;
+      animation: none;
+    }
+
     #scroller {
       display: block;
       transform: translateY(0);

package/src/vaadin-grid.d.ts

@@ -13,6 +13,8 @@
 
 import {ThemableMixin} from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
+import {DisabledMixin} from './vaadin-grid-disabled-mixin.js';
+
 import {ScrollerElement} from './vaadin-grid-scroller.js';
 
 import {A11yMixin} from './vaadin-grid-a11y-mixin.js';

package/src/vaadin-grid.js

@@ -6,6 +6,7 @@ This program is available under Apache License Version 2.0, available at https:/
 import '@polymer/polymer/polymer-legacy.js';
 
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { DisabledMixin } from './vaadin-grid-disabled-mixin.js';
 import { ScrollerElement } from './vaadin-grid-scroller.js';
 import { A11yMixin } from './vaadin-grid-a11y-mixin.js';
 import { ActiveItemMixin } from './vaadin-grid-active-item-mixin.js';
@@ -294,7 +295,8 @@ class GridElement extends
                                 EventContextMixin(
                                   DragAndDropMixin(
                                     StylingMixin(
-                                      ScrollerElement)))))))))))))))))) {
+                                      DisabledMixin(
+                                        ScrollerElement))))))))))))))))))) {
   static get template() {
     return html`
     <style include="vaadin-grid-styles"></style>
@@ -323,7 +325,7 @@ class GridElement extends
   }
 
   static get version() {
-    return '5.9.2';
+    return '5.9.5';
   }
 
   static get observers() {
@@ -334,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,
@@ -599,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);

package/theme/lumo/vaadin-grid-styles.js

@@ -29,6 +29,10 @@ const $_documentContainer = html`<dom-module id="lumo-grid" theme-for="vaadin-gr
         --_lumo-grid-selected-row-color: var(--lumo-primary-color-10pct);
       }
 
+      :host([disabled]) {
+        opacity: 0.7;
+      }
+
       /* No (outer) border */
 
       :host(:not([theme~="no-border"])) {

package/theme/material/vaadin-grid-styles.js

@@ -13,6 +13,10 @@ const $_documentContainer = html`<dom-module id="material-grid" theme-for="vaadi
         color: var(--material-body-text-color);
       }
 
+      :host([disabled]) {
+        opacity: 0.7;
+      }
+
       [part~="cell"] {
         min-height: 48px;
         -webkit-tap-highlight-color: transparent;