@progress/kendo-angular-treelist 13.2.0-develop.9 → 13.2.1-develop.1

package/esm2020/columns/column-list.mjs

@@ -37,7 +37,7 @@ const filterHierarchy = (list, predicate) => {
             }
         }
     });
-    return result;
+    return result.sort((a, b) => Number(b.locked) - Number(a.locked));
 };
 /**
  * @hidden

package/esm2020/navigation/logical-row.directive.mjs

@@ -6,6 +6,7 @@ import { Directive, HostBinding, Input } from '@angular/core';
 import { IdService } from '../common/id.service';
 import { NavigationService } from './navigation.service';
 import { anyChanged } from '@progress/kendo-angular-common';
+import { ColumnsContainer } from '../columns/columns-container';
 import * as i0 from "@angular/core";
 import * as i1 from "../common/id.service";
 import * as i2 from "./navigation.service";
@@ -31,18 +32,35 @@ export class LogicalRowDirective {
         return this.logicalSlaveRow ? 'presentation' : 'row';
     }
     get ariaRowIndex() {
-        if (this.navigation.enabled) {
-            return this.logicalRowIndex + 1;
-        }
+        return this.logicalSlaveRow ? null : this.logicalRowIndex + 1;
+    }
+    get rowIndex() {
+        return this.logicalSlaveRow ? this.logicalRowIndex + 1 : null;
     }
     get ariaOwns() {
-        if (!this.navigation.enabled || this.logicalSlaveRow || this.logicalSlaveCellsCount === 0) {
+        if (this.logicalSlaveRow || this.logicalSlaveCellsCount === 0) {
             return undefined;
         }
         const ids = [];
-        const total = this.logicalCellsCount + this.logicalSlaveCellsCount;
-        for (let cellIndex = this.logicalCellsCount; cellIndex < total; cellIndex++) {
-            ids.push(this.idService.cellId(this.logicalRowIndex, cellIndex));
+        if (this.dataRowIndex < 0) {
+            let total = this.logicalCellsCount + this.logicalSlaveCellsCount;
+            this.columnsArray.forEach(column => {
+                if (column.isSpanColumn) {
+                    total += column.colspan - 1;
+                }
+            });
+            for (let cellIndex = this.logicalCellsCount; cellIndex < total; cellIndex++) {
+                ids.push(this.idService.cellId(this.logicalRowIndex, cellIndex));
+            }
+        }
+        else {
+            let columnIndex = 0;
+            this.columnsArray.forEach(column => {
+                if (!column.isLocked) {
+                    ids.push(this.idService.cellId(this.logicalRowIndex, columnIndex));
+                }
+                columnIndex += column.isSpanColumn ? column.colspan : 1;
+            });
         }
         return ids.join(' ');
     }
@@ -65,9 +83,12 @@ export class LogicalRowDirective {
     ngOnDestroy() {
         this.navigation.unregisterRow(this.logicalRowIndex, this);
     }
+    get columnsArray() {
+        return this.totalColumns?.allColumns.toArray() || [];
+    }
 }
 LogicalRowDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: LogicalRowDirective, deps: [{ token: i1.IdService }, { token: i2.NavigationService }], target: i0.ɵɵFactoryTarget.Directive });
-LogicalRowDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.12", type: LogicalRowDirective, selector: "[kendoTreeListLogicalRow]", inputs: { logicalRowIndex: "logicalRowIndex", logicalSlaveRow: "logicalSlaveRow", logicalCellsCount: "logicalCellsCount", logicalSlaveCellsCount: "logicalSlaveCellsCount", dataRowIndex: "dataRowIndex", dataItem: "dataItem", isNew: "isNew" }, host: { properties: { "attr.role": "this.hostRole", "attr.aria-rowindex": "this.ariaRowIndex", "attr.aria-owns": "this.ariaOwns", "class.k-table-row": "this.tableRowClass" } }, usesOnChanges: true, ngImport: i0 });
+LogicalRowDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.12", type: LogicalRowDirective, selector: "[kendoTreeListLogicalRow]", inputs: { logicalRowIndex: "logicalRowIndex", logicalSlaveRow: "logicalSlaveRow", logicalCellsCount: "logicalCellsCount", logicalSlaveCellsCount: "logicalSlaveCellsCount", dataRowIndex: "dataRowIndex", dataItem: "dataItem", isNew: "isNew", totalColumns: "totalColumns" }, host: { properties: { "attr.role": "this.hostRole", "attr.aria-rowindex": "this.ariaRowIndex", "attr.data-kendo-treelist-row-index": "this.rowIndex", "attr.aria-owns": "this.ariaOwns", "class.k-table-row": "this.tableRowClass" } }, usesOnChanges: true, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: LogicalRowDirective, decorators: [{
             type: Directive,
             args: [{
@@ -87,12 +108,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                 type: Input
             }], isNew: [{
                 type: Input
+            }], totalColumns: [{
+                type: Input
             }], hostRole: [{
                 type: HostBinding,
                 args: ['attr.role']
             }], ariaRowIndex: [{
                 type: HostBinding,
                 args: ['attr.aria-rowindex']
+            }], rowIndex: [{
+                type: HostBinding,
+                args: ['attr.data-kendo-treelist-row-index']
             }], ariaOwns: [{
                 type: HostBinding,
                 args: ['attr.aria-owns']

package/esm2020/navigation/navigation.service.mjs

@@ -45,7 +45,7 @@ const targetCell = (target, treelistElement) => {
     const cell = treelistCell(target, treelistElement);
     const row = closest(cell, matchesNodeName('tr'));
     if (cell && row) {
-        let rowIndex = row.getAttribute('aria-rowindex');
+        let rowIndex = row.getAttribute('aria-rowindex') || row.getAttribute('data-kendo-treelist-row-index');
         rowIndex = rowIndex ? parseInt(rowIndex, 10) - 1 : null;
         let colIndex = cell.getAttribute('aria-colindex');
         colIndex = colIndex ? parseInt(colIndex, 10) - 1 : null;

package/esm2020/package-metadata.mjs

@@ -9,7 +9,7 @@ export const packageMetadata = {
     name: '@progress/kendo-angular-treelist',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1689670141,
-    version: '13.2.0-develop.9',
+    publishDate: 1689768729,
+    version: '13.2.1-develop.1',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
 };

package/esm2020/rendering/header/header.component.mjs

@@ -24,6 +24,7 @@ import { hasItems } from '../../column-menu/utils';
 import { closestInScope, isFocusable } from '../common/dom-queries';
 import { SelectionService } from '../../selection/selection.service';
 import { sortAscSmallIcon, sortDescSmallIcon } from '@progress/kendo-svg-icons';
+import { ColumnsContainer } from '../../columns/columns-container';
 import * as i0 from "@angular/core";
 import * as i1 from "../../common/single-popup.service";
 import * as i2 from "../../dragdrop/drag-hint.service";
@@ -359,12 +360,13 @@ export class HeaderComponent {
     }
 }
 HeaderComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: HeaderComponent, deps: [{ token: i1.SinglePopupService }, { token: i2.DragHintService }, { token: i3.DropCueService }, { token: i4.ColumnReorderService }, { token: i5.SortService }, { token: i6.SelectionService }, { token: i7.LocalizationService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
-HeaderComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: HeaderComponent, selector: "[kendoTreeListHeader]", inputs: { totalColumnLevels: "totalColumnLevels", columns: "columns", scrollable: "scrollable", filterable: "filterable", sort: "sort", filter: "filter", sortable: "sortable", lockedColumnsCount: "lockedColumnsCount", resizable: "resizable", reorderable: "reorderable", columnMenu: "columnMenu", columnMenuTemplate: "columnMenuTemplate", totalColumnsCount: "totalColumnsCount" }, host: { properties: { "class.k-grid-header": "this.headerClass", "class.k-table-thead": "this.hostClass" } }, viewQueries: [{ propertyName: "dropTargets", predicate: DropTargetDirective, descendants: true }], usesOnChanges: true, ngImport: i0, template: `
+HeaderComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: HeaderComponent, selector: "[kendoTreeListHeader]", inputs: { totalColumnLevels: "totalColumnLevels", columns: "columns", scrollable: "scrollable", filterable: "filterable", sort: "sort", filter: "filter", sortable: "sortable", lockedColumnsCount: "lockedColumnsCount", resizable: "resizable", reorderable: "reorderable", columnMenu: "columnMenu", columnMenuTemplate: "columnMenuTemplate", totalColumnsCount: "totalColumnsCount", totalColumns: "totalColumns" }, host: { properties: { "class.k-grid-header": "this.headerClass", "class.k-table-thead": "this.hostClass" } }, viewQueries: [{ propertyName: "dropTargets", predicate: DropTargetDirective, descendants: true }], usesOnChanges: true, ngImport: i0, template: `
         <tr *ngFor="let i of columnLevels; let levelIndex = index" role="row"
             kendoTreeListLogicalRow
                 [logicalRowIndex]="levelIndex"
                 [logicalSlaveRow]="lockedColumnsCount > 0"
                 [logicalCellsCount]="columns.length"
+                [totalColumns]="totalColumns"
                 [logicalSlaveCellsCount]="unlockedColumnsCount">
             <ng-template ngFor let-column="$implicit" [ngForOf]="columnsForLevel(levelIndex)" [ngForTrackBy]="trackByIndex" let-columnIndex="index" let-last="last">
                 <th *ngIf="!isColumnGroupComponent(column)"
@@ -538,13 +540,14 @@ HeaderComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", versio
             [filter]="filter"
             [lockedColumnsCount]="lockedColumnsCount"
             kendoTreeListLogicalRow
+            [totalColumns]="totalColumns"
             [logicalRowIndex]="totalColumnLevels + 1"
             [logicalSlaveRow]="lockedColumnsCount > 0"
             [logicalCellsCount]="columns.length"
             [logicalSlaveCellsCount]="unlockedColumnsCount"
         >
         </tr>
-    `, isInline: true, components: [{ type: i8.FilterMenuComponent, selector: "kendo-treelist-filter-menu", inputs: ["column", "filter"] }, { type: i9.ColumnMenuComponent, selector: "kendo-treelist-column-menu", inputs: ["standalone", "column", "settings", "sort", "filter", "sortable", "columnMenuTemplate"] }, { type: i10.IconWrapperComponent, selector: "kendo-icon-wrapper", inputs: ["name", "svgIcon", "innerCssClass", "customFontClass", "size"], exportAs: ["kendoIconWrapper"] }, { type: i11.FilterRowComponent, selector: "[kendoTreeListFilterRow]", inputs: ["columns", "filter", "logicalRowIndex", "lockedColumnsCount"] }], directives: [{ type: i12.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i13.LogicalRowDirective, selector: "[kendoTreeListLogicalRow]", inputs: ["logicalRowIndex", "logicalSlaveRow", "logicalCellsCount", "logicalSlaveCellsCount", "dataRowIndex", "dataItem", "isNew"] }, { type: i12.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i14.LogicalCellDirective, selector: "[kendoTreeListLogicalCell]", inputs: ["logicalColIndex", "logicalRowIndex", "logicalSlaveCell", "column", "colIndex", "colSpan", "rowSpan", "dataRowIndex", "dataItem", "expandable"] }, { type: i15.DropTargetDirective, selector: "[kendoDropTarget]", inputs: ["context"], outputs: ["enter", "leave", "drop"] }, { type: i16.DraggableDirective, selector: "[kendoDraggable]", inputs: ["enableDrag"], outputs: ["kendoPress", "kendoDrag", "kendoRelease"] }, { type: i17.DraggableColumnDirective, selector: "[kendoDraggableColumn]", inputs: ["context", "enableDrag"], outputs: ["drag"] }, { type: i12.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { type: i12.NgStyle, selector: "[ngStyle]", inputs: ["ngStyle"] }, { type: i18.TemplateContextDirective, selector: "[templateContext]", inputs: ["templateContext"] }, { type: i19.FocusableDirective, selector: "[kendoTreeListFocusable],\n        [kendoTreeListAddCommand],\n        [kendoTreeListEditCommand],\n        [kendoTreeListRemoveCommand],\n        [kendoTreeListSaveCommand],\n        [kendoTreeListCancelCommand]\n    ", inputs: ["kendoTreeListFocusable", "enabled", "kendoTreeListAddCommand", "kendoTreeListEditCommand", "kendoTreeListRemoveCommand", "kendoTreeListSaveCommand", "kendoTreeListCancelCommand"] }, { type: i20.ColumnHandleDirective, selector: "[kendoTreeListColumnHandle]", inputs: ["columns", "column"] }] });
+    `, isInline: true, components: [{ type: i8.FilterMenuComponent, selector: "kendo-treelist-filter-menu", inputs: ["column", "filter"] }, { type: i9.ColumnMenuComponent, selector: "kendo-treelist-column-menu", inputs: ["standalone", "column", "settings", "sort", "filter", "sortable", "columnMenuTemplate"] }, { type: i10.IconWrapperComponent, selector: "kendo-icon-wrapper", inputs: ["name", "svgIcon", "innerCssClass", "customFontClass", "size"], exportAs: ["kendoIconWrapper"] }, { type: i11.FilterRowComponent, selector: "[kendoTreeListFilterRow]", inputs: ["columns", "filter", "logicalRowIndex", "lockedColumnsCount"] }], directives: [{ type: i12.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i13.LogicalRowDirective, selector: "[kendoTreeListLogicalRow]", inputs: ["logicalRowIndex", "logicalSlaveRow", "logicalCellsCount", "logicalSlaveCellsCount", "dataRowIndex", "dataItem", "isNew", "totalColumns"] }, { type: i12.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i14.LogicalCellDirective, selector: "[kendoTreeListLogicalCell]", inputs: ["logicalColIndex", "logicalRowIndex", "logicalSlaveCell", "column", "colIndex", "colSpan", "rowSpan", "dataRowIndex", "dataItem", "expandable"] }, { type: i15.DropTargetDirective, selector: "[kendoDropTarget]", inputs: ["context"], outputs: ["enter", "leave", "drop"] }, { type: i16.DraggableDirective, selector: "[kendoDraggable]", inputs: ["enableDrag"], outputs: ["kendoPress", "kendoDrag", "kendoRelease"] }, { type: i17.DraggableColumnDirective, selector: "[kendoDraggableColumn]", inputs: ["context", "enableDrag"], outputs: ["drag"] }, { type: i12.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { type: i12.NgStyle, selector: "[ngStyle]", inputs: ["ngStyle"] }, { type: i18.TemplateContextDirective, selector: "[templateContext]", inputs: ["templateContext"] }, { type: i19.FocusableDirective, selector: "[kendoTreeListFocusable],\n        [kendoTreeListAddCommand],\n        [kendoTreeListEditCommand],\n        [kendoTreeListRemoveCommand],\n        [kendoTreeListSaveCommand],\n        [kendoTreeListCancelCommand]\n    ", inputs: ["kendoTreeListFocusable", "enabled", "kendoTreeListAddCommand", "kendoTreeListEditCommand", "kendoTreeListRemoveCommand", "kendoTreeListSaveCommand", "kendoTreeListCancelCommand"] }, { type: i20.ColumnHandleDirective, selector: "[kendoTreeListColumnHandle]", inputs: ["columns", "column"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: HeaderComponent, decorators: [{
             type: Component,
             args: [{
@@ -555,6 +558,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                 [logicalRowIndex]="levelIndex"
                 [logicalSlaveRow]="lockedColumnsCount > 0"
                 [logicalCellsCount]="columns.length"
+                [totalColumns]="totalColumns"
                 [logicalSlaveCellsCount]="unlockedColumnsCount">
             <ng-template ngFor let-column="$implicit" [ngForOf]="columnsForLevel(levelIndex)" [ngForTrackBy]="trackByIndex" let-columnIndex="index" let-last="last">
                 <th *ngIf="!isColumnGroupComponent(column)"
@@ -728,6 +732,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
             [filter]="filter"
             [lockedColumnsCount]="lockedColumnsCount"
             kendoTreeListLogicalRow
+            [totalColumns]="totalColumns"
             [logicalRowIndex]="totalColumnLevels + 1"
             [logicalSlaveRow]="lockedColumnsCount > 0"
             [logicalCellsCount]="columns.length"
@@ -762,6 +767,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                 type: Input
             }], totalColumnsCount: [{
                 type: Input
+            }], totalColumns: [{
+                type: Input
             }], headerClass: [{
                 type: HostBinding,
                 args: ['class.k-grid-header']

package/esm2020/rendering/list.component.mjs

@@ -535,6 +535,7 @@ ListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version:
                     [noRecordsText]="''"
                     [columns]="$any(lockedLeafColumns)"
                     [totalColumnsCount]="leafColumns.length"
+                    [totalColumns]="columns"
                     [skip]="skip"
                     [trackBy]="trackBy"
                     [filterable]="filterable"
@@ -569,6 +570,7 @@ ListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version:
                     [noRecordsTemplate]="noRecordsTemplate"
                     [lockedColumnsCount]="lockedLeafColumns.length"
                     [totalColumnsCount]="leafColumns.length"
+                    [totalColumns]="columns"
                     [skip]="skip"
                     [trackBy]="trackBy"
                     [filterable]="filterable"
@@ -589,7 +591,7 @@ ListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version:
     </div>
     <div *ngIf="loading" kendoTreeListLoading>
     </div>
-    `, isInline: true, components: [{ type: i13.ColGroupComponent, selector: "[kendoTreeListColGroup]", inputs: ["columns"] }, { type: i14.TableBodyComponent, selector: "[kendoTreeListTableBody]", inputs: ["columns", "allColumns", "noRecordsTemplate", "view", "skip", "filterable", "noRecordsText", "isLocked", "lockedColumnsCount", "totalColumnsCount", "virtualColumns", "expandIcons", "trackBy", "rowClass"] }, { type: i15.ResizeSensorComponent, selector: "kendo-resize-sensor", inputs: ["rateLimit"], outputs: ["resize"] }, { type: i16.LoadingComponent, selector: "[kendoTreeListLoading]" }], directives: [{ type: i17.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i18.TableDirective, selector: "table", inputs: ["locked", "virtualColumns"] }, { type: i19.ResizableContainerDirective, selector: "[kendoTreeListResizableContainer]", inputs: ["lockedWidth", "kendoTreeListResizableContainer"] }] });
+    `, isInline: true, components: [{ type: i13.ColGroupComponent, selector: "[kendoTreeListColGroup]", inputs: ["columns"] }, { type: i14.TableBodyComponent, selector: "[kendoTreeListTableBody]", inputs: ["columns", "allColumns", "noRecordsTemplate", "view", "skip", "filterable", "noRecordsText", "isLocked", "lockedColumnsCount", "totalColumnsCount", "virtualColumns", "expandIcons", "trackBy", "totalColumns", "rowClass"] }, { type: i15.ResizeSensorComponent, selector: "kendo-resize-sensor", inputs: ["rateLimit"], outputs: ["resize"] }, { type: i16.LoadingComponent, selector: "[kendoTreeListLoading]" }], directives: [{ type: i17.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i18.TableDirective, selector: "table", inputs: ["locked", "virtualColumns"] }, { type: i19.ResizableContainerDirective, selector: "[kendoTreeListResizableContainer]", inputs: ["lockedWidth", "kendoTreeListResizableContainer"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: ListComponent, decorators: [{
             type: Component,
             args: [{
@@ -621,6 +623,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                     [noRecordsText]="''"
                     [columns]="$any(lockedLeafColumns)"
                     [totalColumnsCount]="leafColumns.length"
+                    [totalColumns]="columns"
                     [skip]="skip"
                     [trackBy]="trackBy"
                     [filterable]="filterable"
@@ -655,6 +658,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                     [noRecordsTemplate]="noRecordsTemplate"
                     [lockedColumnsCount]="lockedLeafColumns.length"
                     [totalColumnsCount]="leafColumns.length"
+                    [totalColumns]="columns"
                     [skip]="skip"
                     [trackBy]="trackBy"
                     [filterable]="filterable"

package/esm2020/rendering/table-body.component.mjs

@@ -19,6 +19,7 @@ import { defaultTrackBy } from '../common/default-track-by';
 import { ExpandStateService } from '../expand-state/expand-state.service';
 import { SelectionService } from '../selection/selection.service';
 import { NON_DATA_CELL_CLASSES, NON_DATA_ROW_CLASSES, IGNORE_CONTAINER_CLASSES, ICON_CLASS, EMPTY_ICON_CLASS, DRAG_HANDLE_CLASS } from './constants';
+import { ColumnsContainer } from '../columns/columns-container';
 import * as i0 from "@angular/core";
 import * as i1 from "../data/change-notification.service";
 import * as i2 from "../editing/edit.service";
@@ -74,8 +75,17 @@ export class TableBodyComponent {
         return this.editService.newDataItem;
     }
     // Number of unlocked columns in the next table, if any
-    get unlockedColumnsCount() {
-        return this.totalColumnsCount - this.lockedColumnsCount - (this.allColumns || this.columns).length;
+    unlockedColumnsCount(item) {
+        const allColumns = this.allColumns || this.columns;
+        let allColumnsCount = allColumns.length;
+        allColumns.forEach(column => {
+            if (column.isSpanColumn) {
+                allColumnsCount += column.colspan - 1;
+            }
+        });
+        const contentColumnsCount = this.totalColumnsCount - this.lockedColumnsCount - allColumnsCount;
+        const headerFooterColumnsCount = this.totalColumnsCount - this.lockedColumnsCount - (this.allColumns || this.columns).length;
+        return item && item.type === 'data' ? contentColumnsCount : headerFooterColumnsCount;
     }
     get hasData() {
         const view = this.view;
@@ -114,7 +124,10 @@ export class TableBodyComponent {
         return true;
     }
     ariaRowExpanded(item) {
-        return Boolean(item.expanded);
+        return this.lockedColumnsCount < 1 ? Boolean(item.expanded) : undefined;
+    }
+    ariaRowSelected(item) {
+        return this.lockedColumnsCount < 1 ? Boolean(item.selected) : undefined;
     }
     ariaExpanded(item, column) {
         if (!column.expandable || !item.hasChildren) {
@@ -326,7 +339,7 @@ export class TableBodyComponent {
     }
 }
 TableBodyComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: TableBodyComponent, deps: [{ token: i1.ChangeNotificationService }, { token: i2.EditService }, { token: i3.LocalizationService }, { token: i0.NgZone }, { token: i0.Renderer2 }, { token: i0.ElementRef }, { token: i4.DomEventsService }, { token: i5.ColumnInfoService }, { token: i6.NavigationService }, { token: i7.ExpandStateService }, { token: i8.SelectionService }], target: i0.ɵɵFactoryTarget.Component });
-TableBodyComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: TableBodyComponent, selector: "[kendoTreeListTableBody]", inputs: { columns: "columns", allColumns: "allColumns", noRecordsTemplate: "noRecordsTemplate", view: "view", skip: "skip", filterable: "filterable", noRecordsText: "noRecordsText", isLocked: "isLocked", lockedColumnsCount: "lockedColumnsCount", totalColumnsCount: "totalColumnsCount", virtualColumns: "virtualColumns", expandIcons: "expandIcons", trackBy: "trackBy", rowClass: "rowClass" }, host: { properties: { "class.k-table-tbody": "this.hostClass" } }, usesOnChanges: true, ngImport: i0, template: `
+TableBodyComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: TableBodyComponent, selector: "[kendoTreeListTableBody]", inputs: { columns: "columns", allColumns: "allColumns", noRecordsTemplate: "noRecordsTemplate", view: "view", skip: "skip", filterable: "filterable", noRecordsText: "noRecordsText", isLocked: "isLocked", lockedColumnsCount: "lockedColumnsCount", totalColumnsCount: "totalColumnsCount", virtualColumns: "virtualColumns", expandIcons: "expandIcons", trackBy: "trackBy", totalColumns: "totalColumns", rowClass: "rowClass" }, host: { properties: { "class.k-table-tbody": "this.hostClass" } }, usesOnChanges: true, ngImport: i0, template: `
     <tr *ngIf="!hasData" class="k-grid-norecords">
         <td [attr.colspan]="colSpan" class="k-table-td">
             <ng-container *ngIf="noRecordsTemplate?.templateRef" [ngTemplateOutlet]="noRecordsTemplate.templateRef">
@@ -344,14 +357,15 @@ TableBodyComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", ver
             [logicalRowIndex]="logicalRowIndex(item.rowIndex)"
             [logicalSlaveRow]="lockedColumnsCount > 0"
             [logicalCellsCount]="columns.length"
-            [logicalSlaveCellsCount]="unlockedColumnsCount"
+            [logicalSlaveCellsCount]="unlockedColumnsCount(item)"
+            [totalColumns]="totalColumns"
             [isNew]="item.isNew"
             [attr.aria-expanded]="ariaRowExpanded(item)"
             [ngClass]="rowClass({ dataItem: item.data, index: $any(item).index })"
             class="k-table-row{{isOdd(item) ? ' k-alt k-table-alt-row' : ''}}"
             [class.k-grid-edit-row]="isEditingRow(item)"
             [class.k-grid-add-row]="item.isNew"
-            [attr.aria-selected]="item.selected"
+            [attr.aria-selected]="ariaRowSelected(item)"
             [class.k-selected]="item.selected"
             [attr.data-treelist-view-index]="rowIndex">
 
@@ -376,8 +390,8 @@ TableBodyComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", ver
                     [colSpan]="column.colspan"
                     [expandable]="cellExpandable(item, column)"
                     role="gridcell"
-                    [attr.aria-expanded]="ariaExpanded(item, column)"
-                    [attr.aria-selected]="ariaSelected(item, column, lockedColumnsCount + columnIndex)"
+                    [attr.aria-expanded]="lockedColumnsCount < 1 ? ariaExpanded(item, column) : undefined"
+                    [attr.aria-selected]="lockedColumnsCount < 1 ? ariaSelected(item, column, lockedColumnsCount + columnIndex) : undefined"
                 class="k-table-td"
                 [ngClass]="column.cssClass"
                 [class.k-grid-edit-cell]="isEditingCell(item, column)"
@@ -394,8 +408,8 @@ TableBodyComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", ver
                 [logicalRowIndex]="logicalRowIndex(item.rowIndex)"
                 [logicalSlaveRow]="lockedColumnsCount > 0"
                 [logicalCellsCount]="columns.length"
-                [logicalSlaveCellsCount]="unlockedColumnsCount">
-
+                [logicalSlaveCellsCount]="unlockedColumnsCount(item)"
+                [totalColumns]="totalColumns">
             <td kendoTreeListLogicalCell
                     [logicalRowIndex]="logicalRowIndex(item.rowIndex)"
                     [logicalColIndex]="logicalColIndex(column)"
@@ -423,7 +437,7 @@ TableBodyComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", ver
            </td>
         </tr>
     </ng-container>
-    `, isInline: true, components: [{ type: i9.CellComponent, selector: "[kendoTreeListCell]", inputs: ["column", "columnIndex", "isNew", "level", "hasChildren", "isExpanded", "loading", "expandIcons", "selected", "dataItem", "viewItem"] }], directives: [{ type: i10.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i10.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet"] }, { type: i10.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i11.LogicalRowDirective, selector: "[kendoTreeListLogicalRow]", inputs: ["logicalRowIndex", "logicalSlaveRow", "logicalCellsCount", "logicalSlaveCellsCount", "dataRowIndex", "dataItem", "isNew"] }, { type: i10.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { type: i12.LogicalCellDirective, selector: "[kendoTreeListLogicalCell]", inputs: ["logicalColIndex", "logicalRowIndex", "logicalSlaveCell", "column", "colIndex", "colSpan", "rowSpan", "dataRowIndex", "dataItem", "expandable"] }, { type: i10.NgStyle, selector: "[ngStyle]", inputs: ["ngStyle"] }], pipes: { "levelItems": i13.LevelItemsPipe } });
+    `, isInline: true, components: [{ type: i9.CellComponent, selector: "[kendoTreeListCell]", inputs: ["column", "columnIndex", "isNew", "level", "hasChildren", "isExpanded", "loading", "expandIcons", "selected", "dataItem", "viewItem"] }], directives: [{ type: i10.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i10.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet"] }, { type: i10.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i11.LogicalRowDirective, selector: "[kendoTreeListLogicalRow]", inputs: ["logicalRowIndex", "logicalSlaveRow", "logicalCellsCount", "logicalSlaveCellsCount", "dataRowIndex", "dataItem", "isNew", "totalColumns"] }, { type: i10.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { type: i12.LogicalCellDirective, selector: "[kendoTreeListLogicalCell]", inputs: ["logicalColIndex", "logicalRowIndex", "logicalSlaveCell", "column", "colIndex", "colSpan", "rowSpan", "dataRowIndex", "dataItem", "expandable"] }, { type: i10.NgStyle, selector: "[ngStyle]", inputs: ["ngStyle"] }], pipes: { "levelItems": i13.LevelItemsPipe } });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: TableBodyComponent, decorators: [{
             type: Component,
             args: [{
@@ -446,14 +460,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
             [logicalRowIndex]="logicalRowIndex(item.rowIndex)"
             [logicalSlaveRow]="lockedColumnsCount > 0"
             [logicalCellsCount]="columns.length"
-            [logicalSlaveCellsCount]="unlockedColumnsCount"
+            [logicalSlaveCellsCount]="unlockedColumnsCount(item)"
+            [totalColumns]="totalColumns"
             [isNew]="item.isNew"
             [attr.aria-expanded]="ariaRowExpanded(item)"
             [ngClass]="rowClass({ dataItem: item.data, index: $any(item).index })"
             class="k-table-row{{isOdd(item) ? ' k-alt k-table-alt-row' : ''}}"
             [class.k-grid-edit-row]="isEditingRow(item)"
             [class.k-grid-add-row]="item.isNew"
-            [attr.aria-selected]="item.selected"
+            [attr.aria-selected]="ariaRowSelected(item)"
             [class.k-selected]="item.selected"
             [attr.data-treelist-view-index]="rowIndex">
 
@@ -478,8 +493,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                     [colSpan]="column.colspan"
                     [expandable]="cellExpandable(item, column)"
                     role="gridcell"
-                    [attr.aria-expanded]="ariaExpanded(item, column)"
-                    [attr.aria-selected]="ariaSelected(item, column, lockedColumnsCount + columnIndex)"
+                    [attr.aria-expanded]="lockedColumnsCount < 1 ? ariaExpanded(item, column) : undefined"
+                    [attr.aria-selected]="lockedColumnsCount < 1 ? ariaSelected(item, column, lockedColumnsCount + columnIndex) : undefined"
                 class="k-table-td"
                 [ngClass]="column.cssClass"
                 [class.k-grid-edit-cell]="isEditingCell(item, column)"
@@ -496,8 +511,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                 [logicalRowIndex]="logicalRowIndex(item.rowIndex)"
                 [logicalSlaveRow]="lockedColumnsCount > 0"
                 [logicalCellsCount]="columns.length"
-                [logicalSlaveCellsCount]="unlockedColumnsCount">
-
+                [logicalSlaveCellsCount]="unlockedColumnsCount(item)"
+                [totalColumns]="totalColumns">
             <td kendoTreeListLogicalCell
                     [logicalRowIndex]="logicalRowIndex(item.rowIndex)"
                     [logicalColIndex]="logicalColIndex(column)"
@@ -556,6 +571,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                 type: Input
             }], trackBy: [{
                 type: Input
+            }], totalColumns: [{
+                type: Input
             }], rowClass: [{
                 type: Input
             }] } });

package/esm2020/treelist.component.mjs

@@ -1986,7 +1986,8 @@ TreeListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", vers
                                 [sortable]="sortable"
                                 [columnMenu]="columnMenuOptions"
                                 [columnMenuTemplate]="columnMenuTemplate"
-                                [totalColumnsCount]="leafColumns.length">
+                                [totalColumnsCount]="leafColumns.length"
+                                [totalColumns]="columnsContainer">
                             </thead>
                         </table>
                     </div>
@@ -2016,7 +2017,8 @@ TreeListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", vers
                                 [columnMenu]="columnMenuOptions"
                                 [columnMenuTemplate]="columnMenuTemplate"
                                 [lockedColumnsCount]="lockedLeafColumns.length"
-                                [totalColumnsCount]="leafColumns.length">
+                                [totalColumnsCount]="leafColumns.length"
+                                [totalColumns]="columnsContainer">
                             </thead>
                         </table>
                         <div *ngIf="virtualColumns" class="k-width-container" role="presentation">
@@ -2067,7 +2069,8 @@ TreeListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", vers
                         [filter]="filter"
                         [filterable]="filterable"
                         [columnMenu]="columnMenuOptions"
-                        [columnMenuTemplate]="columnMenuTemplate">
+                        [columnMenuTemplate]="columnMenuTemplate"
+                        [totalColumns]="columnsContainer">
                     </thead>
                     <tbody kendoTreeListTableBody
                         [view]="view"
@@ -2116,7 +2119,7 @@ TreeListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", vers
             </kendo-icon-wrapper>
             {{hintText}}
         </ng-template>
-    `, isInline: true, components: [{ type: i22.ToolbarComponent, selector: "kendo-treelist-toolbar", inputs: ["position", "navigable"] }, { type: i23.ColGroupComponent, selector: "[kendoTreeListColGroup]", inputs: ["columns"] }, { type: i24.HeaderComponent, selector: "[kendoTreeListHeader]", inputs: ["totalColumnLevels", "columns", "scrollable", "filterable", "sort", "filter", "sortable", "lockedColumnsCount", "resizable", "reorderable", "columnMenu", "columnMenuTemplate", "totalColumnsCount"] }, { type: i25.ListComponent, selector: "kendo-treelist-list", inputs: ["view", "total", "rowHeight", "take", "skip", "columns", "noRecordsTemplate", "filterable", "rowClass", "loading", "trackBy", "virtualColumns", "isVirtual", "expandIcons"], outputs: ["contentScroll", "pageChange", "scrollBottom"] }, { type: i26.TableBodyComponent, selector: "[kendoTreeListTableBody]", inputs: ["columns", "allColumns", "noRecordsTemplate", "view", "skip", "filterable", "noRecordsText", "isLocked", "lockedColumnsCount", "totalColumnsCount", "virtualColumns", "expandIcons", "trackBy", "rowClass"] }, { type: i27.LoadingComponent, selector: "[kendoTreeListLoading]" }, { type: i28.PagerComponent, selector: "kendo-treelist-pager", inputs: ["allCount", "total", "skip", "navigable", "pageSize", "options", "template"], outputs: ["pageChange"] }, { type: i29.IconWrapperComponent, selector: "kendo-icon-wrapper", inputs: ["name", "svgIcon", "innerCssClass", "customFontClass", "size"], exportAs: ["kendoIconWrapper"] }], directives: [{ type: i30.LocalizedMessagesDirective, selector: "[kendoTreeListLocalizedMessages]" }, { type: i31.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i32.DragTargetContainerDirective, selector: "[kendoDragTargetContainer]", inputs: ["hint", "dragTargetFilter", "dragHandle", "dragDelay", "threshold", "dragTargetId", "dragData", "dragDisabled", "mode"], outputs: ["onDragReady", "onPress", "onDragStart", "onDrag", "onRelease", "onDragEnd"], exportAs: ["kendoDragTargetContainer"] }, { type: i32.DropTargetContainerDirective, selector: "[kendoDropTargetContainer]", inputs: ["dropTargetFilter", "dropDisabled"], outputs: ["onDragEnter", "onDragOver", "onDragLeave", "onDrop"], exportAs: ["kendoDropTargetContainer"] }, { type: i33.TableDirective, selector: "table", inputs: ["locked", "virtualColumns"] }, { type: i34.ResizableContainerDirective, selector: "[kendoTreeListResizableContainer]", inputs: ["lockedWidth", "kendoTreeListResizableContainer"] }, { type: i35.DraggableDirective, selector: "[kendoDraggable]", inputs: ["enableDrag"], outputs: ["kendoPress", "kendoDrag", "kendoRelease"] }, { type: i36.MarqueeDirective, selector: "[kendoTreeListSelectionMarquee]" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None });
+    `, isInline: true, components: [{ type: i22.ToolbarComponent, selector: "kendo-treelist-toolbar", inputs: ["position", "navigable"] }, { type: i23.ColGroupComponent, selector: "[kendoTreeListColGroup]", inputs: ["columns"] }, { type: i24.HeaderComponent, selector: "[kendoTreeListHeader]", inputs: ["totalColumnLevels", "columns", "scrollable", "filterable", "sort", "filter", "sortable", "lockedColumnsCount", "resizable", "reorderable", "columnMenu", "columnMenuTemplate", "totalColumnsCount", "totalColumns"] }, { type: i25.ListComponent, selector: "kendo-treelist-list", inputs: ["view", "total", "rowHeight", "take", "skip", "columns", "noRecordsTemplate", "filterable", "rowClass", "loading", "trackBy", "virtualColumns", "isVirtual", "expandIcons"], outputs: ["contentScroll", "pageChange", "scrollBottom"] }, { type: i26.TableBodyComponent, selector: "[kendoTreeListTableBody]", inputs: ["columns", "allColumns", "noRecordsTemplate", "view", "skip", "filterable", "noRecordsText", "isLocked", "lockedColumnsCount", "totalColumnsCount", "virtualColumns", "expandIcons", "trackBy", "totalColumns", "rowClass"] }, { type: i27.LoadingComponent, selector: "[kendoTreeListLoading]" }, { type: i28.PagerComponent, selector: "kendo-treelist-pager", inputs: ["allCount", "total", "skip", "navigable", "pageSize", "options", "template"], outputs: ["pageChange"] }, { type: i29.IconWrapperComponent, selector: "kendo-icon-wrapper", inputs: ["name", "svgIcon", "innerCssClass", "customFontClass", "size"], exportAs: ["kendoIconWrapper"] }], directives: [{ type: i30.LocalizedMessagesDirective, selector: "[kendoTreeListLocalizedMessages]" }, { type: i31.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i32.DragTargetContainerDirective, selector: "[kendoDragTargetContainer]", inputs: ["hint", "dragTargetFilter", "dragHandle", "dragDelay", "threshold", "dragTargetId", "dragData", "dragDisabled", "mode"], outputs: ["onDragReady", "onPress", "onDragStart", "onDrag", "onRelease", "onDragEnd"], exportAs: ["kendoDragTargetContainer"] }, { type: i32.DropTargetContainerDirective, selector: "[kendoDropTargetContainer]", inputs: ["dropTargetFilter", "dropDisabled"], outputs: ["onDragEnter", "onDragOver", "onDragLeave", "onDrop"], exportAs: ["kendoDropTargetContainer"] }, { type: i33.TableDirective, selector: "table", inputs: ["locked", "virtualColumns"] }, { type: i34.ResizableContainerDirective, selector: "[kendoTreeListResizableContainer]", inputs: ["lockedWidth", "kendoTreeListResizableContainer"] }, { type: i35.DraggableDirective, selector: "[kendoDraggable]", inputs: ["enableDrag"], outputs: ["kendoPress", "kendoDrag", "kendoRelease"] }, { type: i36.MarqueeDirective, selector: "[kendoTreeListSelectionMarquee]" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: TreeListComponent, decorators: [{
             type: Component,
             args: [{
@@ -2413,7 +2416,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                                 [sortable]="sortable"
                                 [columnMenu]="columnMenuOptions"
                                 [columnMenuTemplate]="columnMenuTemplate"
-                                [totalColumnsCount]="leafColumns.length">
+                                [totalColumnsCount]="leafColumns.length"
+                                [totalColumns]="columnsContainer">
                             </thead>
                         </table>
                     </div>
@@ -2443,7 +2447,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                                 [columnMenu]="columnMenuOptions"
                                 [columnMenuTemplate]="columnMenuTemplate"
                                 [lockedColumnsCount]="lockedLeafColumns.length"
-                                [totalColumnsCount]="leafColumns.length">
+                                [totalColumnsCount]="leafColumns.length"
+                                [totalColumns]="columnsContainer">
                             </thead>
                         </table>
                         <div *ngIf="virtualColumns" class="k-width-container" role="presentation">
@@ -2494,7 +2499,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                         [filter]="filter"
                         [filterable]="filterable"
                         [columnMenu]="columnMenuOptions"
-                        [columnMenuTemplate]="columnMenuTemplate">
+                        [columnMenuTemplate]="columnMenuTemplate"
+                        [totalColumns]="columnsContainer">
                     </thead>
                     <tbody kendoTreeListTableBody
                         [view]="view"