npm - @progress/kendo-angular-filter - Versions diffs - 2.0.1-dev.202205171237 → 2.0.1-dev.202205191247 - Mend

@progress/kendo-angular-filter 2.0.1-dev.202205171237 → 2.0.1-dev.202205191247

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/bundles/kendo-angular-filter.umd.js +1 -1
package/editors/date-editor.component.d.ts +3 -5
package/editors/numeric-editor.component.d.ts +3 -5
package/editors/text-editor.component.d.ts +3 -5
package/esm2015/editors/date-editor.component.js +11 -18
package/esm2015/editors/numeric-editor.component.js +11 -18
package/esm2015/editors/text-editor.component.js +11 -18
package/esm2015/filter-expression-operators.component.js +31 -17
package/esm2015/filter-expression.component.js +23 -10
package/esm2015/filter-group.component.js +6 -3
package/esm2015/filter.component.js +22 -10
package/esm2015/filter.service.js +1 -3
package/esm2015/package-metadata.js +1 -1
package/fesm2015/kendo-angular-filter.js +108 -85
package/filter-expression-operators.component.d.ts +7 -6
package/filter-expression.component.d.ts +2 -1
package/filter-group.component.d.ts +1 -0
package/filter.component.d.ts +2 -0
package/filter.service.d.ts +1 -2
package/package.json +1 -1
package/util.d.ts +2 -4

package/esm2015/editors/text-editor.component.js CHANGED Viewed

@@ -5,39 +5,30 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import * as i0 from "@angular/core";
 import * as i1 from "@progress/kendo-angular-l10n";
-import * as i2 from "../filter.service";
-import * as i3 from "@progress/kendo-angular-inputs";
-import * as i4 from "../aria-label.directive";
+import * as i2 from "@progress/kendo-angular-inputs";
+import * as i3 from "../aria-label.directive";
 /**
  * @hidden
  */
 export class FilterTextEditorComponent {
-    constructor(localization, filterService) {
+    constructor(localization) {
         this.localization = localization;
-        this.filterService = filterService;
         this.valueChange = new EventEmitter();
     }
-    isDisabled() {
-        const isDisabled = this.filterService.isEditorDisabled;
-        if (isDisabled) {
-            this.currentItem.value = null;
-        }
-        return isDisabled;
-    }
     messageFor(key) {
         return this.localization.get(key);
     }
 }
-FilterTextEditorComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: FilterTextEditorComponent, deps: [{ token: i1.LocalizationService }, { token: i2.FilterService }], target: i0.ɵɵFactoryTarget.Component });
-FilterTextEditorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.16", type: FilterTextEditorComponent, selector: "kendo-filter-text-editor", inputs: { currentItem: "currentItem" }, outputs: { valueChange: "valueChange" }, ngImport: i0, template: `
+FilterTextEditorComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: FilterTextEditorComponent, deps: [{ token: i1.LocalizationService }], target: i0.ɵɵFactoryTarget.Component });
+FilterTextEditorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.16", type: FilterTextEditorComponent, selector: "kendo-filter-text-editor", inputs: { currentItem: "currentItem", isDisabled: "isDisabled" }, outputs: { valueChange: "valueChange" }, ngImport: i0, template: `
         <kendo-textbox
             [kendoAriaLabelValue]="messageFor('filterValueAriaLabel')"
             class="k-filter-toolbar-item k-filter-value"
             [(value)]="currentItem.value"
             (valueChange)="valueChange.emit()"
-            [disabled]="isDisabled()">
+            [disabled]="isDisabled">
         </kendo-textbox>
