@progress/kendo-angular-grid 19.0.0-develop.17 → 19.0.0-develop.18

package/esm2022/filtering/menu/filter-menu-input-wrapper.component.mjs

@@ -10,36 +10,52 @@ import { FilterInputWrapperComponent } from "../filter-input-wrapper.component";
 import { replaceMessagePlaceholder } from '../../utils';
 import { ContextService } from '../../common/provider.service';
 import { FilterMenuDropDownListDirective } from './filter-menu-dropdownlist.directive';
+import { AdaptiveGridService } from '../../common/adaptiveness.service';
+import { Subscription } from 'rxjs';
 import * as i0 from "@angular/core";
 import * as i1 from "../../common/provider.service";
+import * as i2 from "../../common/adaptiveness.service";
 /**
  * @hidden
  */
 export class FilterMenuInputWrapperComponent extends FilterInputWrapperComponent {
     ctx;
+    adaptiveGridService;
     filterService;
     isFirstDropDown;
     menuTabbingService;
     firstOperatorDropDown;
     _currentFilter;
+    subs = new Subscription();
     /**
      * @hidden
      */
     get hostClasses() {
         return false;
     }
-    constructor(ctx) {
+    constructor(ctx, adaptiveGridService) {
         super(null);
         this.ctx = ctx;
+        this.adaptiveGridService = adaptiveGridService;
     }
     ngAfterViewInit() {
         const shouldFocusFirstFocusable = this.isFirstDropDown && this.filterService?.menuTabbingService;
         const isTabbedInterface = this.menuTabbingService?.isTabbedInterface;
         if (shouldFocusFirstFocusable && !isTabbedInterface) {
             this.filterService.menuTabbingService.firstFocusable = this.firstOperatorDropDown;
-            this.firstOperatorDropDown.focus();
+            if (this.ctx.grid?.isActionSheetExpanded) {
+                this.subs.add(this.adaptiveGridService.animationEnd.subscribe(() => {
+                    this.firstOperatorDropDown.focus();
+                }));
+            }
+            else {
+                this.firstOperatorDropDown.focus();
+            }
         }
     }
+    ngOnDestroy() {
+        this.subs?.unsubscribe();
+    }
     operatorChange(dataItem) {
         this.currentOperator = dataItem;
     }
@@ -85,10 +101,12 @@ export class FilterMenuInputWrapperComponent extends FilterInputWrapperComponent
         const columnName = this.column ? this.column.title || this.column.field : '';
         return replaceMessagePlaceholder(localizationMsg, 'columnName', columnName);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FilterMenuInputWrapperComponent, deps: [{ token: i1.ContextService }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FilterMenuInputWrapperComponent, deps: [{ token: i1.ContextService }, { token: i2.AdaptiveGridService }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: FilterMenuInputWrapperComponent, isStandalone: true, selector: "kendo-grid-filter-menu-input-wrapper", inputs: { filterService: "filterService", isFirstDropDown: "isFirstDropDown", menuTabbingService: "menuTabbingService", currentFilter: "currentFilter" }, viewQueries: [{ propertyName: "firstOperatorDropDown", first: true, predicate: DropDownListComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: `
         <kendo-dropdownlist
             kendoFilterMenuDropDown
+            [adaptiveTitle]="ctx.localization.get('adaptiveFilterOperatorsTitle')"
+            [adaptiveMode]="ctx.grid?.adaptiveMode"
             [filterMenuDropDownLabel]="filterMenuDropDownLabel"
             [data]="operators"
             (valueChange)="operatorChange($event)"
@@ -108,6 +126,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     template: `
         <kendo-dropdownlist
             kendoFilterMenuDropDown
+            [adaptiveTitle]="ctx.localization.get('adaptiveFilterOperatorsTitle')"
+            [adaptiveMode]="ctx.grid?.adaptiveMode"
             [filterMenuDropDownLabel]="filterMenuDropDownLabel"
             [data]="operators"
             (valueChange)="operatorChange($event)"
@@ -122,7 +142,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     standalone: true,
                     imports: [DropDownListComponent, FilterMenuDropDownListDirective]
                 }]
-        }], ctorParameters: function () { return [{ type: i1.ContextService }]; }, propDecorators: { filterService: [{
+        }], ctorParameters: function () { return [{ type: i1.ContextService }, { type: i2.AdaptiveGridService }]; }, propDecorators: { filterService: [{
                 type: Input
             }], isFirstDropDown: [{
                 type: Input

package/esm2022/filtering/menu/filter-menu.component.mjs

@@ -3,7 +3,7 @@
 * Licensed under commercial license. See LICENSE.md in the project root for more information
 *-------------------------------------------------------------------------------------------*/
 import { NavigationService } from './../../navigation/navigation.service';
-import { ChangeDetectorRef, Component, ElementRef, Input, Optional, Renderer2, TemplateRef, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, ElementRef, Input, NgZone, Optional, Renderer2, TemplateRef, ViewChild } from '@angular/core';
 import { FilterService } from "../filter.service";
 import { ColumnComponent } from '../../columns/column.component';
 import { SinglePopupService } from '../../common/single-popup.service';
@@ -14,12 +14,14 @@ import { ContextService } from '../../common/provider.service';
 import { IdService } from '../../common/id.service';
 import { FilterMenuContainerComponent } from './filter-menu-container.component';
 import { IconWrapperComponent } from '@progress/kendo-angular-icons';
+import { AdaptiveGridService } from '../../common/adaptiveness.service';
 import * as i0 from "@angular/core";
 import * as i1 from "../filter.service";
 import * as i2 from "../../common/single-popup.service";
 import * as i3 from "../../common/provider.service";
 import * as i4 from "./../../navigation/navigation.service";
-import * as i5 from "../../common/id.service";
+import * as i5 from "../../common/adaptiveness.service";
+import * as i6 from "../../common/id.service";
 let id = 0;
 const getId = (gridId) => `${gridId}-filter-menu-${id++}`;
 /**
@@ -32,6 +34,8 @@ export class FilterMenuComponent {
     navigationService;
     renderer;
     cdr;
+    adaptiveGridService;
+    zone;
     idService;
     filterIcon = filterIcon;
     /**
@@ -49,13 +53,15 @@ export class FilterMenuComponent {
     tabIndex = '-1';
     popupRef;
     popupSubs;
-    constructor(filterService, popupService, ctx, navigationService, renderer, cdr, idService) {
+    constructor(filterService, popupService, ctx, navigationService, renderer, cdr, adaptiveGridService, zone, idService) {
         this.filterService = filterService;
         this.popupService = popupService;
         this.ctx = ctx;
         this.navigationService = navigationService;
         this.renderer = renderer;
         this.cdr = cdr;
+        this.adaptiveGridService = adaptiveGridService;
+        this.zone = zone;
         this.idService = idService;
     }
     ngOnDestroy() {
@@ -79,32 +85,41 @@ export class FilterMenuComponent {
         return this.navigationService.tableEnabled;
     }
     toggle(anchor, template) {
-        this.popupRef = this.popupService.open(anchor, template, this.popupRef);
-        // Needed as changes to 'popupRef' are not reflected
-        // automatically when the Popup is closed by clicking outside the anchor
-        const ariaRoot = this.isNavigable ? anchor.closest('.k-table-th') : anchor;
-        if (this.popupRef) {
-            this.popupSubs?.unsubscribe();
-            this.popupSubs = this.popupRef.popup.instance.anchorViewportLeave.subscribe(() => {
-                this.close();
-                this.updateAria(ariaRoot);
-            });
-            this.popupSubs.add(() => this.popupRef.popup.instance.close.subscribe(() => {
-                this.popupRef = null;
-                this.updateAria(ariaRoot);
-            }));
-            const popupAriaElement = this.popupRef.popupElement.querySelector('.k-grid-filter-popup');
-            if (popupAriaElement) {
-                const popupId = getId(this.idService?.gridId());
-                this.renderer.setAttribute(popupAriaElement, 'id', popupId);
-                this.renderer.setAttribute(popupAriaElement, 'role', 'dialog');
-                this.renderer.setAttribute(popupAriaElement, 'aria-label', this.filterLabel);
-                ariaRoot && this.renderer.setAttribute(ariaRoot, 'aria-controls', popupId);
-                ariaRoot && this.renderer.setAttribute(ariaRoot, 'aria-expanded', 'true');
+        if (this.ctx.grid?.adaptiveMode === 'auto' && this.adaptiveGridService.windowSize !== 'large') {
+            if (!this.ctx.grid.isActionSheetExpanded) {
+                this.adaptiveGridService.viewType = 'filterMenu';
+                this.adaptiveGridService.column = this.column;
+                this.ctx.grid.adaptiveRenderer.actionSheet.toggle(true);
             }
         }
         else {
-            this.focusRoot();
+            this.popupRef = this.popupService.open(anchor, template, this.popupRef);
+            // Needed as changes to 'popupRef' are not reflected
+            // automatically when the Popup is closed by clicking outside the anchor
+            const ariaRoot = this.isNavigable ? anchor.closest('.k-table-th') : anchor;
+            if (this.popupRef) {
+                this.popupSubs?.unsubscribe();
+                this.popupSubs = this.popupRef.popup.instance.anchorViewportLeave.subscribe(() => {
+                    this.close();
+                    this.updateAria(ariaRoot);
+                });
+                this.popupSubs.add(() => this.popupRef.popup.instance.close.subscribe(() => {
+                    this.popupRef = null;
+                    this.updateAria(ariaRoot);
+                }));
+                const popupAriaElement = this.popupRef.popupElement.querySelector('.k-grid-filter-popup');
+                if (popupAriaElement) {
+                    const popupId = getId(this.idService?.gridId());
+                    this.renderer.setAttribute(popupAriaElement, 'id', popupId);
+                    this.renderer.setAttribute(popupAriaElement, 'role', 'dialog');
+                    this.renderer.setAttribute(popupAriaElement, 'aria-label', this.filterLabel);
+                    ariaRoot && this.renderer.setAttribute(ariaRoot, 'aria-controls', popupId);
+                    ariaRoot && this.renderer.setAttribute(ariaRoot, 'aria-expanded', 'true');
+                }
+            }
+            else {
+                this.focusRoot();
+            }
         }
         return false;
     }
@@ -126,7 +141,7 @@ export class FilterMenuComponent {
     focusRoot() {
         this.isNavigable ? this.navigationService.focusCell(0, this.column.leafIndex) : this.anchor.nativeElement.focus();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FilterMenuComponent, deps: [{ token: i1.FilterService }, { token: i2.SinglePopupService }, { token: i3.ContextService }, { token: i4.NavigationService }, { token: i0.Renderer2 }, { token: i0.ChangeDetectorRef }, { token: i5.IdService, optional: true }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FilterMenuComponent, deps: [{ token: i1.FilterService }, { token: i2.SinglePopupService }, { token: i3.ContextService }, { token: i4.NavigationService }, { token: i0.Renderer2 }, { token: i0.ChangeDetectorRef }, { token: i5.AdaptiveGridService }, { token: i0.NgZone }, { token: i6.IdService, optional: true }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: FilterMenuComponent, isStandalone: true, selector: "kendo-grid-filter-menu", inputs: { column: "column", filter: "filter", tabIndex: "tabIndex" }, viewQueries: [{ propertyName: "anchor", first: true, predicate: ["anchor"], descendants: true, static: true }, { propertyName: "template", first: true, predicate: ["template"], descendants: true, read: TemplateRef, static: true }], ngImport: i0, template: `
         <a #anchor
             class="k-grid-filter-menu k-grid-header-menu"
@@ -183,9 +198,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         </ng-template>
     `,
                     standalone: true,
-                    imports: [IconWrapperComponent, FilterMenuContainerComponent]
+                    imports: [IconWrapperComponent, FilterMenuContainerComponent],
                 }]
-        }], ctorParameters: function () { return [{ type: i1.FilterService }, { type: i2.SinglePopupService }, { type: i3.ContextService }, { type: i4.NavigationService }, { type: i0.Renderer2 }, { type: i0.ChangeDetectorRef }, { type: i5.IdService, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1.FilterService }, { type: i2.SinglePopupService }, { type: i3.ContextService }, { type: i4.NavigationService }, { type: i0.Renderer2 }, { type: i0.ChangeDetectorRef }, { type: i5.AdaptiveGridService }, { type: i0.NgZone }, { type: i6.IdService, decorators: [{
                     type: Optional
                 }] }]; }, propDecorators: { column: [{
                 type: Input

package/esm2022/filtering/menu/numeric-filter-menu.component.mjs

@@ -116,6 +116,8 @@ export class NumericFilterMenuComponent extends NumericFilterComponent {
         <kendo-dropdownlist
             *ngIf="extra"
             kendoFilterMenuDropDown
+            [adaptiveTitle]="ctx.localization.get('adaptiveFilterOperatorsTitle')"
+            [adaptiveMode]="ctx.grid?.adaptiveMode"
             [filterMenuDropDownLabel]="filterMenuDropDownLabel"
             class="k-filter-and"
             [data]="logicOperators"
@@ -168,6 +170,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         <kendo-dropdownlist
             *ngIf="extra"
             kendoFilterMenuDropDown
+            [adaptiveTitle]="ctx.localization.get('adaptiveFilterOperatorsTitle')"
+            [adaptiveMode]="ctx.grid?.adaptiveMode"
             [filterMenuDropDownLabel]="filterMenuDropDownLabel"
             class="k-filter-and"
             [data]="logicOperators"

package/esm2022/filtering/menu/string-filter-menu.component.mjs

@@ -103,6 +103,8 @@ export class StringFilterMenuComponent extends StringFilterComponent {
         <kendo-dropdownlist
             *ngIf="extra"
             kendoFilterMenuDropDown
+            [adaptiveTitle]="ctx.localization.get('adaptiveFilterOperatorsTitle')"
+            [adaptiveMode]="ctx.grid?.adaptiveMode"
             [filterMenuDropDownLabel]="filterMenuDropDownLabel"
             class="k-filter-and"
             [data]="logicOperators"
@@ -141,6 +143,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         <kendo-dropdownlist
             *ngIf="extra"
             kendoFilterMenuDropDown
+            [adaptiveTitle]="ctx.localization.get('adaptiveFilterOperatorsTitle')"
+            [adaptiveMode]="ctx.grid?.adaptiveMode"
             [filterMenuDropDownLabel]="filterMenuDropDownLabel"
             class="k-filter-and"
             [data]="logicOperators"