@progress/kendo-angular-grid 19.0.0-develop.8 → 19.0.0

package/esm2022/pdf/pdf-command-tool.directive.mjs

@@ -2,14 +2,16 @@
 * Copyright © 2025 Progress Software Corporation. All rights reserved.
 * Licensed under commercial license. See LICENSE.md in the project root for more information
 *-------------------------------------------------------------------------------------------*/
-import { Directive } from '@angular/core';
+import { ChangeDetectorRef, Directive, NgZone } from '@angular/core';
 import { PDFService } from './pdf.service';
 import { ToolBarButtonComponent } from '@progress/kendo-angular-toolbar';
-import { Subscription } from 'rxjs';
-import { filePdfIcon } from '@progress/kendo-svg-icons';
+import { ContextService } from '../common/provider.service';
+import { ToolbarToolBase } from '../common/toolbar-tool-base.directive';
+import { ToolbarToolName } from '../navigation/toolbar-tool-name';
 import * as i0 from "@angular/core";
 import * as i1 from "./pdf.service";
 import * as i2 from "@progress/kendo-angular-toolbar";
+import * as i3 from "../common/provider.service";
 /**
  * Represents the `export-to-PDF` toolbar tool of the Grid.
  * You can apply this directive to any `kendo-toolbar-button` element inside a
@@ -30,22 +32,17 @@ import * as i2 from "@progress/kendo-angular-toolbar";
  * </kendo-grid>
  * ```
  */
