@vaadin/grid 23.0.0-beta3 → 23.0.0-beta4

package/package.json

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

package/src/vaadin-grid-data-provider-mixin.d.ts

@@ -101,6 +101,12 @@ export declare class DataProviderMixinClass<TItem> {
    */
   readonly loading: boolean | null | undefined;
 
+  /**
+   * Path to an item sub-property that indicates whether the item has child items.
+   * @attr {string} item-has-children-path
+   */
+  itemHasChildrenPath: string;
+
   /**
    * Path to an item sub-property that identifies the item.
    * @attr {string} item-id-path

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

@@ -186,6 +186,15 @@ export const DataProviderMixin = (superClass) =>
           value: false
         },
 
+        /**
+         * Path to an item sub-property that indicates whether the item has child items.
+         * @attr {string} item-has-children-path
+         */
+        itemHasChildrenPath: {
+          type: String,
+          value: 'children'
+        },
+
         /**
          * Path to an item sub-property that identifies the item.
          * @attr {string} item-id-path

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

@@ -216,14 +216,12 @@ export const KeyboardNavigationMixin = (superClass) =>
       }
     }
 
-    // TODO: A tree toggle component should not be the way to determine if the row is expandable
     /** @private */
     __isRowExpandable(row) {
-      const treeToggle = [...row.children].reduce(
-        (value, cell) => value || cell._content.querySelector('vaadin-grid-tree-toggle'),
-        null
-      );
-      return treeToggle && !treeToggle.expanded && !treeToggle.leaf;
+      if (this.itemHasChildrenPath) {
+        const item = row._item;
+        return item && this.get(this.itemHasChildrenPath, item) && !this._isExpanded(item);
+      }
     }
 
     /** @private */

package/src/vaadin-grid-tree-column.d.ts

@@ -28,6 +28,7 @@ declare class GridTreeColumn<TItem = GridDefaultItem> extends GridColumn<TItem>
   /**
    * JS Path of the property in the item that indicates whether the item has child items.
    * @attr {string} item-has-children-path
+   * @deprecated Use `grid.itemHasChildrenPath` instead.
    */
   itemHasChildrenPath: string | null | undefined;
 }

package/src/vaadin-grid-tree-column.js

@@ -34,10 +34,11 @@ class GridTreeColumn extends GridColumn {
       /**
        * JS Path of the property in the item that indicates whether the item has child items.
        * @attr {string} item-has-children-path
+       * @deprecated Use `grid.itemHasChildrenPath` instead.
        */
       itemHasChildrenPath: {
         type: String,
-        value: 'children'
+        observer: '_itemHasChildrenPathChanged'
       }
     };
   }
@@ -68,7 +69,7 @@ class GridTreeColumn extends GridColumn {
     toggle.__item = item;
     toggle.__rendererExpanded = expanded;
     toggle.expanded = expanded;
-    toggle.leaf = this.__isLeafItem(item, this.itemHasChildrenPath);
+    toggle.leaf = this.__isLeafItem(item, this._grid.itemHasChildrenPath);
     toggle.textContent = this.__getToggleContent(this.path, item);
     toggle.level = level;
   }
@@ -84,6 +85,19 @@ class GridTreeColumn extends GridColumn {
     return this.__defaultRenderer;
   }
 
+  /** @private */
+  _itemHasChildrenPathChanged(itemHasChildrenPath) {
+    if (itemHasChildrenPath) {
+      console.warn(
+        `WARNING: Since Vaadin 23, itemHasChildrenPath on <vaadin-grid-tree-column> is deprecated. Please set this property on the <vaadin-grid> instead.`
+      );
+
+      if (this._grid) {
+        this._grid.itemHasChildrenPath = itemHasChildrenPath;
+      }
+    }
+  }
+
   /**
    * Expands or collapses the row once the tree toggle is switched.
    * The listener handles only user-fired events.