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

package/lib/esm/tree-widget-react/components/trees/categories-tree/internal/UseSearchPaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"UseSearchPaths.js","sourceRoot":"","sources":["../../../../../../../src/tree-widget-react/components/trees/categories-tree/internal/UseSearchPaths.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 { useEffect, useMemo, useState } from \"react\";\nimport { firstValueFrom } from \"rxjs\";\nimport { assert } from \"@itwin/core-bentley\";\nimport { HierarchyNodeIdentifier, HierarchySearchPath } from \"@itwin/presentation-hierarchies\";\nimport { CLASS_NAME_DefinitionContainer, CLASS_NAME_SubCategory } from \"../../common/internal/ClassNameDefinitions.js\";\nimport { getClassesByView } from \"../../common/internal/Utils.js\";\nimport { SearchLimitExceededError } from \"../../common/TreeErrors.js\";\nimport { useTelemetryContext } from \"../../common/UseTelemetryContext.js\";\nimport { CategoriesTreeDefinition } from \"../CategoriesTreeDefinition.js\";\n\nimport type { GuidString } from \"@itwin/core-bentley\";\nimport type { CategoryInfo } from \"../../common/CategoriesVisibilityUtils.js\";\nimport type { VisibilityTreeProps } from \"../../common/components/VisibilityTree.js\";\nimport type { CategoryId, ElementId, ModelId, SubCategoryId } from \"../../common/internal/Types.js\";\nimport type { CategoriesTreeHierarchyConfiguration } from \"../CategoriesTreeDefinition.js\";\nimport type { CategoriesTreeIdsCache } from \"./CategoriesTreeIdsCache.js\";\n\n/** @internal */\nexport type CategoriesTreeSearchError = \"tooManySearchMatches\" | \"unknownSearchError\";\n\ntype HierarchySearchPaths = Awaited<ReturnType<Required<VisibilityTreeProps>[\"getSearchPaths\"]>>;\n\n/** @internal */\nexport function useSearchPaths({\n  searchText,\n  viewType,\n  hierarchyConfiguration,\n  getCategoriesTreeIdsCache,\n  onCategoriesFiltered,\n  onSearchPathsChanged,\n  componentId,\n}: {\n  viewType: \"2d\" | \"3d\";\n  searchText?: string;\n  hierarchyConfiguration: CategoriesTreeHierarchyConfiguration;\n  getCategoriesTreeIdsCache: () => CategoriesTreeIdsCache;\n  onCategoriesFiltered?: (categories: { categories: CategoryInfo[] | undefined; models?: Array<ModelId> }) => void;\n  onSearchPathsChanged: (paths: HierarchySearchPaths | undefined) => void;\n  componentId: GuidString;\n}): {\n  getPaths: VisibilityTreeProps[\"getSearchPaths\"] | undefined;\n  searchError: CategoriesTreeSearchError | undefined;\n} {\n  const [searchError, setSearchError] = useState<CategoriesTreeSearchError | undefined>();\n  const { onFeatureUsed } = useTelemetryContext();\n\n  useEffect(() => {\n    setSearchError(undefined);\n    onCategoriesFiltered?.({ categories: undefined, models: undefined });\n    if (!searchText) {\n      onSearchPathsChanged(undefined);\n    }\n  }, [searchText, onCategoriesFiltered, onSearchPathsChanged]);\n\n  const getSearchPaths = useMemo<VisibilityTreeProps[\"getSearchPaths\"] | undefined>(() => {\n    if (!searchText) {\n      return undefined;\n    }\n\n    return async ({ imodelAccess, abortSignal }) => {\n      onFeatureUsed({ featureId: \"search\", reportInteraction: true });\n      try {\n        const paths = await CategoriesTreeDefinition.createInstanceKeyPaths({\n          imodelAccess,\n          abortSignal,\n          label: searchText,\n          viewType,\n          idsCache: getCategoriesTreeIdsCache(),\n          hierarchyConfig: hierarchyConfiguration,\n          componentId,\n        });\n        onSearchPathsChanged(paths);\n        const { elementClass, modelClass } = getClassesByView(viewType);\n        onCategoriesFiltered?.(await getCategoriesFromPaths(paths, getCategoriesTreeIdsCache(), elementClass, modelClass, hierarchyConfiguration));\n        return paths;\n      } catch (e) {\n        const newError = e instanceof SearchLimitExceededError ? \"tooManySearchMatches\" : \"unknownSearchError\";\n        if (newError !== \"tooManySearchMatches\") {\n          const feature = e instanceof Error && e.message.includes(\"query too long to execute or server is too busy\") ? \"error-timeout\" : \"error-unknown\";\n          onFeatureUsed({ featureId: feature, reportInteraction: false });\n        }\n        setSearchError(newError);\n        return [];\n      }\n    };\n  }, [onCategoriesFiltered, searchText, onSearchPathsChanged, onFeatureUsed, viewType, getCategoriesTreeIdsCache, hierarchyConfiguration, componentId]);\n\n  return {\n    getPaths: getSearchPaths,\n    searchError,\n  };\n}\n\nasync function getCategoriesFromPaths(\n  paths: HierarchySearchPaths,\n  idsCache: CategoriesTreeIdsCache,\n  elementClassName: string,\n  modelsClassName: string,\n  hierarchyConfig: CategoriesTreeHierarchyConfiguration,\n): Promise<{ categories: CategoryInfo[] | undefined; models?: Array<ModelId> }> {\n  if (!paths) {\n    return { categories: undefined };\n  }\n\n  const rootFilteredElementIds = new Set<ElementId>();\n  const subModelIds = new Set<ModelId>();\n\n  const categories = new Map<CategoryId, Array<SubCategoryId>>();\n  for (const path of paths) {\n    const currPath = HierarchySearchPath.normalize(path).path;\n    if (currPath.length === 0) {\n      continue;\n    }\n\n    let category: HierarchyNodeIdentifier;\n    let subCategory: HierarchyNodeIdentifier | undefined;\n\n    let lastNodeInfo: { lastNode: HierarchyNodeIdentifier; nodeIndex: number } | undefined;\n\n    for (let i = 0; i < currPath.length; ++i) {\n      const currentNode = currPath[i];\n      if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(currentNode)) {\n        continue;\n      }\n      if (currentNode.className === elementClassName) {\n        rootFilteredElementIds.add(currentNode.id);\n        for (let j = i + 1; j < currPath.length; ++j) {\n          const childNode = currPath[j];\n          if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(childNode)) {\n            continue;\n          }\n          if (childNode.className === modelsClassName) {\n            subModelIds.add(childNode.id);\n          }\n        }\n        break;\n      }\n      lastNodeInfo = { lastNode: currentNode, nodeIndex: i };\n    }\n\n    assert(lastNodeInfo !== undefined && HierarchyNodeIdentifier.isInstanceNodeIdentifier(lastNodeInfo.lastNode));\n\n    if (lastNodeInfo.lastNode.className === CLASS_NAME_DefinitionContainer) {\n      const definitionContainerCategories = await firstValueFrom(\n        idsCache.getAllContainedCategories({ definitionContainerIds: lastNodeInfo.lastNode.id, includeEmptyCategories: hierarchyConfig.showEmptyCategories }),\n      );\n      for (const categoryId of definitionContainerCategories) {\n        const value = categories.get(categoryId);\n        if (value === undefined) {\n          categories.set(categoryId, []);\n        }\n      }\n      continue;\n    }\n\n    if (lastNodeInfo.lastNode.className === CLASS_NAME_SubCategory) {\n      const secondToLastNode = lastNodeInfo.nodeIndex > 0 ? currPath[lastNodeInfo.nodeIndex - 1] : undefined;\n      assert(secondToLastNode !== undefined && HierarchyNodeIdentifier.isInstanceNodeIdentifier(secondToLastNode));\n\n      subCategory = lastNodeInfo.lastNode;\n      category = secondToLastNode;\n    } else {\n      category = lastNodeInfo.lastNode;\n    }\n\n    let entry = categories.get(category.id);\n    if (entry === undefined) {\n      entry = [];\n      categories.set(category.id, entry);\n    }\n\n    if (subCategory) {\n      entry.push(subCategory.id);\n    }\n  }\n  const rootElementModelMap = await firstValueFrom(idsCache.getFilteredElementsModels(rootFilteredElementIds));\n  const models = [...subModelIds, ...new Set(rootElementModelMap.values())];\n  return {\n    categories: [...categories.entries()].map(([categoryId, subCategoryIds]) => ({\n      categoryId,\n      subCategoryIds: subCategoryIds.length === 0 ? undefined : subCategoryIds,\n    })),\n    models,\n  };\n}\n"]}
+{"version":3,"file":"UseSearchPaths.js","sourceRoot":"","sources":["../../../../../../../src/tree-widget-react/components/trees/categories-tree/internal/UseSearchPaths.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 { useEffect, useMemo, useState } from \"react\";\nimport { firstValueFrom } from \"rxjs\";\nimport { assert } from \"@itwin/core-bentley\";\nimport { HierarchyNodeIdentifier, HierarchySearchPath } from \"@itwin/presentation-hierarchies\";\nimport { CLASS_NAME_DefinitionContainer, CLASS_NAME_SubCategory } from \"../../common/internal/ClassNameDefinitions.js\";\nimport { getClassesByView } from \"../../common/internal/Utils.js\";\nimport { SearchLimitExceededError } from \"../../common/TreeErrors.js\";\nimport { useTelemetryContext } from \"../../common/UseTelemetryContext.js\";\nimport { CategoriesTreeDefinition } from \"../CategoriesTreeDefinition.js\";\n\nimport type { GuidString } from \"@itwin/core-bentley\";\nimport type { CategoryInfo } from \"../../common/CategoriesVisibilityUtils.js\";\nimport type { VisibilityTreeProps } from \"../../common/components/VisibilityTree.js\";\nimport type { CategoryId, ElementId, ModelId, SubCategoryId } from \"../../common/internal/Types.js\";\nimport type { CategoriesTreeHierarchyConfiguration } from \"../CategoriesTreeDefinition.js\";\nimport type { CategoriesTreeIdsCache } from \"./CategoriesTreeIdsCache.js\";\n\n/** @internal */\nexport type CategoriesTreeSearchError = \"tooManySearchMatches\" | \"unknownSearchError\";\n\ntype HierarchySearchPaths = Awaited<ReturnType<Required<VisibilityTreeProps>[\"getSearchPaths\"]>>;\n\n/** @internal */\nexport function useSearchPaths({\n  searchText,\n  viewType,\n  hierarchyConfiguration,\n  idsCache,\n  onCategoriesFiltered,\n  onSearchPathsChanged,\n  componentId,\n}: {\n  viewType: \"2d\" | \"3d\";\n  searchText?: string;\n  hierarchyConfiguration: CategoriesTreeHierarchyConfiguration;\n  idsCache: CategoriesTreeIdsCache;\n  onCategoriesFiltered?: (categories: { categories: CategoryInfo[] | undefined; models?: Array<ModelId> }) => void;\n  onSearchPathsChanged: (paths: HierarchySearchPaths | undefined) => void;\n  componentId: GuidString;\n}): {\n  getPaths: VisibilityTreeProps[\"getSearchPaths\"] | undefined;\n  searchError: CategoriesTreeSearchError | undefined;\n} {\n  const [searchError, setSearchError] = useState<CategoriesTreeSearchError | undefined>();\n  const { onFeatureUsed } = useTelemetryContext();\n\n  useEffect(() => {\n    setSearchError(undefined);\n    onCategoriesFiltered?.({ categories: undefined, models: undefined });\n    if (!searchText) {\n      onSearchPathsChanged(undefined);\n    }\n  }, [searchText, onCategoriesFiltered, onSearchPathsChanged]);\n\n  const getSearchPaths = useMemo<VisibilityTreeProps[\"getSearchPaths\"] | undefined>(() => {\n    if (!searchText) {\n      return undefined;\n    }\n\n    return async ({ imodelAccess, abortSignal }) => {\n      onFeatureUsed({ featureId: \"search\", reportInteraction: true });\n      try {\n        const paths = await CategoriesTreeDefinition.createInstanceKeyPaths({\n          imodelAccess,\n          abortSignal,\n          label: searchText,\n          viewType,\n          idsCache,\n          hierarchyConfig: hierarchyConfiguration,\n          componentId,\n        });\n        onSearchPathsChanged(paths);\n        const { elementClass, modelClass } = getClassesByView(viewType);\n        onCategoriesFiltered?.(await getCategoriesFromPaths(paths, idsCache, elementClass, modelClass, hierarchyConfiguration));\n        return paths;\n      } catch (e) {\n        const newError = e instanceof SearchLimitExceededError ? \"tooManySearchMatches\" : \"unknownSearchError\";\n        if (newError !== \"tooManySearchMatches\") {\n          const feature = e instanceof Error && e.message.includes(\"query too long to execute or server is too busy\") ? \"error-timeout\" : \"error-unknown\";\n          onFeatureUsed({ featureId: feature, reportInteraction: false });\n        }\n        setSearchError(newError);\n        return [];\n      }\n    };\n  }, [onCategoriesFiltered, searchText, onSearchPathsChanged, onFeatureUsed, viewType, idsCache, hierarchyConfiguration, componentId]);\n\n  return {\n    getPaths: getSearchPaths,\n    searchError,\n  };\n}\n\nasync function getCategoriesFromPaths(\n  paths: HierarchySearchPaths,\n  idsCache: CategoriesTreeIdsCache,\n  elementClassName: string,\n  modelsClassName: string,\n  hierarchyConfig: CategoriesTreeHierarchyConfiguration,\n): Promise<{ categories: CategoryInfo[] | undefined; models?: Array<ModelId> }> {\n  if (!paths) {\n    return { categories: undefined };\n  }\n\n  const rootFilteredElementIds = new Set<ElementId>();\n  const subModelIds = new Set<ModelId>();\n\n  const categories = new Map<CategoryId, Array<SubCategoryId>>();\n  for (const path of paths) {\n    const currPath = HierarchySearchPath.normalize(path).path;\n    if (currPath.length === 0) {\n      continue;\n    }\n\n    let category: HierarchyNodeIdentifier;\n    let subCategory: HierarchyNodeIdentifier | undefined;\n\n    let lastNodeInfo: { lastNode: HierarchyNodeIdentifier; nodeIndex: number } | undefined;\n\n    for (let i = 0; i < currPath.length; ++i) {\n      const currentNode = currPath[i];\n      if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(currentNode)) {\n        continue;\n      }\n      if (currentNode.className === elementClassName) {\n        rootFilteredElementIds.add(currentNode.id);\n        for (let j = i + 1; j < currPath.length; ++j) {\n          const childNode = currPath[j];\n          if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(childNode)) {\n            continue;\n          }\n          if (childNode.className === modelsClassName) {\n            subModelIds.add(childNode.id);\n          }\n        }\n        break;\n      }\n      lastNodeInfo = { lastNode: currentNode, nodeIndex: i };\n    }\n\n    assert(lastNodeInfo !== undefined && HierarchyNodeIdentifier.isInstanceNodeIdentifier(lastNodeInfo.lastNode));\n\n    if (lastNodeInfo.lastNode.className === CLASS_NAME_DefinitionContainer) {\n      const definitionContainerCategories = await firstValueFrom(\n        idsCache.getAllContainedCategories({ definitionContainerIds: lastNodeInfo.lastNode.id, includeEmptyCategories: hierarchyConfig.showEmptyCategories }),\n      );\n      for (const categoryId of definitionContainerCategories) {\n        const value = categories.get(categoryId);\n        if (value === undefined) {\n          categories.set(categoryId, []);\n        }\n      }\n      continue;\n    }\n\n    if (lastNodeInfo.lastNode.className === CLASS_NAME_SubCategory) {\n      const secondToLastNode = lastNodeInfo.nodeIndex > 0 ? currPath[lastNodeInfo.nodeIndex - 1] : undefined;\n      assert(secondToLastNode !== undefined && HierarchyNodeIdentifier.isInstanceNodeIdentifier(secondToLastNode));\n\n      subCategory = lastNodeInfo.lastNode;\n      category = secondToLastNode;\n    } else {\n      category = lastNodeInfo.lastNode;\n    }\n\n    let entry = categories.get(category.id);\n    if (entry === undefined) {\n      entry = [];\n      categories.set(category.id, entry);\n    }\n\n    if (subCategory) {\n      entry.push(subCategory.id);\n    }\n  }\n  const rootElementModelMap = await firstValueFrom(idsCache.getFilteredElementsModels(rootFilteredElementIds));\n  const models = [...subModelIds, ...new Set(rootElementModelMap.values())];\n  return {\n    categories: [...categories.entries()].map(([categoryId, subCategoryIds]) => ({\n      categoryId,\n      subCategoryIds: subCategoryIds.length === 0 ? undefined : subCategoryIds,\n    })),\n    models,\n  };\n}\n"]}

