@vaadin/grid 25.0.0-alpha2 → 25.0.0-alpha21

package/src/styles/vaadin-grid-sorter-base-styles.js

@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/component-base/src/styles/style-props.js';
+import { css } from 'lit';
+
+export const gridSorterStyles = css`
+  :host {
+    display: inline-flex;
+    align-items: center;
+    cursor: pointer;
+    max-width: 100%;
+    gap: var(--vaadin-gap-s);
+    -webkit-user-select: none;
+    user-select: none;
+    -webkit-tap-highlight-color: transparent;
+  }
+
+  [part='content'] {
+    flex: 1 1 auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  [part='indicators'] {
+    position: relative;
+    flex: none;
+    height: 1lh;
+    color: var(--vaadin-text-color-disabled);
+  }
+
+  [part='order'] {
+    display: inline;
+    vertical-align: super;
+    font-size: 0.75em;
+    line-height: 1;
+    color: var(--vaadin-text-color-secondary);
+  }
+
+  [part='indicators']::before {
+    content: '';
+    display: inline-block;
+    height: 12px;
+    width: 8px;
+    mask-image: var(--_vaadin-icon-sort);
+    background: currentColor;
+  }
+
+  :host([direction]) [part='indicators']::before {
+    padding-bottom: 6px;
+    height: 6px;
+    mask-clip: content-box;
+  }
+
+  :host([direction='desc']) [part='indicators']::before {
+    padding-block: 6px 0;
+  }
+
+  :host([direction]) [part='indicators'] {
+    color: var(--vaadin-text-color-secondary);
+  }
+
+  @media (any-hover: hover) {
+    :host(:hover) [part='indicators'] {
+      color: var(--vaadin-text-color);
+    }
+  }
+
+  @media (forced-colors: active) {
+    [part='indicators']::before {
+      background: CanvasText;
+    }
+  }
+`;

package/src/styles/vaadin-grid-tree-toggle-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const gridTreeToggleStyles: CSSResult;

package/src/styles/vaadin-grid-tree-toggle-base-styles.js

@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/component-base/src/styles/style-props.js';
+import { css } from 'lit';
+
+export const gridTreeToggleStyles = css`
+  :host {
+    display: flex;
+    max-width: 100%;
+    pointer-events: none;
+  }
+
+  /* Don't expand/collapse when clicking #level-spacer */
+  [part] {
+    pointer-events: auto;
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  :host(:not([leaf])) {
+    cursor: var(--vaadin-clickable-cursor);
+  }
+
+  #level-spacer,
+  [part='toggle'] {
+    flex: none;
+  }
+
+  #level-spacer {
+    width: calc(var(--_level, 0) * var(--vaadin-grid-tree-toggle-level-offset, 16px));
+  }
+
+  [part='toggle'] {
+    margin-inline-end: var(--vaadin-gap-s);
+  }
+
+  [part='toggle']::before {
+    content: '';
+    display: block;
+    width: var(--vaadin-icon-size, 1lh);
+    height: var(--vaadin-icon-size, 1lh);
+    background: currentColor;
+    mask: var(--_vaadin-icon-chevron-down) 50% / var(--vaadin-icon-visual-size, 100%) no-repeat;
+  }
+
+  :host(:not([expanded])) [part='toggle']::before {
+    rotate: -90deg;
+  }
+
+  @media (prefers-reduced-motion: no-preference) {
+    [part='toggle']::before {
+      transition: rotate 120ms;
+    }
+  }
+
+  :host([leaf]) [part='toggle'] {
+    visibility: hidden;
+  }
+
+  slot {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  @media (forced-colors: active) {
+    [part='toggle']::before {
+      background: CanvasText;
+    }
+  }
+`;

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

@@ -3,7 +3,7 @@
  * Copyright (c) 2016 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { iterateChildren, iterateRowCells } from './vaadin-grid-helpers.js';
+import { findTreeToggleCell, iterateChildren, iterateRowCells } from './vaadin-grid-helpers.js';
 
 /**
  * @polymerMixin
@@ -22,7 +22,7 @@ export const A11yMixin = (superClass) =>
       };
     }
     static get observers() {
-      return ['_a11yUpdateGridSize(size, _columnTree)'];
+      return ['_a11yUpdateGridSize(size, _columnTree, __emptyState)'];
     }
 
     /** @private */
@@ -34,21 +34,27 @@ export const A11yMixin = (superClass) =>
 
     /** @private */
     _a11yGetFooterRowCount(_columnTree) {
-      return _columnTree.filter((level) => level.some((col) => col.headerRenderer)).length;
+      return _columnTree.filter((level) => level.some((col) => col.footerRenderer)).length;
     }
 
     /** @private */