-  `, isInline: true, components: [{ type: i3.TextBoxComponent, selector: "kendo-textbox", inputs: ["focusableId", "title", "disabled", "readonly", "tabindex", "value", "selectOnFocus", "showSuccessIcon", "showErrorIcon", "clearButton", "successIcon", "errorIcon", "clearButtonIcon", "size", "rounded", "fillMode", "tabIndex", "placeholder", "maxlength"], outputs: ["valueChange", "inputFocus", "inputBlur", "focus", "blur"], exportAs: ["kendoTextBox"] }], directives: [{ type: i4.AriaLabelValueDirective, selector: "[kendoAriaLabelValue]", inputs: ["kendoAriaLabelValue"] }] });
+  `, isInline: true, components: [{ type: i2.TextBoxComponent, selector: "kendo-textbox", inputs: ["focusableId", "title", "disabled", "readonly", "tabindex", "value", "selectOnFocus", "showSuccessIcon", "showErrorIcon", "clearButton", "successIcon", "errorIcon", "clearButtonIcon", "size", "rounded", "fillMode", "tabIndex", "placeholder", "maxlength"], outputs: ["valueChange", "inputFocus", "inputBlur", "focus", "blur"], exportAs: ["kendoTextBox"] }], directives: [{ type: i3.AriaLabelValueDirective, selector: "[kendoAriaLabelValue]", inputs: ["kendoAriaLabelValue"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: FilterTextEditorComponent, decorators: [{
             type: Component,
             args: [{
@@ -48,11 +39,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImpo
             class="k-filter-toolbar-item k-filter-value"
             [(value)]="currentItem.value"
             (valueChange)="valueChange.emit()"
-            [disabled]="isDisabled()">
+            [disabled]="isDisabled">
         </kendo-textbox>
   `
                 }]
-        }], ctorParameters: function () { return [{ type: i1.LocalizationService }, { type: i2.FilterService }]; }, propDecorators: { currentItem: [{
+        }], ctorParameters: function () { return [{ type: i1.LocalizationService }]; }, propDecorators: { currentItem: [{
+                type: Input
+            }], isDisabled: [{
                 type: Input
             }], valueChange: [{
                 type: Output

package/esm2015/filter-expression-operators.component.js CHANGED Viewed

@@ -3,18 +3,16 @@
 * Licensed under commercial license. See LICENSE.md in the project root for more information
 *-------------------------------------------------------------------------------------------*/
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { nullOperators } from './util';
+import { defaultOperators, getKeyByValue } from './util';
 import * as i0 from "@angular/core";
-import * as i1 from "./filter.service";
-import * as i2 from "@progress/kendo-angular-l10n";
-import * as i3 from "@progress/kendo-angular-dropdowns";
-import * as i4 from "./aria-label.directive";
+import * as i1 from "@progress/kendo-angular-l10n";
+import * as i2 from "@progress/kendo-angular-dropdowns";
+import * as i3 from "./aria-label.directive";
 /**
  * @hidden
  */
 export class FilterExpressionOperatorsComponent {
-    constructor(filterService, localization) {
-        this.filterService = filterService;
+    constructor(localization) {
         this.localization = localization;
         this.valueChange = new EventEmitter();
         this.operators = [];
@@ -22,13 +20,15 @@ export class FilterExpressionOperatorsComponent {
     messageFor(key) {
         return this.localization.get(key);
     }
+    getOperator(operatorValue) {
+        return this.messageFor(getKeyByValue(defaultOperators[this.editorType], operatorValue));
+    }
     operatorValueChange(value) {
-        this.valueChange.emit();
-        this.filterService.isEditorDisabled = nullOperators.indexOf(value) >= 0;
+        this.valueChange.emit(value);
     }
 }
-FilterExpressionOperatorsComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: FilterExpressionOperatorsComponent, deps: [{ token: i1.FilterService }, { token: i2.LocalizationService }], target: i0.ɵɵFactoryTarget.Component });
-FilterExpressionOperatorsComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.16", type: FilterExpressionOperatorsComponent, selector: "kendo-filter-expression-operators", inputs: { currentItem: "currentItem", operators: "operators" }, outputs: { valueChange: "valueChange" }, ngImport: i0, template: `
+FilterExpressionOperatorsComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: FilterExpressionOperatorsComponent, deps: [{ token: i1.LocalizationService }], target: i0.ɵɵFactoryTarget.Component });
+FilterExpressionOperatorsComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.16", type: FilterExpressionOperatorsComponent, selector: "kendo-filter-expression-operators", inputs: { currentItem: "currentItem", editorType: "editorType", operators: "operators" }, outputs: { valueChange: "valueChange" }, ngImport: i0, template: `
         <kendo-dropdownlist
             [kendoAriaLabelValue]="messageFor('filterOperatorAriaLabel')"
             [data]="operators"
@@ -38,13 +38,19 @@ FilterExpressionOperatorsComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersio
             [valuePrimitive]="true"
             textField="text"
             valueField="value"
-            >
+        >
+            <ng-template kendoDropDownListValueTemplate let-dataItem>
+                {{ getOperator(dataItem.value) }}
+            </ng-template>
+            <ng-template kendoDropDownListItemTemplate let-dataItem>
+                {{ getOperator(dataItem.value) }}
+            </ng-template>
         </kendo-dropdownlist>
-  `, isInline: true, components: [{ type: i3.DropDownListComponent, selector: "kendo-dropdownlist", inputs: ["iconClass", "loading", "data", "value", "textField", "valueField", "popupSettings", "listHeight", "defaultItem", "disabled", "itemDisabled", "readonly", "filterable", "virtual", "ignoreCase", "delay", "valuePrimitive", "tabindex", "tabIndex", "size", "rounded", "fillMode", "id"], outputs: ["valueChange", "filterChange", "selectionChange", "open", "opened", "close", "closed", "focus", "blur"], exportAs: ["kendoDropDownList"] }], directives: [{ type: i4.AriaLabelValueDirective, selector: "[kendoAriaLabelValue]", inputs: ["kendoAriaLabelValue"] }] });
+    `, isInline: true, components: [{ type: i2.DropDownListComponent, selector: "kendo-dropdownlist", inputs: ["iconClass", "loading", "data", "value", "textField", "valueField", "popupSettings", "listHeight", "defaultItem", "disabled", "itemDisabled", "readonly", "filterable", "virtual", "ignoreCase", "delay", "valuePrimitive", "tabindex", "tabIndex", "size", "rounded", "fillMode", "id"], outputs: ["valueChange", "filterChange", "selectionChange", "open", "opened", "close", "closed", "focus", "blur"], exportAs: ["kendoDropDownList"] }], directives: [{ type: i3.AriaLabelValueDirective, selector: "[kendoAriaLabelValue]", inputs: ["kendoAriaLabelValue"] }, { type: i2.ValueTemplateDirective, selector: "[kendoDropDownListValueTemplate],[kendoDropDownTreeValueTemplate]" }, { type: i2.ItemTemplateDirective, selector: "[kendoDropDownListItemTemplate],[kendoComboBoxItemTemplate],[kendoAutoCompleteItemTemplate],[kendoMultiSelectItemTemplate]" }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: FilterExpressionOperatorsComponent, decorators: [{
             type: Component,
             args: [{
-                    selector: 'kendo-filter-expression-operators',
+                    selector: "kendo-filter-expression-operators",
                     template: `
         <kendo-dropdownlist
             [kendoAriaLabelValue]="messageFor('filterOperatorAriaLabel')"
@@ -55,11 +61,19 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImpo
             [valuePrimitive]="true"
             textField="text"
             valueField="value"
-            >
+        >
+            <ng-template kendoDropDownListValueTemplate let-dataItem>
+                {{ getOperator(dataItem.value) }}
+            </ng-template>
+            <ng-template kendoDropDownListItemTemplate let-dataItem>
+                {{ getOperator(dataItem.value) }}
+            </ng-template>
         </kendo-dropdownlist>
-  `
+    `
                 }]
-        }], ctorParameters: function () { return [{ type: i1.FilterService }, { type: i2.LocalizationService }]; }, propDecorators: { currentItem: [{
+        }], ctorParameters: function () { return [{ type: i1.LocalizationService }]; }, propDecorators: { currentItem: [{
+                type: Input
+            }], editorType: [{
                 type: Input
             }], valueChange: [{
                 type: Output

package/esm2015/filter-expression.component.js CHANGED Viewed

@@ -3,7 +3,7 @@
 * Licensed under commercial license. See LICENSE.md in the project root for more information
 *-------------------------------------------------------------------------------------------*/
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { defaultDateOperators, defaultNumericOperators, defaultOperators, defaultStringOperators, getKeyByValue, isFilterEditor, localizeOperators } from './util';
+import { defaultDateOperators, defaultNumericOperators, defaultOperators, defaultStringOperators, getKeyByValue, isFilterEditor, localizeOperators, nullOperators } from './util';
 import * as i0 from "@angular/core";
 import * as i1 from "./filter.service";
 import * as i2 from "@progress/kendo-angular-l10n";
@@ -31,6 +31,7 @@ export class FilterExpressionComponent {
         this.isEditorDisabled = false;
     }
     ngOnInit() {
+        this.isEditorDisabled = nullOperators.indexOf(this.currentItem.operator) >= 0;
         this.filters = this.filterService.filters;
         const foundFilter = this.getFilterExpressionByField(this.currentItem.field);
         if (this.currentItem.field) {
@@ -119,6 +120,16 @@ export class FilterExpressionComponent {
             }
         }
     }
+    onOperatorChange(value) {
+        this.valueChange.emit();
+        if (nullOperators.indexOf(value) >= 0) {
+            this.currentItem.value = null;
+            this.isEditorDisabled = true;
+        }
+        else {
+            this.isEditorDisabled = false;
+        }
+    }
 }
 FilterExpressionComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: FilterExpressionComponent, deps: [{ token: i1.FilterService }, { token: i2.LocalizationService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
 FilterExpressionComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.16", type: FilterExpressionComponent, selector: "kendo-filter-expression", inputs: { index: "index", currentItem: "currentItem" }, outputs: { valueChange: "valueChange" }, ngImport: i0, template: `
@@ -140,15 +151,16 @@ FilterExpressionComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.
                     <kendo-filter-expression-operators
                         [currentItem]="currentItem"
                         [operators]="operators"
-                        (valueChange)="valueChange.emit();">
+                        [editorType]="getEditorType()"
+                        (valueChange)="onOperatorChange($event);">
                     </kendo-filter-expression-operators>
                 </div>
                 <ng-container [ngSwitch]="getEditorType()">
-                    <kendo-filter-text-editor *ngSwitchCase="'string'" [currentItem]="currentItem" (valueChange)="valueChange.emit()"></kendo-filter-text-editor>
-                    <kendo-filter-numeric-editor *ngSwitchCase="'number'" [currentItem]="currentItem" (valueChange)="valueChange.emit()"></kendo-filter-numeric-editor>
+                    <kendo-filter-text-editor *ngSwitchCase="'string'" [currentItem]="currentItem" [isDisabled]="isEditorDisabled" (valueChange)="valueChange.emit()"></kendo-filter-text-editor>
+                    <kendo-filter-numeric-editor *ngSwitchCase="'number'" [currentItem]="currentItem" [isDisabled]="isEditorDisabled" (valueChange)="valueChange.emit()"></kendo-filter-numeric-editor>
                     <kendo-filter-boolean-editor *ngSwitchCase="'boolean'" [currentItem]="currentItem" (valueChange)="valueChange.emit()"></kendo-filter-boolean-editor>
-                    <kendo-filter-date-editor *ngSwitchCase="'date'" [currentItem]="currentItem" (valueChange)="valueChange.emit()"></kendo-filter-date-editor>
+                    <kendo-filter-date-editor *ngSwitchCase="'date'" [currentItem]="currentItem" [isDisabled]="isEditorDisabled" (valueChange)="valueChange.emit()"></kendo-filter-date-editor>
                 </ng-container>
                 <div class="k-filter-toolbar-item">
@@ -162,7 +174,7 @@ FilterExpressionComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.
                 </div>
             </div>
         </div>
-  `, isInline: true, components: [{ type: i3.DropDownListComponent, selector: "kendo-dropdownlist", inputs: ["iconClass", "loading", "data", "value", "textField", "valueField", "popupSettings", "listHeight", "defaultItem", "disabled", "itemDisabled", "readonly", "filterable", "virtual", "ignoreCase", "delay", "valuePrimitive", "tabindex", "tabIndex", "size", "rounded", "fillMode", "id"], outputs: ["valueChange", "filterChange", "selectionChange", "open", "opened", "close", "closed", "focus", "blur"], exportAs: ["kendoDropDownList"] }, { type: i4.FilterExpressionOperatorsComponent, selector: "kendo-filter-expression-operators", inputs: ["currentItem", "operators"], outputs: ["valueChange"] }, { type: i5.FilterTextEditorComponent, selector: "kendo-filter-text-editor", inputs: ["currentItem"], outputs: ["valueChange"] }, { type: i6.FilterNumericEditorComponent, selector: "kendo-filter-numeric-editor", inputs: ["currentItem"], outputs: ["valueChange"] }, { type: i7.FilterBooleanEditorComponent, selector: "kendo-filter-boolean-editor", inputs: ["currentItem"], outputs: ["valueChange"] }, { type: i8.FilterDateEditorComponent, selector: "kendo-filter-date-editor", inputs: ["currentItem"], outputs: ["valueChange"] }], directives: [{ type: i9.AriaLabelValueDirective, selector: "[kendoAriaLabelValue]", inputs: ["kendoAriaLabelValue"] }, { type: i10.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i10.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { type: i10.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { type: i11.ButtonDirective, selector: "button[kendoButton], span[kendoButton]", inputs: ["toggleable", "togglable", "selected", "tabIndex", "icon", "iconClass", "imageUrl", "disabled", "size", "rounded", "fillMode", "themeColor", "role", "primary", "look"], outputs: ["selectedChange", "click"], exportAs: ["kendoButton"] }] });
+  `, isInline: true, components: [{ type: i3.DropDownListComponent, selector: "kendo-dropdownlist", inputs: ["iconClass", "loading", "data", "value", "textField", "valueField", "popupSettings", "listHeight", "defaultItem", "disabled", "itemDisabled", "readonly", "filterable", "virtual", "ignoreCase", "delay", "valuePrimitive", "tabindex", "tabIndex", "size", "rounded", "fillMode", "id"], outputs: ["valueChange", "filterChange", "selectionChange", "open", "opened", "close", "closed", "focus", "blur"], exportAs: ["kendoDropDownList"] }, { type: i4.FilterExpressionOperatorsComponent, selector: "kendo-filter-expression-operators", inputs: ["currentItem", "editorType", "operators"], outputs: ["valueChange"] }, { type: i5.FilterTextEditorComponent, selector: "kendo-filter-text-editor", inputs: ["currentItem", "isDisabled"], outputs: ["valueChange"] }, { type: i6.FilterNumericEditorComponent, selector: "kendo-filter-numeric-editor", inputs: ["currentItem", "isDisabled"], outputs: ["valueChange"] }, { type: i7.FilterBooleanEditorComponent, selector: "kendo-filter-boolean-editor", inputs: ["currentItem"], outputs: ["valueChange"] }, { type: i8.FilterDateEditorComponent, selector: "kendo-filter-date-editor", inputs: ["currentItem", "isDisabled"], outputs: ["valueChange"] }], directives: [{ type: i9.AriaLabelValueDirective, selector: "[kendoAriaLabelValue]", inputs: ["kendoAriaLabelValue"] }, { type: i10.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i10.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { type: i10.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { type: i11.ButtonDirective, selector: "button[kendoButton], span[kendoButton]", inputs: ["toggleable", "togglable", "selected", "tabIndex", "icon", "iconClass", "imageUrl", "disabled", "size", "rounded", "fillMode", "themeColor", "role", "primary", "look"], outputs: ["selectedChange", "click"], exportAs: ["kendoButton"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: FilterExpressionComponent, decorators: [{
             type: Component,
             args: [{
@@ -186,15 +198,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImpo
                     <kendo-filter-expression-operators
                         [currentItem]="currentItem"
                         [operators]="operators"
-                        (valueChange)="valueChange.emit();">
+                        [editorType]="getEditorType()"
+                        (valueChange)="onOperatorChange($event);">
                     </kendo-filter-expression-operators>
                 </div>
                 <ng-container [ngSwitch]="getEditorType()">
-                    <kendo-filter-text-editor *ngSwitchCase="'string'" [currentItem]="currentItem" (valueChange)="valueChange.emit()"></kendo-filter-text-editor>
-                    <kendo-filter-numeric-editor *ngSwitchCase="'number'" [currentItem]="currentItem" (valueChange)="valueChange.emit()"></kendo-filter-numeric-editor>
+                    <kendo-filter-text-editor *ngSwitchCase="'string'" [currentItem]="currentItem" [isDisabled]="isEditorDisabled" (valueChange)="valueChange.emit()"></kendo-filter-text-editor>
+                    <kendo-filter-numeric-editor *ngSwitchCase="'number'" [currentItem]="currentItem" [isDisabled]="isEditorDisabled" (valueChange)="valueChange.emit()"></kendo-filter-numeric-editor>
                     <kendo-filter-boolean-editor *ngSwitchCase="'boolean'" [currentItem]="currentItem" (valueChange)="valueChange.emit()"></kendo-filter-boolean-editor>
-                    <kendo-filter-date-editor *ngSwitchCase="'date'" [currentItem]="currentItem" (valueChange)="valueChange.emit()"></kendo-filter-date-editor>
+                    <kendo-filter-date-editor *ngSwitchCase="'date'" [currentItem]="currentItem" [isDisabled]="isEditorDisabled" (valueChange)="valueChange.emit()"></kendo-filter-date-editor>
                 </ng-container>
                 <div class="k-filter-toolbar-item">

package/esm2015/filter-group.component.js CHANGED Viewed

@@ -3,7 +3,7 @@
 * Licensed under commercial license. See LICENSE.md in the project root for more information
 *-------------------------------------------------------------------------------------------*/
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { localizeOperators, logicOperators } from './util';
+import { getKeyByValue, localizeOperators, logicOperators } from './util';
 import * as i0 from "@angular/core";
 import * as i1 from "./filter.service";
 import * as i2 from "@progress/kendo-angular-l10n";
@@ -44,6 +44,9 @@ export class FilterGroupComponent {
     messageFor(key) {
         return this.localization.get(key);
     }
+    getOperator(operatorValue) {
+        return this.messageFor(getKeyByValue(logicOperators, operatorValue));
+    }
     selectedChange(logicOperator) {
         if (this.currentItem.logic !== logicOperator) {
             this.currentItem.logic = logicOperator;
@@ -77,7 +80,7 @@ FilterGroupComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", v
                     [title]="operator.text"
                     (click)="selectedChange(operator.value)"
                     >
-                    {{operator.text}}
+                    {{getOperator(operator.value)}}
                   </button>
               </div>
             </div>
@@ -145,7 +148,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImpo
                     [title]="operator.text"
                     (click)="selectedChange(operator.value)"
                     >
-                    {{operator.text}}
+                    {{getOperator(operator.value)}}
                   </button>
               </div>
             </div>

package/esm2015/filter.component.js CHANGED Viewed

@@ -5,7 +5,7 @@
 import { Component, Input, Output, EventEmitter, HostBinding, isDevMode } from '@angular/core';
 import { L10N_PREFIX, LocalizationService } from '@progress/kendo-angular-l10n';
 import { FilterService } from './filter.service';
-import { isArray, isPresent } from './util';
+import { isArray, nullOperators, isPresent } from './util';
 import { validatePackage } from '@progress/kendo-licensing';
 import { packageMetadata } from './package-metadata';
 import * as i0 from "@angular/core";
@@ -55,6 +55,7 @@ export class FilterComponent {
          * That is each time a Filter Group or Filter Expression is added, removed, or updated.
          */
         this.valueChange = new EventEmitter();
+        this._value = { filters: [], logic: 'and' };
         validatePackage(packageMetadata);
         this.direction = localization.rtl ? 'rtl' : 'ltr';
     }
@@ -72,6 +73,7 @@ export class FilterComponent {
             }
             return clonedFilter;
         });
+        this.setValue(this.value);
     }
     get filters() {
         return this.filterService.filters;
@@ -81,11 +83,11 @@ export class FilterComponent {
      */
     set value(value) {
         const clonedValue = JSON.parse(JSON.stringify(value));
-        this.normalizeValue(clonedValue);
-        this.filterService.value = clonedValue;
+        this._value = clonedValue;
+        this.setValue(this.value);
     }
     get value() {
-        return this.filterService.value;
+        return this._value;
     }
     ngOnInit() {
         if (this.filters.length === 0) {
@@ -105,13 +107,13 @@ export class FilterComponent {
      * @hidden
      */
     getCurrentFilter() {
-        return this.value;
+        return this.filterService.normalizedValue;
     }
     /**
      * @hidden
      */
     onValueChange() {
-        this.valueChange.emit(this.filterService.value);
+        this.valueChange.emit(this.filterService.normalizedValue);
     }
     normalizeFilter(filterDescriptor) {
         const foundFilter = this.filterService.filters.find((filter) => filter.field === filterDescriptor.field);
@@ -133,9 +135,19 @@ export class FilterComponent {
         if (!isPresent(filterDescriptor.value)) {
             filterDescriptor.value = null;
         }
+        if (nullOperators.indexOf(filterDescriptor.operator) >= 0) {
+            filterDescriptor.value = null;
+        }
     }
-    normalizeValue(item) {
-        item.filters.forEach((item) => {
+    setValue(items) {
+        this.normalizeValue(items);
+        this.filterService.normalizedValue = items;
+    }
+    normalizeValue(items) {
+        if (!this.filterService.filters.length) {
+            return;
+        }
+        items.filters.forEach((item) => {
             if (item.filters) {
                 this.normalizeValue(item);
             }
@@ -278,7 +290,7 @@ FilterComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", versio
                 </li>
             </ul>
         </div>
-`, isInline: true, components: [{ type: i3.FilterGroupComponent, selector: "kendo-filter-group", inputs: ["index", "currentItem"], outputs: ["valueChange"] }], directives: [{ type: i4.LocalizedMessagesDirective, selector: "[kendoFilterLocalizedMessages]" }] });
+    `, isInline: true, components: [{ type: i3.FilterGroupComponent, selector: "kendo-filter-group", inputs: ["index", "currentItem"], outputs: ["valueChange"] }], directives: [{ type: i4.LocalizedMessagesDirective, selector: "[kendoFilterLocalizedMessages]" }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: FilterComponent, decorators: [{
             type: Component,
             args: [{
@@ -416,7 +428,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImpo
                 </li>
             </ul>
         </div>
-`
+    `
                 }]
         }], ctorParameters: function () { return [{ type: i1.FilterService }, { type: i2.LocalizationService }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { direction: [{
                 type: HostBinding,

package/esm2015/filter.service.js CHANGED Viewed

@@ -9,9 +9,7 @@ import * as i0 from "@angular/core";
  */
 export class FilterService {
     constructor() {
-        this.value = { filters: [], logic: 'or' };
         this.filters = [];
-        this.isEditorDisabled = false;
     }
     addFilterGroup(item) {
         let filterGroup = { logic: 'or', filters: [] };
@@ -23,7 +21,7 @@ export class FilterService {
     }
     remove(item, positionIndex, parentItem) {
         if (!parentItem) {
-            parentItem = this.value;
+            parentItem = this.normalizedValue;
         }
         if (item === parentItem) {
             parentItem.filters = [];

package/esm2015/package-metadata.js CHANGED Viewed

@@ -9,7 +9,7 @@ export const packageMetadata = {
     name: '@progress/kendo-angular-filter',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1652791009,
+    publishDate: 1652964392,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
 };