package/lib/esm/tree-widget-react/components/trees/categories-tree/internal/visibility/CategoriesTreeVisibilityHandler.d.ts

@@ -1,9 +1,8 @@
-import { HierarchyNode } from "@itwin/presentation-hierarchies";
 import { HierarchyVisibilityHandlerImpl } from "../../../common/internal/useTreeHooks/UseCachedVisibility.js";
 import type { Observable } from "rxjs";
-import type { HierarchySearchPath } from "@itwin/presentation-hierarchies";
+import type { ClassGroupingNodeKey, HierarchyNode, HierarchySearchPath, InstancesNodeKey } from "@itwin/presentation-hierarchies";
 import type { ECClassHierarchyInspector } from "@itwin/presentation-shared";
-import type { AlwaysAndNeverDrawnElementInfo } from "../../../common/internal/AlwaysAndNeverDrawnElementInfo.js";
+import type { AlwaysAndNeverDrawnElementInfoCache } from "../../../common/internal/caches/AlwaysAndNeverDrawnElementInfoCache.js";
 import type { TreeSpecificVisibilityHandler } from "../../../common/internal/visibility/BaseVisibilityHelper.js";
 import type { TreeWidgetViewport } from "../../../common/TreeWidgetViewport.js";
 import type { VisibilityStatus } from "../../../common/UseHierarchyVisibility.js";
