@itwin/tree-widget-react 4.0.0-alpha.22 → 4.0.0-alpha.24

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

@@ -13,40 +13,40 @@ import { createVisibilityStatus } from "../Tooltip.js";
 import { createVisibilityChangeEventListener } from "../VisibilityChangeEventListener.js";
 /** @internal */
 export function useCachedVisibility(props) {
-    const [filteredPaths, setFilteredPaths] = useState(undefined);
-    const { activeView, getCache, createFilteredTree, createTreeSpecificVisibilityHandler, componentId } = props;
+    const [searchPaths, setSearchPaths] = useState(undefined);
+    const { activeView, getCache, createSearchResultsTree, createTreeSpecificVisibilityHandler, componentId } = props;
     const [visibilityHandlerFactory, setVisibilityHandlerFactory] = useState(() => createVisibilityHandlerFactory({
         activeView,
         getCache,
-        createFilteredTree,
+        createSearchResultsTree,
         createTreeSpecificVisibilityHandler,
-        filteringPaths: filteredPaths,
+        searchPaths,
         componentId,
     }));
     useEffect(() => {
         setVisibilityHandlerFactory(() => createVisibilityHandlerFactory({
             activeView,
             getCache,
-            createFilteredTree,
+            createSearchResultsTree,
             createTreeSpecificVisibilityHandler,
-            filteringPaths: filteredPaths,
+            searchPaths,
             componentId,
         }));
-    }, [activeView, getCache, filteredPaths, createFilteredTree, createTreeSpecificVisibilityHandler, componentId]);
+    }, [activeView, getCache, searchPaths, createSearchResultsTree, createTreeSpecificVisibilityHandler, componentId]);
     return {
         visibilityHandlerFactory,
-        onFilteredPathsChanged: useCallback((paths) => setFilteredPaths(paths), []),
-        filteredPaths,
+        onSearchPathsChanged: useCallback((paths) => setSearchPaths(paths), []),
+        searchPaths,
     };
 }
 function createVisibilityHandlerFactory(props) {
-    const { activeView, createFilteredTree, createTreeSpecificVisibilityHandler, getCache, filteringPaths, componentId } = props;
+    const { activeView, createSearchResultsTree, createTreeSpecificVisibilityHandler, getCache, searchPaths, componentId } = props;
     return ({ imodelAccess }) => new HierarchyVisibilityHandlerImpl({
         componentId,
         viewport: activeView,
-        getFilteredTree: () => {
-            if (filteringPaths) {
-                return createFilteredTree({ imodelAccess, filteringPaths, getCache });
+        getSearchResultsTree: () => {
+            if (searchPaths) {
+                return createSearchResultsTree({ imodelAccess, searchPaths, getCache });
             }
             return undefined;
         },
@@ -72,7 +72,7 @@ export class HierarchyVisibilityHandlerImpl {
     #alwaysAndNeverDrawnElements;
     #treeSpecificVisibilityHandler;
     #changeRequest = new Subject();
-    #filteredTree;
+    #searchResultsTree;
     constructor(props) {
         this.#props = props;
         this.#eventListener = createVisibilityChangeEventListener({
@@ -86,7 +86,7 @@ export class HierarchyVisibilityHandlerImpl {
         });
         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();
+        this.#searchResultsTree = this.#props.getSearchResultsTree();
     }
     get onVisibilityChange() {
         return this.#eventListener.onVisibilityChange;
@@ -126,44 +126,44 @@ export class HierarchyVisibilityHandlerImpl {
     }
     getVisibilityStatusInternal(node) {
         if (HierarchyNode.isClassGroupingNode(node)) {
-            if (node.extendedData?.hasDirectNonFilteredTargets && !node.extendedData?.hasFilterTargetAncestor) {
-                return this.getFilteredNodeVisibility({ node });
+            if (node.extendedData?.hasDirectNonSearchTargets && !node.extendedData?.hasSearchTargetAncestor) {
+                return this.getSearchResultsNodeVisibility({ node });
             }
         }
-        if (HierarchyNode.isInstancesNode(node) && node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
-            return this.getFilteredNodeVisibility({ node });
+        if (HierarchyNode.isInstancesNode(node) && node.search?.childrenTargetPaths?.length && !node.search.isSearchTarget) {
+            return this.getSearchResultsNodeVisibility({ node });
         }
         return this.#treeSpecificVisibilityHandler.getVisibilityStatus(node);
     }
     changeVisibilityStatusInternal(node, on) {
         if (HierarchyNode.isClassGroupingNode(node)) {
-            if (node.extendedData?.hasDirectNonFilteredTargets && !node.extendedData?.hasFilterTargetAncestor) {
-                return this.changeFilteredNodeVisibility({ node, on });
+            if (node.extendedData?.hasDirectNonSearchTargets && !node.extendedData?.hasSearchTargetAncestor) {
+                return this.changeSearchResultsNodeVisibility({ node, on });
             }
         }
-        if (HierarchyNode.isInstancesNode(node) && node.filtering?.filteredChildrenIdentifierPaths?.length && !node.filtering.isFilterTarget) {
-            return this.changeFilteredNodeVisibility({ node, on });
+        if (HierarchyNode.isInstancesNode(node) && node.search?.childrenTargetPaths?.length && !node.search.isSearchTarget) {
+            return this.changeSearchResultsNodeVisibility({ node, on });
         }
         return this.#treeSpecificVisibilityHandler.changeVisibilityStatus(node, on);
     }
-    getFilteredNodeVisibility(props) {
-        return this.getFilteredTreeTargets(props).pipe(mergeMap((targets) => {
+    getSearchResultsNodeVisibility(props) {
+        return this.getSearchResultsTreeTargets(props).pipe(mergeMap((targets) => {
             if (!targets) {
                 return EMPTY;
             }
-            return this.#treeSpecificVisibilityHandler.getFilterTargetsVisibilityStatus(targets);
+            return this.#treeSpecificVisibilityHandler.getSearchTargetsVisibilityStatus(targets);
         }));
     }
-    getFilteredTreeTargets({ node, }) {
-        assert(this.#filteredTree !== undefined);
-        return from(this.#filteredTree).pipe(map((filteredTree) => filteredTree.getFilterTargets(node)));
+    getSearchResultsTreeTargets({ node, }) {
+        assert(this.#searchResultsTree !== undefined);
+        return from(this.#searchResultsTree).pipe(map((searchResultsTree) => searchResultsTree.getSearchTargets(node)));
     }
-    changeFilteredNodeVisibility({ on, node, }) {
-        return this.getFilteredTreeTargets({ node }).pipe(mergeMap((targets) => {
+    changeSearchResultsNodeVisibility({ on, node, }) {
+        return this.getSearchResultsTreeTargets({ node }).pipe(mergeMap((targets) => {
             if (!targets) {
                 return EMPTY;
             }
-            return this.#treeSpecificVisibilityHandler.changeFilterTargetsVisibilityStatus(targets, on);
+            return this.#treeSpecificVisibilityHandler.changeSearchTargetsVisibilityStatus(targets, on);
         }));
     }
 }

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, 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.extendedData?.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.extendedData?.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"]}
+{"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, HierarchySearchPath, 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 { SearchResultsTree } from \"../visibility/BaseSearchResultsTree.js\";\nimport type { TreeSpecificVisibilityHandler } from \"../visibility/BaseVisibilityHelper.js\";\nimport type { IVisibilityChangeEventListener } from \"../VisibilityChangeEventListener.js\";\n\n/** @internal */\nexport interface CreateSearchResultsTreeProps<TCache> {\n  getCache: () => TCache;\n  imodelAccess: ECClassHierarchyInspector;\n  searchPaths: HierarchySearchPath[];\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, TSearchTargets> {\n  componentId: GuidString;\n  activeView: TreeWidgetViewport;\n  getCache: () => TCache;\n  createSearchResultsTree: (props: CreateSearchResultsTreeProps<TCache>) => Promise<SearchResultsTree<TSearchTargets>>;\n  createTreeSpecificVisibilityHandler: (props: CreateTreeSpecificVisibilityHandlerProps<TCache>) => TreeSpecificVisibilityHandler<TSearchTargets> & Disposable;\n}\n\n/** @internal */\nexport function useCachedVisibility<TCache, TSearchTargets>(props: UseCachedVisibilityProps<TCache, TSearchTargets>) {\n  const [searchPaths, setSearchPaths] = useState<HierarchySearchPath[] | undefined>(undefined);\n  const { activeView, getCache, createSearchResultsTree, createTreeSpecificVisibilityHandler, componentId } = props;\n\n  const [visibilityHandlerFactory, setVisibilityHandlerFactory] = useState<VisibilityTreeProps[\"visibilityHandlerFactory\"]>(() =>\n    createVisibilityHandlerFactory({\n      activeView,\n      getCache,\n      createSearchResultsTree,\n      createTreeSpecificVisibilityHandler,\n      searchPaths,\n      componentId,\n    }),\n  );\n\n  useEffect(() => {\n    setVisibilityHandlerFactory(() =>\n      createVisibilityHandlerFactory({\n        activeView,\n        getCache,\n        createSearchResultsTree,\n        createTreeSpecificVisibilityHandler,\n        searchPaths,\n        componentId,\n      }),\n    );\n  }, [activeView, getCache, searchPaths, createSearchResultsTree, createTreeSpecificVisibilityHandler, componentId]);\n\n  return {\n    visibilityHandlerFactory,\n    onSearchPathsChanged: useCallback((paths: HierarchySearchPath[] | undefined) => setSearchPaths(paths), []),\n    searchPaths,\n  };\n}\n\nfunction createVisibilityHandlerFactory<TCache, TSearchTargets>(\n  props: UseCachedVisibilityProps<TCache, TSearchTargets> & {\n    searchPaths: HierarchySearchPath[] | undefined;\n  },\n): VisibilityTreeProps[\"visibilityHandlerFactory\"] {\n  const { activeView, createSearchResultsTree, createTreeSpecificVisibilityHandler, getCache, searchPaths, componentId } = props;\n  return ({ imodelAccess }) =>\n    new HierarchyVisibilityHandlerImpl<TSearchTargets>({\n      componentId,\n      viewport: activeView,\n      getSearchResultsTree: (): Promise<SearchResultsTree<TSearchTargets>> | undefined => {\n        if (searchPaths) {\n          return createSearchResultsTree({ imodelAccess, searchPaths, 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<TSearchTargets> {\n  viewport: TreeWidgetViewport;\n  getTreeSpecificVisibilityHandler: (\n    info: AlwaysAndNeverDrawnElementInfo,\n    overrideHandler: HierarchyVisibilityOverrideHandler,\n  ) => TreeSpecificVisibilityHandler<TSearchTargets> & Disposable;\n  getSearchResultsTree: () => Promise<SearchResultsTree<TSearchTargets>> | 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<TSearchTargets> implements HierarchyVisibilityHandler, Disposable {\n  readonly #props: HierarchyVisibilityHandlerImplProps<TSearchTargets>;\n  readonly #eventListener: IVisibilityChangeEventListener;\n  readonly #alwaysAndNeverDrawnElements: AlwaysAndNeverDrawnElementInfo;\n  #treeSpecificVisibilityHandler: TreeSpecificVisibilityHandler<TSearchTargets> & Disposable;\n  #changeRequest = new Subject<{ key: HierarchyNodeKey; depth: number }>();\n  #searchResultsTree: Promise<SearchResultsTree<TSearchTargets>> | undefined;\n\n  constructor(props: HierarchyVisibilityHandlerImplProps<TSearchTargets>) {\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.#searchResultsTree = this.#props.getSearchResultsTree();\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?.hasDirectNonSearchTargets && !node.extendedData?.hasSearchTargetAncestor) {\n        return this.getSearchResultsNodeVisibility({ node });\n      }\n    }\n\n    if (HierarchyNode.isInstancesNode(node) && node.search?.childrenTargetPaths?.length && !node.search.isSearchTarget) {\n      return this.getSearchResultsNodeVisibility({ 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?.hasDirectNonSearchTargets && !node.extendedData?.hasSearchTargetAncestor) {\n        return this.changeSearchResultsNodeVisibility({ node, on });\n      }\n    }\n    if (HierarchyNode.isInstancesNode(node) && node.search?.childrenTargetPaths?.length && !node.search.isSearchTarget) {\n      return this.changeSearchResultsNodeVisibility({ node, on });\n    }\n    return this.#treeSpecificVisibilityHandler.changeVisibilityStatus(node, on);\n  }\n\n  private getSearchResultsNodeVisibility(props: {\n    node: HierarchyNode & {\n      key: ClassGroupingNodeKey | InstancesNodeKey;\n    };\n  }) {\n    return this.getSearchResultsTreeTargets(props).pipe(\n      mergeMap((targets) => {\n        if (!targets) {\n          return EMPTY;\n        }\n        return this.#treeSpecificVisibilityHandler.getSearchTargetsVisibilityStatus(targets);\n      }),\n    );\n  }\n\n  private getSearchResultsTreeTargets({\n    node,\n  }: {\n    node: HierarchyNode & {\n      key: ClassGroupingNodeKey | InstancesNodeKey;\n    };\n  }): Observable<TSearchTargets | undefined> {\n    assert(this.#searchResultsTree !== undefined);\n    return from(this.#searchResultsTree).pipe(map((searchResultsTree) => searchResultsTree.getSearchTargets(node)));\n  }\n\n  private changeSearchResultsNodeVisibility({\n    on,\n    node,\n  }: {\n    on: boolean;\n    node: HierarchyNode & {\n      key: ClassGroupingNodeKey | InstancesNodeKey;\n    };\n  }) {\n    return this.getSearchResultsTreeTargets({ node }).pipe(\n      mergeMap((targets) => {\n        if (!targets) {\n          return EMPTY;\n        }\n        return this.#treeSpecificVisibilityHandler.changeSearchTargetsVisibilityStatus(targets, on);\n      }),\n    );\n  }\n}\n"]}

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

@@ -0,0 +1,91 @@
+import { HierarchyNode, HierarchySearchPath } from "@itwin/presentation-hierarchies";
+import type { Id64String } from "@itwin/core-bentley";
+import type { ClassGroupingNodeKey, InstancesNodeKey } from "@itwin/presentation-hierarchies";
+import type { InstanceKey } from "@itwin/presentation-shared";
+/** @internal */
+export type SearchResultsTreeNodeChildren<TSearchResultsTreeNode> = Map<Id64String, TSearchResultsTreeNode>;
+/**
+ * A generic interface for a search results tree root node.
+ *
+ * It differs from `BaseSearchResultsTreeNode` in that it only contains children details and nothing else.
+ * @internal
+ */
+export interface SearchResultsTreeRootNode<TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>> {
+    children: SearchResultsTreeNodeChildren<TSearchResultsTreeNode>;
+}
+/**
+ * A generic interface for a search results tree node.
+ *
+ * It represents every node in a search results tree structure.
+ * @internal
+ * */
+export interface BaseSearchResultsTreeNode<TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>> {
+    type: string;
+    id: Id64String;
+    children?: SearchResultsTreeNodeChildren<TSearchResultsTreeNode>;
+    isSearchTarget: boolean;
+}
+/**
+ * Class that provides methods to handle search results nodes in a tree structure.
+ *
+ * It provides two methods that can be shared across different search results trees:
+ * - `processSearchResultsNodes` - processes search results nodes and returns a function to get search targets for a node.
+ * - `accept` - accepts a new node and adds it to the tree structure.
+ * @internal
+ */
+export declare abstract class SearchResultsNodesHandler<TProcessedSearchResultsNodes, TSearchTargets, TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>> {
+    readonly root: SearchResultsTreeRootNode<TSearchResultsTreeNode>;
+    readonly searchResultsNodesArr: TSearchResultsTreeNode[];
+    /** Returns search results tree node type based on its' className */
+    abstract getType(className: string): Promise<TSearchResultsTreeNode["type"]>;
+    /** Converts nodes to search targets */
+    abstract convertNodesToSearchTargets(searchResultsNodes: TSearchResultsTreeNode[], processedSearchResultsNodes: TProcessedSearchResultsNodes): TSearchTargets | undefined;
+    /**
+     * Processes search results nodes.
+     *
+     * Nodes are created using search paths, and some information is not present in the search paths.
+     * Because of this, some nodes may need to be processed to get additional information.
+     *
+     * E.g. Retrieving categoryId of elements can't be done using search paths.
+     */
+    abstract getProcessedSearchResultsNodes(): Promise<TProcessedSearchResultsNodes>;
+    /** Creates search results nodes  */
+    abstract createSearchResultsTreeNode(props: {
+        type: TSearchResultsTreeNode["type"];
+        id: Id64String;
+        isSearchTarget: boolean;
+        parent: TSearchResultsTreeNode | SearchResultsTreeRootNode<TSearchResultsTreeNode>;
+    }): TSearchResultsTreeNode;
+    processSearchResultsNodes(): Promise<{
+        getNodeSearchTargets: (node: HierarchyNode & {
+            key: ClassGroupingNodeKey | InstancesNodeKey;
+        }) => TSearchTargets | undefined;
+    }>;
+    /** Takes a new node and adds it to the tree structure. */
+    accept(props: {
+        instanceKey: InstanceKey;
+        parentNode: TSearchResultsTreeNode | SearchResultsTreeRootNode<TSearchResultsTreeNode>;
+        isSearchTarget: boolean;
+    }): Promise<TSearchResultsTreeNode>;
+    /** Takes a specific node and gets all search targets related to it. */
+    private getNodeSearchTargets;
+    /** Finds search results nodes that match the given keys. */
+    private findMatchingSearchResultsNodes;
+}
+/** @internal */
+export interface SearchResultsTree<TSearchTargets> {
+    getSearchTargets: (node: HierarchyNode & {
+        key: ClassGroupingNodeKey | InstancesNodeKey;
+    }) => TSearchTargets | undefined;
+}
+/** @internal */
+export interface CreateSearchResultsTreeProps<TProcessedSearchResultsNodes, TSearchTargets, TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>> {
+    searchResultsNodesHandler: SearchResultsNodesHandler<TProcessedSearchResultsNodes, TSearchTargets, TSearchResultsTreeNode>;
+    searchPaths: HierarchySearchPath[];
+}
+/**
+ * Function iterates over search paths and uses `searchResultsNodesHandler` to create a search results tree.
+ * @internal
+ */
+export declare function createSearchResultsTree<TProcessedSearchResultsNodes, TSearchTargets, TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>>(props: CreateSearchResultsTreeProps<TProcessedSearchResultsNodes, TSearchTargets, TSearchResultsTreeNode>): Promise<SearchResultsTree<TSearchTargets>>;
+//# sourceMappingURL=BaseSearchResultsTree.d.ts.map

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

@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+import { Id64 } from "@itwin/core-bentley";
+import { HierarchyNode, HierarchyNodeIdentifier, HierarchyNodeKey, HierarchySearchPath } from "@itwin/presentation-hierarchies";
+/**
+ * Class that provides methods to handle search results nodes in a tree structure.
+ *
+ * It provides two methods that can be shared across different search results trees:
+ * - `processSearchResultsNodes` - processes search results nodes and returns a function to get search targets for a node.
+ * - `accept` - accepts a new node and adds it to the tree structure.
+ * @internal
+ */
+export class SearchResultsNodesHandler {
+    root = {
+        children: new Map(),
+    };
+    searchResultsNodesArr = new Array();
+    async processSearchResultsNodes() {
+        const processedSearchResultsNodes = await this.getProcessedSearchResultsNodes();
+        return {
+            getNodeSearchTargets: (node) => this.getNodeSearchTargets(node, processedSearchResultsNodes),
+        };
+    }
+    /** Takes a new node and adds it to the tree structure. */
+    async accept(props) {
+        const { instanceKey, parentNode, isSearchTarget } = props;
+        const type = await this.getType(instanceKey.className);
+        const newNode = this.createSearchResultsTreeNode({
+            type,
+            id: instanceKey.id,
+            isSearchTarget,
+            parent: parentNode,
+        });
+        (parentNode.children ??= new Map()).set(instanceKey.id, newNode);
+        this.searchResultsNodesArr.push(newNode);
+        return newNode;
+    }
+    /** Takes a specific node and gets all search targets related to it. */
+    getNodeSearchTargets(node, processedSearchResultsNodes) {
+        let lookupParents = [this.root];
+        // find the search results parent nodes of the `node`
+        for (const parentKey of node.parentKeys) {
+            if (!HierarchyNodeKey.isInstances(parentKey)) {
+                continue;
+            }
+            // tree node might be merged from multiple instances. As search results 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.findMatchingSearchResultsNodes(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 search results nodes that match the `node`
+        const searchResultsNodes = this.findMatchingSearchResultsNodes(lookupParents, ids);
+        if (searchResultsNodes.length === 0) {
+            return undefined;
+        }
+        return this.convertNodesToSearchTargets(searchResultsNodes, processedSearchResultsNodes);
+    }
+    /** Finds search results nodes that match the given keys. */
+    findMatchingSearchResultsNodes(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;
+        });
+    }
+}
+/**
+ * Function iterates over search paths and uses `searchResultsNodesHandler` to create a search results tree.
+ * @internal
+ */
+export async function createSearchResultsTree(props) {
+    const { searchPaths, searchResultsNodesHandler } = props;
+    for (const searchPath of searchPaths) {
+        const normalizedPath = HierarchySearchPath.normalize(searchPath).path;
+        let parentNode = searchResultsNodesHandler.root;
+        for (let i = 0; i < normalizedPath.length; ++i) {
+            if ("type" in parentNode && "isSearchTarget" in parentNode && parentNode.isSearchTarget) {
+                break;
+            }
+            const identifier = normalizedPath[i];
+            if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {
+                break;
+            }
+            const currentNode = parentNode.children?.get(identifier.id);
+            if (currentNode !== undefined) {
+                parentNode = currentNode;
+                continue;
+            }
+            parentNode = await searchResultsNodesHandler.accept({
+                instanceKey: identifier,
+                parentNode,
+                isSearchTarget: i === normalizedPath.length - 1,
+            });
+        }
+    }
+    const processedSearchResultsNodes = await searchResultsNodesHandler.processSearchResultsNodes();
+    return {
+        getSearchTargets: (node) => processedSearchResultsNodes.getNodeSearchTargets(node),
+    };
+}
+//# sourceMappingURL=BaseSearchResultsTree.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"BaseSearchResultsTree.js","sourceRoot":"","sources":["../../../../../../../../src/tree-widget-react/components/trees/common/internal/visibility/BaseSearchResultsTree.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 { HierarchyNode, HierarchyNodeIdentifier, HierarchyNodeKey, HierarchySearchPath } 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 SearchResultsTreeNodeChildren<TSearchResultsTreeNode> = Map<Id64String, TSearchResultsTreeNode>;\n\n/**\n * A generic interface for a search results tree root node.\n *\n * It differs from `BaseSearchResultsTreeNode` in that it only contains children details and nothing else.\n * @internal\n */\nexport interface SearchResultsTreeRootNode<TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>> {\n  children: SearchResultsTreeNodeChildren<TSearchResultsTreeNode>;\n}\n\n/**\n * A generic interface for a search results tree node.\n *\n * It represents every node in a search results tree structure.\n * @internal\n * */\nexport interface BaseSearchResultsTreeNode<TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>> {\n  type: string;\n  id: Id64String;\n  children?: SearchResultsTreeNodeChildren<TSearchResultsTreeNode>;\n  isSearchTarget: boolean;\n}\n\n/**\n * Class that provides methods to handle search results nodes in a tree structure.\n *\n * It provides two methods that can be shared across different search results trees:\n * - `processSearchResultsNodes` - processes search results nodes and returns a function to get search targets for a node.\n * - `accept` - accepts a new node and adds it to the tree structure.\n * @internal\n */\nexport abstract class SearchResultsNodesHandler<\n  TProcessedSearchResultsNodes,\n  TSearchTargets,\n  TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>,\n> {\n  public readonly root: SearchResultsTreeRootNode<TSearchResultsTreeNode> = {\n    children: new Map(),\n  };\n  public readonly searchResultsNodesArr = new Array<TSearchResultsTreeNode>();\n\n  /** Returns search results tree node type based on its' className */\n  public abstract getType(className: string): Promise<TSearchResultsTreeNode[\"type\"]>;\n  /** Converts nodes to search targets */\n  public abstract convertNodesToSearchTargets(\n    searchResultsNodes: TSearchResultsTreeNode[],\n    processedSearchResultsNodes: TProcessedSearchResultsNodes,\n  ): TSearchTargets | undefined;\n  /**\n   * Processes search results nodes.\n   *\n   * Nodes are created using search paths, and some information is not present in the search 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 search paths.\n   */\n  public abstract getProcessedSearchResultsNodes(): Promise<TProcessedSearchResultsNodes>;\n  /** Creates search results nodes  */\n  public abstract createSearchResultsTreeNode(props: {\n    type: TSearchResultsTreeNode[\"type\"];\n    id: Id64String;\n    isSearchTarget: boolean;\n    parent: TSearchResultsTreeNode | SearchResultsTreeRootNode<TSearchResultsTreeNode>;\n  }): TSearchResultsTreeNode;\n\n  public async processSearchResultsNodes(): Promise<{\n    getNodeSearchTargets: (node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey }) => TSearchTargets | undefined;\n  }> {\n    const processedSearchResultsNodes = await this.getProcessedSearchResultsNodes();\n    return {\n      getNodeSearchTargets: (node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey }) =>\n        this.getNodeSearchTargets(node, processedSearchResultsNodes),\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: TSearchResultsTreeNode | SearchResultsTreeRootNode<TSearchResultsTreeNode>;\n    isSearchTarget: boolean;\n  }): Promise<TSearchResultsTreeNode> {\n    const { instanceKey, parentNode, isSearchTarget } = props;\n    const type = await this.getType(instanceKey.className);\n\n    const newNode = this.createSearchResultsTreeNode({\n      type,\n      id: instanceKey.id,\n      isSearchTarget,\n      parent: parentNode,\n    });\n    (parentNode.children ??= new Map()).set(instanceKey.id, newNode);\n    this.searchResultsNodesArr.push(newNode);\n    return newNode;\n  }\n\n  /** Takes a specific node and gets all search targets related to it. */\n  private getNodeSearchTargets(\n    node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey },\n    processedSearchResultsNodes: TProcessedSearchResultsNodes,\n  ): TSearchTargets | undefined {\n    let lookupParents: Array<SearchResultsTreeRootNode<TSearchResultsTreeNode> | TSearchResultsTreeNode> = [this.root];\n\n    // find the search results 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 search results 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.findMatchingSearchResultsNodes(\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 search results nodes that match the `node`\n    const searchResultsNodes = this.findMatchingSearchResultsNodes(lookupParents, ids);\n    if (searchResultsNodes.length === 0) {\n      return undefined;\n    }\n\n    return this.convertNodesToSearchTargets(searchResultsNodes, processedSearchResultsNodes);\n  }\n\n  /** Finds search results nodes that match the given keys. */\n  private findMatchingSearchResultsNodes(lookupParents: Array<SearchResultsTreeRootNode<TSearchResultsTreeNode> | TSearchResultsTreeNode>, ids: Id64Arg) {\n    return lookupParents.flatMap((lookup) => {\n      const childrenArray = Array<TSearchResultsTreeNode>();\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 SearchResultsTree<TSearchTargets> {\n  getSearchTargets: (node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey }) => TSearchTargets | undefined;\n}\n\n/** @internal */\nexport interface CreateSearchResultsTreeProps<\n  TProcessedSearchResultsNodes,\n  TSearchTargets,\n  TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>,\n> {\n  searchResultsNodesHandler: SearchResultsNodesHandler<TProcessedSearchResultsNodes, TSearchTargets, TSearchResultsTreeNode>;\n  searchPaths: HierarchySearchPath[];\n}\n\n/**\n * Function iterates over search paths and uses `searchResultsNodesHandler` to create a search results tree.\n * @internal\n */\nexport async function createSearchResultsTree<\n  TProcessedSearchResultsNodes,\n  TSearchTargets,\n  TSearchResultsTreeNode extends BaseSearchResultsTreeNode<TSearchResultsTreeNode>,\n>(props: CreateSearchResultsTreeProps<TProcessedSearchResultsNodes, TSearchTargets, TSearchResultsTreeNode>): Promise<SearchResultsTree<TSearchTargets>> {\n  const { searchPaths, searchResultsNodesHandler } = props;\n\n  for (const searchPath of searchPaths) {\n    const normalizedPath = HierarchySearchPath.normalize(searchPath).path;\n\n    let parentNode: SearchResultsTreeRootNode<TSearchResultsTreeNode> | TSearchResultsTreeNode = searchResultsNodesHandler.root;\n    for (let i = 0; i < normalizedPath.length; ++i) {\n      if (\"type\" in parentNode && \"isSearchTarget\" in parentNode && parentNode.isSearchTarget) {\n        break;\n      }\n\n      const identifier = normalizedPath[i];\n\n      if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {\n        break;\n      }\n\n      const currentNode: TSearchResultsTreeNode | undefined = parentNode.children?.get(identifier.id);\n      if (currentNode !== undefined) {\n        parentNode = currentNode;\n        continue;\n      }\n      parentNode = await searchResultsNodesHandler.accept({\n        instanceKey: identifier,\n        parentNode,\n        isSearchTarget: i === normalizedPath.length - 1,\n      });\n    }\n  }\n  const processedSearchResultsNodes = await searchResultsNodesHandler.processSearchResultsNodes();\n  return {\n    getSearchTargets: (node: HierarchyNode & { key: ClassGroupingNodeKey | InstancesNodeKey }) => processedSearchResultsNodes.getNodeSearchTargets(node),\n  };\n}\n"]}

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

@@ -1,5 +1,5 @@
 import type { Observable } from "rxjs";
-import type { Id64Arg, Id64Set, Id64String } from "@itwin/core-bentley";
+import type { Id64Arg, Id64Array, Id64Set, Id64String } from "@itwin/core-bentley";
 import type { HierarchyNode } from "@itwin/presentation-hierarchies";
 import type { TreeWidgetViewport } from "../../TreeWidgetViewport.js";
 import type { HierarchyVisibilityHandlerOverridableMethod, HierarchyVisibilityOverrideHandler, VisibilityStatus } from "../../UseHierarchyVisibility.js";
@@ -46,11 +46,8 @@ export interface BaseIdsCache {
         categoryId: Id64String;
     }) => Observable<number>;
     getSubCategories: (props: {
-        categoryIds: Id64Arg;
-    }) => Observable<{
-        id: Id64String;
-        subCategories: Id64Arg | undefined;
-    }>;
+        categoryId: Id64String;
+    }) => Observable<Id64Array>;
     getModels: (props: {
         categoryIds: Id64Arg;
     }) => Observable<{
@@ -83,11 +80,11 @@ export interface BaseIdsCache {
  * Interface for a tree visibility handler that provides methods to get and change visibility status of hierarchy nodes.
  * @internal
  */
-export interface TreeSpecificVisibilityHandler<TFilterTargets> {
+export interface TreeSpecificVisibilityHandler<TSearchTargets> {
     getVisibilityStatus: (node: HierarchyNode) => Observable<VisibilityStatus>;
     changeVisibilityStatus: (node: HierarchyNode, on: boolean) => Observable<void>;
-    getFilterTargetsVisibilityStatus: (targets: TFilterTargets) => Observable<VisibilityStatus>;
-    changeFilterTargetsVisibilityStatus: (targets: TFilterTargets, on: boolean) => Observable<void>;
+    getSearchTargetsVisibilityStatus: (targets: TSearchTargets) => Observable<VisibilityStatus>;
+    changeSearchTargetsVisibilityStatus: (targets: TSearchTargets, on: boolean) => Observable<void>;
 }
 /** @internal */
 export interface BaseVisibilityHelperProps {
@@ -151,7 +148,6 @@ export declare class BaseVisibilityHelper implements Disposable {
     getSubCategoriesVisibilityStatus(props: {
         subCategoryIds: Id64Arg;
         categoryId: Id64String;
-        modelId?: Id64String;
     }): Observable<VisibilityStatus>;
     /**
      * Gets visibility status of categories.

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, identity, map, merge, mergeMap, of, reduce, shareReplay, startWith, Subject, take, takeLast, takeUntil, tap, } from "rxjs";
+import { concat, concatAll, defaultIfEmpty, defer, EMPTY, filter, forkJoin, from, identity, map, merge, mergeAll, 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, releaseMainThreadOnItemsCount, setDifference, setIntersection } from "../Utils.js";
+import { fromWithRelease, getSetFromId64Arg, releaseMainThreadOnItemsCount, setDifference, setIntersection } from "../Utils.js";
 import { changeElementStateNoChildrenOperator, enableCategoryDisplay, getVisibilityFromAlwaysAndNeverDrawnElementsImpl, mergeVisibilityStatuses, } from "../VisibilityUtils.js";
 /**
  * Base class for visibility status getters and modifiers.
@@ -132,7 +132,7 @@ export class BaseVisibilityHelper {
      * - Sub-categories visibility in the viewport.
      */
     getSubCategoriesVisibilityStatus(props) {
-        return (props.modelId ? of({ id: props.categoryId, models: props.modelId }) : from(this.#props.baseIdsCache.getModels({ categoryIds: props.categoryId }))).pipe(map(({ models }) => {
+        return this.#props.baseIdsCache.getModels({ categoryIds: props.categoryId }).pipe(map(({ models }) => {
             let visibility = "unknown";
             let nonDefaultModelDisplayStatesCount = 0;
             for (const modelId of Id64.iterable(models ?? [])) {
@@ -197,9 +197,10 @@ export class BaseVisibilityHelper {
             if (!isSupportedInView) {
                 return of(createVisibilityStatus("disabled"));
             }
-            return (modelIdFromProps
+            const categoryModelsObs = modelIdFromProps
                 ? from(Id64.iterable(categoryIds)).pipe(map((categoryId) => ({ id: categoryId, models: modelIdFromProps })))
-                : this.#props.baseIdsCache.getModels({ categoryIds })).pipe(mergeMap(({ id, models }) => {
+                : this.#props.baseIdsCache.getModels({ categoryIds });
+            return (Id64.sizeOf(categoryIds) > 100 ? categoryModelsObs.pipe(releaseMainThreadOnItemsCount(100)) : categoryModelsObs).pipe(mergeMap(({ id, models }) => {
                 if (!this.#props.viewport.isAlwaysDrawnExclusive) {
                     return of({ id, models });
                 }
@@ -253,12 +254,14 @@ export class BaseVisibilityHelper {
                     })))
                     : EMPTY, 
                 // We need to check subCategories as well
-                this.#props.baseIdsCache.getSubCategories({ categoryIds: categoryId }).pipe(mergeMap(({ subCategories }) => {
-                    if (subCategories && Id64.sizeOf(subCategories) > 0) {
-                        return this.getSubCategoriesVisibilityStatus({ categoryId, modelId: modelIdFromProps, subCategoryIds: subCategories });
-                    }
-                    return EMPTY;
-                }))).pipe(defaultIfEmpty(createVisibilityStatus(!this.#props.viewport.isAlwaysDrawnExclusive && this.#props.viewport.viewsCategory(categoryId) ? "visible" : "hidden")));
+                !modelIdFromProps
+                    ? this.#props.baseIdsCache.getSubCategories({ categoryId }).pipe(mergeMap((subCategoryIds) => {
+                        if (subCategoryIds.length > 0) {
+                            return this.getSubCategoriesVisibilityStatus({ categoryId, subCategoryIds });
+                        }
+                        return EMPTY;
+                    }))
+                    : EMPTY).pipe(defaultIfEmpty(createVisibilityStatus(!this.#props.viewport.isAlwaysDrawnExclusive && this.#props.viewport.viewsCategory(categoryId) ? "visible" : "hidden")));
             }), mergeVisibilityStatuses);
         });
         return this.#props.overrideHandler
@@ -311,7 +314,7 @@ export class BaseVisibilityHelper {
             }
             // TODO: check child elements that are subModels
             if (!this.#props.viewport.viewsModel(modelId)) {
-                return from(elementIds).pipe(releaseMainThreadOnItemsCount(100), mergeMap((elementId) => this.#props.baseIdsCache.hasSubModel(elementId).pipe(mergeMap((isSubModel) => {
+                return fromWithRelease({ source: elementIds, releaseOnCount: 100 }).pipe(mergeMap((elementId) => this.#props.baseIdsCache.hasSubModel(elementId).pipe(mergeMap((isSubModel) => {
                     if (isSubModel) {
                         return this.getModelsVisibilityStatus({
                             modelIds: elementId,
@@ -370,7 +373,7 @@ export class BaseVisibilityHelper {
             }));
         }
         const { modelId, categoryIds } = props.queryProps;
-        return from(Id64.iterable(categoryIds)).pipe(releaseMainThreadOnItemsCount(100), mergeMap((categoryId) => {
+        return fromWithRelease({ source: categoryIds, releaseOnCount: 100 }).pipe(mergeMap((categoryId) => {
             return forkJoin({
                 categoryId: of(categoryId),
                 totalCount: this.#props.baseIdsCache.getElementsCount({ modelId, categoryId }),
@@ -502,7 +505,16 @@ export class BaseVisibilityHelper {
                     categoryIds,
                     override: on ? "show" : "hide",
                 }))
-                : concat(from(enableCategoryDisplay(viewport, categoryIds, on, on)), modelIdsObservable.pipe(map(([modelId, modelCategories]) => {
+                : merge(
+                // In case of turning categories on, need to change sub-categories separately as enableCategoryDisplay
+                // takes a long time to get sub-categories for each category
+                on
+                    ? fromWithRelease({ source: categoryIds, releaseOnCount: 200 }).pipe(mergeMap((categoryId) => this.#props.baseIdsCache.getSubCategories({ categoryId })), mergeAll(), releaseMainThreadOnItemsCount(200), map((subCategoryId) => {
+                        if (!this.#props.viewport.viewsSubCategory(subCategoryId)) {
+                            this.#props.viewport.changeSubCategoryDisplay({ subCategoryId, display: true });
+                        }
+                    }))
+                    : EMPTY, from(enableCategoryDisplay(viewport, categoryIds, on, false)), modelIdsObservable.pipe(map(([modelId, modelCategories]) => {
                     viewport.setPerModelCategoryOverride({ modelIds: modelId, categoryIds: modelCategories, override: "none" });
                 }))), 
             // If categories visibility needs to be turned on, we need to turn on models without turning on unrelated elements or categories for that model
@@ -558,7 +570,7 @@ export class BaseVisibilityHelper {
                 return this.queueElementsVisibilityChange(elementIds, on, isDisplayedByDefault);
             }), 
             // Change visibility of elements that are models
-            from(Id64.iterable(elementIds)).pipe(releaseMainThreadOnItemsCount(100), mergeMap((elementId) => this.#props.baseIdsCache.hasSubModel(elementId).pipe(mergeMap((isSubModel) => {
+            fromWithRelease({ source: elementIds, releaseOnCount: 100 }).pipe(mergeMap((elementId) => this.#props.baseIdsCache.hasSubModel(elementId).pipe(mergeMap((isSubModel) => {
                 if (isSubModel) {
                     return this.changeModelsVisibilityStatus({ modelIds: elementId, on });
                 }