-    _a11yUpdateGridSize(size, _columnTree) {
+    _a11yUpdateGridSize(size, _columnTree, emptyState) {
       if (size === undefined || _columnTree === undefined) {
         return;
       }
 
+      const headerRowsCount = this._a11yGetHeaderRowCount(_columnTree);
+      const footerRowsCount = this._a11yGetFooterRowCount(_columnTree);
+      const bodyRowsCount = emptyState ? 1 : size;
+      const rowsCount = bodyRowsCount + headerRowsCount + footerRowsCount;
+
+      this.$.table.setAttribute('aria-rowcount', rowsCount);
+
       const bodyColumns = _columnTree[_columnTree.length - 1];
-      this.$.table.setAttribute(
-        'aria-rowcount',
-        size + this._a11yGetHeaderRowCount(_columnTree) + this._a11yGetFooterRowCount(_columnTree),
-      );
-      this.$.table.setAttribute('aria-colcount', (bodyColumns && bodyColumns.length) || 0);
+      // If no header and footer rows while the empty state is active, count as one column
+      // Otherwise, use the number of body columns, if present
+      const columnsCount = emptyState ? 1 : (rowsCount && bodyColumns && bodyColumns.length) || 0;
+      this.$.table.setAttribute('aria-colcount', columnsCount);
 
       this._a11yUpdateHeaderRows();
       this._a11yUpdateFooterRows();
@@ -95,12 +101,22 @@ export const A11yMixin = (superClass) =>
      * @protected
      */
     _a11yUpdateRowExpanded(row) {
+      const toggleCell = findTreeToggleCell(row);
       if (this.__isRowExpandable(row)) {
         row.setAttribute('aria-expanded', 'false');
+        if (toggleCell) {
+          toggleCell.setAttribute('aria-expanded', 'false');
+        }
       } else if (this.__isRowCollapsible(row)) {
         row.setAttribute('aria-expanded', 'true');
+        if (toggleCell) {
+          toggleCell.setAttribute('aria-expanded', 'true');
+        }
       } else {
         row.removeAttribute('aria-expanded');
+        if (toggleCell) {
+          toggleCell.removeAttribute('aria-expanded');
+        }
       }
     }
 
@@ -132,7 +148,7 @@ export const A11yMixin = (superClass) =>
     }
 
     /**
-     * @param {!HTMLElement} row
+     * @param {!HTMLElement} cell
      * @param {number} colspan
      * @protected
      */

package/src/vaadin-grid-column-auto-width-mixin.js

@@ -59,9 +59,15 @@ export const ColumnAutoWidthMixin = (superClass) =>
     }
 
     /** @private */
-    __flatSizeChangedAutoWidth() {
+    __flatSizeChangedAutoWidth(flatSize) {
       // Flat size changed, recalculate column widths if pending (asynchronously, to allow grid to render row elements first)
-      requestAnimationFrame(() => this.__tryToRecalculateColumnWidthsIfPending());
+      requestAnimationFrame(() => {
+        if (!!flatSize && !this.__hasHadRenderedRowsForColumnWidthCalculation) {
+          this.recalculateColumnWidths();
+        } else {
+          this.__tryToRecalculateColumnWidthsIfPending();
+        }
+      });
     }
 
     /**
@@ -131,10 +137,7 @@ export const ColumnAutoWidthMixin = (superClass) =>
       return this.__getIntrinsicWidth(innerColumn) + shareOfInnerColumnFromNecessaryExtraSpace;
     }
 
-    /**
-     * @param {!Array<!GridColumn>} cols the columns to auto size based on their content width
-     * @private
-     */
+    /** @private */
     _recalculateColumnWidths() {
       // Flush to make sure DOM is up-to-date when measuring the column widths
       this.__virtualizer.flush();

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

@@ -147,6 +147,7 @@ export declare class GridColumnMixinClass<
    *   - `model.level` Level of the tree represented with a horizontal offset of the toggle button.
    *   - `model.selected` Selected state.
    *   - `model.detailsOpened` Details opened state.
+   *   - `model.hasChildren` Whether the item has children.
    */
   renderer: GridBodyRenderer<TItem, Column> | null | undefined;
 

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

@@ -536,24 +536,8 @@ export const ColumnBaseMixin = (superClass) =>
         return;
       }
 
-      let textAlignFallback;
-      if (getComputedStyle(this._grid).direction === 'ltr') {
-        if (textAlign === 'start') {
-          textAlignFallback = 'left';
-        } else if (textAlign === 'end') {
-          textAlignFallback = 'right';
-        }
-      } else if (textAlign === 'start') {
-        textAlignFallback = 'right';
-      } else if (textAlign === 'end') {
-        textAlignFallback = 'left';
-      }
-
       this._allCells.forEach((cell) => {
         cell._content.style.textAlign = textAlign;
-        if (getComputedStyle(cell._content).textAlign !== textAlign) {
-          cell._content.style.textAlign = textAlignFallback;
-        }
       });
     }
 