@@ -14,7 +13,7 @@ import type { CategoriesTreeSearchTargets } from "./SearchResultsTree.js";
 export interface CategoriesTreeVisibilityHandlerProps {
     idsCache: CategoriesTreeIdsCache;
     viewport: TreeWidgetViewport;
-    alwaysAndNeverDrawnElementInfo: AlwaysAndNeverDrawnElementInfo;
+    alwaysAndNeverDrawnElementInfo: AlwaysAndNeverDrawnElementInfoCache;
     hierarchyConfig: CategoriesTreeHierarchyConfiguration;
 }
 /**
@@ -31,14 +30,9 @@ export declare class CategoriesTreeVisibilityHandler implements Disposable, Tree
     getVisibilityStatus(node: HierarchyNode): Observable<VisibilityStatus>;
     /** Changes visibility of the items represented by the tree node. */
     changeVisibilityStatus(node: HierarchyNode, on: boolean): Observable<void>;
-    getSearchTargetsVisibilityStatus(targets: CategoriesTreeSearchTargets): Observable<VisibilityStatus>;
-    private getCategories;
-    private getAllCategories;
-    private getElementsCount;
-    private getModels;
-    private getSubCategories;
-    private getSubModels;
-    private getGroupingNodeInfo;
+    getSearchTargetsVisibilityStatus(targets: CategoriesTreeSearchTargets, node: HierarchyNode & {
+        key: ClassGroupingNodeKey | InstancesNodeKey;
+    }): Observable<VisibilityStatus>;
 }
 /**
  * Creates categories tree visibility handler. Is used by integration and performance tests.

package/lib/esm/tree-widget-react/components/trees/categories-tree/internal/visibility/CategoriesTreeVisibilityHandler.js

@@ -2,14 +2,14 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-import { concat, defer, EMPTY, from, map, merge, mergeMap, of } from "rxjs";
-import { assert, Guid, Id64 } from "@itwin/core-bentley";
-import { HierarchyNode } from "@itwin/presentation-hierarchies";
+import { concat, defer, EMPTY, from, map, merge, mergeAll, mergeMap, of } from "rxjs";
+import { assert, Guid } from "@itwin/core-bentley";
+import { HierarchyNodeKey } from "@itwin/presentation-hierarchies";
 import { createVisibilityStatus } from "../../../common/internal/Tooltip.js";
 import { HierarchyVisibilityHandlerImpl } from "../../../common/internal/useTreeHooks/UseCachedVisibility.js";
-import { fromWithRelease, getClassesByView } from "../../../common/internal/Utils.js";
+import { fromWithRelease, getClassesByView, getIdsFromChildrenTree, getParentElementsIdsPath, setDifference, setIntersection, } from "../../../common/internal/Utils.js";
 import { mergeVisibilityStatuses } from "../../../common/internal/VisibilityUtils.js";
-import { CategoriesTreeNode } from "../CategoriesTreeNode.js";
+import { CategoriesTreeNodeInternal } from "../../internal/CategoriesTreeNodeInternal.js";
 import { CategoriesTreeVisibilityHelper } from "./CategoriesTreeVisibilityHelper.js";
 import { createCategoriesSearchResultsTree } from "./SearchResultsTree.js";
 /**
@@ -21,38 +21,24 @@ import { createCategoriesSearchResultsTree } from "./SearchResultsTree.js";
 export class CategoriesTreeVisibilityHandler {
     #props;
     #visibilityHelper;
-    #elementType;
-    #categoryType;
-    #modelType;
     constructor(constructorProps) {
         this.#props = constructorProps;
-        // Remove after https://github.com/iTwin/viewer-components-react/issues/1421.
-        // We won't need to create a custom base ids cache.
-        const baseIdsCache = {
-            getCategories: (props) => this.getCategories(props),
-            getAllCategories: () => this.getAllCategories(),
-            getElementsCount: (props) => this.getElementsCount(props),
-            getModels: (props) => this.getModels(props),
-            getSubCategories: (props) => this.getSubCategories(props),
-            getSubModels: (props) => this.getSubModels(props),
-            hasSubModel: (props) => this.#props.idsCache.hasSubModel(props),
-        };
         this.#visibilityHelper = new CategoriesTreeVisibilityHelper({
             viewport: this.#props.viewport,
             idsCache: this.#props.idsCache,
             alwaysAndNeverDrawnElementInfo: this.#props.alwaysAndNeverDrawnElementInfo,
-            baseIdsCache,
+            baseIdsCache: constructorProps.idsCache,
             hierarchyConfig: constructorProps.hierarchyConfig,
         });
-        this.#elementType = this.#props.viewport.viewType === "2d" ? "GeometricElement2d" : "GeometricElement3d";
-        this.#categoryType = this.#props.viewport.viewType === "2d" ? "DrawingCategory" : "SpatialCategory";
-        this.#modelType = this.#props.viewport.viewType === "2d" ? "GeometricModel2d" : "GeometricModel3d";
     }
     [Symbol.dispose]() {
         this.#visibilityHelper[Symbol.dispose]();
     }
     changeSearchTargetsVisibilityStatus(targets, on) {
         return defer(() => {
+            if (this.#props.viewport.viewType === "other") {
+                return EMPTY;
+            }
             const { definitionContainerIds, subCategories, modelIds, categories, elements } = targets;
             const observables = new Array();
             if (definitionContainerIds?.size) {
@@ -68,119 +54,174 @@ export class CategoriesTreeVisibilityHandler {
                 observables.push(from(subCategories).pipe(mergeMap(({ categoryId, subCategoryIds }) => this.#visibilityHelper.changeSubCategoriesVisibilityStatus({ subCategoryIds, categoryId, on }))));
             }
             if (elements?.length) {
-                observables.push(fromWithRelease({ source: elements, releaseOnCount: 50 }).pipe(mergeMap(({ modelId, elements: elementsMap, categoryId }) => this.#visibilityHelper.changeElementsVisibilityStatus({ modelId, categoryId, elementIds: [...elementsMap.keys()], on }))));
+                const searchTargetElements = new Array();
+                const elementIdsSet = new Set();
+                const modelCategoryElementMap = new Map();
+                // elements is an array that stores elements grouped by:
+                // 1. Their path
+                // 2. Their modelId and categoryId
+                // When changing visibility of elements, visibility handler does not care about the path.
+                // So we can first get all elements and group them only by modelId and categoryId.
+                for (const { elements: elementsMap, categoryId, modelId } of elements) {
+                    const key = `${modelId}-${categoryId}`;
+                    let mapEntry = modelCategoryElementMap.get(key);
+                    if (!mapEntry) {
+                        mapEntry = [];
+                        modelCategoryElementMap.set(key, mapEntry);
+                    }
+                    for (const [elementId, { isSearchTarget }] of elementsMap) {
+                        mapEntry.push(elementId);
+                        elementIdsSet.add(elementId);
+                        if (isSearchTarget) {
+                            searchTargetElements.push(elementId);
+                        }
+                    }
+                }
+                observables.push(
+                // Get children for search targets, since non search targets don't have all the children present in the hierarchy.
+                this.#props.idsCache.getChildElementsTree({ elementIds: searchTargetElements }).pipe(
+                // Need to filter out and keep only those children ids that are not part of elements that are present in search paths.
+                // Elements in search paths will have their visibility changed directly: they will be provided as elementIds to changeElementsVisibilityStatus.
+                map((childrenTree) => ({
+                    childrenNotInSearchPaths: setDifference(getIdsFromChildrenTree({ tree: childrenTree, predicate: ({ depth }) => depth > 0 }), elementIdsSet),
+                    childrenTree,
+                })), mergeMap(({ childrenNotInSearchPaths, childrenTree }) => fromWithRelease({ source: modelCategoryElementMap.entries(), size: modelCategoryElementMap.size, releaseOnCount: 50 }).pipe(mergeMap(([key, elementsInSearchPathsGroupedByModelAndCategory]) => {
+                    const [modelId, categoryId] = key.split("-");
+                    const childrenIds = new Set();
+                    // A shared children tree was created, need to get the children for each element in the group.
+                    for (const elementId of elementsInSearchPathsGroupedByModelAndCategory) {
+                        const elementChildrenTree = childrenTree.get(elementId)?.children;
+                        if (!elementChildrenTree) {
+                            continue;
+                        }
+                        for (const childId of getIdsFromChildrenTree({ tree: elementChildrenTree })) {
+                            childrenIds.add(childId);
+                        }
+                    }
+                    return this.#visibilityHelper.changeElementsVisibilityStatus({
+                        modelId,
+                        categoryId,
+                        elementIds: elementsInSearchPathsGroupedByModelAndCategory,
+                        // Pass only those children that are not part of search paths.
+                        children: setIntersection(childrenIds, childrenNotInSearchPaths),
+                        on,
+                    });
+                })))));
             }
             return merge(...observables);
         });
     }
     getVisibilityStatus(node) {
-        if (HierarchyNode.isClassGroupingNode(node)) {
-            const nodeInfo = this.getGroupingNodeInfo(node);
-            return this.#visibilityHelper.getGroupedElementsVisibilityStatus({ categoryId: nodeInfo.categoryId, modelElementsMap: nodeInfo.modelElementsMap });
-        }
-        if (!HierarchyNode.isInstancesNode(node)) {
+        if (this.#props.viewport.viewType === "other") {
             return of(createVisibilityStatus("disabled"));
         }
-        if (CategoriesTreeNode.isDefinitionContainerNode(node)) {
+        if (CategoriesTreeNodeInternal.isElementClassGroupingNode(node)) {
+            return this.#visibilityHelper.getGroupedElementsVisibilityStatus({
+                categoryId: node.extendedData.categoryId,
+                modelElementsMap: node.extendedData.modelElementsMap,
+                parentKeys: node.parentKeys,
+                childrenCount: node.extendedData.childrenCount,
+                topMostParentElementId: node.extendedData.topMostParentElementId,
+            });
+        }
+        if (CategoriesTreeNodeInternal.isDefinitionContainerNode(node)) {
             return this.#visibilityHelper.getDefinitionContainersVisibilityStatus({
                 definitionContainerIds: node.key.instanceKeys.map((instanceKey) => instanceKey.id),
             });
         }
-        if (CategoriesTreeNode.isModelNode(node)) {
+        if (CategoriesTreeNodeInternal.isModelNode(node)) {
             return this.#visibilityHelper.getModelsVisibilityStatus({
                 modelIds: node.key.instanceKeys.map((instanceKey) => instanceKey.id),
-                type: this.#modelType,
             });
         }
-        if (CategoriesTreeNode.isCategoryNode(node)) {
+        if (CategoriesTreeNodeInternal.isCategoryNode(node)) {
             return this.#visibilityHelper.getCategoriesVisibilityStatus({
                 categoryIds: node.key.instanceKeys.map((instanceKey) => instanceKey.id),
-                modelId: CategoriesTreeNode.getModelId(node),
-                type: this.#categoryType,
+                modelId: node.extendedData.isCategoryOfSubModel ? node.extendedData.modelIds[0] : undefined,
             });
         }
-        const categoryId = CategoriesTreeNode.getCategoryId(node);
-        if (!categoryId) {
-            return of(createVisibilityStatus("disabled"));
-        }
-        if (CategoriesTreeNode.isSubCategoryNode(node)) {
+        if (CategoriesTreeNodeInternal.isSubCategoryNode(node)) {
             return this.#visibilityHelper.getSubCategoriesVisibilityStatus({
-                categoryId,
+                categoryId: node.extendedData.categoryId,
                 subCategoryIds: node.key.instanceKeys.map((instanceKey) => instanceKey.id),
             });
         }
-        const modelId = CategoriesTreeNode.getModelId(node);
-        if (!modelId) {
-            return of(createVisibilityStatus("disabled"));
-        }
+        assert(CategoriesTreeNodeInternal.isElementNode(node));
+        const parentElementsIdsPath = getParentElementsIdsPath({
+            parentInstanceKeys: node.parentKeys.filter((parentKey) => HierarchyNodeKey.isInstances(parentKey)).map((key) => key.instanceKeys),
+            topMostParentElementId: node.extendedData.topMostParentElementId,
+        });
         return this.#visibilityHelper.getElementsVisibilityStatus({
             elementIds: node.key.instanceKeys.map((instanceKey) => instanceKey.id),
-            modelId,
-            categoryId,
-            type: this.#elementType,
+            modelId: node.extendedData.modelId,
+            categoryId: node.extendedData.categoryId,
+            parentElementsIdsPath,
+            childrenCount: node.extendedData.childrenCount,
+            categoryOfTopMostParentElement: node.extendedData.categoryOfTopMostParentElement,
         });
     }
     /** Changes visibility of the items represented by the tree node. */
     changeVisibilityStatus(node, on) {
         const changeObs = defer(() => {
-            if (HierarchyNode.isClassGroupingNode(node)) {
-                const nodeInfo = this.getGroupingNodeInfo(node);
+            if (this.#props.viewport.viewType === "other") {
+                return EMPTY;
+            }
+            if (CategoriesTreeNodeInternal.isElementClassGroupingNode(node)) {
                 return this.#visibilityHelper.changeGroupedElementsVisibilityStatus({
-                    categoryId: nodeInfo.categoryId,
-                    modelElementsMap: nodeInfo.modelElementsMap,
+                    categoryId: node.extendedData.categoryId,
+                    modelElementsMap: node.extendedData.modelElementsMap,
                     on,
                 });
             }
-            if (!HierarchyNode.isInstancesNode(node)) {
-                return EMPTY;
-            }
-            if (CategoriesTreeNode.isDefinitionContainerNode(node)) {
+            if (CategoriesTreeNodeInternal.isDefinitionContainerNode(node)) {
                 return this.#visibilityHelper.changeDefinitionContainersVisibilityStatus({
                     definitionContainerIds: node.key.instanceKeys.map((instanceKey) => instanceKey.id),
                     on,
                 });
             }
-            if (CategoriesTreeNode.isModelNode(node)) {
+            if (CategoriesTreeNodeInternal.isModelNode(node)) {
                 return this.#visibilityHelper.changeModelsVisibilityStatus({
                     modelIds: node.key.instanceKeys.map(({ id }) => id),
                     on,
                 });
             }
