@vaadin/grid 23.0.10 → 23.0.11

package/package.json

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

package/src/vaadin-grid-data-provider-mixin.js

@@ -219,13 +219,13 @@ export const DataProviderMixin = (superClass) =>
          */
         __expandedKeys: {
           type: Object,
-          value: () => new Set(),
+          computed: '__computeExpandedKeys(itemIdPath, expandedItems.*)',
         },
       };
     }
 
     static get observers() {
-      return ['_sizeChanged(size)', '_itemIdPathChanged(itemIdPath)', '_expandedItemsChanged(expandedItems.*)'];
+      return ['_sizeChanged(size)', '_expandedItemsChanged(expandedItems.*)'];
     }
 
     /** @private */
@@ -282,25 +282,20 @@ export const DataProviderMixin = (superClass) =>
 
     /** @private */
     _expandedItemsChanged() {
-      this.__cacheExpandedKeys();
       this._cache.updateSize();
       this._effectiveSize = this._cache.effectiveSize;
       this.__updateVisibleRows();
     }
 
     /** @private */
-    _itemIdPathChanged() {
-      this.__cacheExpandedKeys();
-    }
+    __computeExpandedKeys(itemIdPath, expandedItems) {
+      const expanded = expandedItems.base || [];
+      const expandedKeys = new Set();
+      expanded.forEach((item) => {
+        expandedKeys.add(this.getItemId(item));
+      });
 
-    /** @private */
-    __cacheExpandedKeys() {
-      if (this.expandedItems) {
-        this.__expandedKeys = new Set();
-        this.expandedItems.forEach((item) => {
-          this.__expandedKeys.add(this.getItemId(item));
-        });
-      }
+      return expandedKeys;
     }
 
     /**

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

@@ -27,13 +27,13 @@ export const SelectionMixin = (superClass) =>
          */
         __selectedKeys: {
           type: Object,
-          value: () => new Set(),
+          computed: '__computeSelectedKeys(itemIdPath, selectedItems.*)',
         },
       };
     }
 
     static get observers() {
-      return ['_updateSelectedKeys(itemIdPath, selectedItems.*)'];
+      return ['__selectedItemsChanged(itemIdPath, selectedItems.*)'];
     }
 
     /**
@@ -85,14 +85,19 @@ export const SelectionMixin = (superClass) =>
     }
 
     /** @private */
-    _updateSelectedKeys() {
-      const selectedItems = this.selectedItems || [];
-      this.__selectedKeys = new Set();
-      selectedItems.forEach((item) => {
-        this.__selectedKeys.add(this.getItemId(item));
+    __selectedItemsChanged() {
+      this.requestContentUpdate();
+    }
+
+    /** @private */
+    __computeSelectedKeys(itemIdPath, selectedItems) {
+      const selected = selectedItems.base || [];
+      const selectedKeys = new Set();
+      selected.forEach((item) => {
+        selectedKeys.add(this.getItemId(item));
       });
 
-      this.requestContentUpdate();
+      return selectedKeys;
     }
 
     /**