@progress/kendo-angular-treeview 5.4.2-dev.202111011443 → 6.0.0-dev.202112021059

package/dist/es2015/check.directive.js

@@ -8,6 +8,7 @@ import { TreeViewComponent } from './treeview.component';
 import { fetchLoadedDescendants, isBoolean, isPresent, noop } from './utils';
 import { Subscription } from 'rxjs';
 import { filter, take, switchMap, tap } from 'rxjs/operators';
+import { isChanged } from '@progress/kendo-angular-common';
 const indexChecked = (keys, index) => keys.filter(k => k === index).length > 0;
 const ɵ0 = indexChecked;
 const matchKey = index => k => {
@@ -44,7 +45,10 @@ let CheckDirective = class CheckDirective {
             'multiple': (e) => this.checkMultiple(e),
             'single': (e) => this.checkSingle(e)
         };
-        this._checkedKeys = [];
+        /**
+         * Reflectes the internal `checkedKeys` state.
+         */
+        this.state = new Set();
         this.subscriptions.add(this.treeView.checkedChange
             .subscribe((e) => this.check(e)));
         let expandedItems = [];
@@ -59,16 +63,6 @@ let CheckDirective = class CheckDirective {
     set isChecked(value) {
         this.treeView.isChecked = value;
     }
-    /**
-     * Defines the collection that will store the checked keys
-     * ([see example]({% slug checkboxes_treeview %})).
-     */
-    get checkedKeys() {
-        return this._checkedKeys;
-    }
-    set checkedKeys(keys) {
-        this._checkedKeys = keys;
-    }
     get options() {
         const defaultOptions = {
             checkChildren: true,
@@ -89,6 +83,9 @@ let CheckDirective = class CheckDirective {
             this.treeView.checkboxes = this.options.enabled;
             this.toggleCheckOnClick();
         }
+        if (isChanged('checkedKeys', changes, false) && changes.checkedKeys.currentValue !== this.lastChange) {
+            this.state = new Set(changes.checkedKeys.currentValue);
+        }
     }
     ngOnDestroy() {
         this.subscriptions.unsubscribe();
@@ -98,11 +95,11 @@ let CheckDirective = class CheckDirective {
         if (!this.checkKey) {
             return this.isIndexChecked(index);
         }
-        const keyIndex = this.checkedKeys.indexOf(this.itemKey({ dataItem, index }));
-        return keyIndex > -1 ? 'checked' : 'none';
+        const hasKey = this.state.has(this.itemKey({ dataItem, index }));
+        return hasKey ? 'checked' : 'none';
     }
     isIndexChecked(index) {
-        const checkedKeys = this.checkedKeys.filter(matchKey(index));
+        const checkedKeys = Array.from(this.state).filter(matchKey(index));
         if (indexChecked(checkedKeys, index)) {
             return 'checked';
         }
@@ -133,7 +130,11 @@ let CheckDirective = class CheckDirective {
     }
     checkSingle(node) {
         const key = this.itemKey(node.item);
-        this.checkedKeys = this.checkedKeys[0] !== key ? [key] : [];
+        const hasKey = this.state.has(key);
+        this.state.clear();
+        if (!hasKey) {
+            this.state.add(key);
+        }
         this.notify();
     }
     checkMultiple(node) {
@@ -168,7 +169,6 @@ let CheckDirective = class CheckDirective {
         if (!isPresent(currentKey)) {
             return;
         }
-        const checkedKeys = new Set(this.checkedKeys);
         const pendingCheck = [currentKey];
         if (this.options.checkChildren) {
             const descendants = fetchLoadedDescendants(node, ({ item }) => this.treeView.isVisible(item.dataItem, item.index) &&
@@ -176,61 +176,57 @@ let CheckDirective = class CheckDirective {
                 .map(({ item }) => this.itemKey(item));
             pendingCheck.push(...descendants);
         }
-        const shouldCheck = !checkedKeys.has(currentKey);
+        const shouldCheck = !this.state.has(currentKey);
         pendingCheck.forEach(key => {
             if (shouldCheck) {
-                checkedKeys.add(key);
+                this.state.add(key);
             }
             else {
-                checkedKeys.delete(key);
+                this.state.delete(key);
             }
         });
-        this.checkedKeys = Array.from(checkedKeys);
     }
     checkParents(parent) {
         if (!isPresent(parent)) {
             return;
         }
-        const checkedKeys = new Set(this.checkedKeys);
         let currentParent = parent;
         while (currentParent) {
             const parentKey = this.itemKey(currentParent.item);
-            const allChildrenSelected = currentParent.children.every(item => checkedKeys.has(this.itemKey(item)));
+            const allChildrenSelected = currentParent.children.every(item => this.state.has(this.itemKey(item)));
             if (allChildrenSelected) {
-                checkedKeys.add(parentKey);
+                this.state.add(parentKey);
             }
             else {
-                checkedKeys.delete(parentKey);
+                this.state.delete(parentKey);
             }
             currentParent = currentParent.parent;
         }
-        this.checkedKeys = Array.from(checkedKeys);
     }
     notify() {
-        this.checkedKeysChange.emit(this.checkedKeys.slice());
+        this.lastChange = Array.from(this.state);
+        this.checkedKeysChange.emit(this.lastChange);
     }
     addCheckedItemsChildren(lookups) {
         if (!isPresent(lookups) || lookups.length === 0) {
             return;
         }
-        const initiallyCheckedItemsCount = this.checkedKeys.length;
-        const checkedKeys = new Set(this.checkedKeys);
+        const initiallyCheckedItemsCount = this.state.size;
         lookups.forEach(lookup => {
             const itemKey = this.itemKey(lookup.item);
-            if (!checkedKeys.has(itemKey)) {
+            if (!this.state.has(itemKey)) {
                 return;
             }
             lookup.children.forEach(item => {
                 // ensure both the parent item and each child node is enabled
                 if (!this.treeView.isDisabled(lookup.item.dataItem, lookup.item.index) &&
                     !this.treeView.isDisabled(item.dataItem, item.index)) {
-                    checkedKeys.add(this.itemKey(item));
+                    this.state.add(this.itemKey(item));
                 }
             });
         });
-        const hasNewlyCheckedItems = initiallyCheckedItemsCount !== checkedKeys.size;
+        const hasNewlyCheckedItems = initiallyCheckedItemsCount !== this.state.size;
         if (hasNewlyCheckedItems) {
-            this.checkedKeys = Array.from(checkedKeys);
             this.zone.run(() => this.notify());
         }
     }
@@ -246,9 +242,8 @@ tslib_1.__decorate([
 ], CheckDirective.prototype, "checkKey", void 0);
 tslib_1.__decorate([
     Input(),
-    tslib_1.__metadata("design:type", Array),
-    tslib_1.__metadata("design:paramtypes", [Array])
-], CheckDirective.prototype, "checkedKeys", null);
+    tslib_1.__metadata("design:type", Array)
+], CheckDirective.prototype, "checkedKeys", void 0);
 tslib_1.__decorate([
     Input('kendoTreeViewCheckable'),
     tslib_1.__metadata("design:type", Object)

package/dist/es2015/expand.directive.d.ts

@@ -2,7 +2,7 @@
 * Copyright © 2021 Progress Software Corporation. All rights reserved.
 * Licensed under commercial license. See LICENSE.md in the project root for more information
 *-------------------------------------------------------------------------------------------*/
-import { EventEmitter, OnDestroy } from '@angular/core';
+import { EventEmitter, OnDestroy, SimpleChanges, OnChanges } from '@angular/core';
 import { ExpandableComponent } from './expandable-component';
 import { Subscription } from 'rxjs';
 import { TreeItem } from './treeitem.interface';
@@ -17,7 +17,7 @@ interface ExpandTreeItem extends TreeItem {
  * A directive which manages the expanded state of the TreeView.
  * ([see example]({% slug expandedstate_treeview %})).
  */
-export declare class ExpandDirective implements OnDestroy {
+export declare class ExpandDirective implements OnDestroy, OnChanges {
     protected component: ExpandableComponent;
     /**
      * @hidden
@@ -43,10 +43,18 @@ export declare class ExpandDirective implements OnDestroy {
      */
     expandedKeys: any[];
     protected subscriptions: Subscription;
-    private _expandedKeys;
+    /**
+     * Reflectes the internal `expandedKeys` state.
+     */
+    private state;
     private originalExpandedKeys;
     private isFiltered;
+    /**
+     * Holds the last emitted `expandedKeys` collection.
+     */
+    private lastChange;
     constructor(component: ExpandableComponent);
+    ngOnChanges(changes: SimpleChanges): void;
     ngOnDestroy(): void;
     /**
      * @hidden
@@ -62,5 +70,6 @@ export declare class ExpandDirective implements OnDestroy {
      * Fills array with the expand key of every node.
      */
     private getEveryExpandKey;
+    private notify;
 }
 export {};

package/dist/es2015/expand.directive.js

@@ -8,6 +8,7 @@ import { ExpandableComponent } from './expandable-component';
 import { Subscription, merge } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { isArrayWithAtLeastOneItem, isBoolean, sameValues } from './utils';
+import { isChanged } from '@progress/kendo-angular-common';
 const DEFAULT_FILTER_EXPAND_SETTINGS = {
     maxAutoExpandResults: -1,
     expandMatches: false,
@@ -31,8 +32,11 @@ let ExpandDirective = class ExpandDirective {
          */
         this.expandedKeysChange = new EventEmitter();
         this.subscriptions = new Subscription();
-        this._expandedKeys = [];
-        this.originalExpandedKeys = [];
+        /**
+         * Reflectes the internal `expandedKeys` state.
+         */
+        this.state = new Set();
+        this.originalExpandedKeys = new Set();
         this.isFiltered = false;
         /**
          * Fills array with the correct expand keys according to wrapper metadata.
@@ -64,7 +68,7 @@ let ExpandDirective = class ExpandDirective {
         if (this.component.filterStateChange) {
             this.subscriptions.add(this.component.filterStateChange.subscribe(this.handleAutoExpand.bind(this)));
         }
-        this.component.isExpanded = (dataItem, index) => this.expandedKeys.indexOf(this.itemKey({ dataItem, index })) > -1;
+        this.component.isExpanded = (dataItem, index) => this.state.has(this.itemKey({ dataItem, index }));
     }
     /**
      * @hidden
@@ -76,14 +80,10 @@ let ExpandDirective = class ExpandDirective {
         const settings = isBoolean(this.expandOnFilter) ? { enabled: this.expandOnFilter } : Object.assign({}, this.expandOnFilter, { enabled: true });
         return Object.assign({}, DEFAULT_FILTER_EXPAND_SETTINGS, settings);
     }
-    /**
-     * Defines the collection that will store the expanded keys.
-     */
-    get expandedKeys() {
-        return this._expandedKeys;
-    }
-    set expandedKeys(keys) {
-        this._expandedKeys = keys;
+    ngOnChanges(changes) {
+        if (isChanged('expandedKeys', changes, false) && changes.expandedKeys.currentValue !== this.lastChange) {
+            this.state = new Set(changes.expandedKeys.currentValue);
+        }
     }
     ngOnDestroy() {
         this.subscriptions.unsubscribe();
@@ -103,19 +103,19 @@ let ExpandDirective = class ExpandDirective {
         return e.index;
     }
     toggleExpand({ index, dataItem, expand }) {
-        const item = this.itemKey({ index, dataItem });
-        const idx = this.expandedKeys.indexOf(item);
+        const key = this.itemKey({ index, dataItem });
+        const isExpanded = this.state.has(key);
         let notify = false;
-        if (idx > -1 && !expand) {
-            this.expandedKeys.splice(idx, 1);
+        if (isExpanded && !expand) {
+            this.state.delete(key);
             notify = true;
         }
-        else if (idx === -1 && expand) {
-            this.expandedKeys.push(item);
+        else if (!isExpanded && expand) {
+            this.state.add(key);
             notify = true;
         }
         if (notify) {
-            this.expandedKeysChange.emit(this.expandedKeys);
+            this.notify();
         }
     }
     handleAutoExpand({ nodes, matchCount, term }) {
@@ -124,7 +124,7 @@ let ExpandDirective = class ExpandDirective {
         }
         const { maxAutoExpandResults, expandMatches: autoExpandMatches, expandedOnClear } = this.filterExpandSettings;
         if (!this.isFiltered) {
-            this.originalExpandedKeys = this.expandedKeys.slice();
+            this.originalExpandedKeys = new Set(this.state);
         }
         const exitingFilteredState = this.isFiltered && !term;
         const maxExceeded = maxAutoExpandResults !== -1 && matchCount > maxAutoExpandResults;
@@ -132,18 +132,18 @@ let ExpandDirective = class ExpandDirective {
         if (exitAutoExpandedState) {
             switch (expandedOnClear) {
                 case "initial": {
-                    if (!sameValues(this.expandedKeys, this.originalExpandedKeys)) {
-                        this.expandedKeys = this.originalExpandedKeys;
-                        this.expandedKeysChange.emit(this.expandedKeys);
+                    if (!sameValues(this.state, this.originalExpandedKeys)) {
+                        this.state = this.originalExpandedKeys;
+                        this.notify();
                     }
                     break;
                 }
                 case "all": {
-                    this.expandedKeys = nodes.reduce((acc, rootNode) => {
+                    this.state = new Set(nodes.reduce((acc, rootNode) => {
                         this.getEveryExpandKey(acc, rootNode);
                         return acc;
-                    }, []);
-                    this.expandedKeysChange.emit(this.expandedKeys);
+                    }, []));
+                    this.notify();
                     break;
                 }
                 case "unchanged": {
@@ -151,9 +151,9 @@ let ExpandDirective = class ExpandDirective {
                 }
                 case "none":
                 default: {
-                    if (this.expandedKeys.length !== 0) {
-                        this.expandedKeys = [];
-                        this.expandedKeysChange.emit(this.expandedKeys);
+                    if (this.state.size !== 0) {
+                        this.state.clear();
+                        this.notify();
                     }
                     break;
                 }
@@ -161,16 +161,20 @@ let ExpandDirective = class ExpandDirective {
             this.isFiltered = false;
             return;
         }
-        const indicesToExpand = nodes.reduce((acc, rootNode) => {
+        const indicesToExpand = new Set(nodes.reduce((acc, rootNode) => {
             this.updateExpandedNodes(acc, rootNode, autoExpandMatches);
             return acc;
-        }, []);
-        if (!sameValues(this.expandedKeys, indicesToExpand)) {
-            this.expandedKeys = indicesToExpand;
-            this.expandedKeysChange.emit(this.expandedKeys);
+        }, []));
+        if (!sameValues(this.state, indicesToExpand)) {
+            this.state = indicesToExpand;
+            this.notify();
         }
         this.isFiltered = true;
     }
+    notify() {
+        this.lastChange = Array.from(this.state);
+        this.expandedKeysChange.emit(this.lastChange);
+    }
 };
 tslib_1.__decorate([
     Input(),
@@ -191,9 +195,8 @@ tslib_1.__decorate([
 ], ExpandDirective.prototype, "expandedKeysChange", void 0);
 tslib_1.__decorate([
     Input(),
-    tslib_1.__metadata("design:type", Array),
-    tslib_1.__metadata("design:paramtypes", [Array])
-], ExpandDirective.prototype, "expandedKeys", null);
+    tslib_1.__metadata("design:type", Array)
+], ExpandDirective.prototype, "expandedKeys", void 0);
 ExpandDirective = tslib_1.__decorate([
     Directive({ selector: '[kendoTreeViewExpandable]' }),
     tslib_1.__metadata("design:paramtypes", [ExpandableComponent])