-            if (CategoriesTreeNode.isCategoryNode(node)) {
+            if (CategoriesTreeNodeInternal.isCategoryNode(node)) {
                 return this.#visibilityHelper.changeCategoriesVisibilityStatus({
                     categoryIds: node.key.instanceKeys.map((instanceKey) => instanceKey.id),
-                    modelId: CategoriesTreeNode.getModelId(node),
+                    modelId: node.extendedData.isCategoryOfSubModel ? node.extendedData.modelIds[0] : undefined,
                     on,
                 });
             }
-            const categoryId = CategoriesTreeNode.getCategoryId(node);
-            if (!categoryId) {
-                return EMPTY;
-            }
-            if (CategoriesTreeNode.isSubCategoryNode(node)) {
+            if (CategoriesTreeNodeInternal.isSubCategoryNode(node)) {
                 return this.#visibilityHelper.changeSubCategoriesVisibilityStatus({
-                    categoryId,
+                    categoryId: node.extendedData.categoryId,
                     subCategoryIds: node.key.instanceKeys.map((instanceKey) => instanceKey.id),
                     on,
                 });
             }
-            const modelId = CategoriesTreeNode.getModelId(node);
-            if (!modelId) {
-                return EMPTY;
-            }
-            return this.#visibilityHelper.changeElementsVisibilityStatus({
-                elementIds: node.key.instanceKeys.map(({ id }) => id),
-                modelId,
-                categoryId,
+            assert(CategoriesTreeNodeInternal.isElementNode(node));
+            const elementIds = node.key.instanceKeys.map(({ id }) => id);
+            return this.#props.idsCache.getChildElementsTree({ elementIds }).pipe(map((childrenTree) => {
+                // Children tree contains provided elementIds, they are at the root of this tree.
+                // We want to skip them and only get ids of children.
+                return getIdsFromChildrenTree({ tree: childrenTree, predicate: ({ depth }) => depth > 0 });
+            }), mergeMap((children) => this.#visibilityHelper.changeElementsVisibilityStatus({
+                elementIds,
+                modelId: node.extendedData.modelId,
+                children: children.size > 0 ? children : undefined,
+                categoryId: node.extendedData.categoryId,
                 on,
-            });
+            })));
         });
         if (this.#props.viewport.isAlwaysDrawnExclusive) {
             return concat(this.#visibilityHelper.removeAlwaysDrawnExclusive(), changeObs);
         }
         return changeObs;
     }
