@koobiq/components 16.0.0-beta.14 → 16.0.0-beta.16

package/fesm2022/koobiq-components-tree.mjs

@@ -357,7 +357,7 @@ class KbqTreeNodeToggleBaseDirective extends KbqTreeNodeToggleMixinBase {
         this.treeNode = treeNode;
         this._recursive = false;
         this.tree.treeControl.filterValue
-            .subscribe((value) => this.disabled = !!value);
+            .subscribe((value) => this.disabled = !!value?.length);
     }
     toggle(event) {
         if (this.disabled) {
@@ -819,21 +819,21 @@ class BaseTreeControl {
     }
     /** Toggles one single data node's expanded/collapsed state. */
     toggle(dataNode) {
-        if (this.filterValue.value) {
+        if (this.filterValue.value?.length) {
             return;
         }
         this.expansionModel.toggle(dataNode);
     }
     /** Expands one single data node. */
     expand(dataNode) {
-        if (this.filterValue.value) {
+        if (this.filterValue.value?.length) {
             return;
         }
         this.expansionModel.select(dataNode);
     }
     /** Collapses one single data node. */
     collapse(dataNode) {
-        if (this.filterValue.value) {
+        if (this.filterValue.value?.length) {
             return;
         }
         this.expansionModel.deselect(dataNode);
@@ -866,6 +866,53 @@ class BaseTreeControl {
     }
 }
 
+class FilterByViewValue {
+    constructor(control) {
+        this.control = control;
+    }
+    handle(value) {
+        const viewValue = value || null;
+        this.result = this.control.dataNodes
+            .filter((node) => this.control.compareViewValues(this.control.getViewValue(node), viewValue));
+        return this.result;
+    }
+}
+class FilterParentsForNodes {
+    constructor(control) {
+        this.control = control;
+    }
+    handle(_, prevFilter) {
+        const result = new Set();
+        this.control.dataNodes
+            .filter((node) => prevFilter?.result.includes(node))
+            .forEach((node) => {
+            this.control.getParents(node, [])
+                .forEach((parent) => result.add(parent));
+            result.add(node);
+        });
+        this.result = Array.from(result);
+        return this.result;
+    }
+}
+class FilterByValues {
+    constructor(control) {
+        this.control = control;
+        this.values = [];
+        this.setValues = (values) => {
+            this.values = values;
+        };
+    }
+    handle(_, prevFilter) {
+        const found = this.control.dataNodes
+            .filter((node) => this.values.includes(this.control.getValue(node)));
+        this.result = Array.from(new Set([...(prevFilter?.result || []), ...found]));
+        return this.result;
+    }
+    getValues() {
+        return this.values;
+    }
+}
+
 function defaultCompareValues(firstValue, secondValue) {
     return firstValue === secondValue;
 }
@@ -894,6 +941,13 @@ class FlatTreeControl extends BaseTreeControl {
         this.compareValues = compareValues;
         this.compareViewValues = compareViewValues;
         this.isDisabled = isDisabled;
+        this.setFilters(new FilterByViewValue(this), new FilterParentsForNodes(this));
+    }
+    getFilters() {
+        return this.filters;
+    }
+    setFilters(...filters) {
+        this.filters = filters;
     }
     /**
      * Gets a list of the data node's subtree of descendent data nodes.
@@ -936,62 +990,36 @@ class FlatTreeControl extends BaseTreeControl {
     hasValue(value) {
         return this.dataNodes.find((node) => this.compareValues(this.getValue(node), value));
     }
-    filterNodes(value) {
+    filterNodes(value = null) {
         this.saveExpansionState();
-        this.filterModel.clear();
-        this.expansionModel.clear();
-        const filteredNodes = this.dataNodes
-            .filter((node) => this.compareViewValues(this.getViewValue(node), value));
-        const filteredNodesWithTheirParents = new Set();
-        filteredNodes.forEach((filteredNode) => {
-            this.getParents(filteredNode, [])
-                .forEach((node) => {
-                filteredNodesWithTheirParents.add(node);
-                this.expandDataNode(node);
-            });
-            filteredNodesWithTheirParents.add(filteredNode);
-            this.expandDataNode(filteredNode);
-            if (this.isExpandable(filteredNode)) {
-                const childNodeLevel = this.getLevel(filteredNode) + 1;
-                this.getDescendants(filteredNode)
-                    .filter((childNode) => this.getLevel(childNode) === childNodeLevel)
-                    .filter((childNode) => !this.isExpandable(childNode) || !this.hasFilteredDescendant(childNode, filteredNodes))
-                    .forEach((childNode) => {
-                    filteredNodesWithTheirParents.add(childNode);
-                    this.expandDataNode(childNode);
-                });
-            }
+        let result = [];
+        this.filters
+            .forEach((filter, index, filters) => {
+            const prevFilter = filters[index - 1] || null;
+            result = filter.handle(value, prevFilter);
         });
-        this.filterModel.select(...Array.from(filteredNodesWithTheirParents));
-        this.updateFilterValue(value);
-        Promise.resolve().then(() => this.restoreExpansionState());
+        this.filterModel.clear();
+        this.filterModel.select(...result);
+        // set current expansion state according to filtered tree
+        this.expansionModel.setSelection(...result.filter((node) => this.isExpandable(node)));
+        this.updateFilterValue(value || result);
+        Promise.resolve()
+            .then(() => this.restoreExpansionState());
     }
     updateFilterValue(value) {
-        Promise.resolve().then(() => this.filterValue.next(value));
-    }
-    expandDataNode(dataNode) {
-        if (this.isExpandable(dataNode)) {
-            this.expansionModel.select(dataNode);
-        }
+        Promise.resolve()
+            .then(() => this.filterValue.next(value));
     }
     saveExpansionState() {
-        if (!this.filterValue.value) {
+        if (!this.filterValue.value?.length) {
             this.expandedItemsBeforeFiltration = this.expansionModel.selected;
         }
     }
     restoreExpansionState() {
-        if (!this.filterValue.value) {
-            this.expansionModel.clear();
-            this.expansionModel.select(...this.expandedItemsBeforeFiltration);
+        if (!this.filterValue.value?.length) {
+            this.expansionModel.setSelection(...this.expandedItemsBeforeFiltration);
         }
     }
-    hasFilteredDescendant(dataNode, filteredNodes) {
-        const filteredViewValues = filteredNodes
-            .map((node) => this.getViewValue(node));
-        return this.getDescendants(dataNode)
-            .filter((node) => filteredViewValues.includes(this.getViewValue(node)))
-            .length > 0;
-    }
 }
 
 /* tslint:disable:no-empty */
@@ -1811,5 +1839,5 @@ class KbqTreeNestedDataSource extends DataSource {
  * Generated bundle index. Do not edit.
  */
 
-export { BaseTreeControl, FlatTreeControl, KBQ_SELECTION_TREE_VALUE_ACCESSOR, KBQ_TREE_OPTION_PARENT_COMPONENT, KbqTree, KbqTreeBase, KbqTreeCopyEvent, KbqTreeFlatDataSource, KbqTreeFlattener, KbqTreeModule, KbqTreeNavigationChange, KbqTreeNestedDataSource, KbqTreeNode, KbqTreeNodeDef, KbqTreeNodeOutlet, KbqTreeNodeOutletContext, KbqTreeNodePadding, KbqTreeNodeToggleBase, KbqTreeNodeToggleBaseDirective, KbqTreeNodeToggleComponent, KbqTreeNodeToggleDirective, KbqTreeNodeToggleMixinBase, KbqTreeOption, KbqTreeOptionChange, KbqTreeSelectAllEvent, KbqTreeSelection, KbqTreeSelectionChange, NestedTreeControl, defaultCompareValues, defaultCompareViewValues };
+export { BaseTreeControl, FilterByValues, FilterByViewValue, FilterParentsForNodes, FlatTreeControl, KBQ_SELECTION_TREE_VALUE_ACCESSOR, KBQ_TREE_OPTION_PARENT_COMPONENT, KbqTree, KbqTreeBase, KbqTreeCopyEvent, KbqTreeFlatDataSource, KbqTreeFlattener, KbqTreeModule, KbqTreeNavigationChange, KbqTreeNestedDataSource, KbqTreeNode, KbqTreeNodeDef, KbqTreeNodeOutlet, KbqTreeNodeOutletContext, KbqTreeNodePadding, KbqTreeNodeToggleBase, KbqTreeNodeToggleBaseDirective, KbqTreeNodeToggleComponent, KbqTreeNodeToggleDirective, KbqTreeNodeToggleMixinBase, KbqTreeOption, KbqTreeOptionChange, KbqTreeSelectAllEvent, KbqTreeSelection, KbqTreeSelectionChange, NestedTreeControl, defaultCompareValues, defaultCompareViewValues };
 //# sourceMappingURL=koobiq-components-tree.mjs.map