-export class PDFCommandToolbarDirective {
+export class PDFCommandToolbarDirective extends ToolbarToolBase {
     pdfService;
     host;
-    clickSub = new Subscription();
-    constructor(pdfService, host) {
+    constructor(pdfService, host, ctx, zone, cdr) {
+        super(host, ToolbarToolName.pdfExport, ctx, zone, cdr);
         this.pdfService = pdfService;
         this.host = host;
     }
     ngOnInit() {
-        this.clickSub = this.host.click.subscribe(e => this.onClick(e));
+        super.ngOnInit();
         this.host.className = 'k-grid-pdf';
-        this.host.svgIcon = filePdfIcon;
-        this.host.icon = 'file-pdf';
-    }
-    ngOnDestroy() {
-        this.clickSub.unsubscribe();
     }
     /**
      * @hidden
@@ -54,8 +51,8 @@ export class PDFCommandToolbarDirective {
         e.preventDefault();
         this.pdfService.exportClick.emit();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PDFCommandToolbarDirective, deps: [{ token: i1.PDFService }, { token: i2.ToolBarButtonComponent }], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.12", type: PDFCommandToolbarDirective, isStandalone: true, selector: "[kendoGridPDFTool]", ngImport: i0 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PDFCommandToolbarDirective, deps: [{ token: i1.PDFService }, { token: i2.ToolBarButtonComponent }, { token: i3.ContextService }, { token: i0.NgZone }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.12", type: PDFCommandToolbarDirective, isStandalone: true, selector: "[kendoGridPDFTool]", usesInheritance: true, ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PDFCommandToolbarDirective, decorators: [{
             type: Directive,
@@ -63,4 +60,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     selector: '[kendoGridPDFTool]',
                     standalone: true
                 }]
-        }], ctorParameters: function () { return [{ type: i1.PDFService }, { type: i2.ToolBarButtonComponent }]; } });
+        }], ctorParameters: function () { return [{ type: i1.PDFService }, { type: i2.ToolBarButtonComponent }, { type: i3.ContextService }, { type: i0.NgZone }, { type: i0.ChangeDetectorRef }]; } });

package/esm2022/rendering/cell.component.mjs

@@ -110,7 +110,7 @@ export class CellComponent {
     get isSpanColumn() {
         return isSpanColumn(this.column) && !this.column.templateRef;
     }
-    get childColumns() {
+    get children() {
         return columnsToRender([this.column]);
     }
     get isRowReorderColumn() {
@@ -183,7 +183,7 @@ export class CellComponent {
                         [ngTemplateOutletContext]="templateContext">
                     </ng-template>
                     <ng-container *ngIf="isSpanColumn">
-                        <ng-container *ngFor="let childColumn of childColumns">
+                        <ng-container *ngFor="let childColumn of children">
                             {{ dataItem | valueOf: childColumn.field: childColumn.format}}
                         </ng-container>
                     </ng-container>
@@ -275,7 +275,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                         [ngTemplateOutletContext]="templateContext">
                     </ng-template>
                     <ng-container *ngIf="isSpanColumn">
-                        <ng-container *ngFor="let childColumn of childColumns">
+                        <ng-container *ngFor="let childColumn of children">
                             {{ dataItem | valueOf: childColumn.field: childColumn.format}}
                         </ng-container>
                     </ng-container>

package/esm2022/rendering/header/header.component.mjs

@@ -433,7 +433,7 @@ export class HeaderComponent {
             const arr = this.dropTargets.toArray();
             const firstSpan = arr.find(t => t.context.column.parent === parent);
             const index = arr.indexOf(firstSpan);
-            const adjust = e.before ? 0 : parent.childColumns.length - 1;
+            const adjust = e.before ? 0 : parent.children.length - 1;
             target = arr[index + adjust];
         }
         return mergeObjects(e, { target });

package/esm2022/rendering/list.component.mjs

@@ -616,7 +616,7 @@ export class ListComponent {
         for (let idx = 0; idx < leafColumns.length; idx++) {
             const column = leafColumns[idx];
             if (column.isSpanColumn) {
-                viewportEnd += column.childColumns.length;
+                viewportEnd += column.children.length;
             }
         }
         this.navigationService.setColumnViewport(viewportStart, viewportEnd);

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

@@ -348,7 +348,7 @@ export class TableBodyComponent {
     }
     get footerColumns() {
         const colsToRender = Array.from(this.columns).reduce((cols, col) => {
-            const newCols = (col instanceof SpanColumnComponent) ? Array.from(col.childColumns) : [col];
+            const newCols = (col instanceof SpanColumnComponent) ? Array.from(col.children) : [col];
             return [...cols, ...newCols];
         }, []);
         return colsToRender;

package/esm2022/rendering/toolbar/tools/column-chooser-tool.directive.mjs

@@ -0,0 +1,210 @@
+/**-----------------------------------------------------------------------------------------
+* Copyright © 2025 Progress Software Corporation. All rights reserved.
+* Licensed under commercial license. See LICENSE.md in the project root for more information
+*-------------------------------------------------------------------------------------------*/
+import { Directive, NgZone, Input, Renderer2, ChangeDetectorRef } from '@angular/core';
+import { PopupService } from '@progress/kendo-angular-popup';
+import { RefreshService, ToolBarButtonComponent } from '@progress/kendo-angular-toolbar';
+import { ColumnListComponent } from '../../../column-menu/column-list.component';
+import { closest, isPresent } from '@progress/kendo-angular-common';
+import { Subscription } from 'rxjs';
+import { columnsIcon } from '@progress/kendo-svg-icons';
+import { ContextService } from '../../../common/provider.service';
+import { filter, take } from 'rxjs/operators';
+import { AdaptiveGridService } from '../../../common/adaptiveness.service';
+import { ColumnInfoService } from '../../../common/column-info.service';
+import { ToolbarToolBase } from '../../../common/toolbar-tool-base.directive';
+import { ToolbarToolName } from '../../../navigation/toolbar-tool-name';
+import * as i0 from "@angular/core";
+import * as i1 from "@progress/kendo-angular-popup";
+import * as i2 from "@progress/kendo-angular-toolbar";
+import * as i3 from "../../../common/provider.service";
+import * as i4 from "../../../common/adaptiveness.service";
+import * as i5 from "../../../common/column-info.service";
+let incrementingId = 0;
+/**
+ * Represents the `column-chooser` toolbar tool of the Grid.
+ * You can apply this directive to any `kendo-toolbar-button` element inside a
+ * ToolbarComponent used in the Grid.
+ *
+ * @example
+ * ```html-no-run
+ * <kendo-grid>
+ *      <kendo-toolbar>
+ *         <kendo-toolbar-button kendoGridColumnChooserTool></kendo-toolbar-button>
+ *      </kendo-toolbar>
+ * </kendo-grid>
+ * ```
+ */
+export class ColumnChooserToolbarDirective extends ToolbarToolBase {
+    renderer;
+    popupSerivce;
+    host;
+    ctx;
+    zone;
+    refresh;
+    adaptiveGridService;
+    columnInfoService;
+    /**
+     * Specifies if the changes in the visibility of the column will be immediately applied.
+     *
+     * @default false
+     */
+    autoSync = false;
+    /**
+     * Specifies if all columns can be hidden.
+     *
+     * @default true
+     */
+    allowHideAll = true;
+    /**
+     * @hidden
+     */
+    get columns() {
+        return this.columnInfoService.leafNamedColumns;
+    }
+    popupRef;
+    subs = new Subscription();
+    actionSheetCloseSub;
+    nextId = incrementingId++;
+    constructor(renderer, popupSerivce, host, ctx, zone, refresh, adaptiveGridService, columnInfoService, cdr) {
+        super(host, ToolbarToolName.columns, ctx, zone, cdr);
+        this.renderer = renderer;
+        this.popupSerivce = popupSerivce;
+        this.host = host;
+        this.ctx = ctx;
+        this.zone = zone;
+        this.refresh = refresh;
+        this.adaptiveGridService = adaptiveGridService;
+        this.columnInfoService = columnInfoService;
+    }
+    ngOnInit() {
+        this.subs.add(this.host.click.subscribe(e => this.onClick(e)));
+        const hasToolbarIcon = isPresent(this.host.toolbarOptions.icon) && this.host.toolbarOptions.icon !== '';
+        const hasOverflowIcon = isPresent(this.host.overflowOptions.icon) && this.host.overflowOptions.icon !== '';
+        const hasIcon = hasToolbarIcon && hasOverflowIcon;
+        const hasSvgIcon = isPresent(this.host.toolbarOptions.svgIcon) && isPresent(this.host.overflowOptions.svgIcon);
+        if (!hasIcon) {
+            this.host.icon = 'columns';
+        }
+        if (!hasSvgIcon) {
+            this.host.svgIcon = columnsIcon;
+        }
+    }
+    ngAfterViewInit() {
+        super.ngAfterViewInit();
+        this.zone.onStable.pipe(take(1)).subscribe(() => {
+            this.buttonElement?.setAttribute('aria-haspopup', 'dialog');
+            this.buttonElement?.setAttribute('aria-expanded', 'false');
+            this.buttonElement?.setAttribute('title', this.ctx.localization.get('columns'));
+        });
+        this.subs.add(this.refresh.onRefresh.pipe(filter((tool) => tool === this.host)).subscribe((tool) => {
+            if (tool.overflows && this.popupRef) {
+                this.popupRef.close();
+            }
+        }));
+    }
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        this.subs.unsubscribe();
+        if (this.actionSheetCloseSub) {
+            this.actionSheetCloseSub.unsubscribe();
+            this.actionSheetCloseSub = null;
+        }
+    }
+    /**
+     * @hidden
+     */
+    onClick(e) {
+        e.preventDefault();
+        if (this.ctx.grid.adaptiveMode === 'auto' && this.adaptiveGridService.windowSize !== 'large') {
+            if (!this.ctx.grid.isActionSheetExpanded) {
+                this.adaptiveGridService.viewType = 'columnChooserToolbarTool';
+                this.adaptiveGridService.columns = this.columns;
+                this.ctx.grid.adaptiveRenderer.actionSheet.toggle(true);
+                this.host.selected = true;
+                this.actionSheetCloseSub = this.ctx.grid.adaptiveRenderer.actionSheet.collapse.subscribe(() => this.host.selected = false);
+            }
+        }
+        else {
+            this.togglePopup();
+        }
+    }
+    togglePopup() {
+        if (!this.popupRef) {
+            const direction = this.ctx.localization.rtl ? 'right' : 'left';
+            this.popupRef = this.popupSerivce.open({
+                anchor: this.buttonElement,
+                content: ColumnListComponent,
+                positionMode: 'absolute',
+                anchorAlign: { vertical: 'bottom', horizontal: direction },
+                popupAlign: { vertical: 'top', horizontal: direction }
+            });
+            this.adaptiveGridService.popupRef = this.popupRef;
+            const popupElement = this.popupRef.popupElement;
+            const popupId = `k-column-chooser-tool-${this.nextId}-popup`;
+            const popupAriaElement = popupElement.querySelector('.k-popup');
+            this.zone.runOutsideAngular(() => {
+                this.renderer.listen(popupAriaElement, 'keydown', (e) => {
+                    if (e.key === 'Escape') {
+                        this.closePopup(true);
+                    }
+                });
+            });
+            this.renderer.setAttribute(popupElement, 'dir', this.ctx.localization.rtl ? 'rtl' : 'ltr');
+            this.renderer.setAttribute(popupAriaElement, 'id', popupId);
+            this.renderer.setAttribute(popupAriaElement, 'role', 'dialog');
+            this.buttonElement?.setAttribute('aria-expanded', 'true');
+            this.buttonElement?.setAttribute('aria-controls', popupId);
+            this.host.selected = true;
+            const columnList = this.popupRef.content.instance;
+            columnList.isLast = true;
+            columnList.autoSync = this.autoSync;
+            columnList.allowHideAll = this.allowHideAll;
+            columnList.applyText = this.ctx.localization.get('columnsApply');
+            columnList.resetText = this.ctx.localization.get('columnsReset');
+            columnList.columns = this.ctx.grid.columns;
+            columnList.ariaLabel = this.ctx.localization.get('columns');
+            this.subs.add(this.popupRef.popup.instance.anchorViewportLeave.subscribe(() => {
+                this.closePopup(true);
+            }));
+            this.subs.add(columnList.apply.subscribe(() => {
+                this.closePopup();
+            }));
+            this.zone.runOutsideAngular(() => this.renderer.listen('document', 'click', ({ target }) => {
+                if (this.popupRef && !closest(target, node => node === this.popupRef.popupElement || node === this.buttonElement)) {
+                    this.zone.run(() => {
+                        this.closePopup();
+                    });
+                }
+            }));
+        }
+        else {
+            this.closePopup();
+        }
+    }
+    closePopup(focusAnchor = false) {
+        this.popupRef.close();
+        this.popupRef = null;
+        this.buttonElement?.setAttribute('aria-expanded', 'false');
+        this.buttonElement?.removeAttribute('aria-controls');
+        this.host.selected = false;
+        focusAnchor && this.buttonElement?.focus();
+    }
+    get buttonElement() {
+        return this.host.getButton();
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ColumnChooserToolbarDirective, deps: [{ token: i0.Renderer2 }, { token: i1.PopupService }, { token: i2.ToolBarButtonComponent }, { token: i3.ContextService }, { token: i0.NgZone }, { token: i2.RefreshService }, { token: i4.AdaptiveGridService }, { token: i5.ColumnInfoService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.12", type: ColumnChooserToolbarDirective, isStandalone: true, selector: "[kendoGridColumnChooserTool]", inputs: { autoSync: "autoSync", allowHideAll: "allowHideAll" }, usesInheritance: true, ngImport: i0 });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ColumnChooserToolbarDirective, decorators: [{
+            type: Directive,
+            args: [{
+                    selector: '[kendoGridColumnChooserTool]',
+                    standalone: true
+                }]
+        }], ctorParameters: function () { return [{ type: i0.Renderer2 }, { type: i1.PopupService }, { type: i2.ToolBarButtonComponent }, { type: i3.ContextService }, { type: i0.NgZone }, { type: i2.RefreshService }, { type: i4.AdaptiveGridService }, { type: i5.ColumnInfoService }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { autoSync: [{
+                type: Input
+            }], allowHideAll: [{
+                type: Input
+            }] } });

package/esm2022/rendering/toolbar/tools/filter-command-tool.directive.mjs

@@ -13,12 +13,14 @@ import { ColumnInfoService } from '../../../common/column-info.service';
 import { take } from 'rxjs/operators';
 import { FilterService } from '../../../filtering/filter.service';
 import { FilterToolWrapperComponent } from './filter-tool-wrapper.component';
+import { AdaptiveGridService } from '../../../common/adaptiveness.service';
 import * as i0 from "@angular/core";
 import * as i1 from "@progress/kendo-angular-toolbar";
 import * as i2 from "@progress/kendo-angular-popup";
 import * as i3 from "../../../common/provider.service";
 import * as i4 from "../../../filtering/filter.service";
 import * as i5 from "../../../common/column-info.service";
+import * as i6 from "../../../common/adaptiveness.service";
 let incrementingId = 0;
 /**
  * Represents the toolbar tool for filtering columns of the Grid.
@@ -45,12 +47,20 @@ export class FilterCommandToolbarDirective {
     columnInfoService;
     ngZone;
     renderer;
+    adaptiveGridService;
     popupRef;
     nextId = incrementingId++;
     toolSubs = new Subscription();
     popupSubs;
+    actionSheetCloseSub;
     removeClickListener;
-    constructor(host, popupService, ctx, filterService, columnInfoService, ngZone, renderer) {
+    /**
+     * @hidden
+     */
+    isFilterApplied(filter) {
+        return isPresent(filter) && filter.filters?.length > 0;
+    }
+    constructor(host, popupService, ctx, filterService, columnInfoService, ngZone, renderer, adaptiveGridService) {
         this.host = host;
         this.popupService = popupService;
         this.ctx = ctx;
@@ -58,18 +68,21 @@ export class FilterCommandToolbarDirective {
         this.columnInfoService = columnInfoService;
         this.ngZone = ngZone;
         this.renderer = renderer;
+        this.adaptiveGridService = adaptiveGridService;
     }
     ngOnInit() {
         this.toolSubs = this.host.click.subscribe(e => this.onClick(e));
         this.toolSubs.add(this.filterService.changes.subscribe(filter => {
-            this.host.showBadge = isPresent(filter) && filter.filters.length > 0;
+            this.host.showBadge = this.isFilterApplied(filter);
         }));
+        this.host.hasBadgeContainer = true;
+        this.host.showBadge = this.isFilterApplied(this.ctx.grid.filter);
         const hasToolbarIcon = isPresent(this.host.toolbarOptions.icon) && this.host.toolbarOptions.icon !== '';
         const hasOverflowIcon = isPresent(this.host.overflowOptions.icon) && this.host.overflowOptions.icon !== '';
         const hasIcon = hasToolbarIcon && hasOverflowIcon;
         const hasSvgIcon = isPresent(this.host.toolbarOptions.svgIcon) && isPresent(this.host.overflowOptions.svgIcon);
         if (!hasIcon) {
-            this.host.icon = 'k-i-filter';
+            this.host.icon = 'filter';
         }
         if (!hasSvgIcon) {
             this.host.svgIcon = filterIcon;
@@ -81,9 +94,9 @@ export class FilterCommandToolbarDirective {
                 this.host.text = this.ctx.localization.get(`filterToolbarToolText`);
             });
         }
-        this.host.toolbarButtonElement.nativeElement.setAttribute('aria-haspopup', 'dialog');
-        this.host.toolbarButtonElement.nativeElement.setAttribute('aria-expanded', 'false');
-        this.host.toolbarButtonElement.nativeElement.setAttribute('title', this.ctx.localization.get('filter'));
+        this.buttonElement?.setAttribute('aria-haspopup', 'dialog');
+        this.buttonElement?.setAttribute('aria-expanded', 'false');
+        this.buttonElement?.setAttribute('title', this.ctx.localization.get('filterToolbarToolText'));
     }
     ngOnDestroy() {
         if (this.toolSubs) {
@@ -96,6 +109,10 @@ export class FilterCommandToolbarDirective {
             this.popupRef.close();
             this.popupRef = null;
         }
+        if (this.actionSheetCloseSub) {
+            this.actionSheetCloseSub.unsubscribe();
+            this.actionSheetCloseSub = null;
+        }
         if (this.removeClickListener) {
             this.removeClickListener();
             this.removeClickListener = null;
@@ -111,31 +128,45 @@ export class FilterCommandToolbarDirective {
     }
     openPopup() {
         const direction = this.ctx.localization.rtl ? 'right' : 'left';
-        this.popupRef = this.popupService.open({
-            anchor: this.host.toolbarButtonElement.nativeElement,
-            content: FilterToolWrapperComponent,
-            popupClass: 'k-grid-columnmenu-popup',
-            positionMode: 'absolute',
-            anchorAlign: { vertical: 'bottom', horizontal: direction },
-            popupAlign: { vertical: 'top', horizontal: direction }
-        });
-        this.setPopupAttributes();
-        this.ngZone.runOutsideAngular(() => {
-            if (!isDocumentAvailable()) {
-                return;
+        if (this.ctx.grid.adaptiveMode === 'auto' && this.adaptiveGridService.windowSize !== 'large') {
+            if (!this.ctx.grid.isActionSheetExpanded) {
+                this.adaptiveGridService.viewType = 'filterToolbarTool';
+                this.ctx.grid.adaptiveRenderer.actionSheet.toggle(true);
+                this.host.selected = true;
+                this.actionSheetCloseSub = this.ctx.grid.adaptiveRenderer.actionSheet.collapse.subscribe(() => this.host.selected = false);
             }
-            this.removeClickListener = this.renderer.listen('document', 'click', (e) => {
-                if (this.popupRef && !closest(e.target, node => node === this.popupRef.popupElement || node === this.host.toolbarButtonElement.nativeElement)) {
-                    this.closePopup();
+        }
+        else {
+            this.popupRef = this.popupService.open({
+                anchor: this.buttonElement,
+                content: FilterToolWrapperComponent,
+                popupClass: 'k-grid-columnmenu-popup',
+                positionMode: 'absolute',
+                anchorAlign: { vertical: 'bottom', horizontal: direction },
+                popupAlign: { vertical: 'top', horizontal: direction }
+            });
+            this.adaptiveGridService.popupRef = this.popupRef;
+            this.setPopupAttributes();
+            this.host.selected = true;
+            this.ngZone.runOutsideAngular(() => {
+                if (!isDocumentAvailable()) {
+                    return;
                 }
+                this.removeClickListener = this.renderer.listen('document', 'click', (e) => {
+                    if (this.popupRef && !closest(e.target, node => node === this.popupRef.popupElement || node === this.buttonElement)) {
+                        this.ngZone.run(() => {
+                            this.closePopup();
+                        });
+                    }
+                });
             });
-        });
-        this.popupSubs = this.popupRef.popup.instance.anchorViewportLeave.subscribe(() => {
-            this.popupSubs?.unsubscribe();
-            this.popupSubs = null;
-            this.closePopup();
-        });
-        this.initPopupProperties();
+            this.popupSubs = this.popupRef.popup.instance.anchorViewportLeave.subscribe(() => {
+                this.popupSubs?.unsubscribe();
+                this.popupSubs = null;
+                this.closePopup();
+            });
+            this.initPopupProperties();
+        }
     }
     setPopupAttributes() {
         const popupElement = this.popupRef.popupElement;
@@ -144,8 +175,8 @@ export class FilterCommandToolbarDirective {
         this.renderer.setAttribute(popupElement, 'dir', this.ctx.localization.rtl ? 'rtl' : 'ltr');
         this.renderer.setAttribute(popupAriaElement, 'id', popupId);
         this.renderer.setAttribute(popupAriaElement, 'role', 'dialog');
-        this.host.toolbarButtonElement.nativeElement.setAttribute('aria-expanded', 'true');
-        this.host.toolbarButtonElement.nativeElement.setAttribute('aria-controls', popupId);
+        this.buttonElement?.setAttribute('aria-expanded', 'true');
+        this.buttonElement?.setAttribute('aria-controls', popupId);
     }
     initPopupProperties() {
         this.popupRef.content.instance.columnInfoService = this.columnInfoService;
@@ -157,8 +188,9 @@ export class FilterCommandToolbarDirective {
         }));
     }
     closePopup() {
-        this.host.toolbarButtonElement.nativeElement.setAttribute('aria-expanded', 'false');
-        this.host.toolbarButtonElement.nativeElement.removeAttribute('aria-controls');
+        this.buttonElement?.setAttribute('aria-expanded', 'false');
+        this.buttonElement?.removeAttribute('aria-controls');
+        this.host.selected = false;
         if (this.popupRef) {
             this.popupRef.close();
             this.popupRef = null;
@@ -172,7 +204,10 @@ export class FilterCommandToolbarDirective {
             this.removeClickListener = null;
         }
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FilterCommandToolbarDirective, deps: [{ token: i1.ToolBarButtonComponent }, { token: i2.PopupService }, { token: i3.ContextService }, { token: i4.FilterService }, { token: i5.ColumnInfoService }, { token: i0.NgZone }, { token: i0.Renderer2 }], target: i0.ɵɵFactoryTarget.Directive });
+    get buttonElement() {
+        return this.host.getButton();
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FilterCommandToolbarDirective, deps: [{ token: i1.ToolBarButtonComponent }, { token: i2.PopupService }, { token: i3.ContextService }, { token: i4.FilterService }, { token: i5.ColumnInfoService }, { token: i0.NgZone }, { token: i0.Renderer2 }, { token: i6.AdaptiveGridService }], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.12", type: FilterCommandToolbarDirective, isStandalone: true, selector: "[kendoGridFilterTool]", ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FilterCommandToolbarDirective, decorators: [{
@@ -181,4 +216,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     selector: '[kendoGridFilterTool]',
                     standalone: true
                 }]
-        }], ctorParameters: function () { return [{ type: i1.ToolBarButtonComponent }, { type: i2.PopupService }, { type: i3.ContextService }, { type: i4.FilterService }, { type: i5.ColumnInfoService }, { type: i0.NgZone }, { type: i0.Renderer2 }]; } });
+        }], ctorParameters: function () { return [{ type: i1.ToolBarButtonComponent }, { type: i2.PopupService }, { type: i3.ContextService }, { type: i4.FilterService }, { type: i5.ColumnInfoService }, { type: i0.NgZone }, { type: i0.Renderer2 }, { type: i6.AdaptiveGridService }]; } });

package/esm2022/rendering/toolbar/tools/filter-tool-wrapper.component.mjs

@@ -12,6 +12,7 @@ import { SinglePopupService } from '../../../common/single-popup.service';
 import { ScrollSyncService } from '../../../scrolling/scroll-sync.service';
 import { ColumnInfoService } from '../../../common/column-info.service';
 import { cloneFilters } from '../../../common/filter-descriptor-differ';
+import { AdaptiveGridService } from '../../../common/adaptiveness.service';
 import * as i0 from "@angular/core";
 import * as i1 from "@progress/kendo-angular-buttons";
 /**
@@ -26,22 +27,23 @@ export class FilterToolWrapperComponent {
         this.close.emit();
         this.hostButton?.focus(event);
     }
+    onClick(event) {
+        if (this.hostButton.location !== 'toolbar') {
+            event.stopImmediatePropagation();
+        }
+    }
     close = new EventEmitter();
     hostButton;
     clearIcon = filterClearIcon;
     columnInfoService;
-    popupRef;
-    filter;
-    subscriptions;
-    _ctx;
     set ctx(ctx) {
         this._ctx = ctx;
+        this.filter = ctx.grid.filter;
         this.createPopup();
     }
     get ctx() {
         return this._ctx;
     }
-    _filterService;
     set filterService(filterService) {
         this._filterService = filterService;
         this.subscriptions = this._filterService.changes.subscribe(filter => {
@@ -53,6 +55,11 @@ export class FilterToolWrapperComponent {
         return this._filterService;
     }
     columnMenuService;
+    popupRef;
+    filter;
+    subscriptions;
+    _ctx;
+    _filterService;
     constructor(injector) {
         this.injector = injector;
     }
@@ -81,6 +88,7 @@ export class FilterToolWrapperComponent {
                     { provide: FilterService, useValue: this._filterService },
                     { provide: ContextService, useValue: this._ctx },
                     { provide: ColumnInfoService, useValue: this.columnInfoService },
+                    AdaptiveGridService,
                     SinglePopupService,
                     ScrollSyncService
                 ],
@@ -93,10 +101,15 @@ export class FilterToolWrapperComponent {
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FilterToolWrapperComponent, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: FilterToolWrapperComponent, isStandalone: true, selector: "kendo-filter-tool-wrapper", outputs: { close: "close" }, host: { listeners: { "keydown.escape": "onEscKeyDown($event)" }, properties: { "class.k-column-menu": "this.wrapperClasses", "class.k-column-menu-md": "this.wrapperClasses" } }, viewQueries: [{ propertyName: "container", first: true, predicate: ["container"], descendants: true, read: ViewContainerRef, static: true }], ngImport: i0, template: `
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: FilterToolWrapperComponent, isStandalone: true, selector: "kendo-filter-tool-wrapper", outputs: { close: "close" }, host: { listeners: { "keydown.escape": "onEscKeyDown($event)", "click": "onClick($event)" }, properties: { "class.k-column-menu": "this.wrapperClasses", "class.k-column-menu-md": "this.wrapperClasses" } }, viewQueries: [{ propertyName: "container", first: true, predicate: ["container"], descendants: true, read: ViewContainerRef, static: true }], ngImport: i0, template: `
         <ng-container #container></ng-container>
         <div class="k-actions k-actions-stretched k-actions-horizontal k-column-menu-footer">
-            <button kendoButton [svgIcon]="clearIcon" (click)="clear()">Clear all filters</button>
+            <button kendoButton
+                    [svgIcon]="clearIcon"
+                    icon="filter-clear"
+                    (click)="clear()">
+                    {{ctx?.localization.get('filterClearAllButton')}}
+            </button>
         </div>
     `, isInline: true, dependencies: [{ kind: "component", type: i1.ButtonComponent, selector: "button[kendoButton]", inputs: ["arrowIcon", "toggleable", "togglable", "selected", "tabIndex", "imageUrl", "iconClass", "icon", "disabled", "size", "rounded", "fillMode", "themeColor", "svgIcon", "primary", "look"], outputs: ["selectedChange", "click"], exportAs: ["kendoButton"] }] });
 }
@@ -107,7 +120,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     template: `
         <ng-container #container></ng-container>
         <div class="k-actions k-actions-stretched k-actions-horizontal k-column-menu-footer">
-            <button kendoButton [svgIcon]="clearIcon" (click)="clear()">Clear all filters</button>
+            <button kendoButton
+                    [svgIcon]="clearIcon"
+                    icon="filter-clear"
+                    (click)="clear()">
+                    {{ctx?.localization.get('filterClearAllButton')}}
+            </button>
         </div>
     `,
                     standalone: true,
@@ -125,6 +143,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             }], onEscKeyDown: [{
                 type: HostListener,
                 args: ['keydown.escape', ['$event']]
+            }], onClick: [{
+                type: HostListener,
+                args: ['click', ['$event']]
             }], close: [{
                 type: Output
             }] } });