-    getSearchTargetsVisibilityStatus(targets) {
+    getSearchTargetsVisibilityStatus(targets, node) {
+        if (this.#props.viewport.viewType === "other") {
+            return of(createVisibilityStatus("disabled"));
+        }
         return defer(() => {
             const { definitionContainerIds, subCategories, modelIds, categories, elements } = targets;
             const observables = new Array();
@@ -188,71 +229,95 @@ export class CategoriesTreeVisibilityHandler {
                 observables.push(this.#visibilityHelper.getDefinitionContainersVisibilityStatus({ definitionContainerIds }));
             }
             if (modelIds?.size) {
-                observables.push(this.#visibilityHelper.getModelsVisibilityStatus({ modelIds, type: this.#modelType }));
+                observables.push(this.#visibilityHelper.getModelsVisibilityStatus({ modelIds }));
             }
             if (categories?.length) {
                 observables.push(from(categories).pipe(mergeMap(({ modelId, categoryIds }) => this.#visibilityHelper.getCategoriesVisibilityStatus({
                     categoryIds,
                     modelId,
-                    type: this.#categoryType,
                 }))));
             }
             if (subCategories?.length) {
                 observables.push(from(subCategories).pipe(mergeMap(({ categoryId, subCategoryIds }) => this.#visibilityHelper.getSubCategoriesVisibilityStatus({ subCategoryIds, categoryId }))));
             }
             if (elements?.length) {
-                observables.push(fromWithRelease({ source: elements, releaseOnCount: 50 }).pipe(mergeMap(({ modelId, elements: elementsMap, categoryId }) => this.#visibilityHelper.getElementsVisibilityStatus({ modelId, categoryId, elementIds: [...elementsMap.keys()], type: this.#elementType }))));
-            }
-            return merge(...observables);
-        }).pipe(mergeVisibilityStatuses);
-    }
-    getCategories(props) {
-        return from(Id64.iterable(props.modelIds)).pipe(mergeMap((modelId) => this.#props.idsCache.getModelCategoryIds(modelId).pipe(map((categories) => ({
-            id: modelId,
-            ...(this.#props.viewport.viewType === "2d" ? { drawingCategories: categories } : { spatialCategories: categories }),
-        })))));
-    }
-    getAllCategories() {
-        return this.#props.idsCache.getAllCategories().pipe(map((categories) => {
-            if (this.#props.viewport.viewType === "2d") {
-                return { drawingCategories: categories };
-            }
-            return { spatialCategories: categories };
-        }));
-    }
-    getElementsCount(props) {
-        return this.#props.idsCache.getCategoryElementsCount(props.modelId, props.categoryId);
-    }
-    getModels(props) {
-        return this.#props.idsCache.getCategoriesElementModels(props.categoryIds, true);
-    }
-    getSubCategories(props) {
-        return this.#props.idsCache.getSubCategories(props.categoryId);
-    }
-    getSubModels(props) {
-        if ("modelIds" in props) {
-            return from(Id64.iterable(props.modelIds)).pipe(mergeMap((modelId) => {
-                if (props.categoryId) {
-                    return this.#props.idsCache.getCategoriesModeledElements(modelId, props.categoryId).pipe(map((subModels) => ({ id: modelId, subModels })));
+                const searchTargetElements = new Array();
+                for (const { elements: elementsMap } of elements) {
+                    for (const [elementId, { isSearchTarget }] of elementsMap) {
+                        if (isSearchTarget) {
+                            searchTargetElements.push(elementId);
+                        }
+                    }
                 }
-                return this.#props.idsCache.getModelCategoryIds(modelId).pipe(mergeMap((categoryIds) => this.#props.idsCache.getCategoriesModeledElements(modelId, categoryIds)), map((subModels) => ({ id: modelId, subModels })));
-            }));
-        }
-        if (props.modelId) {
-            return from(Id64.iterable(props.categoryIds)).pipe(mergeMap((categoryId) => this.#props.idsCache.getCategoriesModeledElements(props.modelId, categoryId).pipe(map((subModels) => ({ id: categoryId, subModels })))));
-        }
-        return this.#props.idsCache.getCategoriesElementModels(props.categoryIds).pipe(mergeMap(({ id, models }) => {
-            if (!models) {
-                return of({ id, subModels: undefined });
+                let childrenCountMapObs;
+                if (CategoriesTreeNodeInternal.isElementClassGroupingNode(node)) {
+                    const groupingNodesSearchTargets = node.extendedData?.searchTargets;
+                    const nestedSearchTargetElements = searchTargetElements.filter((searchTarget) => !groupingNodesSearchTargets?.has(searchTarget));
+                    // Only need to request children count for indirect children search targets.
+                    // Direct children search targets already have children count stored in grouping nodes extended data.
+                    childrenCountMapObs = this.#props.idsCache.getAllChildElementsCount({ elementIds: nestedSearchTargetElements }).pipe(map((elementCountMap) => {
+                        // Direct children search targets already have children count stored in grouping nodes extended data.
+                        for (const [key, value] of node.extendedData.searchTargets ?? []) {
+                            elementCountMap.set(key, value.childrenCount);
+                        }
+                        return elementCountMap;
+                    }));
+                }
+                else {
+                    childrenCountMapObs = this.#props.idsCache.getAllChildElementsCount({ elementIds: searchTargetElements });
+                }
+                observables.push(childrenCountMapObs.pipe(mergeMap((elementsChildrenCountMap) => fromWithRelease({ source: elements, releaseOnCount: 50 }).pipe(mergeMap(({ modelId, elements: elementsMap, categoryId, pathToElements, topMostParentElementId }) => {
+                    const parentElementsIdsPath = topMostParentElementId
+                        ? getParentElementsIdsPath({
+                            parentInstanceKeys: pathToElements.map((instanceKey) => [instanceKey]),
+                            topMostParentElementId,
+                        })
+                        : [];
+                    let totalSearchTargetsChildrenCount = 0;
+                    const nonSearchTargetIds = new Array();
+                    const searchTargetIds = new Array();
+                    for (const [elementId, { isSearchTarget }] of elementsMap) {
+                        if (!isSearchTarget) {
+                            nonSearchTargetIds.push(elementId);
+                            continue;
+                        }
+                        searchTargetIds.push(elementId);
+                        const childCount = elementsChildrenCountMap.get(elementId);
+                        if (childCount) {
+                            totalSearchTargetsChildrenCount += childCount;
+                        }
+                    }
+                    return merge(searchTargetIds.length > 0
+                        ? this.#visibilityHelper.getElementsVisibilityStatus({
+                            modelId,
+                            categoryId,
+                            elementIds: searchTargetIds,
+                            parentElementsIdsPath,
+                            childrenCount: totalSearchTargetsChildrenCount,
+                            // Search results tree is created on search paths. Since search paths contain only categories that are directly under models
+                            // or at the root, categoryId can be used here here.
+                            categoryOfTopMostParentElement: categoryId,
+                        })
+                        : EMPTY, 
+                    // Set childrenCount to undefined for non search targets, as some of their child elements might be filtered out.
+                    // Since childrenCount is set to undefined, these elements won't check child always/never drawn child elements status.
+                    // Child always/never drawn elements will be in search paths, and their visibility status will be handled separately.
+                    nonSearchTargetIds.length > 0
+                        ? this.#visibilityHelper.getElementsVisibilityStatus({
+                            modelId,
+                            categoryId,
+                            elementIds: nonSearchTargetIds,
+                            parentElementsIdsPath,
+                            childrenCount: undefined,
+                            // Search results tree is created on search paths. Since search paths contain only categories that are directly under models
+                            // or at the root, categoryId can be used here here.
+                            categoryOfTopMostParentElement: categoryId,
+                        })
+                        : EMPTY).pipe(mergeVisibilityStatuses());
+                })))));
             }
-            return from(models).pipe(mergeMap((modelId) => this.#props.idsCache.getCategoriesModeledElements(modelId, id)), map((subModels) => ({ id, subModels })));
-        }));
-    }
-    getGroupingNodeInfo(node) {
-        const modelElementsMap = node.extendedData?.modelElementsMap;
-        const categoryId = node.extendedData?.categoryId;
-        assert(!!modelElementsMap && !!categoryId);
-        return { modelElementsMap, categoryId };
+            return from(observables).pipe(mergeAll(), mergeVisibilityStatuses());
+        });
     }
 }
 /**