@@ -885,6 +869,7 @@ export const GridColumnMixin = (superClass) =>
          *   - `model.level` Level of the tree represented with a horizontal offset of the toggle button.
          *   - `model.selected` Selected state.
          *   - `model.detailsOpened` Details opened state.
+         *   - `model.hasChildren` Whether the item has children.
          *
          * @type {GridBodyRenderer | null | undefined}
          */

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

@@ -127,9 +127,9 @@ export const ColumnReorderingMixin = (superClass) =>
         return;
       }
 
-      // Cancel reordering if there are draggable nodes on the event path
+      // Cancel reordering if there are draggable nodes on the event path following this element
       const path = e.composedPath && e.composedPath();
-      if (path && path.some((node) => node.hasAttribute && node.hasAttribute('draggable'))) {
+      if (path && path.slice(0, Math.max(0, path.indexOf(this))).some((node) => node.draggable)) {
         return;
       }
 

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

@@ -7,7 +7,6 @@ import { microTask, timeOut } from '@vaadin/component-base/src/async.js';
 import { DataProviderController } from '@vaadin/component-base/src/data-provider-controller/data-provider-controller.js';
 import { Debouncer } from '@vaadin/component-base/src/debounce.js';
 import { get } from '@vaadin/component-base/src/path-utils.js';
-import { getBodyRowCells, updateCellsPart, updateState } from './vaadin-grid-helpers.js';
 
 /**
  * @polymerMixin
@@ -166,24 +165,6 @@ export const DataProviderMixin = (superClass) =>
       this._dataProviderController.addEventListener('page-loaded', this._onDataProviderPageLoaded.bind(this));
     }
 
-    /**
-     * @protected
-     * @deprecated since 24.3 and will be removed in Vaadin 25.
-     */
-    get _cache() {
-      console.warn('<vaadin-grid> The `_cache` property is deprecated and will be removed in Vaadin 25.');
-      return this._dataProviderController.rootCache;
-    }
-
-    /**
-     * @protected
-     * @deprecated since 24.3 and will be removed in Vaadin 25.
-     */
-    get _effectiveSize() {
-      console.warn('<vaadin-grid> The `_effectiveSize` property is deprecated and will be removed in Vaadin 25.');
-      return this._flatSize;
-    }
-
     /** @private */
     _sizeChanged(size) {
       this._dataProviderController.rootCache.size = size;
@@ -200,46 +181,26 @@ export const DataProviderMixin = (superClass) =>
       this.requestContentUpdate();
     }
 
-    /**
-     * @param {number} index
-     * @param {HTMLElement} el
-     * @protected
-     */
-    _getItem(index, el) {
-      el.index = index;
-
-      const { item } = this._dataProviderController.getFlatIndexContext(index);
-      if (item) {
-        this.__updateLoading(el, false);
-        this._updateItem(el, item);
-        if (this._isExpanded(item)) {
-          this._dataProviderController.ensureFlatIndexHierarchy(index);
-        }
-      } else {
-        this.__updateLoading(el, true);
-        this._dataProviderController.ensureFlatIndexLoaded(index);
-      }
+    /** @private */
+    __getRowLevel(row) {
+      const { level } = this._dataProviderController.getFlatIndexContext(row.index);
+      return level;
     }
 
-    /**
-     * @param {!HTMLElement} row
-     * @param {boolean} loading
-     * @private
-     */
-    __updateLoading(row, loading) {
-      const cells = getBodyRowCells(row);
-
-      // Row state attribute
-      updateState(row, 'loading', loading);
+    /** @private */
+    __getRowItem(row) {
+      const { item } = this._dataProviderController.getFlatIndexContext(row.index);
+      return item;
+    }
 
-      // Cells part attribute
-      updateCellsPart(cells, 'loading-row-cell', loading);
+    /** @private */
+    __ensureRowItem(row) {
+      this._dataProviderController.ensureFlatIndexLoaded(row.index);
+    }
 
-      if (loading) {
-        // Run style generators for the loading row to have custom names cleared
-        this._generateCellClassNames(row);
-        this._generateCellPartNames(row);
-      }
+    /** @private */
+    __ensureRowHierarchy(row) {
+      this._dataProviderController.ensureFlatIndexHierarchy(row.index);
     }
 
     /**
@@ -261,6 +222,15 @@ export const DataProviderMixin = (superClass) =>
       return this.__expandedKeys && this.__expandedKeys.has(this.getItemId(item));
     }
 
+    /**
+     * @param {!GridItem} item
+     * @return {boolean}
+     * @protected
+     */
+    _hasChildren(item) {
+      return this.itemHasChildrenPath && item && !!get(this.itemHasChildrenPath, item);
+    }
+
     /** @private */
     _expandedItemsChanged() {
       this._dataProviderController.recalculateFlatSize();
@@ -299,27 +269,6 @@ export const DataProviderMixin = (superClass) =>
       }
     }
 
-    /**
-     * @param {number} index
-     * @return {number}
-     * @protected
-     */
-    _getIndexLevel(index = 0) {
-      const { level } = this._dataProviderController.getFlatIndexContext(index);
-      return level;
-    }
-
-    /**
-     * @param {number} page
-     * @param {ItemCache} cache
-     * @protected
-     * @deprecated since 24.3 and will be removed in Vaadin 25.
-     */
-    _loadPage(page, cache) {
-      console.warn('<vaadin-grid> The `_loadPage` method is deprecated and will be removed in Vaadin 25.');
-      this._dataProviderController.__loadCachePage(cache, page);
-    }
-
     /** @protected */
     _onDataProviderPageRequested() {
       this._setLoading(true);
@@ -331,7 +280,7 @@ export const DataProviderMixin = (superClass) =>
       if (this._flatSize !== this._dataProviderController.flatSize) {
         // Schedule an update of all rendered rows by _debouncerApplyCachedData,
         // to ensure that all pages associated with the rendered rows are loaded.
-        this._shouldUpdateAllRenderedRowsAfterPageLoad = true;
+        this._shouldLoadAllRenderedRowsAfterPageLoad = true;
 
         // TODO: Updating the flat size property can still result in a synchonous virtualizer update
         // if the size change requires the virtualizer to increase the amount of physical elements
@@ -341,9 +290,7 @@ export const DataProviderMixin = (superClass) =>
       }
 
       // After updating the cache, check if some of the expanded items should have sub-caches loaded
-      this._getRenderedRows().forEach((row) => {
-        this._dataProviderController.ensureFlatIndexHierarchy(row.index);
-      });
+      this._getRenderedRows().forEach((row) => this.__ensureRowHierarchy(row));
 
       this._hasData = true;
     }
@@ -354,13 +301,14 @@ export const DataProviderMixin = (superClass) =>
       this._debouncerApplyCachedData = Debouncer.debounce(this._debouncerApplyCachedData, timeOut.after(0), () => {
         this._setLoading(false);
 
-        const shouldUpdateAllRenderedRowsAfterPageLoad = this._shouldUpdateAllRenderedRowsAfterPageLoad;
-        this._shouldUpdateAllRenderedRowsAfterPageLoad = false;
+        const shouldLoadAllRenderedRowsAfterPageLoad = this._shouldLoadAllRenderedRowsAfterPageLoad;
+        this._shouldLoadAllRenderedRowsAfterPageLoad = false;
 
         this._getRenderedRows().forEach((row) => {
-          const { item } = this._dataProviderController.getFlatIndexContext(row.index);
-          if (item || shouldUpdateAllRenderedRowsAfterPageLoad) {
-            this._getItem(row.index, row);
+          this.__updateRow(row);
+
+          if (shouldLoadAllRenderedRowsAfterPageLoad) {
+            this.__ensureRowItem(row);
           }
         });
 

package/src/vaadin-grid-drag-and-drop-mixin.js

@@ -247,6 +247,9 @@ export const DragAndDropMixin = (superClass) =>
 
         let row = e.composedPath().find((node) => node.localName === 'tr');
 
+        // Update the horizontal scroll position property of the row being dragged over
+        this.__updateRowScrollPositionProperty(row);
+
         if (!this._flatSize || this.dropMode === DropMode.ON_GRID) {
           // The grid is empty or "on-grid" drop mode was used, always default to "empty"
           this._dropLocation = DropLocation.EMPTY;

package/src/vaadin-grid-event-context-mixin.d.ts

@@ -13,6 +13,7 @@ export interface GridEventContext<TItem> {
   index?: number;
   selected?: boolean;
   detailsOpened?: boolean;
+  hasChildren?: boolean;
   expanded?: boolean;
   level?: number;
 }
@@ -34,6 +35,7 @@ export declare class EventContextMixinClass<TItem> {
    * - `detailsOpened`: whether the row details are open for the item
    * - `expanded`: the expanded state of the tree toggle
    * - `level`: the tree hierarchy level
+   * - `hasChildren`: whether the item has children
    *
    * The returned object is populated only when a grid cell, header, footer or row details is found in `event.composedPath()`.
    * This means mostly mouse and keyboard events. If such a grid part is not found in the path, an empty object is returned.

package/src/vaadin-grid-event-context-mixin.js

@@ -21,6 +21,7 @@ export const EventContextMixin = (superClass) =>
      * - `detailsOpened`: whether the row details are open for the item
      * - `expanded`: the expanded state of the tree toggle
      * - `level`: the tree hierarchy level
+     * - `hasChildren`: whether the item has children
      *
      * The returned object is populated only when a grid cell, header, footer or row details is found in `event.composedPath()`.
      * This means mostly mouse and keyboard events. If such a grid part is not found in the path, an empty object is returned.

package/src/vaadin-grid-filter-element-mixin.js

@@ -6,23 +6,6 @@
 import { timeOut } from '@vaadin/component-base/src/async.js';
 import { Debouncer } from '@vaadin/component-base/src/debounce.js';
 import { SlotController } from '@vaadin/component-base/src/slot-controller.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin';
-
-registerStyles(
-  'vaadin-grid-filter',
-  css`
-    :host {
-      display: inline-flex;
-      max-width: 100%;
-    }
-
-    ::slotted(*) {
-      width: 100%;
-      box-sizing: border-box;
-    }
-  `,
-  { moduleId: 'vaadin-grid-filter-styles' },
-);
 
 /**
  * @polymerMixin

package/src/vaadin-grid-filter.js

@@ -8,6 +8,8 @@ import { html, LitElement } from 'lit';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin';
+import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
+import { gridFilterStyles } from './styles/vaadin-grid-filter-base-styles.js';
 import { GridFilterElementMixin } from './vaadin-grid-filter-element-mixin.js';
 
 /**
@@ -39,11 +41,15 @@ import { GridFilterElementMixin } from './vaadin-grid-filter-element-mixin.js';
  * @extends HTMLElement
  * @mixes GridFilterElementMixin
  */
-class GridFilter extends GridFilterElementMixin(ThemableMixin(PolylitMixin(LitElement))) {
+class GridFilter extends GridFilterElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement)))) {
   static get is() {
     return 'vaadin-grid-filter';
   }
 
+  static get styles() {
+    return gridFilterStyles;
+  }
+
   /** @protected */
   render() {
     return html`<slot></slot>`;

package/src/vaadin-grid-helpers.js

@@ -173,6 +173,15 @@ export function updateCellState(cell, attribute, value, part, oldPart) {
   updatePart(cell, value, part || `${attribute}-cell`);
 }
 
+/**
+ * Finds the cell containing the tree toggle element
+ * @param {!HTMLElement} row
+ * @return {HTMLElement | null}
+ */
+export function findTreeToggleCell(row) {
+  return getBodyRowCells(row).find((cell) => cell._content.querySelector('vaadin-grid-tree-toggle'));
+}
+
 /**
  * A helper for observing flattened child column list of an element.
  */

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

@@ -7,7 +7,6 @@ import { isKeyboardActive } from '@vaadin/a11y-base/src/focus-utils.js';
 import { animationFrame } from '@vaadin/component-base/src/async.js';
 import { Debouncer } from '@vaadin/component-base/src/debounce.js';
 import { addValueToAttribute, removeValueFromAttribute } from '@vaadin/component-base/src/dom-utils.js';
-import { get } from '@vaadin/component-base/src/path-utils.js';
 
 function isRow(element) {
   return element instanceof HTMLTableRowElement;
@@ -280,16 +279,13 @@ export const KeyboardNavigationMixin = (superClass) =>
       if (!targetRowInDom) {
         this._scrollToFlatIndex(index);
       } else {
-        this.__scrollIntoViewport(index);
+        this.__scrollIntoViewport(targetRowInDom);
       }
     }
 
     /** @private */
     __isRowExpandable(row) {
-      if (this.itemHasChildrenPath) {
-        const item = row._item;
-        return !!(item && get(this.itemHasChildrenPath, item) && !this._isExpanded(item));
-      }
+      return this._hasChildren(row._item) && !this._isExpanded(row._item);
     }
 
     /** @private */

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

@@ -62,6 +62,7 @@ export interface GridItemModel<TItem> {
   expanded?: boolean;
   level?: number;
   detailsOpened?: boolean;
+  hasChildren?: boolean;
 }
 
 /**