@itwin/tree-widget-react 3.15.1 → 3.16.0

package/lib/cjs/tree-widget-react/components/trees/models-tree/internal/ModelsTreeVisibilityHandler.js

@@ -31,49 +31,49 @@ function createModelsTreeVisibilityHandler(props) {
     return new ModelsTreeVisibilityHandlerImpl(props);
 }
 class ModelsTreeVisibilityHandlerImpl {
-    _props;
-    _eventListener;
-    _alwaysAndNeverDrawnElements;
-    _idsCache;
-    _filteredTree;
-    _elementChangeQueue = new rxjs_1.Subject();
-    _subscriptions = [];
-    _changeRequest = new rxjs_1.Subject();
-    constructor(_props) {
-        this._props = _props;
-        this._eventListener = (0, VisibilityChangeEventListener_js_1.createVisibilityChangeEventListener)(_props.viewport);
-        this._alwaysAndNeverDrawnElements = new AlwaysAndNeverDrawnElementInfo_js_1.AlwaysAndNeverDrawnElementInfo(_props.viewport);
-        this._idsCache = this._props.idsCache;
-        this._filteredTree = _props.filteredPaths ? (0, FilteredTree_js_1.createFilteredTree)(this._props.imodelAccess, _props.filteredPaths) : undefined;
-        this._subscriptions.push(this._elementChangeQueue.pipe((0, rxjs_1.concatAll)()).subscribe());
+    #eventListener;
+    #alwaysAndNeverDrawnElements;
+    #idsCache;
+    #filteredTree;
+    #elementChangeQueue = new rxjs_1.Subject();
+    #subscriptions = [];
+    #changeRequest = new rxjs_1.Subject();
+    #props;
+    constructor(props) {
+        this.#props = props;
+        this.#eventListener = (0, VisibilityChangeEventListener_js_1.createVisibilityChangeEventListener)(this.#props.viewport);
+        this.#alwaysAndNeverDrawnElements = new AlwaysAndNeverDrawnElementInfo_js_1.AlwaysAndNeverDrawnElementInfo(this.#props.viewport, this.#props.componentId);
+        this.#idsCache = this.#props.idsCache;
+        this.#filteredTree = this.#props.filteredPaths ? (0, FilteredTree_js_1.createFilteredTree)(this.#props.imodelAccess, this.#props.filteredPaths) : undefined;
+        this.#subscriptions.push(this.#elementChangeQueue.pipe((0, rxjs_1.concatAll)()).subscribe());
     }
     get onVisibilityChange() {
-        return this._eventListener.onVisibilityChange;
+        return this.#eventListener.onVisibilityChange;
     }
     async getVisibilityStatus(node) {
         return (0, rxjs_1.firstValueFrom)(this.getVisibilityStatusObs(node).pipe(
         // unsubscribe from the observable if the change request for this node is received
-        (0, rxjs_1.takeUntil)(this._changeRequest.pipe((0, rxjs_1.filter)(({ key, depth }) => depth === node.parentKeys.length && presentation_hierarchies_1.HierarchyNodeKey.equals(node.key, key)))), 
+        (0, rxjs_1.takeUntil)(this.#changeRequest.pipe((0, rxjs_1.filter)(({ key, depth }) => depth === node.parentKeys.length && presentation_hierarchies_1.HierarchyNodeKey.equals(node.key, key)))), 
         // unsubscribe if visibility changes
         (0, rxjs_1.takeUntil)((0, rxjs_1.fromEventPattern)((handler) => {
-            this._eventListener.onVisibilityChange.addListener(handler);
+            this.#eventListener.onVisibilityChange.addListener(handler);
         }, (handler) => {
-            this._eventListener.onVisibilityChange.removeListener(handler);
+            this.#eventListener.onVisibilityChange.removeListener(handler);
         })), (0, rxjs_1.defaultIfEmpty)((0, Tooltip_js_1.createVisibilityStatus)("hidden"))));
     }
     async changeVisibility(node, shouldDisplay) {
         // notify about new change request
-        this._changeRequest.next({ key: node.key, depth: node.parentKeys.length });
+        this.#changeRequest.next({ key: node.key, depth: node.parentKeys.length });
         const changeObservable = this.changeVisibilityObs(node, shouldDisplay).pipe(
         // unsubscribe from the observable if the change request for this node is received
-        (0, rxjs_1.takeUntil)(this._changeRequest.pipe((0, rxjs_1.filter)(({ key, depth }) => depth === node.parentKeys.length && presentation_hierarchies_1.HierarchyNodeKey.equals(node.key, key)))), (0, rxjs_1.tap)({
+        (0, rxjs_1.takeUntil)(this.#changeRequest.pipe((0, rxjs_1.filter)(({ key, depth }) => depth === node.parentKeys.length && presentation_hierarchies_1.HierarchyNodeKey.equals(node.key, key)))), (0, rxjs_1.tap)({
             subscribe: () => {
-                this._eventListener.suppressChangeEvents();
-                this._alwaysAndNeverDrawnElements.suppressChangeEvents();
+                this.#eventListener.suppressChangeEvents();
+                this.#alwaysAndNeverDrawnElements.suppressChangeEvents();
             },
             finalize: () => {
-                this._eventListener.resumeChangeEvents();
-                this._alwaysAndNeverDrawnElements.resumeChangeEvents();
+                this.#eventListener.resumeChangeEvents();
+                this.#alwaysAndNeverDrawnElements.resumeChangeEvents();
             },
         }));
         return (0, Rxjs_js_1.toVoidPromise)(changeObservable);
@@ -82,20 +82,23 @@ class ModelsTreeVisibilityHandlerImpl {
         this[Symbol.dispose]();
     }
     [Symbol.dispose]() {
-        this._eventListener[Symbol.dispose]();
-        this._alwaysAndNeverDrawnElements[Symbol.dispose]();
-        this._subscriptions.forEach((x) => x.unsubscribe());
+        this.#eventListener[Symbol.dispose]();
+        this.#alwaysAndNeverDrawnElements[Symbol.dispose]();
+        this.#subscriptions.forEach((x) => x.unsubscribe());
     }
     getVisibilityStatusObs(node) {
-        if (node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
-            return this.getFilteredNodeVisibility({ node });
-        }
         if (presentation_hierarchies_1.HierarchyNode.isClassGroupingNode(node)) {
+            if (node.extendedData?.hasDirectNonFilteredTargets && !node.filtering?.hasFilterTargetAncestor) {
+                return this.getFilteredNodeVisibility({ node });
+            }
             return this.getClassGroupingNodeDisplayStatus(node);
         }
         if (!presentation_hierarchies_1.HierarchyNode.isInstancesNode(node)) {
             return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("disabled"));
         }
+        if (node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
+            return this.getFilteredNodeVisibility({ node });
+        }
         if (ModelsTreeNode_js_1.ModelsTreeNode.isSubjectNode(node)) {
             // note: subject nodes may be merged to represent multiple subject instances
             return this.getSubjectNodeVisibilityStatus({ subjectIds: node.key.instanceKeys.map((key) => key.id) });
@@ -118,13 +121,14 @@ class ModelsTreeVisibilityHandlerImpl {
             return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("disabled"));
         }
         return this.getElementDisplayStatus({
-            elementId: node.key.instanceKeys[0].id,
+            elementIds: node.key.instanceKeys.map(({ id }) => id),
             modelId,
             categoryId,
         });
     }
     getFilteredNodeVisibility(props) {
-        return (0, rxjs_1.from)(this.getVisibilityChangeTargets(props)).pipe((0, rxjs_1.mergeMap)(({ subjects, models, categories, elements }) => {
+        (0, core_bentley_1.assert)(this.#filteredTree !== undefined);
+        return (0, rxjs_1.from)(this.#filteredTree).pipe((0, rxjs_1.map)((filteredTree) => filteredTree.getVisibilityChangeTargets(props.node)), (0, rxjs_1.mergeMap)(({ subjects, models, categories, elements }) => {
             const observables = new Array();
             if (subjects?.size) {
                 observables.push(this.getSubjectNodeVisibilityStatus({ subjectIds: [...subjects], ignoreTooltip: true }));
@@ -139,9 +143,13 @@ class ModelsTreeVisibilityHandlerImpl {
                 })));
             }
             if (elements?.size) {
-                observables.push((0, rxjs_1.from)(elements).pipe((0, Utils_js_1.releaseMainThreadOnItemsCount)(50), (0, rxjs_1.mergeMap)(([categoryKey, elementIds]) => {
+                observables.push((0, rxjs_1.from)(elements).pipe((0, Utils_js_1.releaseMainThreadOnItemsCount)(50), (0, rxjs_1.mergeMap)(([categoryKey, elementsMap]) => {
                     const { modelId, categoryId } = (0, FilteredTree_js_1.parseCategoryKey)(categoryKey);
-                    return (0, rxjs_1.from)(elementIds).pipe((0, Utils_js_1.releaseMainThreadOnItemsCount)(1000), (0, rxjs_1.mergeMap)((elementId) => this.getElementDisplayStatus({ modelId, categoryId, elementId, ignoreTooltip: true })));
+                    return this.getElementsDisplayStatus({
+                        elementIds: [...elementsMap.keys()],
+                        modelId,
+                        categoryId,
+                    });
                 })));
             }
             return (0, rxjs_1.merge)(...observables);
@@ -149,49 +157,49 @@ class ModelsTreeVisibilityHandlerImpl {
     }
     getSubjectNodeVisibilityStatus({ subjectIds, ignoreTooltip }) {
         const result = (0, rxjs_1.defer)(() => {
-            if (!this._props.viewport.view.isSpatialView()) {
+            if (!this.#props.viewport.view.isSpatialView()) {
                 return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("disabled", getTooltipOptions("modelsTree.subject.nonSpatialView", ignoreTooltip)));
             }
-            return (0, rxjs_1.from)(this._idsCache.getSubjectModelIds(subjectIds)).pipe((0, rxjs_1.mergeMap)((modelIds) => this.getModelVisibilityStatus({ modelIds, ignoreTooltip: true })), mergeVisibilityStatuses({
+            return (0, rxjs_1.from)(this.#idsCache.getSubjectModelIds(subjectIds)).pipe((0, rxjs_1.mergeMap)((modelIds) => this.getModelVisibilityStatus({ modelIds, ignoreTooltip: true })), mergeVisibilityStatuses({
                 visible: "modelsTree.subject.allModelsVisible",
                 hidden: "modelsTree.subject.allModelsHidden",
                 partial: "modelsTree.subject.someModelsHidden",
             }, ignoreTooltip));
         });
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { ids: subjectIds }, result, this._props.overrides?.getSubjectNodeVisibility);
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { ids: subjectIds }, result, this.#props.overrides?.getSubjectNodeVisibility);
     }
     getModelVisibilityStatus({ modelIds, ignoreTooltip }) {
         const result = (0, rxjs_1.defer)(() => {
-            const viewport = this._props.viewport;
+            const viewport = this.#props.viewport;
             if (!viewport.view.isSpatialView()) {
                 return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("disabled", getTooltipOptions("modelsTree.model.nonSpatialView", ignoreTooltip)));
             }
-            return (0, rxjs_1.from)(modelIds).pipe((0, rxjs_1.distinct)(), (0, rxjs_1.mergeMap)((modelId) => {
+            return (0, rxjs_1.from)(core_bentley_1.Id64.iterable(modelIds)).pipe((0, rxjs_1.distinct)(), (0, rxjs_1.mergeMap)((modelId) => {
                 if (!viewport.view.viewsModel(modelId)) {
-                    return (0, rxjs_1.from)(this._idsCache.getModelCategories(modelId)).pipe((0, rxjs_1.mergeMap)((categoryIds) => (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(modelId, categoryIds))), this.getSubModeledElementsVisibilityStatus({
+                    return (0, rxjs_1.from)(this.#idsCache.getModelCategories(modelId)).pipe((0, rxjs_1.mergeMap)((categoryIds) => (0, rxjs_1.from)(this.#idsCache.getCategoriesModeledElements(modelId, categoryIds))), this.getSubModeledElementsVisibilityStatus({
                         ignoreTooltips: ignoreTooltip,
                         haveSubModel: "yes",
                         tooltips: { visible: undefined, hidden: "modelsTree.model.hiddenThroughModelSelector", partial: "modelsTree.model.someSubModelsVisible" },
                         parentNodeVisibilityStatus: (0, Tooltip_js_1.createVisibilityStatus)("hidden"),
                     }));
                 }
-                return (0, rxjs_1.from)(this._idsCache.getModelCategories(modelId)).pipe((0, rxjs_1.mergeMap)((categoryIds) => categoryIds.length === 0 ? (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("visible")) : this.getCategoryDisplayStatus({ modelId, categoryIds, ignoreTooltip: true })), mergeVisibilityStatuses({
+                return (0, rxjs_1.from)(this.#idsCache.getModelCategories(modelId)).pipe((0, rxjs_1.mergeMap)((categoryIds) => categoryIds.length === 0 ? (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("visible")) : this.getCategoryDisplayStatus({ modelId, categoryIds, ignoreTooltip: true })), mergeVisibilityStatuses({
                     visible: "modelsTree.model.allCategoriesVisible",
                     partial: "modelsTree.model.someCategoriesHidden",
                     hidden: "modelsTree.model.allCategoriesHidden",
                 }));
             }), mergeVisibilityStatuses());
         });
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { ids: modelIds }, result, this._props.overrides?.getModelDisplayStatus);
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { ids: modelIds }, result, this.#props.overrides?.getModelDisplayStatus);
     }
     getDefaultCategoryVisibilityStatus({ modelId, categoryIds, ignoreTooltip, }) {
-        const viewport = this._props.viewport;
+        const viewport = this.#props.viewport;
         if (!viewport.view.viewsModel(modelId) || core_bentley_1.Id64.sizeOf(categoryIds) === 0) {
             return (0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.category.hiddenThroughModel", ignoreTooltip));
         }
         let visibility = "unknown";
         for (const categoryId of core_bentley_1.Id64.iterable(categoryIds)) {
-            const override = this._props.viewport.perModelCategoryVisibility.getOverride(modelId, categoryId);
+            const override = this.#props.viewport.perModelCategoryVisibility.getOverride(modelId, categoryId);
             if (override === core_frontend_1.PerModelCategoryVisibility.Override.Show) {
                 if (visibility === "hidden") {
                     return (0, Tooltip_js_1.createVisibilityStatus)("partial");
@@ -220,8 +228,8 @@ class ModelsTreeVisibilityHandlerImpl {
     }
     getCategoryDisplayStatus({ ignoreTooltip, ...props }) {
         const result = (0, rxjs_1.defer)(() => {
-            if (!this._props.viewport.view.viewsModel(props.modelId)) {
-                return (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(props.modelId, props.categoryIds)).pipe(this.getSubModeledElementsVisibilityStatus({
+            if (!this.#props.viewport.view.viewsModel(props.modelId)) {
+                return (0, rxjs_1.from)(this.#idsCache.getCategoriesModeledElements(props.modelId, props.categoryIds)).pipe(this.getSubModeledElementsVisibilityStatus({
                     ignoreTooltips: ignoreTooltip,
                     parentNodeVisibilityStatus: (0, Tooltip_js_1.createVisibilityStatus)("hidden"),
                     tooltips: {
@@ -245,7 +253,7 @@ class ModelsTreeVisibilityHandlerImpl {
                     : this.getDefaultCategoryVisibilityStatus({ modelId: props.modelId, categoryIds: props.categoryIds }),
                 ignoreTooltip,
             }).pipe((0, rxjs_1.mergeMap)((visibilityStatusAlwaysAndNeverDraw) => {
-                return (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(props.modelId, props.categoryIds)).pipe(this.getSubModeledElementsVisibilityStatus({
+                return (0, rxjs_1.from)(this.#idsCache.getCategoriesModeledElements(props.modelId, props.categoryIds)).pipe(this.getSubModeledElementsVisibilityStatus({
                     tooltips: {
                         visible: undefined,
                         hidden: "modelsTree.category.allElementsAndSubModelsHidden",
@@ -257,14 +265,30 @@ class ModelsTreeVisibilityHandlerImpl {
                 }));
             }));
         });
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this._props.overrides?.getCategoryDisplayStatus);
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this.#props.overrides?.getCategoryDisplayStatus);
     }
     getClassGroupingNodeDisplayStatus(node) {
-        const result = (0, rxjs_1.defer)(() => {
-            const info = this.getGroupingNodeInfo(node);
-            const { modelId, categoryId, elementIds } = info;
-            if (!this._props.viewport.view.viewsModel(modelId)) {
-                return (0, rxjs_1.of)([...elementIds]).pipe(this.getSubModeledElementsVisibilityStatus({
+        const { elementIds, modelId, categoryId } = this.getGroupingNodeInfo(node);
+        const result = this.getElementsDisplayStatus({
+            elementIds,
+            modelId,
+            categoryId,
+        });
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { node }, result, this.#props.overrides?.getElementGroupingNodeDisplayStatus);
+    }
+    getElementDisplayStatus({ elementIds, modelId, categoryId, }) {
+        const result = this.getElementsDisplayStatus({
+            elementIds,
+            modelId,
+            categoryId,
+        });
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { elementId: elementIds[0], modelId, categoryId }, result, this.#props.overrides?.getElementDisplayStatus);
+    }
+    getElementsDisplayStatus(props) {
+        return (0, rxjs_1.defer)(() => {
+            const { modelId, categoryId, elementIds } = props;
+            if (!this.#props.viewport.view.viewsModel(modelId)) {
+                return (0, rxjs_1.of)(elementIds).pipe(this.getSubModeledElementsVisibilityStatus({
                     tooltips: {
                         visible: undefined,
                         hidden: undefined,
@@ -287,7 +311,7 @@ class ModelsTreeVisibilityHandlerImpl {
                     noElementsInExclusiveAlwaysDrawnList: "modelsTree.groupingNode.allElementsHidden",
                 },
             }).pipe((0, rxjs_1.mergeMap)((visibilityStatusAlwaysAndNeverDraw) => {
-                return (0, rxjs_1.of)([...elementIds]).pipe(this.getSubModeledElementsVisibilityStatus({
+                return (0, rxjs_1.of)(elementIds).pipe(this.getSubModeledElementsVisibilityStatus({
                     tooltips: {
                         visible: undefined,
                         hidden: "modelsTree.groupingNode.allElementsAndSubModelsHidden",
@@ -298,80 +322,22 @@ class ModelsTreeVisibilityHandlerImpl {
                 }));
             }));
         });
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { node }, result, this._props.overrides?.getElementGroupingNodeDisplayStatus);
-    }
-    getElementOverriddenVisibility(elementId, ignoreTooltip) {
-        const viewport = this._props.viewport;
-        if (viewport.neverDrawn?.has(elementId)) {
-            return (0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.element.hiddenThroughNeverDrawnList", ignoreTooltip));
-        }
-        if (viewport.alwaysDrawn?.size) {
-            if (viewport.alwaysDrawn.has(elementId)) {
-                return (0, Tooltip_js_1.createVisibilityStatus)("visible", getTooltipOptions("modelsTree.element.displayedThroughAlwaysDrawnList", ignoreTooltip));
-            }
-            if (viewport.isAlwaysDrawnExclusive) {
-                return (0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.element.hiddenDueToOtherElementsExclusivelyAlwaysDrawn", ignoreTooltip));
-            }
-        }
-        return undefined;
-    }
-    getElementVisibility(ignoreTooltip, viewsModel, overriddenVisibility, categoryVisibility, subModelVisibilityStatus) {
-        if (subModelVisibilityStatus === undefined) {
-            if (!viewsModel) {
-                return (0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.element.hiddenThroughModel", ignoreTooltip));
-            }
-            if (overriddenVisibility) {
-                return overriddenVisibility;
-            }
-            return (0, Tooltip_js_1.createVisibilityStatus)(categoryVisibility.state, getTooltipOptions(categoryVisibility.state === "visible" ? undefined : "modelsTree.element.hiddenThroughCategory", ignoreTooltip));
-        }
-        if (subModelVisibilityStatus.state === "partial") {
-            return (0, Tooltip_js_1.createVisibilityStatus)("partial", getTooltipOptions("modelsTree.element.someElementsAreHidden", ignoreTooltip));
-        }
-        if (subModelVisibilityStatus.state === "visible") {
-            if (!viewsModel || overriddenVisibility?.state === "hidden" || (categoryVisibility.state === "hidden" && !overriddenVisibility)) {
-                return (0, Tooltip_js_1.createVisibilityStatus)("partial", getTooltipOptions("modelsTree.element.partialThroughSubModel", ignoreTooltip));
-            }
-            return (0, Tooltip_js_1.createVisibilityStatus)("visible", getTooltipOptions(undefined, ignoreTooltip));
-        }
-        if (!viewsModel) {
-            return (0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.element.hiddenThroughModel", ignoreTooltip));
-        }
-        if (overriddenVisibility) {
-            if (overriddenVisibility.state === "hidden") {
-                return overriddenVisibility;
-            }
-            return (0, Tooltip_js_1.createVisibilityStatus)("partial", getTooltipOptions("modelsTree.element.partialThroughElement", ignoreTooltip));
-        }
-        if (categoryVisibility.state === "visible") {
-            return (0, Tooltip_js_1.createVisibilityStatus)("partial", getTooltipOptions("modelsTree.element.partialThroughCategory", ignoreTooltip));
-        }
-        return (0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.element.hiddenThroughCategory", ignoreTooltip));
-    }
-    getElementDisplayStatus({ ignoreTooltip, ...props }) {
-        const result = (0, rxjs_1.defer)(() => {
-            const viewport = this._props.viewport;
-            const { elementId, modelId, categoryId } = props;
-            const viewsModel = viewport.view.viewsModel(modelId);
-            const elementStatus = this.getElementOverriddenVisibility(elementId, ignoreTooltip);
-            return (0, rxjs_1.from)(this._idsCache.hasSubModel(elementId)).pipe((0, rxjs_1.mergeMap)((hasSubModel) => (hasSubModel ? this.getModelVisibilityStatus({ modelIds: [elementId] }) : (0, rxjs_1.of)(undefined))), (0, rxjs_1.map)((subModelVisibilityStatus) => this.getElementVisibility(ignoreTooltip, viewsModel, elementStatus, 
-            // Single category will always return "visible" or "hidden"
-            this.getDefaultCategoryVisibilityStatus({ categoryIds: categoryId, modelId, ignoreTooltip: true }), subModelVisibilityStatus)));
-        });
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this._props.overrides?.getElementDisplayStatus);
     }
     /** Changes visibility of the items represented by the tree node. */
     changeVisibilityObs(node, on) {
         const changeObs = (0, rxjs_1.defer)(() => {
-            if (node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
-                return this.changeFilteredNodeVisibility({ node, on });
-            }
             if (presentation_hierarchies_1.HierarchyNode.isClassGroupingNode(node)) {
+                if (node.extendedData?.hasDirectNonFilteredTargets && !node.filtering?.hasFilterTargetAncestor) {
+                    return this.changeFilteredNodeVisibility({ node, on });
+                }
                 return this.changeElementGroupingNodeState(node, on);
             }
             if (!presentation_hierarchies_1.HierarchyNode.isInstancesNode(node)) {
                 return rxjs_1.EMPTY;
             }
+            if (node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
+                return this.changeFilteredNodeVisibility({ node, on });
+            }
             if (ModelsTreeNode_js_1.ModelsTreeNode.isSubjectNode(node)) {
                 return this.changeSubjectNodeState(node.key.instanceKeys.map((key) => key.id), on);
             }
@@ -400,17 +366,14 @@ class ModelsTreeVisibilityHandlerImpl {
                 on,
             });
         });
-        if (this._props.viewport.isAlwaysDrawnExclusive) {
+        if (this.#props.viewport.isAlwaysDrawnExclusive) {
             return (0, rxjs_1.concat)(this.removeAlwaysDrawnExclusive(), changeObs);
         }
         return changeObs;
     }
-    async getVisibilityChangeTargets({ node }) {
-        const filteredTree = await this._filteredTree;
-        return filteredTree ? filteredTree.getVisibilityChangeTargets(node) : {};
-    }
     changeFilteredNodeVisibility({ on, ...props }) {
-        return (0, rxjs_1.from)(this.getVisibilityChangeTargets(props)).pipe((0, rxjs_1.mergeMap)(({ subjects, models, categories, elements }) => {
+        (0, core_bentley_1.assert)(this.#filteredTree !== undefined);
+        return (0, rxjs_1.from)(this.#filteredTree).pipe((0, rxjs_1.map)((filteredTree) => filteredTree.getVisibilityChangeTargets(props.node)), (0, rxjs_1.mergeMap)(({ subjects, models, categories, elements }) => {
             const observables = new Array();
             if (subjects?.size) {
                 observables.push(this.changeSubjectNodeState([...subjects], on));
@@ -425,30 +388,30 @@ class ModelsTreeVisibilityHandlerImpl {
                 })));
             }
             if (elements?.size) {
-                observables.push((0, rxjs_1.from)(elements).pipe((0, rxjs_1.mergeMap)(([categoryKey, elementIds]) => {
+                observables.push((0, rxjs_1.from)(elements).pipe((0, rxjs_1.mergeMap)(([categoryKey, elementsMap]) => {
                     const { modelId, categoryId } = (0, FilteredTree_js_1.parseCategoryKey)(categoryKey);
-                    return this.changeElementsState({ modelId, categoryId, elementIds, on });
+                    return this.changeElementsState({ modelId, categoryId, elementIds: new Set([...elementsMap.keys()]), on });
                 })));
             }
             return (0, rxjs_1.merge)(...observables);
         }));
     }
     removeAlwaysDrawnExclusive() {
-        return (0, rxjs_1.from)(this._idsCache.getAllCategories()).pipe((0, rxjs_1.map)((categoryIds) => {
-            this._props.viewport.changeCategoryDisplay(categoryIds, false, false);
-            this._props.viewport.clearNeverDrawn();
-            this._props.viewport.perModelCategoryVisibility.clearOverrides();
-            this._props.viewport.setAlwaysDrawn(this._props.viewport.alwaysDrawn ?? new Set());
+        return (0, rxjs_1.from)(this.#idsCache.getAllCategories()).pipe((0, rxjs_1.map)((categoryIds) => {
+            this.#props.viewport.changeCategoryDisplay(categoryIds, false, false);
+            this.#props.viewport.clearNeverDrawn();
+            this.#props.viewport.perModelCategoryVisibility.clearOverrides();
+            this.#props.viewport.setAlwaysDrawn(this.#props.viewport.alwaysDrawn ?? new Set());
         }));
     }
     changeSubjectNodeState(ids, on) {
         const result = (0, rxjs_1.defer)(() => {
-            if (!this._props.viewport.view.isSpatialView()) {
+            if (!this.#props.viewport.view.isSpatialView()) {
                 return rxjs_1.EMPTY;
             }
-            return (0, rxjs_1.from)(this._idsCache.getSubjectModelIds(ids)).pipe((0, rxjs_1.mergeMap)((modelIds) => this.changeModelState({ ids: modelIds, on })));
+            return (0, rxjs_1.from)(this.#idsCache.getSubjectModelIds(ids)).pipe((0, rxjs_1.mergeMap)((modelIds) => this.changeModelState({ ids: modelIds, on })));
         });
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { ids, on }, result, this._props.overrides?.changeSubjectNodeState);
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { ids, on }, result, this.#props.overrides?.changeSubjectNodeState);
     }
     changeModelState(props) {
         const { ids, on } = props;
@@ -456,31 +419,31 @@ class ModelsTreeVisibilityHandlerImpl {
             return rxjs_1.EMPTY;
         }
         const result = (0, rxjs_1.defer)(() => {
-            const viewport = this._props.viewport;
+            const viewport = this.#props.viewport;
             if (!viewport.view.isSpatialView()) {
                 return rxjs_1.EMPTY;
             }
             const idsObs = (0, rxjs_1.from)(core_bentley_1.Id64.iterable(ids));
             if (!on) {
                 viewport.changeModelDisplay(ids, false);
-                return idsObs.pipe((0, rxjs_1.mergeMap)(async (modelId) => ({ modelId, categoryIds: await this._idsCache.getModelCategories(modelId) })), (0, rxjs_1.mergeMap)(({ modelId, categoryIds }) => (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(modelId, categoryIds))), (0, rxjs_1.mergeMap)((modeledElementIds) => this.changeModelState({ ids: modeledElementIds, on })));
+                return idsObs.pipe((0, rxjs_1.mergeMap)(async (modelId) => ({ modelId, categoryIds: await this.#idsCache.getModelCategories(modelId) })), (0, rxjs_1.mergeMap)(({ modelId, categoryIds }) => (0, rxjs_1.from)(this.#idsCache.getCategoriesModeledElements(modelId, categoryIds))), (0, rxjs_1.mergeMap)((modeledElementIds) => this.changeModelState({ ids: modeledElementIds, on })));
             }
             return (0, rxjs_1.concat)((0, rxjs_1.defer)(() => {
                 viewport.perModelCategoryVisibility.clearOverrides(ids);
                 return (0, rxjs_1.from)(viewport.addViewedModels(ids));
             }), idsObs.pipe((0, rxjs_1.mergeMap)((modelId) => {
-                return (0, rxjs_1.from)(this._idsCache.getModelCategories(modelId)).pipe((0, rxjs_1.mergeMap)((categoryIds) => this.changeCategoryState({ categoryIds, modelId, on: true })));
+                return (0, rxjs_1.from)(this.#idsCache.getModelCategories(modelId)).pipe((0, rxjs_1.mergeMap)((categoryIds) => this.changeCategoryState({ categoryIds, modelId, on: true })));
             })));
         });
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this._props.overrides?.changeModelState);
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this.#props.overrides?.changeModelState);
     }
     showModelWithoutAnyCategoriesOrElements(modelId) {
-        const viewport = this._props.viewport;
+        const viewport = this.#props.viewport;
         return (0, rxjs_1.forkJoin)({
-            categories: this._idsCache.getModelCategories(modelId),
-            alwaysDrawnElements: this.getAlwaysDrawnElements({ modelId }),
+            categories: this.#idsCache.getModelCategories(modelId),
+            alwaysDrawnElements: this.getAlwaysOrNeverDrawnElements({ modelIds: modelId, setType: "always" }),
         }).pipe((0, rxjs_1.mergeMap)(async ({ categories, alwaysDrawnElements }) => {
-            const alwaysDrawn = this._props.viewport.alwaysDrawn;
+            const alwaysDrawn = this.#props.viewport.alwaysDrawn;
             if (alwaysDrawn && alwaysDrawnElements) {
                 viewport.setAlwaysDrawn(setDifference(alwaysDrawn, alwaysDrawnElements));
             }
@@ -491,7 +454,7 @@ class ModelsTreeVisibilityHandlerImpl {
         }));
     }
     changeCategoryStateInViewportAccordingToModelVisibility(modelId, categoryId, on) {
-        const viewport = this._props.viewport;
+        const viewport = this.#props.viewport;
         const isDisplayedInSelector = viewport.view.viewsCategory(categoryId);
         const override = on === isDisplayedInSelector
             ? core_frontend_1.PerModelCategoryVisibility.Override.None
@@ -507,26 +470,26 @@ class ModelsTreeVisibilityHandlerImpl {
     }
     changeCategoryState(props) {
         const result = (0, rxjs_1.defer)(() => {
-            const viewport = this._props.viewport;
+            const viewport = this.#props.viewport;
             const { modelId, categoryIds, on } = props;
             return (0, rxjs_1.concat)(props.on && !viewport.view.viewsModel(modelId) ? this.showModelWithoutAnyCategoriesOrElements(modelId) : rxjs_1.EMPTY, (0, rxjs_1.defer)(() => {
                 for (const categoryId of core_bentley_1.Id64.iterable(categoryIds)) {
                     this.changeCategoryStateInViewportAccordingToModelVisibility(modelId, categoryId, on);
                 }
                 return this.clearAlwaysAndNeverDrawnElements(props);
-            }), (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(modelId, categoryIds)).pipe((0, rxjs_1.mergeMap)((modeledElementIds) => this.changeModelState({ ids: modeledElementIds, on }))));
+            }), (0, rxjs_1.from)(this.#idsCache.getCategoriesModeledElements(modelId, categoryIds)).pipe((0, rxjs_1.mergeMap)((modeledElementIds) => this.changeModelState({ ids: modeledElementIds, on }))));
         });
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this._props.overrides?.changeCategoryState);
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this.#props.overrides?.changeCategoryState);
     }
     doChangeElementsState(props) {
         return (0, rxjs_1.defer)(() => {
             const { modelId, categoryId, elementIds, on } = props;
-            const viewport = this._props.viewport;
+            const viewport = this.#props.viewport;
             return (0, rxjs_1.concat)(on && !viewport.view.viewsModel(modelId) ? this.showModelWithoutAnyCategoriesOrElements(modelId) : rxjs_1.EMPTY, (0, rxjs_1.defer)(() => {
                 const categoryVisibility = this.getDefaultCategoryVisibilityStatus({ categoryIds: categoryId, modelId, ignoreTooltip: true });
                 const isDisplayedByDefault = categoryVisibility.state === "visible";
                 return this.queueElementsVisibilityChange(elementIds, on, isDisplayedByDefault);
-            }), (0, rxjs_1.from)(elementIds).pipe((0, rxjs_1.mergeMap)(async (elementId) => ({ elementId, isSubModel: await this._idsCache.hasSubModel(elementId) })), (0, rxjs_1.filter)(({ isSubModel }) => isSubModel), (0, rxjs_1.map)(({ elementId }) => elementId), (0, rxjs_1.toArray)(), (0, rxjs_1.mergeMap)((subModelIds) => this.changeModelState({ ids: subModelIds, on }))));
+            }), (0, rxjs_1.from)(elementIds).pipe((0, rxjs_1.mergeMap)(async (elementId) => ({ elementId, isSubModel: await this.#idsCache.hasSubModel(elementId) })), (0, rxjs_1.filter)(({ isSubModel }) => isSubModel), (0, rxjs_1.map)(({ elementId }) => elementId), (0, rxjs_1.toArray)(), (0, rxjs_1.mergeMap)((subModelIds) => this.changeModelState({ ids: subModelIds, on }))));
         });
     }
     /**
@@ -535,7 +498,7 @@ class ModelsTreeVisibilityHandlerImpl {
      */
     changeElementGroupingNodeState(node, on) {
         const result = this.doChangeElementsState({ ...this.getGroupingNodeInfo(node), on });
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { node, on }, result, this._props.overrides?.changeElementGroupingNodeState);
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { node, on }, result, this.#props.overrides?.changeElementGroupingNodeState);
     }
     /**
      * Updates visibility of an element and all its child elements by adding them to the always/never drawn list.
@@ -543,7 +506,7 @@ class ModelsTreeVisibilityHandlerImpl {
      */
     changeElementsState(props) {
         const result = this.doChangeElementsState(props);
-        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this._props.overrides?.changeElementsState);
+        return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this.#props.overrides?.changeElementsState);
     }
     queueElementsVisibilityChange(elementIds, on, visibleByDefault) {
         const finishedSubject = new rxjs_1.Subject();
@@ -558,7 +521,7 @@ class ModelsTreeVisibilityHandlerImpl {
             },
         }));
         // queue visibility change. `changeObservable` will be subscribed to when other queue changes are finished
-        this._elementChangeQueue.next(changeObservable);
+        this.#elementChangeQueue.next(changeObservable);
         // return observable that will emit when visibility change is finished
         return changeFinished.pipe((0, rxjs_1.take)(1), (0, rxjs_1.tap)({
             unsubscribe: () => {
@@ -570,11 +533,11 @@ class ModelsTreeVisibilityHandlerImpl {
     changeElementStateNoChildrenOperator(props) {
         return (elementIds) => {
             const { on, isDisplayedByDefault } = props;
-            const isAlwaysDrawnExclusive = this._props.viewport.isAlwaysDrawnExclusive;
+            const isAlwaysDrawnExclusive = this.#props.viewport.isAlwaysDrawnExclusive;
             return elementIds.pipe((0, Utils_js_1.releaseMainThreadOnItemsCount)(500), (0, rxjs_1.reduce)((acc, elementId) => {
                 if (acc.alwaysDrawn === undefined || acc.neverDrawn === undefined) {
-                    acc.alwaysDrawn = new Set(this._props.viewport.alwaysDrawn || []);
-                    acc.neverDrawn = new Set(this._props.viewport.neverDrawn || []);
+                    acc.alwaysDrawn = new Set(this.#props.viewport.alwaysDrawn || []);
+                    acc.neverDrawn = new Set(this.#props.viewport.neverDrawn || []);
                 }
                 if (on) {
                     const wasRemoved = acc.neverDrawn.delete(elementId);
@@ -601,8 +564,8 @@ class ModelsTreeVisibilityHandlerImpl {
                 neverDrawn: undefined,
                 alwaysDrawn: undefined,
             }), (0, rxjs_1.map)((state) => {
-                state.changedNeverDrawn && state.neverDrawn && this._props.viewport.setNeverDrawn(state.neverDrawn);
-                state.changedAlwaysDrawn && state.alwaysDrawn && this._props.viewport.setAlwaysDrawn(state.alwaysDrawn, this._props.viewport.isAlwaysDrawnExclusive);
+                state.changedNeverDrawn && state.neverDrawn && this.#props.viewport.setNeverDrawn(state.neverDrawn);
+                state.changedAlwaysDrawn && state.alwaysDrawn && this.#props.viewport.setAlwaysDrawn(state.alwaysDrawn, this.#props.viewport.isAlwaysDrawnExclusive);
             }));
         };
     }
@@ -617,7 +580,7 @@ class ModelsTreeVisibilityHandlerImpl {
         if (alwaysDrawn?.size === totalCount) {
             return (0, Tooltip_js_1.createVisibilityStatus)("visible", getTooltipOptions(props.tooltips.allElementsInAlwaysDrawnList, ignoreTooltip));
         }
-        const viewport = this._props.viewport;
+        const viewport = this.#props.viewport;
         if (viewport.isAlwaysDrawnExclusive && viewport.alwaysDrawn?.size) {
             return alwaysDrawn?.size
                 ? (0, Tooltip_js_1.createVisibilityStatus)("partial", getTooltipOptions(props.tooltips.elementsInBothAlwaysAndNeverDrawn, ignoreTooltip))
@@ -630,7 +593,7 @@ class ModelsTreeVisibilityHandlerImpl {
         return status;
     }
     getVisibilityFromAlwaysAndNeverDrawnElements({ ignoreTooltip, ...props }) {
-        const viewport = this._props.viewport;
+        const viewport = this.#props.viewport;
         if (viewport.isAlwaysDrawnExclusive) {
             if (!viewport?.alwaysDrawn?.size) {
                 return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions(props.tooltips.noElementsInExclusiveAlwaysDrawnList, ignoreTooltip)));
@@ -644,17 +607,17 @@ class ModelsTreeVisibilityHandlerImpl {
                 ...props,
                 alwaysDrawn: viewport.alwaysDrawn?.size ? setIntersection(props.elements, viewport.alwaysDrawn) : undefined,
                 neverDrawn: viewport.neverDrawn?.size ? setIntersection(props.elements, viewport.neverDrawn) : undefined,
-                totalCount: props.elements.size,
+                totalCount: core_bentley_1.Id64.sizeOf(props.elements),
                 ignoreTooltip,
             }));
         }
         const { modelId, categoryIds } = props.categoryProps;
         return (0, rxjs_1.from)(core_bentley_1.Id64.iterable(categoryIds)).pipe((0, rxjs_1.mergeMap)((categoryId) => {
-            const totalCount = this._idsCache.getCategoryElementsCount(modelId, categoryId);
+            const totalCount = this.#idsCache.getCategoryElementsCount(modelId, categoryId);
             return (0, rxjs_1.forkJoin)({
                 totalCount,
-                alwaysDrawn: this.getAlwaysDrawnElements({ categoryIds: categoryId, modelId }),
-                neverDrawn: this.getNeverDrawnElements({ categoryIds: categoryId, modelId }),
+                alwaysDrawn: this.getAlwaysOrNeverDrawnElements({ modelIds: modelId, categoryIds: categoryId, setType: "always" }),
+                neverDrawn: this.getAlwaysOrNeverDrawnElements({ modelIds: modelId, categoryIds: categoryId, setType: "never" }),
             }).pipe(
             // There is a known bug:
             // Categories that don't have root elements will make visibility result incorrect
@@ -674,18 +637,17 @@ class ModelsTreeVisibilityHandlerImpl {
             }));
         }), mergeVisibilityStatuses());
     }
-    getAlwaysDrawnElements(props) {
-        return this._alwaysAndNeverDrawnElements.getElements({ modelId: props.modelId, categoryIds: props.categoryIds, setType: "always" });
-    }
-    getNeverDrawnElements(props) {
-        return this._alwaysAndNeverDrawnElements.getElements({ modelId: props.modelId, categoryIds: props.categoryIds, setType: "never" });
+    getAlwaysOrNeverDrawnElements(props) {
+        return this.#alwaysAndNeverDrawnElements
+            .getElementsTree(props)
+            .pipe((0, rxjs_1.map)((childrenTree) => (0, Utils_js_1.getIdsFromChildrenTree)({ tree: childrenTree, predicate: ({ treeEntry }) => treeEntry.isInAlwaysOrNeverDrawnSet })));
     }
     clearAlwaysAndNeverDrawnElements(props) {
         return (0, rxjs_1.forkJoin)({
-            alwaysDrawn: this.getAlwaysDrawnElements(props),
-            neverDrawn: this.getNeverDrawnElements(props),
+            alwaysDrawn: this.getAlwaysOrNeverDrawnElements({ modelIds: props.modelId, categoryIds: props.categoryIds, setType: "always" }),
+            neverDrawn: this.getAlwaysOrNeverDrawnElements({ modelIds: props.modelId, categoryIds: props.categoryIds, setType: "never" }),
         }).pipe((0, rxjs_1.map)(({ alwaysDrawn, neverDrawn }) => {
-            const viewport = this._props.viewport;
+            const viewport = this.#props.viewport;
             if (viewport.alwaysDrawn?.size && alwaysDrawn.size) {
                 viewport.setAlwaysDrawn(setDifference(viewport.alwaysDrawn, alwaysDrawn));
             }
@@ -709,11 +671,11 @@ class ModelsTreeVisibilityHandlerImpl {
                 if (haveSubModel === "yes") {
                     return (0, rxjs_1.of)(modeledElementIds);
                 }
-                return (0, rxjs_1.from)(modeledElementIds).pipe((0, rxjs_1.mergeMap)(async (elementId) => ({ elementId, hasSubModel: await this._idsCache.hasSubModel(elementId) })), (0, rxjs_1.filter)(({ hasSubModel }) => hasSubModel), (0, rxjs_1.map)(({ elementId }) => elementId), (0, rxjs_1.toArray)());
+                return (0, rxjs_1.from)(core_bentley_1.Id64.iterable(modeledElementIds)).pipe((0, rxjs_1.mergeMap)(async (elementId) => ({ elementId, hasSubModel: await this.#idsCache.hasSubModel(elementId) })), (0, rxjs_1.filter)(({ hasSubModel }) => hasSubModel), (0, rxjs_1.map)(({ elementId }) => elementId), (0, rxjs_1.toArray)());
             }), 
             // combine visibility status of sub-models with visibility status of parent node
             (0, rxjs_1.mergeMap)((modeledElementIds) => {
-                if (modeledElementIds.length === 0) {
+                if (core_bentley_1.Id64.sizeOf(modeledElementIds) === 0) {
                     return (0, rxjs_1.of)(parentNodeVisibilityStatus);
                 }
                 return this.getModelVisibilityStatus({ modelIds: modeledElementIds }).pipe((0, rxjs_1.startWith)(parentNodeVisibilityStatus), mergeVisibilityStatuses(tooltips, ignoreTooltips));
@@ -745,24 +707,40 @@ function mergeVisibilityStatuses(tooltipMap, ignoreTooltip) {
 }
 function setDifference(lhs, rhs) {
     const result = new Set();
-    lhs.forEach((x) => !rhs.has(x) && result.add(x));
+    for (const x of lhs) {
+        if (!rhs.has(x)) {
+            result.add(x);
+        }
+    }
     return result;
 }
 function setIntersection(lhs, rhs) {
     const result = new Set();
-    lhs.forEach((x) => rhs.has(x) && result.add(x));
+    for (const x of lhs) {
+        if (rhs.has(x)) {
+            result.add(x);
+        }
+    }
     return result;
 }
 /**
  * Enables display of all given models. Also enables display of all categories and clears always and
  * never drawn lists in the viewport.
+ *
+ * @param componentId Optional unique id of the component that consumes this function.
+ * It can be any string, as long as it is not shared across different components.
  * @public
  */
-async function showAllModels(models, viewport) {
+async function showAllModels(models, viewport, componentId) {
     await viewport.addViewedModels(models);
     viewport.clearNeverDrawn();
     viewport.clearAlwaysDrawn();
-    await (0, CategoriesVisibilityUtils_js_1.toggleAllCategories)(viewport, true);
+    const categories = await (0, CategoriesVisibilityUtils_js_1.loadCategoriesFromViewport)(viewport, componentId);
+    if (categories.length === 0) {
+        return;
+    }
+    const ids = categories.map((category) => category.categoryId);
+    await (0, CategoriesVisibilityUtils_js_1.enableCategoryDisplay)(viewport, ids, true);
 }
 /**
  * Disables display of all given models.