@itwin/tree-widget-react 4.0.0-alpha.17 → 4.0.0-alpha.19

package/lib/esm/tree-widget-react/components/trees/common/internal/useTreeHooks/UseCachedVisibility.js

@@ -3,8 +3,9 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import { useCallback, useEffect, useState } from "react";
-import { defaultIfEmpty, EMPTY, filter, firstValueFrom, from, fromEventPattern, map, mergeMap, of, Subject, takeUntil, tap } from "rxjs";
-import { HierarchyNodeKey } from "@itwin/presentation-hierarchies";
+import { defaultIfEmpty, EMPTY, filter, firstValueFrom, from, fromEventPattern, map, mergeMap, Subject, takeUntil, tap } from "rxjs";
+import { assert } from "@itwin/core-bentley";
+import { HierarchyNode, HierarchyNodeKey } from "@itwin/presentation-hierarchies";
 import { HierarchyVisibilityOverrideHandler } from "../../UseHierarchyVisibility.js";
 import { AlwaysAndNeverDrawnElementInfo } from "../AlwaysAndNeverDrawnElementInfo.js";
 import { toVoidPromise } from "../Rxjs.js";
@@ -13,13 +14,14 @@ import { createVisibilityChangeEventListener } from "../VisibilityChangeEventLis
 /** @internal */
 export function useCachedVisibility(props) {
     const [filteredPaths, setFilteredPaths] = useState(undefined);
-    const { activeView, getCache, createFilteredTree, createTreeSpecificVisibilityHandler } = props;
+    const { activeView, getCache, createFilteredTree, createTreeSpecificVisibilityHandler, componentId } = props;
     const [visibilityHandlerFactory, setVisibilityHandlerFactory] = useState(() => createVisibilityHandlerFactory({
         activeView,
         getCache,
         createFilteredTree,
         createTreeSpecificVisibilityHandler,
         filteringPaths: filteredPaths,
+        componentId,
     }));
     useEffect(() => {
         setVisibilityHandlerFactory(() => createVisibilityHandlerFactory({
@@ -28,8 +30,9 @@ export function useCachedVisibility(props) {
             createFilteredTree,
             createTreeSpecificVisibilityHandler,
             filteringPaths: filteredPaths,
+            componentId,
         }));
-    }, [activeView, getCache, filteredPaths, createFilteredTree, createTreeSpecificVisibilityHandler]);
+    }, [activeView, getCache, filteredPaths, createFilteredTree, createTreeSpecificVisibilityHandler, componentId]);
     return {
         visibilityHandlerFactory,
         onFilteredPathsChanged: useCallback((paths) => setFilteredPaths(paths), []),
@@ -37,8 +40,9 @@ export function useCachedVisibility(props) {
     };
 }
 function createVisibilityHandlerFactory(props) {
-    const { activeView, createFilteredTree, createTreeSpecificVisibilityHandler, getCache, filteringPaths } = props;
+    const { activeView, createFilteredTree, createTreeSpecificVisibilityHandler, getCache, filteringPaths, componentId } = props;
     return ({ imodelAccess }) => new HierarchyVisibilityHandlerImpl({
+        componentId,
         viewport: activeView,
         getFilteredTree: () => {
             if (filteringPaths) {
@@ -80,7 +84,7 @@ export class HierarchyVisibilityHandlerImpl {
                 displayStyle: true,
             },
         });
-        this.#alwaysAndNeverDrawnElements = new AlwaysAndNeverDrawnElementInfo(this.#props.viewport);
+        this.#alwaysAndNeverDrawnElements = new AlwaysAndNeverDrawnElementInfo({ viewport: this.#props.viewport, componentId: props.componentId });
         this.#treeSpecificVisibilityHandler = this.#props.getTreeSpecificVisibilityHandler(this.#alwaysAndNeverDrawnElements, new HierarchyVisibilityOverrideHandler(this));
         this.#filteredTree = this.#props.getFilteredTree();
     }
@@ -121,13 +125,23 @@ export class HierarchyVisibilityHandlerImpl {
         this.#treeSpecificVisibilityHandler[Symbol.dispose]();
     }
     getVisibilityStatusInternal(node) {
-        if (node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
+        if (HierarchyNode.isClassGroupingNode(node)) {
+            if (node.extendedData?.hasDirectNonFilteredTargets && !node.filtering?.hasFilterTargetAncestor) {
+                return this.getFilteredNodeVisibility({ node });
+            }
+        }
+        if (HierarchyNode.isInstancesNode(node) && node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
             return this.getFilteredNodeVisibility({ node });
         }
         return this.#treeSpecificVisibilityHandler.getVisibilityStatus(node);
     }
     changeVisibilityStatusInternal(node, on) {
-        if (node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
+        if (HierarchyNode.isClassGroupingNode(node)) {
+            if (node.extendedData?.hasDirectNonFilteredTargets && !node.filtering?.hasFilterTargetAncestor) {
+                return this.changeFilteredNodeVisibility({ node, on });
+            }
+        }
+        if (HierarchyNode.isInstancesNode(node) && node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
             return this.changeFilteredNodeVisibility({ node, on });
         }
         return this.#treeSpecificVisibilityHandler.changeVisibilityStatus(node, on);
@@ -140,13 +154,11 @@ export class HierarchyVisibilityHandlerImpl {
             return this.#treeSpecificVisibilityHandler.getFilterTargetsVisibilityStatus(targets);
         }));
     }
-    getFilteredTreeTargets({ node }) {
-        if (!this.#filteredTree) {
-            return of(undefined);
-        }
+    getFilteredTreeTargets({ node, }) {
+        assert(this.#filteredTree !== undefined);
         return from(this.#filteredTree).pipe(map((filteredTree) => filteredTree.getFilterTargets(node)));
     }
-    changeFilteredNodeVisibility({ on, node }) {
+    changeFilteredNodeVisibility({ on, node, }) {
         return this.getFilteredTreeTargets({ node }).pipe(mergeMap((targets) => {
             if (!targets) {
                 return EMPTY;

package/lib/esm/tree-widget-react/components/trees/common/internal/useTreeHooks/UseCachedVisibility.js.map

@@ -1 +1 @@
-{"version":3,"file":"UseCachedVisibility.js","sourceRoot":"","sources":["../../../../../../../../src/tree-widget-react/components/trees/common/internal/useTreeHooks/UseCachedVisibility.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { useCallback, useEffect, useState } from \"react\";\nimport { defaultIfEmpty, EMPTY, filter, firstValueFrom, from, fromEventPattern, map, mergeMap, of, Subject, takeUntil, tap } from \"rxjs\";\nimport { HierarchyNodeKey } from \"@itwin/presentation-hierarchies\";\nimport { HierarchyVisibilityOverrideHandler } from \"../../UseHierarchyVisibility.js\";\nimport { AlwaysAndNeverDrawnElementInfo } from \"../AlwaysAndNeverDrawnElementInfo.js\";\nimport { toVoidPromise } from \"../Rxjs.js\";\nimport { createVisibilityStatus } from \"../Tooltip.js\";\nimport { createVisibilityChangeEventListener } from \"../VisibilityChangeEventListener.js\";\n\nimport type { Observable } from \"rxjs\";\nimport type { HierarchyFilteringPath, HierarchyNode } from \"@itwin/presentation-hierarchies\";\nimport type { ECClassHierarchyInspector } from \"@itwin/presentation-shared\";\nimport type { VisibilityTreeProps } from \"../../components/VisibilityTree.js\";\nimport type { TreeWidgetViewport } from \"../../TreeWidgetViewport.js\";\nimport type { HierarchyVisibilityHandler, VisibilityStatus } from \"../../UseHierarchyVisibility.js\";\nimport type { FilteredTree } from \"../visibility/BaseFilteredTree.js\";\nimport type { TreeSpecificVisibilityHandler } from \"../visibility/BaseVisibilityHelper.js\";\nimport type { IVisibilityChangeEventListener } from \"../VisibilityChangeEventListener.js\";\n\n/** @internal */\nexport interface CreateFilteredTreeProps<TCache> {\n  getCache: () => TCache;\n  imodelAccess: ECClassHierarchyInspector;\n  filteringPaths: HierarchyFilteringPath[];\n}\n\n/** @internal */\nexport interface CreateTreeSpecificVisibilityHandlerProps<TCache> {\n  info: AlwaysAndNeverDrawnElementInfo;\n  getCache: () => TCache;\n  viewport: TreeWidgetViewport;\n  overrideHandler: HierarchyVisibilityOverrideHandler;\n}\n\n/** @internal */\nexport interface UseCachedVisibilityProps<TCache, TFilterTargets> {\n  activeView: TreeWidgetViewport;\n  getCache: () => TCache;\n  createFilteredTree: (props: CreateFilteredTreeProps<TCache>) => Promise<FilteredTree<TFilterTargets>>;\n  createTreeSpecificVisibilityHandler: (props: CreateTreeSpecificVisibilityHandlerProps<TCache>) => TreeSpecificVisibilityHandler<TFilterTargets> & Disposable;\n}\n\n/** @internal */\nexport function useCachedVisibility<TCache, TFilterTargets>(props: UseCachedVisibilityProps<TCache, TFilterTargets>) {\n  const [filteredPaths, setFilteredPaths] = useState<HierarchyFilteringPath[] | undefined>(undefined);\n  const { activeView, getCache, createFilteredTree, createTreeSpecificVisibilityHandler } = props;\n\n  const [visibilityHandlerFactory, setVisibilityHandlerFactory] = useState<VisibilityTreeProps[\"visibilityHandlerFactory\"]>(() =>\n    createVisibilityHandlerFactory({\n      activeView,\n      getCache,\n      createFilteredTree,\n      createTreeSpecificVisibilityHandler,\n      filteringPaths: filteredPaths,\n    }),\n  );\n\n  useEffect(() => {\n    setVisibilityHandlerFactory(() =>\n      createVisibilityHandlerFactory({\n        activeView,\n        getCache,\n        createFilteredTree,\n        createTreeSpecificVisibilityHandler,\n        filteringPaths: filteredPaths,\n      }),\n    );\n  }, [activeView, getCache, filteredPaths, createFilteredTree, createTreeSpecificVisibilityHandler]);\n\n  return {\n    visibilityHandlerFactory,\n    onFilteredPathsChanged: useCallback((paths: HierarchyFilteringPath[] | undefined) => setFilteredPaths(paths), []),\n    filteredPaths,\n  };\n}\n\nfunction createVisibilityHandlerFactory<TCache, TFilterTargets>(\n  props: UseCachedVisibilityProps<TCache, TFilterTargets> & {\n    filteringPaths: HierarchyFilteringPath[] | undefined;\n  },\n): VisibilityTreeProps[\"visibilityHandlerFactory\"] {\n  const { activeView, createFilteredTree, createTreeSpecificVisibilityHandler, getCache, filteringPaths } = props;\n  return ({ imodelAccess }) =>\n    new HierarchyVisibilityHandlerImpl<TFilterTargets>({\n      viewport: activeView,\n      getFilteredTree: (): Promise<FilteredTree<TFilterTargets>> | undefined => {\n        if (filteringPaths) {\n          return createFilteredTree({ imodelAccess, filteringPaths, getCache });\n        }\n        return undefined;\n      },\n      getTreeSpecificVisibilityHandler: (info, overrideHandler) =>\n        createTreeSpecificVisibilityHandler({\n          info,\n          getCache,\n          viewport: activeView,\n          overrideHandler,\n        }),\n    });\n}\n\n/** @internal */\nexport interface HierarchyVisibilityHandlerImplProps<TFilterTargets> {\n  viewport: TreeWidgetViewport;\n  getTreeSpecificVisibilityHandler: (\n    info: AlwaysAndNeverDrawnElementInfo,\n    overrideHandler: HierarchyVisibilityOverrideHandler,\n  ) => TreeSpecificVisibilityHandler<TFilterTargets> & Disposable;\n  getFilteredTree: () => Promise<FilteredTree<TFilterTargets>> | undefined;\n}\n\n/**\n * Class that handles visibility of hierarchy nodes in a tree.\n *\n * - It provides methods to get and change visibility status of nodes.\n * - Also handles filtered tree nodes visibility.\n * - Listens to visibility change events and updates visibility status accordingly.\n * @internal\n */\nexport class HierarchyVisibilityHandlerImpl<TFilterTargets> implements HierarchyVisibilityHandler, Disposable {\n  readonly #props: HierarchyVisibilityHandlerImplProps<TFilterTargets>;\n  readonly #eventListener: IVisibilityChangeEventListener;\n  readonly #alwaysAndNeverDrawnElements: AlwaysAndNeverDrawnElementInfo;\n  #treeSpecificVisibilityHandler: TreeSpecificVisibilityHandler<TFilterTargets> & Disposable;\n  #changeRequest = new Subject<{ key: HierarchyNodeKey; depth: number }>();\n  #filteredTree: Promise<FilteredTree<TFilterTargets>> | undefined;\n\n  constructor(props: HierarchyVisibilityHandlerImplProps<TFilterTargets>) {\n    this.#props = props;\n    this.#eventListener = createVisibilityChangeEventListener({\n      viewport: this.#props.viewport,\n      listeners: {\n        models: true,\n        categories: true,\n        elements: true,\n        displayStyle: true,\n      },\n    });\n    this.#alwaysAndNeverDrawnElements = new AlwaysAndNeverDrawnElementInfo(this.#props.viewport);\n    this.#treeSpecificVisibilityHandler = this.#props.getTreeSpecificVisibilityHandler(\n      this.#alwaysAndNeverDrawnElements,\n      new HierarchyVisibilityOverrideHandler(this),\n    );\n    this.#filteredTree = this.#props.getFilteredTree();\n  }\n\n  public get onVisibilityChange() {\n    return this.#eventListener.onVisibilityChange;\n  }\n\n  public async getVisibilityStatus(node: HierarchyNode): Promise<VisibilityStatus> {\n    return firstValueFrom(\n      this.getVisibilityStatusInternal(node).pipe(\n        // unsubscribe from the observable if the change request for this node is received\n        takeUntil(this.#changeRequest.pipe(filter(({ key, depth }) => depth === node.parentKeys.length && HierarchyNodeKey.equals(node.key, key)))),\n        // unsubscribe if visibility changes\n        takeUntil(\n          fromEventPattern(\n            (handler) => {\n              this.#eventListener.onVisibilityChange.addListener(handler);\n            },\n            (handler) => {\n              this.#eventListener.onVisibilityChange.removeListener(handler);\n            },\n          ),\n        ),\n        defaultIfEmpty(createVisibilityStatus(\"hidden\")),\n      ),\n    );\n  }\n\n  public async changeVisibility(node: HierarchyNode, shouldDisplay: boolean): Promise<void> {\n    // notify about new change request\n    this.#changeRequest.next({ key: node.key, depth: node.parentKeys.length });\n\n    const changeObservable = this.changeVisibilityStatusInternal(node, shouldDisplay).pipe(\n      // unsubscribe from the observable if the change request for this node is received\n      takeUntil(this.#changeRequest.pipe(filter(({ key, depth }) => depth === node.parentKeys.length && HierarchyNodeKey.equals(node.key, key)))),\n      tap({\n        subscribe: () => {\n          this.#eventListener.suppressChangeEvents();\n          this.#alwaysAndNeverDrawnElements.suppressChangeEvents();\n        },\n        finalize: () => {\n          this.#eventListener.resumeChangeEvents();\n          this.#alwaysAndNeverDrawnElements.resumeChangeEvents();\n        },\n      }),\n    );\n\n    return toVoidPromise(changeObservable);\n  }\n\n  public [Symbol.dispose]() {\n    this.#eventListener[Symbol.dispose]();\n    this.#alwaysAndNeverDrawnElements[Symbol.dispose]();\n    this.#treeSpecificVisibilityHandler[Symbol.dispose]();\n  }\n\n  private getVisibilityStatusInternal(node: HierarchyNode) {\n    if (node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {\n      return this.getFilteredNodeVisibility({ node });\n    }\n    return this.#treeSpecificVisibilityHandler.getVisibilityStatus(node);\n  }\n\n  private changeVisibilityStatusInternal(node: HierarchyNode, on: boolean): Observable<void> {\n    if (node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {\n      return this.changeFilteredNodeVisibility({ node, on });\n    }\n    return this.#treeSpecificVisibilityHandler.changeVisibilityStatus(node, on);\n  }\n\n  private getFilteredNodeVisibility(props: { node: HierarchyNode }) {\n    return this.getFilteredTreeTargets(props).pipe(\n      mergeMap((targets) => {\n        if (!targets) {\n          return EMPTY;\n        }\n        return this.#treeSpecificVisibilityHandler.getFilterTargetsVisibilityStatus(targets);\n      }),\n    );\n  }\n\n  private getFilteredTreeTargets({ node }: { node: HierarchyNode }): Observable<TFilterTargets | undefined> {\n    if (!this.#filteredTree) {\n      return of(undefined);\n    }\n    return from(this.#filteredTree).pipe(map((filteredTree) => filteredTree.getFilterTargets(node)));\n  }\n\n  private changeFilteredNodeVisibility({ on, node }: { on: boolean; node: HierarchyNode }) {\n    return this.getFilteredTreeTargets({ node }).pipe(\n      mergeMap((targets) => {\n        if (!targets) {\n          return EMPTY;\n        }\n        return this.#treeSpecificVisibilityHandler.changeFilterTargetsVisibilityStatus(targets, on);\n      }),\n    );\n  }\n}\n"]}
+{"version":3,"file":"UseCachedVisibility.js","sourceRoot":"","sources":["../../../../../../../../src/tree-widget-react/components/trees/common/internal/useTreeHooks/UseCachedVisibility.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { useCallback, useEffect, useState } from \"react\";\nimport { defaultIfEmpty, EMPTY, filter, firstValueFrom, from, fromEventPattern, map, mergeMap, Subject, takeUntil, tap } from \"rxjs\";\nimport { assert } from \"@itwin/core-bentley\";\nimport { HierarchyNode, HierarchyNodeKey } from \"@itwin/presentation-hierarchies\";\nimport { HierarchyVisibilityOverrideHandler } from \"../../UseHierarchyVisibility.js\";\nimport { AlwaysAndNeverDrawnElementInfo } from \"../AlwaysAndNeverDrawnElementInfo.js\";\nimport { toVoidPromise } from \"../Rxjs.js\";\nimport { createVisibilityStatus } from \"../Tooltip.js\";\nimport { createVisibilityChangeEventListener } from \"../VisibilityChangeEventListener.js\";\n\nimport type { Observable } from \"rxjs\";\nimport type { GuidString } from \"@itwin/core-bentley\";\nimport type { ClassGroupingNodeKey, HierarchyFilteringPath, InstancesNodeKey } from \"@itwin/presentation-hierarchies\";\nimport type { ECClassHierarchyInspector } from \"@itwin/presentation-shared\";\nimport type { VisibilityTreeProps } from \"../../components/VisibilityTree.js\";\nimport type { TreeWidgetViewport } from \"../../TreeWidgetViewport.js\";\nimport type { HierarchyVisibilityHandler, VisibilityStatus } from \"../../UseHierarchyVisibility.js\";\nimport type { FilteredTree } from \"../visibility/BaseFilteredTree.js\";\nimport type { TreeSpecificVisibilityHandler } from \"../visibility/BaseVisibilityHelper.js\";\nimport type { IVisibilityChangeEventListener } from \"../VisibilityChangeEventListener.js\";\n\n/** @internal */\nexport interface CreateFilteredTreeProps<TCache> {\n  getCache: () => TCache;\n  imodelAccess: ECClassHierarchyInspector;\n  filteringPaths: HierarchyFilteringPath[];\n}\n\n/** @internal */\nexport interface CreateTreeSpecificVisibilityHandlerProps<TCache> {\n  info: AlwaysAndNeverDrawnElementInfo;\n  getCache: () => TCache;\n  viewport: TreeWidgetViewport;\n  overrideHandler: HierarchyVisibilityOverrideHandler;\n}\n\n/** @internal */\nexport interface UseCachedVisibilityProps<TCache, TFilterTargets> {\n  componentId: GuidString;\n  activeView: TreeWidgetViewport;\n  getCache: () => TCache;\n  createFilteredTree: (props: CreateFilteredTreeProps<TCache>) => Promise<FilteredTree<TFilterTargets>>;\n  createTreeSpecificVisibilityHandler: (props: CreateTreeSpecificVisibilityHandlerProps<TCache>) => TreeSpecificVisibilityHandler<TFilterTargets> & Disposable;\n}\n\n/** @internal */\nexport function useCachedVisibility<TCache, TFilterTargets>(props: UseCachedVisibilityProps<TCache, TFilterTargets>) {\n  const [filteredPaths, setFilteredPaths] = useState<HierarchyFilteringPath[] | undefined>(undefined);\n  const { activeView, getCache, createFilteredTree, createTreeSpecificVisibilityHandler, componentId } = props;\n\n  const [visibilityHandlerFactory, setVisibilityHandlerFactory] = useState<VisibilityTreeProps[\"visibilityHandlerFactory\"]>(() =>\n    createVisibilityHandlerFactory({\n      activeView,\n      getCache,\n      createFilteredTree,\n      createTreeSpecificVisibilityHandler,\n      filteringPaths: filteredPaths,\n      componentId,\n    }),\n  );\n\n  useEffect(() => {\n    setVisibilityHandlerFactory(() =>\n      createVisibilityHandlerFactory({\n        activeView,\n        getCache,\n        createFilteredTree,\n        createTreeSpecificVisibilityHandler,\n        filteringPaths: filteredPaths,\n        componentId,\n      }),\n    );\n  }, [activeView, getCache, filteredPaths, createFilteredTree, createTreeSpecificVisibilityHandler, componentId]);\n\n  return {\n    visibilityHandlerFactory,\n    onFilteredPathsChanged: useCallback((paths: HierarchyFilteringPath[] | undefined) => setFilteredPaths(paths), []),\n    filteredPaths,\n  };\n}\n\nfunction createVisibilityHandlerFactory<TCache, TFilterTargets>(\n  props: UseCachedVisibilityProps<TCache, TFilterTargets> & {\n    filteringPaths: HierarchyFilteringPath[] | undefined;\n  },\n): VisibilityTreeProps[\"visibilityHandlerFactory\"] {\n  const { activeView, createFilteredTree, createTreeSpecificVisibilityHandler, getCache, filteringPaths, componentId } = props;\n  return ({ imodelAccess }) =>\n    new HierarchyVisibilityHandlerImpl<TFilterTargets>({\n      componentId,\n      viewport: activeView,\n      getFilteredTree: (): Promise<FilteredTree<TFilterTargets>> | undefined => {\n        if (filteringPaths) {\n          return createFilteredTree({ imodelAccess, filteringPaths, getCache });\n        }\n        return undefined;\n      },\n      getTreeSpecificVisibilityHandler: (info, overrideHandler) =>\n        createTreeSpecificVisibilityHandler({\n          info,\n          getCache,\n          viewport: activeView,\n          overrideHandler,\n        }),\n    });\n}\n\n/** @internal */\nexport interface HierarchyVisibilityHandlerImplProps<TFilterTargets> {\n  viewport: TreeWidgetViewport;\n  getTreeSpecificVisibilityHandler: (\n    info: AlwaysAndNeverDrawnElementInfo,\n    overrideHandler: HierarchyVisibilityOverrideHandler,\n  ) => TreeSpecificVisibilityHandler<TFilterTargets> & Disposable;\n  getFilteredTree: () => Promise<FilteredTree<TFilterTargets>> | undefined;\n  componentId?: GuidString;\n}\n\n/**\n * Class that handles visibility of hierarchy nodes in a tree.\n *\n * - It provides methods to get and change visibility status of nodes.\n * - Also handles filtered tree nodes visibility.\n * - Listens to visibility change events and updates visibility status accordingly.\n * @internal\n */\nexport class HierarchyVisibilityHandlerImpl<TFilterTargets> implements HierarchyVisibilityHandler, Disposable {\n  readonly #props: HierarchyVisibilityHandlerImplProps<TFilterTargets>;\n  readonly #eventListener: IVisibilityChangeEventListener;\n  readonly #alwaysAndNeverDrawnElements: AlwaysAndNeverDrawnElementInfo;\n  #treeSpecificVisibilityHandler: TreeSpecificVisibilityHandler<TFilterTargets> & Disposable;\n  #changeRequest = new Subject<{ key: HierarchyNodeKey; depth: number }>();\n  #filteredTree: Promise<FilteredTree<TFilterTargets>> | undefined;\n\n  constructor(props: HierarchyVisibilityHandlerImplProps<TFilterTargets>) {\n    this.#props = props;\n    this.#eventListener = createVisibilityChangeEventListener({\n      viewport: this.#props.viewport,\n      listeners: {\n        models: true,\n        categories: true,\n        elements: true,\n        displayStyle: true,\n      },\n    });\n    this.#alwaysAndNeverDrawnElements = new AlwaysAndNeverDrawnElementInfo({ viewport: this.#props.viewport, componentId: props.componentId });\n    this.#treeSpecificVisibilityHandler = this.#props.getTreeSpecificVisibilityHandler(\n      this.#alwaysAndNeverDrawnElements,\n      new HierarchyVisibilityOverrideHandler(this),\n    );\n    this.#filteredTree = this.#props.getFilteredTree();\n  }\n\n  public get onVisibilityChange() {\n    return this.#eventListener.onVisibilityChange;\n  }\n\n  public async getVisibilityStatus(node: HierarchyNode): Promise<VisibilityStatus> {\n    return firstValueFrom(\n      this.getVisibilityStatusInternal(node).pipe(\n        // unsubscribe from the observable if the change request for this node is received\n        takeUntil(this.#changeRequest.pipe(filter(({ key, depth }) => depth === node.parentKeys.length && HierarchyNodeKey.equals(node.key, key)))),\n        // unsubscribe if visibility changes\n        takeUntil(\n          fromEventPattern(\n            (handler) => {\n              this.#eventListener.onVisibilityChange.addListener(handler);\n            },\n            (handler) => {\n              this.#eventListener.onVisibilityChange.removeListener(handler);\n            },\n          ),\n        ),\n        defaultIfEmpty(createVisibilityStatus(\"hidden\")),\n      ),\n    );\n  }\n\n  public async changeVisibility(node: HierarchyNode, shouldDisplay: boolean): Promise<void> {\n    // notify about new change request\n    this.#changeRequest.next({ key: node.key, depth: node.parentKeys.length });\n\n    const changeObservable = this.changeVisibilityStatusInternal(node, shouldDisplay).pipe(\n      // unsubscribe from the observable if the change request for this node is received\n      takeUntil(this.#changeRequest.pipe(filter(({ key, depth }) => depth === node.parentKeys.length && HierarchyNodeKey.equals(node.key, key)))),\n      tap({\n        subscribe: () => {\n          this.#eventListener.suppressChangeEvents();\n          this.#alwaysAndNeverDrawnElements.suppressChangeEvents();\n        },\n        finalize: () => {\n          this.#eventListener.resumeChangeEvents();\n          this.#alwaysAndNeverDrawnElements.resumeChangeEvents();\n        },\n      }),\n    );\n\n    return toVoidPromise(changeObservable);\n  }\n\n  public [Symbol.dispose]() {\n    this.#eventListener[Symbol.dispose]();\n    this.#alwaysAndNeverDrawnElements[Symbol.dispose]();\n    this.#treeSpecificVisibilityHandler[Symbol.dispose]();\n  }\n\n  private getVisibilityStatusInternal(node: HierarchyNode) {\n    if (HierarchyNode.isClassGroupingNode(node)) {\n      if (node.extendedData?.hasDirectNonFilteredTargets && !node.filtering?.hasFilterTargetAncestor) {\n        return this.getFilteredNodeVisibility({ node });\n      }\n    }\n\n    if (HierarchyNode.isInstancesNode(node) && node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {\n      return this.getFilteredNodeVisibility({ node });\n    }\n    return this.#treeSpecificVisibilityHandler.getVisibilityStatus(node);\n  }\n\n  private changeVisibilityStatusInternal(node: HierarchyNode, on: boolean): Observable<void> {\n    if (HierarchyNode.isClassGroupingNode(node)) {\n      if (node.extendedData?.hasDirectNonFilteredTargets && !node.filtering?.hasFilterTargetAncestor) {\n        return this.changeFilteredNodeVisibility({ node, on });\n      }\n    }\n    if (HierarchyNode.isInstancesNode(node) && node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {\n      return this.changeFilteredNodeVisibility({ node, on });\n    }\n    return this.#treeSpecificVisibilityHandler.changeVisibilityStatus(node, on);\n  }\n\n  private getFilteredNodeVisibility(props: {\n    node: HierarchyNode & {\n      key: ClassGroupingNodeKey | InstancesNodeKey;\n    };\n  }) {\n    return this.getFilteredTreeTargets(props).pipe(\n      mergeMap((targets) => {\n        if (!targets) {\n          return EMPTY;\n        }\n        return this.#treeSpecificVisibilityHandler.getFilterTargetsVisibilityStatus(targets);\n      }),\n    );\n  }\n\n  private getFilteredTreeTargets({\n    node,\n  }: {\n    node: HierarchyNode & {\n      key: ClassGroupingNodeKey | InstancesNodeKey;\n    };\n  }): Observable<TFilterTargets | undefined> {\n    assert(this.#filteredTree !== undefined);\n    return from(this.#filteredTree).pipe(map((filteredTree) => filteredTree.getFilterTargets(node)));\n  }\n\n  private changeFilteredNodeVisibility({\n    on,\n    node,\n  }: {\n    on: boolean;\n    node: HierarchyNode & {\n      key: ClassGroupingNodeKey | InstancesNodeKey;\n    };\n  }) {\n    return this.getFilteredTreeTargets({ node }).pipe(\n      mergeMap((targets) => {\n        if (!targets) {\n          return EMPTY;\n        }\n        return this.#treeSpecificVisibilityHandler.changeFilterTargetsVisibilityStatus(targets, on);\n      }),\n    );\n  }\n}\n"]}

package/lib/esm/tree-widget-react/components/trees/common/internal/useTreeHooks/UseIdsCache.d.ts

@@ -1,14 +1,17 @@
+import type { GuidString } from "@itwin/core-bentley";
 import type { IModelConnection } from "@itwin/core-frontend";
 /** @internal */
 export interface CreateCacheProps<TCacheSpecificProps> {
     imodel: IModelConnection;
     specificProps: TCacheSpecificProps;
+    componentId: GuidString;
 }
 /** @internal */
 export interface UseIdsCacheProps<TCache, TCacheSpecificProps> {
     imodel: IModelConnection;
     createCache: (props: CreateCacheProps<TCacheSpecificProps>) => TCache;
     cacheSpecificProps: TCacheSpecificProps;
+    componentId: GuidString;
 }
 /** @internal */
 export declare function useIdsCache<TCache extends Disposable, TCacheSpecificProps extends object>(props: UseIdsCacheProps<TCache, TCacheSpecificProps>): {

package/lib/esm/tree-widget-react/components/trees/common/internal/useTreeHooks/UseIdsCache.js

@@ -12,32 +12,32 @@ export function useIdsCache(props) {
         cacheRef.current = undefined;
     });
     const { imodel, createCache, cacheSpecificProps } = props;
-    const createCacheGetterRef = useRef((currImodel, specificProps) => {
+    const createCacheGetterRef = useRef((currImodel, specificProps, componentId) => {
         return () => {
             if (cacheRef.current === undefined) {
-                cacheRef.current = createCache({ imodel: currImodel, specificProps });
+                cacheRef.current = createCache({ imodel: currImodel, specificProps, componentId });
             }
             return cacheRef.current;
         };
     });
-    const [getCache, setCacheGetter] = useState(() => createCacheGetterRef.current(imodel, cacheSpecificProps));
+    const [getCache, setCacheGetter] = useState(() => createCacheGetterRef.current(imodel, cacheSpecificProps, props.componentId));
     useEffect(() => {
         // clear cache in case it was created before `useEffect` was run first time
         clearCacheRef.current();
         // make sure all cache users rerender
-        setCacheGetter(() => createCacheGetterRef.current(imodel, cacheSpecificProps));
+        setCacheGetter(() => createCacheGetterRef.current(imodel, cacheSpecificProps, props.componentId));
         return () => {
             // eslint-disable-next-line react-hooks/exhaustive-deps
             clearCacheRef.current();
         };
-    }, [imodel, cacheSpecificProps]);
+    }, [imodel, cacheSpecificProps, props.componentId]);
     useIModelChangeListener({
         imodel,
         action: useCallback(() => {
             clearCacheRef.current();
             // make sure all cache users rerender
-            setCacheGetter(() => createCacheGetterRef.current(imodel, cacheSpecificProps));
-        }, [imodel, cacheSpecificProps]),
+            setCacheGetter(() => createCacheGetterRef.current(imodel, cacheSpecificProps, props.componentId));
+        }, [imodel, cacheSpecificProps, props.componentId]),
     });
     return {
         getCache,

package/lib/esm/tree-widget-react/components/trees/common/internal/useTreeHooks/UseIdsCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"UseIdsCache.js","sourceRoot":"","sources":["../../../../../../../../src/tree-widget-react/components/trees/common/internal/useTreeHooks/UseIdsCache.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAiBxE,gBAAgB;AAChB,MAAM,UAAU,WAAW,CACzB,KAAoD;IAEpD,MAAM,QAAQ,GAAG,MAAM,CAAqB,SAAS,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,EAAE;QAChC,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;QACvC,QAAQ,CAAC,OAAO,GAAG,SAAS,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,KAAK,CAAC;IAE1D,MAAM,oBAAoB,GAAG,MAAM,CAAC,CAAC,UAA4B,EAAE,aAAkC,EAAE,EAAE;QACvG,OAAO,GAAG,EAAE;YACV,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBACnC,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;YACxE,CAAC;YACD,OAAO,QAAQ,CAAC,OAAO,CAAC;QAC1B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAe,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAE1H,SAAS,CAAC,GAAG,EAAE;QACb,2EAA2E;QAC3E,aAAa,CAAC,OAAO,EAAE,CAAC;QAExB,qCAAqC;QACrC,cAAc,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAC/E,OAAO,GAAG,EAAE;YACV,uDAAuD;YACvD,aAAa,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAEjC,uBAAuB,CAAC;QACtB,MAAM;QACN,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE;YACvB,aAAa,CAAC,OAAO,EAAE,CAAC;YACxB,qCAAqC;YACrC,cAAc,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;QACjF,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;KACjC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;KACT,CAAC;AACJ,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { useCallback, useEffect, useRef, useState } from \"react\";\nimport { useIModelChangeListener } from \"../UseIModelChangeListener.js\";\n\nimport type { IModelConnection } from \"@itwin/core-frontend\";\n\n/** @internal */\nexport interface CreateCacheProps<TCacheSpecificProps> {\n  imodel: IModelConnection;\n  specificProps: TCacheSpecificProps;\n}\n\n/** @internal */\nexport interface UseIdsCacheProps<TCache, TCacheSpecificProps> {\n  imodel: IModelConnection;\n  createCache: (props: CreateCacheProps<TCacheSpecificProps>) => TCache;\n  cacheSpecificProps: TCacheSpecificProps;\n}\n\n/** @internal */\nexport function useIdsCache<TCache extends Disposable, TCacheSpecificProps extends object>(\n  props: UseIdsCacheProps<TCache, TCacheSpecificProps>,\n): { getCache: () => TCache } {\n  const cacheRef = useRef<TCache | undefined>(undefined);\n  const clearCacheRef = useRef(() => {\n    cacheRef.current?.[Symbol.dispose]?.();\n    cacheRef.current = undefined;\n  });\n  const { imodel, createCache, cacheSpecificProps } = props;\n\n  const createCacheGetterRef = useRef((currImodel: IModelConnection, specificProps: TCacheSpecificProps) => {\n    return () => {\n      if (cacheRef.current === undefined) {\n        cacheRef.current = createCache({ imodel: currImodel, specificProps });\n      }\n      return cacheRef.current;\n    };\n  });\n\n  const [getCache, setCacheGetter] = useState<() => TCache>(() => createCacheGetterRef.current(imodel, cacheSpecificProps));\n\n  useEffect(() => {\n    // clear cache in case it was created before `useEffect` was run first time\n    clearCacheRef.current();\n\n    // make sure all cache users rerender\n    setCacheGetter(() => createCacheGetterRef.current(imodel, cacheSpecificProps));\n    return () => {\n      // eslint-disable-next-line react-hooks/exhaustive-deps\n      clearCacheRef.current();\n    };\n  }, [imodel, cacheSpecificProps]);\n\n  useIModelChangeListener({\n    imodel,\n    action: useCallback(() => {\n      clearCacheRef.current();\n      // make sure all cache users rerender\n      setCacheGetter(() => createCacheGetterRef.current(imodel, cacheSpecificProps));\n    }, [imodel, cacheSpecificProps]),\n  });\n\n  return {\n    getCache,\n  };\n}\n"]}
+{"version":3,"file":"UseIdsCache.js","sourceRoot":"","sources":["../../../../../../../../src/tree-widget-react/components/trees/common/internal/useTreeHooks/UseIdsCache.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAoBxE,gBAAgB;AAChB,MAAM,UAAU,WAAW,CACzB,KAAoD;IAEpD,MAAM,QAAQ,GAAG,MAAM,CAAqB,SAAS,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,EAAE;QAChC,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;QACvC,QAAQ,CAAC,OAAO,GAAG,SAAS,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,KAAK,CAAC;IAE1D,MAAM,oBAAoB,GAAG,MAAM,CAAC,CAAC,UAA4B,EAAE,aAAkC,EAAE,WAAuB,EAAE,EAAE;QAChI,OAAO,GAAG,EAAE;YACV,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBACnC,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,CAAC;YACrF,CAAC;YACD,OAAO,QAAQ,CAAC,OAAO,CAAC;QAC1B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAe,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IAE7I,SAAS,CAAC,GAAG,EAAE;QACb,2EAA2E;QAC3E,aAAa,CAAC,OAAO,EAAE,CAAC;QAExB,qCAAqC;QACrC,cAAc,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QAClG,OAAO,GAAG,EAAE;YACV,uDAAuD;YACvD,aAAa,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IAEpD,uBAAuB,CAAC;QACtB,MAAM;QACN,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE;YACvB,aAAa,CAAC,OAAO,EAAE,CAAC;YACxB,qCAAqC;YACrC,cAAc,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACpG,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;KACpD,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;KACT,CAAC;AACJ,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { useCallback, useEffect, useRef, useState } from \"react\";\nimport { useIModelChangeListener } from \"../UseIModelChangeListener.js\";\n\nimport type { GuidString } from \"@itwin/core-bentley\";\nimport type { IModelConnection } from \"@itwin/core-frontend\";\n\n/** @internal */\nexport interface CreateCacheProps<TCacheSpecificProps> {\n  imodel: IModelConnection;\n  specificProps: TCacheSpecificProps;\n  componentId: GuidString;\n}\n\n/** @internal */\nexport interface UseIdsCacheProps<TCache, TCacheSpecificProps> {\n  imodel: IModelConnection;\n  createCache: (props: CreateCacheProps<TCacheSpecificProps>) => TCache;\n  cacheSpecificProps: TCacheSpecificProps;\n  componentId: GuidString;\n}\n\n/** @internal */\nexport function useIdsCache<TCache extends Disposable, TCacheSpecificProps extends object>(\n  props: UseIdsCacheProps<TCache, TCacheSpecificProps>,\n): { getCache: () => TCache } {\n  const cacheRef = useRef<TCache | undefined>(undefined);\n  const clearCacheRef = useRef(() => {\n    cacheRef.current?.[Symbol.dispose]?.();\n    cacheRef.current = undefined;\n  });\n  const { imodel, createCache, cacheSpecificProps } = props;\n\n  const createCacheGetterRef = useRef((currImodel: IModelConnection, specificProps: TCacheSpecificProps, componentId: GuidString) => {\n    return () => {\n      if (cacheRef.current === undefined) {\n        cacheRef.current = createCache({ imodel: currImodel, specificProps, componentId });\n      }\n      return cacheRef.current;\n    };\n  });\n\n  const [getCache, setCacheGetter] = useState<() => TCache>(() => createCacheGetterRef.current(imodel, cacheSpecificProps, props.componentId));\n\n  useEffect(() => {\n    // clear cache in case it was created before `useEffect` was run first time\n    clearCacheRef.current();\n\n    // make sure all cache users rerender\n    setCacheGetter(() => createCacheGetterRef.current(imodel, cacheSpecificProps, props.componentId));\n    return () => {\n      // eslint-disable-next-line react-hooks/exhaustive-deps\n      clearCacheRef.current();\n    };\n  }, [imodel, cacheSpecificProps, props.componentId]);\n\n  useIModelChangeListener({\n    imodel,\n    action: useCallback(() => {\n      clearCacheRef.current();\n      // make sure all cache users rerender\n      setCacheGetter(() => createCacheGetterRef.current(imodel, cacheSpecificProps, props.componentId));\n    }, [imodel, cacheSpecificProps, props.componentId]),\n  });\n\n  return {\n    getCache,\n  };\n}\n"]}

package/lib/esm/tree-widget-react/components/trees/common/internal/visibility/BaseFilteredTree.d.ts

@@ -1,6 +1,6 @@
-import { HierarchyFilteringPath } from "@itwin/presentation-hierarchies";
+import { HierarchyFilteringPath, HierarchyNode } from "@itwin/presentation-hierarchies";
 import type { Id64String } from "@itwin/core-bentley";
-import type { HierarchyNode } from "@itwin/presentation-hierarchies";
+import type { ClassGroupingNodeKey, InstancesNodeKey } from "@itwin/presentation-hierarchies";
 import type { InstanceKey } from "@itwin/presentation-shared";
 /** @internal */
 export type FilteredTreeNodeChildren<TFilteredTreeNode> = Map<Id64String, TFilteredTreeNode>;
@@ -57,7 +57,9 @@ export declare abstract class FilteredNodesHandler<TProcessedFilteredNodes, TFil
         parent: TFilteredTreeNode | FilteredTreeRootNode<TFilteredTreeNode>;
     }): TFilteredTreeNode;
     processFilteredNodes(): Promise<{
-        getNodeFilterTargets: (node: HierarchyNode) => TFilterTargets | undefined;
+        getNodeFilterTargets: (node: HierarchyNode & {
+            key: ClassGroupingNodeKey | InstancesNodeKey;
+        }) => TFilterTargets | undefined;
     }>;
     /** Takes a new node and adds it to the tree structure. */
     accept(props: {
@@ -72,7 +74,9 @@ export declare abstract class FilteredNodesHandler<TProcessedFilteredNodes, TFil
 }
 /** @internal */
 export interface FilteredTree<TFilterTargets> {
-    getFilterTargets: (node: HierarchyNode) => TFilterTargets | undefined;
+    getFilterTargets: (node: HierarchyNode & {
+        key: ClassGroupingNodeKey | InstancesNodeKey;
+    }) => TFilterTargets | undefined;
 }
 /** @internal */
 export interface CreateFilteredTreeProps<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>> {

package/lib/esm/tree-widget-react/components/trees/common/internal/visibility/BaseFilteredTree.js

@@ -2,7 +2,8 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-import { HierarchyFilteringPath, HierarchyNodeIdentifier, HierarchyNodeKey } from "@itwin/presentation-hierarchies";
+import { Id64 } from "@itwin/core-bentley";
+import { HierarchyFilteringPath, HierarchyNode, HierarchyNodeIdentifier, HierarchyNodeKey } from "@itwin/presentation-hierarchies";
 /**
  * Class that provides methods to handle filtered nodes in a tree structure.
  *
@@ -39,10 +40,6 @@ export class FilteredNodesHandler {
     /** Takes a specific node and gets all filter targets related to it. */
     getNodeFilterTargets(node, processedFilteredNodes) {
         let lookupParents = [this.root];
-        const nodeKey = node.key;
-        if (!HierarchyNodeKey.isInstances(nodeKey)) {
-            return undefined;
-        }
         // find the filtered parent nodes of the `node`
         for (const parentKey of node.parentKeys) {
             if (!HierarchyNodeKey.isInstances(parentKey)) {
@@ -50,24 +47,32 @@ export class FilteredNodesHandler {
             }
             // tree node might be merged from multiple instances. As filtered tree stores only one instance per node, we need to find all matching nodes
             // and use them when checking for matching node in one level deeper.
-            const parentNodes = this.findMatchingFilteredNodes(lookupParents, parentKey.instanceKeys);
+            const parentNodes = this.findMatchingFilteredNodes(lookupParents, parentKey.instanceKeys.map((key) => key.id));
             if (parentNodes.length === 0) {
                 return undefined;
             }
             lookupParents = parentNodes;
         }
+        const ids = HierarchyNode.isInstancesNode(node) ? node.key.instanceKeys.map(({ id }) => id) : node.groupedInstanceKeys.map(({ id }) => id);
         // find filtered nodes that match the `node`
-        const filteredNodes = this.findMatchingFilteredNodes(lookupParents, nodeKey.instanceKeys);
+        const filteredNodes = this.findMatchingFilteredNodes(lookupParents, ids);
         if (filteredNodes.length === 0) {
             return undefined;
         }
         return this.convertNodesToFilterTargets(filteredNodes, processedFilteredNodes);
     }
     /** Finds filtered nodes that match the given keys. */
-    findMatchingFilteredNodes(lookupParents, keys) {
-        return lookupParents
-            .flatMap((lookup) => keys.map((key) => lookup.children?.get(key.id)))
-            .filter((lookupNode) => lookupNode !== undefined);
+    findMatchingFilteredNodes(lookupParents, ids) {
+        return lookupParents.flatMap((lookup) => {
+            const childrenArray = Array();
+            for (const id of Id64.iterable(ids)) {
+                const node = lookup.children?.get(id);
+                if (node) {
+                    childrenArray.push(node);
+                }
+            }
+            return childrenArray;
+        });
     }
 }
 /**

package/lib/esm/tree-widget-react/components/trees/common/internal/visibility/BaseFilteredTree.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseFilteredTree.js","sourceRoot":"","sources":["../../../../../../../../src/tree-widget-react/components/trees/common/internal/visibility/BaseFilteredTree.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { HierarchyFilteringPath, HierarchyNodeIdentifier, HierarchyNodeKey } from \"@itwin/presentation-hierarchies\";\n\nimport type { Id64String } from \"@itwin/core-bentley\";\nimport type { HierarchyNode } from \"@itwin/presentation-hierarchies\";\nimport type { InstanceKey } from \"@itwin/presentation-shared\";\n\n/** @internal */\nexport type FilteredTreeNodeChildren<TFilteredTreeNode> = Map<Id64String, TFilteredTreeNode>;\n\n/**\n * A generic interface for a filtered tree root node.\n *\n * It differs from `BaseFilteredTreeNode` in that it only contains children details and nothing else.\n * @internal\n */\nexport interface FilteredTreeRootNode<TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>> {\n  children: FilteredTreeNodeChildren<TFilteredTreeNode>;\n}\n\n/**\n * A generic interface for a filtered tree node.\n *\n * It represents every node in a filtered tree structure.\n * @internal\n * */\nexport interface BaseFilteredTreeNode<TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>> {\n  type: string;\n  id: Id64String;\n  children?: FilteredTreeNodeChildren<TFilteredTreeNode>;\n  isFilterTarget: boolean;\n}\n\n/**\n * Class that provides methods to handle filtered nodes in a tree structure.\n *\n * It provides two methods that can be shared across different filtered trees:\n * - `processFilteredNodes` - processes filtered nodes and returns a function to get filter targets for a node.\n * - `accept` - accepts a new node and adds it to the tree structure.\n * @internal\n */\nexport abstract class FilteredNodesHandler<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>> {\n  public readonly root: FilteredTreeRootNode<TFilteredTreeNode> = {\n    children: new Map(),\n  };\n  public readonly filteredNodesArr = new Array<TFilteredTreeNode>();\n\n  /** Returns filtered tree node type based on its' className */\n  public abstract getType(className: string): Promise<TFilteredTreeNode[\"type\"]>;\n  /** Converts nodes to filter targets */\n  public abstract convertNodesToFilterTargets(filteredNodes: TFilteredTreeNode[], processedFilteredNodes: TProcessedFilteredNodes): TFilterTargets | undefined;\n  /**\n   * Processes filtered nodes.\n   *\n   * Nodes are created using filtering paths, and some information is not present in the filtering paths.\n   * Because of this, some nodes may need to be processed to get additional information.\n   *\n   * E.g. Retrieving categoryId of elements can't be done using filtering paths.\n   */\n  public abstract getProcessedFilteredNodes(): Promise<TProcessedFilteredNodes>;\n  /** Creates filtered nodes  */\n  public abstract createFilteredTreeNode(props: {\n    type: TFilteredTreeNode[\"type\"];\n    id: Id64String;\n    isFilterTarget: boolean;\n    parent: TFilteredTreeNode | FilteredTreeRootNode<TFilteredTreeNode>;\n  }): TFilteredTreeNode;\n\n  public async processFilteredNodes(): Promise<{ getNodeFilterTargets: (node: HierarchyNode) => TFilterTargets | undefined }> {\n    const processedFilteredNodes = await this.getProcessedFilteredNodes();\n    return {\n      getNodeFilterTargets: (node: HierarchyNode) => this.getNodeFilterTargets(node, processedFilteredNodes),\n    };\n  }\n\n  /** Takes a new node and adds it to the tree structure. */\n  public async accept(props: {\n    instanceKey: InstanceKey;\n    parentNode: TFilteredTreeNode | FilteredTreeRootNode<TFilteredTreeNode>;\n    isFilterTarget: boolean;\n  }): Promise<TFilteredTreeNode> {\n    const { instanceKey, parentNode, isFilterTarget } = props;\n    const type = await this.getType(instanceKey.className);\n\n    const newNode = this.createFilteredTreeNode({\n      type,\n      id: instanceKey.id,\n      isFilterTarget,\n      parent: parentNode,\n    });\n    (parentNode.children ??= new Map()).set(instanceKey.id, newNode);\n    this.filteredNodesArr.push(newNode);\n    return newNode;\n  }\n\n  /** Takes a specific node and gets all filter targets related to it. */\n  private getNodeFilterTargets(node: HierarchyNode, processedFilteredNodes: TProcessedFilteredNodes): TFilterTargets | undefined {\n    let lookupParents: Array<{ children?: Map<Id64String, TFilteredTreeNode> }> = [this.root];\n\n    const nodeKey = node.key;\n    if (!HierarchyNodeKey.isInstances(nodeKey)) {\n      return undefined;\n    }\n\n    // find the filtered parent nodes of the `node`\n    for (const parentKey of node.parentKeys) {\n      if (!HierarchyNodeKey.isInstances(parentKey)) {\n        continue;\n      }\n\n      // tree node might be merged from multiple instances. As filtered tree stores only one instance per node, we need to find all matching nodes\n      // and use them when checking for matching node in one level deeper.\n      const parentNodes = this.findMatchingFilteredNodes(lookupParents, parentKey.instanceKeys);\n      if (parentNodes.length === 0) {\n        return undefined;\n      }\n      lookupParents = parentNodes;\n    }\n\n    // find filtered nodes that match the `node`\n    const filteredNodes = this.findMatchingFilteredNodes(lookupParents, nodeKey.instanceKeys);\n    if (filteredNodes.length === 0) {\n      return undefined;\n    }\n\n    return this.convertNodesToFilterTargets(filteredNodes, processedFilteredNodes);\n  }\n\n  /** Finds filtered nodes that match the given keys. */\n  private findMatchingFilteredNodes(lookupParents: Array<{ children?: Map<Id64String, TFilteredTreeNode> }>, keys: InstanceKey[]) {\n    return lookupParents\n      .flatMap((lookup) => keys.map((key) => lookup.children?.get(key.id)))\n      .filter((lookupNode): lookupNode is TFilteredTreeNode => lookupNode !== undefined);\n  }\n}\n\n/** @internal */\nexport interface FilteredTree<TFilterTargets> {\n  getFilterTargets: (node: HierarchyNode) => TFilterTargets | undefined;\n}\n\n/** @internal */\nexport interface CreateFilteredTreeProps<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>> {\n  filteredNodesHandler: FilteredNodesHandler<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode>;\n  filteringPaths: HierarchyFilteringPath[];\n}\n\n/**\n * Function iterates over filtering paths and creates uses `filteredNodesHandler` to create a filtered tree.\n * @internal\n */\nexport async function createFilteredTree<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>>(\n  props: CreateFilteredTreeProps<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode>,\n): Promise<FilteredTree<TFilterTargets>> {\n  const { filteringPaths, filteredNodesHandler } = props;\n\n  for (const filteringPath of filteringPaths) {\n    const normalizedPath = HierarchyFilteringPath.normalize(filteringPath).path;\n\n    let parentNode: FilteredTreeRootNode<TFilteredTreeNode> | TFilteredTreeNode = filteredNodesHandler.root;\n    for (let i = 0; i < normalizedPath.length; ++i) {\n      if (\"type\" in parentNode && \"isFilterTarget\" in parentNode && parentNode.isFilterTarget) {\n        break;\n      }\n\n      const identifier = normalizedPath[i];\n\n      if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {\n        break;\n      }\n\n      const currentNode: TFilteredTreeNode | undefined = parentNode.children?.get(identifier.id);\n      if (currentNode !== undefined) {\n        parentNode = currentNode;\n        continue;\n      }\n      parentNode = await filteredNodesHandler.accept({\n        instanceKey: identifier,\n        parentNode,\n        isFilterTarget: i === normalizedPath.length - 1,\n      });\n    }\n  }\n  const processedFilteredNodes = await filteredNodesHandler.processFilteredNodes();\n  return {\n    getFilterTargets: (node: HierarchyNode) => processedFilteredNodes.getNodeFilterTargets(node),\n  };\n}\n"]}
+{"version":3,"file":"BaseFilteredTree.js","sourceRoot":"","sources":["../../../../../../../../src/tree-widget-react/components/trees/common/internal/visibility/BaseFilteredTree.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { Id64 } from \"@itwin/core-bentley\";\nimport { HierarchyFilteringPath, HierarchyNode, HierarchyNodeIdentifier, HierarchyNodeKey } from \"@itwin/presentation-hierarchies\";\n\nimport type { Id64Arg, Id64String } from \"@itwin/core-bentley\";\nimport type { ClassGroupingNodeKey, InstancesNodeKey } from \"@itwin/presentation-hierarchies\";\nimport type { InstanceKey } from \"@itwin/presentation-shared\";\n\n/** @internal */\nexport type FilteredTreeNodeChildren<TFilteredTreeNode> = Map<Id64String, TFilteredTreeNode>;\n\n/**\n * A generic interface for a filtered tree root node.\n *\n * It differs from `BaseFilteredTreeNode` in that it only contains children details and nothing else.\n * @internal\n */\nexport interface FilteredTreeRootNode<TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>> {\n  children: FilteredTreeNodeChildren<TFilteredTreeNode>;\n}\n\n/**\n * A generic interface for a filtered tree node.\n *\n * It represents every node in a filtered tree structure.\n * @internal\n * */\nexport interface BaseFilteredTreeNode<TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>> {\n  type: string;\n  id: Id64String;\n  children?: FilteredTreeNodeChildren<TFilteredTreeNode>;\n  isFilterTarget: boolean;\n}\n\n/**\n * Class that provides methods to handle filtered nodes in a tree structure.\n *\n * It provides two methods that can be shared across different filtered trees:\n * - `processFilteredNodes` - processes filtered nodes and returns a function to get filter targets for a node.\n * - `accept` - accepts a new node and adds it to the tree structure.\n * @internal\n */\nexport abstract class FilteredNodesHandler<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>> {\n  public readonly root: FilteredTreeRootNode<TFilteredTreeNode> = {\n    children: new Map(),\n  };\n  public readonly filteredNodesArr = new Array<TFilteredTreeNode>();\n\n  /** Returns filtered tree node type based on its' className */\n  public abstract getType(className: string): Promise<TFilteredTreeNode[\"type\"]>;\n  /** Converts nodes to filter targets */\n  public abstract convertNodesToFilterTargets(filteredNodes: TFilteredTreeNode[], processedFilteredNodes: TProcessedFilteredNodes): TFilterTargets | undefined;\n  /**\n   * Processes filtered nodes.\n   *\n   * Nodes are created using filtering paths, and some information is not present in the filtering paths.\n   * Because of this, some nodes may need to be processed to get additional information.\n   *\n   * E.g. Retrieving categoryId of elements can't be done using filtering paths.\n   */\n  public abstract getProcessedFilteredNodes(): Promise<TProcessedFilteredNodes>;\n  /** Creates filtered nodes  */\n  public abstract createFilteredTreeNode(props: {\n    type: TFilteredTreeNode[\"type\"];\n    id: Id64String;\n    isFilterTarget: boolean;\n    parent: TFilteredTreeNode | FilteredTreeRootNode<TFilteredTreeNode>;\n  }): TFilteredTreeNode;\n\n  public async processFilteredNodes(): Promise<{\n    getNodeFilterTargets: (node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey }) => TFilterTargets | undefined;\n  }> {\n    const processedFilteredNodes = await this.getProcessedFilteredNodes();\n    return {\n      getNodeFilterTargets: (node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey }) => this.getNodeFilterTargets(node, processedFilteredNodes),\n    };\n  }\n\n  /** Takes a new node and adds it to the tree structure. */\n  public async accept(props: {\n    instanceKey: InstanceKey;\n    parentNode: TFilteredTreeNode | FilteredTreeRootNode<TFilteredTreeNode>;\n    isFilterTarget: boolean;\n  }): Promise<TFilteredTreeNode> {\n    const { instanceKey, parentNode, isFilterTarget } = props;\n    const type = await this.getType(instanceKey.className);\n\n    const newNode = this.createFilteredTreeNode({\n      type,\n      id: instanceKey.id,\n      isFilterTarget,\n      parent: parentNode,\n    });\n    (parentNode.children ??= new Map()).set(instanceKey.id, newNode);\n    this.filteredNodesArr.push(newNode);\n    return newNode;\n  }\n\n  /** Takes a specific node and gets all filter targets related to it. */\n  private getNodeFilterTargets(\n    node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey },\n    processedFilteredNodes: TProcessedFilteredNodes,\n  ): TFilterTargets | undefined {\n    let lookupParents: Array<FilteredTreeRootNode<TFilteredTreeNode> | TFilteredTreeNode> = [this.root];\n\n    // find the filtered parent nodes of the `node`\n    for (const parentKey of node.parentKeys) {\n      if (!HierarchyNodeKey.isInstances(parentKey)) {\n        continue;\n      }\n\n      // tree node might be merged from multiple instances. As filtered tree stores only one instance per node, we need to find all matching nodes\n      // and use them when checking for matching node in one level deeper.\n      const parentNodes = this.findMatchingFilteredNodes(\n        lookupParents,\n        parentKey.instanceKeys.map((key) => key.id),\n      );\n      if (parentNodes.length === 0) {\n        return undefined;\n      }\n      lookupParents = parentNodes;\n    }\n\n    const ids = HierarchyNode.isInstancesNode(node) ? node.key.instanceKeys.map(({ id }) => id) : node.groupedInstanceKeys.map(({ id }) => id);\n    // find filtered nodes that match the `node`\n    const filteredNodes = this.findMatchingFilteredNodes(lookupParents, ids);\n    if (filteredNodes.length === 0) {\n      return undefined;\n    }\n\n    return this.convertNodesToFilterTargets(filteredNodes, processedFilteredNodes);\n  }\n\n  /** Finds filtered nodes that match the given keys. */\n  private findMatchingFilteredNodes(lookupParents: Array<FilteredTreeRootNode<TFilteredTreeNode> | TFilteredTreeNode>, ids: Id64Arg) {\n    return lookupParents.flatMap((lookup) => {\n      const childrenArray = Array<TFilteredTreeNode>();\n      for (const id of Id64.iterable(ids)) {\n        const node = lookup.children?.get(id);\n        if (node) {\n          childrenArray.push(node);\n        }\n      }\n      return childrenArray;\n    });\n  }\n}\n\n/** @internal */\nexport interface FilteredTree<TFilterTargets> {\n  getFilterTargets: (node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey }) => TFilterTargets | undefined;\n}\n\n/** @internal */\nexport interface CreateFilteredTreeProps<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>> {\n  filteredNodesHandler: FilteredNodesHandler<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode>;\n  filteringPaths: HierarchyFilteringPath[];\n}\n\n/**\n * Function iterates over filtering paths and creates uses `filteredNodesHandler` to create a filtered tree.\n * @internal\n */\nexport async function createFilteredTree<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode extends BaseFilteredTreeNode<TFilteredTreeNode>>(\n  props: CreateFilteredTreeProps<TProcessedFilteredNodes, TFilterTargets, TFilteredTreeNode>,\n): Promise<FilteredTree<TFilterTargets>> {\n  const { filteringPaths, filteredNodesHandler } = props;\n\n  for (const filteringPath of filteringPaths) {\n    const normalizedPath = HierarchyFilteringPath.normalize(filteringPath).path;\n\n    let parentNode: FilteredTreeRootNode<TFilteredTreeNode> | TFilteredTreeNode = filteredNodesHandler.root;\n    for (let i = 0; i < normalizedPath.length; ++i) {\n      if (\"type\" in parentNode && \"isFilterTarget\" in parentNode && parentNode.isFilterTarget) {\n        break;\n      }\n\n      const identifier = normalizedPath[i];\n\n      if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {\n        break;\n      }\n\n      const currentNode: TFilteredTreeNode | undefined = parentNode.children?.get(identifier.id);\n      if (currentNode !== undefined) {\n        parentNode = currentNode;\n        continue;\n      }\n      parentNode = await filteredNodesHandler.accept({\n        instanceKey: identifier,\n        parentNode,\n        isFilterTarget: i === normalizedPath.length - 1,\n      });\n    }\n  }\n  const processedFilteredNodes = await filteredNodesHandler.processFilteredNodes();\n  return {\n    getFilterTargets: (node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey }) => processedFilteredNodes.getNodeFilterTargets(node),\n  };\n}\n"]}

package/lib/esm/tree-widget-react/components/trees/common/internal/visibility/BaseVisibilityHelper.d.ts

@@ -40,7 +40,7 @@ export interface BaseTreeVisibilityHandlerOverrides {
 }
 /** @internal */
 export interface BaseIdsCache {
-    hasSubModel: (elementId: Id64String) => Promise<boolean>;
+    hasSubModel: (elementId: Id64String) => Observable<boolean>;
     getElementsCount: (props: {
         modelId: Id64String;
         categoryId: Id64String;
@@ -66,6 +66,7 @@ export interface BaseIdsCache {
     }>;
     getSubModels: (props: {
         modelIds: Id64Arg;
+        categoryId?: Id64String;
     } | {
         categoryIds: Id64Arg;
         modelId: Id64String | undefined;

package/lib/esm/tree-widget-react/components/trees/common/internal/visibility/BaseVisibilityHelper.js

@@ -2,10 +2,10 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-import { concat, concatAll, defaultIfEmpty, defer, EMPTY, filter, forkJoin, from, map, merge, mergeMap, of, reduce, shareReplay, startWith, Subject, take, takeUntil, tap, } from "rxjs";
+import { concat, concatAll, defaultIfEmpty, defer, EMPTY, filter, forkJoin, from, identity, map, merge, mergeMap, of, reduce, shareReplay, startWith, Subject, take, takeLast, takeUntil, tap, } from "rxjs";
 import { assert, Id64 } from "@itwin/core-bentley";
 import { createVisibilityStatus } from "../Tooltip.js";
-import { getSetFromId64Arg, setDifference, setIntersection } from "../Utils.js";
+import { getSetFromId64Arg, releaseMainThreadOnItemsCount, setDifference, setIntersection } from "../Utils.js";
 import { changeElementStateNoChildrenOperator, enableCategoryDisplay, getVisibilityFromAlwaysAndNeverDrawnElementsImpl, mergeVisibilityStatuses, } from "../VisibilityUtils.js";
 /**
  * Base class for visibility status getters and modifiers.
@@ -199,7 +199,24 @@ export class BaseVisibilityHelper {
             }
             return (modelIdFromProps
                 ? from(Id64.iterable(categoryIds)).pipe(map((categoryId) => ({ id: categoryId, models: modelIdFromProps })))
-                : this.#props.baseIdsCache.getModels({ categoryIds })).pipe(map(({ id, models }) => {
+                : this.#props.baseIdsCache.getModels({ categoryIds })).pipe(mergeMap(({ id, models }) => {
+                if (!this.#props.viewport.isAlwaysDrawnExclusive) {
+                    return of({ id, models });
+                }
+                // Ignore categories that don't have root geometric elements in always drawn exclusive mode
+                if (!models) {
+                    return EMPTY;
+                }
+                return from(Id64.iterable(models)).pipe(mergeMap((modelId) => forkJoin({
+                    modelId: of(modelId),
+                    elementCount: this.#props.baseIdsCache.getElementsCount({ modelId, categoryId: id }),
+                })), reduce((acc, { modelId, elementCount }) => {
+                    if (elementCount > 0) {
+                        acc.models.push(modelId);
+                    }
+                    return acc;
+                }, { id, models: new Array() }), filter(({ models: modelsWithElements }) => modelsWithElements.length > 0));
+            }), map(({ id, models }) => {
                 const acc = { categoryId: id, visibleModels: new Array(), hiddenModels: new Array() };
                 if (!models) {
                     return acc;
@@ -217,7 +234,7 @@ export class BaseVisibilityHelper {
                 return merge(
                 // For hidden models we only need to check subModels
                 hiddenModels.length > 0
-                    ? this.#props.baseIdsCache.getSubModels({ modelIds: hiddenModels }).pipe(mergeMap(({ subModels }) => {
+                    ? this.#props.baseIdsCache.getSubModels({ modelIds: hiddenModels, categoryId }).pipe(mergeMap(({ subModels }) => {
                         if (subModels && Id64.sizeOf(subModels) > 0) {
                             return this.getModelsVisibilityStatus({
                                 modelIds: subModels,
@@ -241,7 +258,7 @@ export class BaseVisibilityHelper {
                         return this.getSubCategoriesVisibilityStatus({ categoryId, modelId: modelIdFromProps, subCategoryIds: subCategories });
                     }
                     return EMPTY;
-                }))).pipe(defaultIfEmpty(createVisibilityStatus(this.#props.viewport.viewsCategory(categoryId) ? "visible" : "hidden")));
+                }))).pipe(defaultIfEmpty(createVisibilityStatus(!this.#props.viewport.isAlwaysDrawnExclusive && this.#props.viewport.viewsCategory(categoryId) ? "visible" : "hidden")));
             }), mergeVisibilityStatuses);
         });
         return this.#props.overrideHandler
@@ -294,7 +311,7 @@ export class BaseVisibilityHelper {
             }
             // TODO: check child elements that are subModels
             if (!this.#props.viewport.viewsModel(modelId)) {
-                return from(elementIds).pipe(mergeMap((elementId) => from(this.#props.baseIdsCache.hasSubModel(elementId)).pipe(mergeMap((isSubModel) => {
+                return from(elementIds).pipe(releaseMainThreadOnItemsCount(100), mergeMap((elementId) => this.#props.baseIdsCache.hasSubModel(elementId).pipe(mergeMap((isSubModel) => {
                     if (isSubModel) {
                         return this.getModelsVisibilityStatus({
                             modelIds: elementId,
@@ -311,7 +328,7 @@ export class BaseVisibilityHelper {
                 elements: elementIds,
                 defaultStatus: () => this.getVisibleModelCategoriesDirectVisibilityStatus({ categoryIds: categoryId, modelId }),
             }).pipe(mergeMap((visibilityStatusAlwaysAndNeverDraw) => {
-                return from(Id64.iterable(elementIds)).pipe(mergeMap((elementId) => from(this.#props.baseIdsCache.hasSubModel(elementId)).pipe(mergeMap((isSubModel) => {
+                return from(Id64.iterable(elementIds)).pipe(mergeMap((elementId) => this.#props.baseIdsCache.hasSubModel(elementId).pipe(mergeMap((isSubModel) => {
                     if (isSubModel) {
                         return this.getModelsVisibilityStatus({
                             modelIds: elementId,
@@ -353,14 +370,14 @@ export class BaseVisibilityHelper {
             }));
         }
         const { modelId, categoryIds } = props.queryProps;
-        const totalCount = from(Id64.iterable(categoryIds)).pipe(mergeMap((categoryId) => this.#props.baseIdsCache.getElementsCount({ modelId, categoryId })), reduce((acc, specificModelCategoryCount) => {
-            return acc + specificModelCategoryCount;
-        }, 0));
-        return forkJoin({
-            totalCount,
-            alwaysDrawn: this.#alwaysAndNeverDrawnElements.getAlwaysDrawnElements(props.queryProps),
-            neverDrawn: this.#alwaysAndNeverDrawnElements.getNeverDrawnElements(props.queryProps),
-        }).pipe(
+        return from(Id64.iterable(categoryIds)).pipe(releaseMainThreadOnItemsCount(100), mergeMap((categoryId) => {
+            return forkJoin({
+                categoryId: of(categoryId),
+                totalCount: this.#props.baseIdsCache.getElementsCount({ modelId, categoryId }),
+                alwaysDrawn: this.#alwaysAndNeverDrawnElements.getAlwaysOrNeverDrawnElements({ modelIds: modelId, categoryIds: categoryId, setType: "always" }),
+                neverDrawn: this.#alwaysAndNeverDrawnElements.getAlwaysOrNeverDrawnElements({ modelIds: modelId, categoryIds: categoryId, setType: "never" }),
+            });
+        }), 
         // There is a known bug:
         // Categories that don't have root elements will make visibility result incorrect
         // E.g.:
@@ -369,13 +386,17 @@ export class BaseVisibilityHelper {
         //    - ChildElementB (CategoryB is hidden) ChildElementB is in always drawn list
         // Result will be "partial" because CategoryB will return hidden visibility, even though all elements are visible
         // TODO fix with: https://github.com/iTwin/viewer-components-react/issues/1100
-        map((state) => {
-            return getVisibilityFromAlwaysAndNeverDrawnElementsImpl({
+        mergeMap((state) => {
+            if (this.#props.viewport.isAlwaysDrawnExclusive && state.totalCount === 0) {
+                return EMPTY;
+            }
+            return of(getVisibilityFromAlwaysAndNeverDrawnElementsImpl({
                 ...props,
                 ...state,
                 viewport,
-            });
-        }));
+                defaultStatus: () => props.defaultStatus(state.categoryId),
+            }));
+        }), defaultIfEmpty(createVisibilityStatus("hidden")), mergeVisibilityStatuses);
     }
     /**
      * Changes visibility status of models.
@@ -422,19 +443,14 @@ export class BaseVisibilityHelper {
                 }
                 return acc;
             }, new Set())),
-            modelAlwaysDrawnElements: this.#alwaysAndNeverDrawnElements.getAlwaysDrawnElements({ modelId }),
-        }).pipe(mergeMap(async ({ allModelCategories, modelAlwaysDrawnElements }) => {
+            modelAlwaysDrawnElements: this.#alwaysAndNeverDrawnElements.getAlwaysOrNeverDrawnElements({ modelIds: modelId, setType: "always" }),
+        }).pipe(mergeMap(({ allModelCategories, modelAlwaysDrawnElements }) => {
             const alwaysDrawn = this.#props.viewport.alwaysDrawn;
             if (alwaysDrawn && modelAlwaysDrawnElements) {
                 viewport.setAlwaysDrawn({ elementIds: setDifference(alwaysDrawn, modelAlwaysDrawnElements) });
             }
-            const categoriesToOverride = categoriesToNotOverride
-                ? setDifference(allModelCategories, getSetFromId64Arg(categoriesToNotOverride))
-                : allModelCategories;
-            categoriesToOverride.forEach((categoryId) => {
-                this.changeCategoryStateInViewportAccordingToModelVisibility(modelId, categoryId, false, false);
-            });
             viewport.changeModelDisplay({ modelIds: modelId, display: true });
+            return from(Id64.iterable(allModelCategories)).pipe(categoriesToNotOverride ? filter((modelCategory) => !Id64.has(categoriesToNotOverride, modelCategory)) : identity, map((categoryId) => this.changeCategoryStateInViewportAccordingToModelVisibility(modelId, categoryId, false, false)), takeLast(1), defaultIfEmpty(undefined));
         }));
     }
     /** Adds per-model category overrides based on category visibility in category selector. */
@@ -542,7 +558,7 @@ export class BaseVisibilityHelper {
                 return this.queueElementsVisibilityChange(elementIds, on, isDisplayedByDefault);
             }), 
             // Change visibility of elements that are models
-            from(Id64.iterable(elementIds)).pipe(mergeMap((elementId) => from(this.#props.baseIdsCache.hasSubModel(elementId)).pipe(mergeMap((isSubModel) => {
+            from(Id64.iterable(elementIds)).pipe(releaseMainThreadOnItemsCount(100), mergeMap((elementId) => this.#props.baseIdsCache.hasSubModel(elementId).pipe(mergeMap((isSubModel) => {
                 if (isSubModel) {
                     return this.changeModelsVisibilityStatus({ modelIds: elementId, on });
                 }