@itwin/tree-widget-react 3.0.2 → 3.1.0

package/lib/esm/components/trees/models-tree/internal/AlwaysAndNeverDrawnElementInfo.js

@@ -2,7 +2,7 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-import { BehaviorSubject, debounceTime, EMPTY, first, from, fromEventPattern, map, reduce, share, startWith, Subject, switchMap, takeUntil, tap } from "rxjs";
+import { BehaviorSubject, debounceTime, EMPTY, filter, first, from, fromEventPattern, map, merge, reduce, scan, share, shareReplay, startWith, Subject, switchMap, take, takeUntil, tap, } from "rxjs";
 import { createECSqlQueryExecutor } from "@itwin/presentation-core-interop";
 import { pushToMap } from "../../common/Utils";
 export const SET_CHANGE_DEBOUNCE_TIME = 20;
@@ -10,15 +10,32 @@ export class AlwaysAndNeverDrawnElementInfo {
     constructor(_viewport) {
         this._viewport = _viewport;
         this._disposeSubject = new Subject();
+        this._suppress = new Subject();
+        this._forceUpdate = new Subject();
         this._alwaysDrawn = this.createCacheEntryObservable({
             event: this._viewport.onAlwaysDrawnChanged,
             getSet: () => this._viewport.alwaysDrawn,
+            id: "alwaysDrawn",
         });
         this._neverDrawn = this.createCacheEntryObservable({
             event: this._viewport.onNeverDrawnChanged,
             getSet: () => this._viewport.neverDrawn,
+            id: "neverDrawn",
         });
-        this._subscriptions = [this._alwaysDrawn.subscribe(), this._neverDrawn.subscribe()];
+        this._suppressors = this._suppress.pipe(scan((acc, suppress) => acc + (suppress ? 1 : -1), 0), startWith(0), shareReplay(1));
+        this._subscriptions = [
+            this._alwaysDrawn.subscribe(),
+            this._neverDrawn.subscribe(),
+            this._suppressors.pipe(filter((suppressors) => suppressors === 0)).subscribe({
+                next: () => this._forceUpdate.next(),
+            }),
+        ];
+    }
+    suppressChangeEvents() {
+        this._suppress.next(true);
+    }
+    resumeChangeEvents() {
+        this._suppress.next(false);
     }
     getElements({ setType, modelId, categoryId }) {
         const cache = setType === "always" ? this._alwaysDrawn : this._neverDrawn;
@@ -39,7 +56,7 @@ export class AlwaysAndNeverDrawnElementInfo {
     createCacheEntryObservable(props) {
         const event = props.event;
         const resultSubject = new BehaviorSubject(undefined);
-        const obs = fromEventPattern((handler) => event.addListener(handler), (handler) => event.removeListener(handler)).pipe(
+        const obs = merge(fromEventPattern((handler) => event.addListener(handler), (handler) => event.removeListener(handler)), this._forceUpdate).pipe(
         // Fire the observable once at the beginning
         startWith(undefined), 
         // Stop listening to events when dispose() is called
@@ -47,11 +64,13 @@ export class AlwaysAndNeverDrawnElementInfo {
         // Reset result subject as soon as a new event is emitted.
         // This will make newly subscribed observers wait for the debounce period to pass
         // instead of consuming the cached value which at this point becomes invalid.
-        tap(() => resultSubject.next(undefined)), debounceTime(SET_CHANGE_DEBOUNCE_TIME), 
+        tap(() => resultSubject.next(undefined)), 
+        // Check if cache updates are not suppressed.
+        switchMap(() => this._suppressors.pipe(filter((suppressors) => suppressors === 0), take(1))), debounceTime(SET_CHANGE_DEBOUNCE_TIME), 
         // Cancel pending request if dispose() is called.
         takeUntil(this._disposeSubject), 
         // If multiple requests are sent at once, preserve only the result of the newest.
-        switchMap(() => this.queryAlwaysOrNeverDrawnElementInfo(props.getSet())), 
+        switchMap(() => this.queryAlwaysOrNeverDrawnElementInfo(props.getSet(), props.id)), 
         // Share the result by using a subject which always emits the saved result.
         share({
             connector: () => resultSubject,
@@ -66,8 +85,8 @@ export class AlwaysAndNeverDrawnElementInfo {
         this._subscriptions = [];
         this._disposeSubject.next();
     }
-    queryAlwaysOrNeverDrawnElementInfo(set) {
-        const elementInfo = set?.size ? this.queryElementInfo([...set]) : EMPTY;
+    queryAlwaysOrNeverDrawnElementInfo(set, requestId) {
+        const elementInfo = set?.size ? this.queryElementInfo([...set], requestId) : EMPTY;
         return elementInfo.pipe(reduce((state, val) => {
             let entry = state.get(val.modelId);
             if (!entry) {
@@ -78,7 +97,7 @@ export class AlwaysAndNeverDrawnElementInfo {
             return state;
         }, new Map()));
     }
-    queryElementInfo(elementIds) {
+    queryElementInfo(elementIds, requestId) {
         const executor = createECSqlQueryExecutor(this._viewport.iModel);
         const reader = executor.createQueryReader({
             ctes: [
@@ -110,6 +129,8 @@ export class AlwaysAndNeverDrawnElementInfo {
         WHERE parentId IS NULL
       `,
             bindings: [{ type: "idset", value: elementIds }],
+        }, {
+            restartToken: `ModelsTreeVisibilityHandler/${requestId}`,
         });
         return from(reader).pipe(map((row) => ({ elementId: row.elementId, modelId: row.modelId, categoryId: row.categoryId })));
     }

package/lib/esm/components/trees/models-tree/internal/AlwaysAndNeverDrawnElementInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"AlwaysAndNeverDrawnElementInfo.js","sourceRoot":"","sources":["../../../../../../src/components/trees/models-tree/internal/AlwaysAndNeverDrawnElementInfo.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 { BehaviorSubject, debounceTime, EMPTY, first, from, fromEventPattern, map, reduce, share, startWith, Subject, switchMap, takeUntil, tap } from \"rxjs\";\nimport { createECSqlQueryExecutor } from \"@itwin/presentation-core-interop\";\nimport { pushToMap } from \"../../common/Utils\";\n\nimport type { Observable, Subscription } from \"rxjs\";\nimport type { Viewport } from \"@itwin/core-frontend\";\nimport type { BeEvent, Id64Array, Id64Set, Id64String, IDisposable } from \"@itwin/core-bentley\";\n\ninterface ElementInfo {\n  elementId: Id64String;\n  modelId: Id64String;\n  categoryId: Id64String;\n}\n\ntype CacheEntry = Map<Id64String, Map<Id64String, Id64Set>>;\n\nexport interface AlwaysOrNeverDrawnElementsQueryProps {\n  modelId: Id64String;\n  categoryId?: Id64String;\n}\n\nexport const SET_CHANGE_DEBOUNCE_TIME = 20;\n\nexport class AlwaysAndNeverDrawnElementInfo implements IDisposable {\n  private _subscriptions: Subscription[];\n  private _alwaysDrawn: Observable<CacheEntry>;\n  private _neverDrawn: Observable<CacheEntry>;\n  private _disposeSubject = new Subject<void>();\n\n  constructor(private readonly _viewport: Viewport) {\n    this._alwaysDrawn = this.createCacheEntryObservable({\n      event: this._viewport.onAlwaysDrawnChanged,\n      getSet: () => this._viewport.alwaysDrawn,\n    });\n    this._neverDrawn = this.createCacheEntryObservable({\n      event: this._viewport.onNeverDrawnChanged,\n      getSet: () => this._viewport.neverDrawn,\n    });\n    this._subscriptions = [this._alwaysDrawn.subscribe(), this._neverDrawn.subscribe()];\n  }\n\n  public getElements({ setType, modelId, categoryId }: { setType: \"always\" | \"never\" } & AlwaysOrNeverDrawnElementsQueryProps): Observable<Id64Set> {\n    const cache = setType === \"always\" ? this._alwaysDrawn : this._neverDrawn;\n    const getElements = categoryId\n      ? (entry: CacheEntry | undefined) => {\n          return entry?.get(modelId)?.get(categoryId) ?? new Set();\n        }\n      : (entry: CacheEntry | undefined) => {\n          const modelEntry = entry?.get(modelId);\n          const elements = new Set<Id64String>();\n          for (const set of modelEntry?.values() ?? []) {\n            set.forEach((id) => elements.add(id));\n          }\n          return elements;\n        };\n\n    return cache.pipe(map(getElements));\n  }\n\n  private createCacheEntryObservable(props: { event: BeEvent<() => void>; getSet(): Id64Set | undefined }) {\n    const event = props.event;\n    const resultSubject = new BehaviorSubject<CacheEntry | undefined>(undefined);\n    const obs = fromEventPattern(\n      (handler) => event.addListener(handler),\n      (handler) => event.removeListener(handler),\n    ).pipe(\n      // Fire the observable once at the beginning\n      startWith(undefined),\n      // Stop listening to events when dispose() is called\n      takeUntil(this._disposeSubject),\n      // Reset result subject as soon as a new event is emitted.\n      // This will make newly subscribed observers wait for the debounce period to pass\n      // instead of consuming the cached value which at this point becomes invalid.\n      tap(() => resultSubject.next(undefined)),\n      debounceTime(SET_CHANGE_DEBOUNCE_TIME),\n      // Cancel pending request if dispose() is called.\n      takeUntil(this._disposeSubject),\n      // If multiple requests are sent at once, preserve only the result of the newest.\n      switchMap(() => this.queryAlwaysOrNeverDrawnElementInfo(props.getSet())),\n      // Share the result by using a subject which always emits the saved result.\n      share({\n        connector: () => resultSubject,\n        resetOnRefCountZero: false,\n      }),\n      // Wait until the result is available.\n      first((x): x is CacheEntry => !!x),\n    );\n    return obs;\n  }\n\n  public dispose(): void {\n    this._subscriptions.forEach((x) => x.unsubscribe());\n    this._subscriptions = [];\n    this._disposeSubject.next();\n  }\n\n  private queryAlwaysOrNeverDrawnElementInfo(set: Id64Set | undefined): Observable<CacheEntry> {\n    const elementInfo = set?.size ? this.queryElementInfo([...set]) : EMPTY;\n    return elementInfo.pipe(\n      reduce((state, val) => {\n        let entry = state.get(val.modelId);\n        if (!entry) {\n          entry = new Map();\n          state.set(val.modelId, entry);\n        }\n        pushToMap(entry, val.categoryId, val.elementId);\n        return state;\n      }, new Map<Id64String, Map<Id64String, Id64Set>>()),\n    );\n  }\n\n  private queryElementInfo(elementIds: Id64Array): Observable<ElementInfo> {\n    const executor = createECSqlQueryExecutor(this._viewport.iModel);\n    const reader = executor.createQueryReader({\n      ctes: [\n        `\n        ElementInfo(elementId, modelId, categoryId, parentId) AS (\n          SELECT\n            ECInstanceId elementId,\n            Model.Id modelId,\n            Category.Id categoryId,\n            Parent.Id parentId\n          FROM bis.GeometricElement3d\n          WHERE InVirtualSet(?, ECInstanceId)\n\n          UNION ALL\n\n          SELECT\n            e.elementId,\n            e.modelId,\n            p.Category.Id categoryId,\n            p.Parent.Id parentId\n          FROM bis.GeometricElement3d p\n          JOIN ElementInfo e ON p.ECInstanceId = e.parentId\n        )\n        `,\n      ],\n      ecsql: `\n        SELECT elementId, modelId, categoryId\n        FROM ElementInfo\n        WHERE parentId IS NULL\n      `,\n      bindings: [{ type: \"idset\", value: elementIds }],\n    });\n\n    return from(reader).pipe(map((row) => ({ elementId: row.elementId, modelId: row.modelId, categoryId: row.categoryId })));\n  }\n}\n"]}
+{"version":3,"file":"AlwaysAndNeverDrawnElementInfo.js","sourceRoot":"","sources":["../../../../../../src/components/trees/models-tree/internal/AlwaysAndNeverDrawnElementInfo.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 {\n  BehaviorSubject,\n  debounceTime,\n  EMPTY,\n  filter,\n  first,\n  from,\n  fromEventPattern,\n  map,\n  merge,\n  reduce,\n  scan,\n  share,\n  shareReplay,\n  startWith,\n  Subject,\n  switchMap,\n  take,\n  takeUntil,\n  tap,\n} from \"rxjs\";\nimport { createECSqlQueryExecutor } from \"@itwin/presentation-core-interop\";\nimport { pushToMap } from \"../../common/Utils\";\n\nimport type { Observable, Subscription } from \"rxjs\";\nimport type { Viewport } from \"@itwin/core-frontend\";\nimport type { BeEvent, Id64Array, Id64Set, Id64String, IDisposable } from \"@itwin/core-bentley\";\n\ninterface ElementInfo {\n  elementId: Id64String;\n  modelId: Id64String;\n  categoryId: Id64String;\n}\n\ntype CacheEntry = Map<Id64String, Map<Id64String, Id64Set>>;\n\nexport interface AlwaysOrNeverDrawnElementsQueryProps {\n  modelId: Id64String;\n  categoryId?: Id64String;\n}\n\nexport const SET_CHANGE_DEBOUNCE_TIME = 20;\n\nexport class AlwaysAndNeverDrawnElementInfo implements IDisposable {\n  private _subscriptions: Subscription[];\n  private _alwaysDrawn: Observable<CacheEntry>;\n  private _neverDrawn: Observable<CacheEntry>;\n  private _disposeSubject = new Subject<void>();\n\n  private _suppressors: Observable<number>;\n  private _suppress = new Subject<boolean>();\n  private _forceUpdate = new Subject<void>();\n\n  constructor(private readonly _viewport: Viewport) {\n    this._alwaysDrawn = this.createCacheEntryObservable({\n      event: this._viewport.onAlwaysDrawnChanged,\n      getSet: () => this._viewport.alwaysDrawn,\n      id: \"alwaysDrawn\",\n    });\n    this._neverDrawn = this.createCacheEntryObservable({\n      event: this._viewport.onNeverDrawnChanged,\n      getSet: () => this._viewport.neverDrawn,\n      id: \"neverDrawn\",\n    });\n    this._suppressors = this._suppress.pipe(\n      scan((acc, suppress) => acc + (suppress ? 1 : -1), 0),\n      startWith(0),\n      shareReplay(1),\n    );\n    this._subscriptions = [\n      this._alwaysDrawn.subscribe(),\n      this._neverDrawn.subscribe(),\n      this._suppressors.pipe(filter((suppressors) => suppressors === 0)).subscribe({\n        next: () => this._forceUpdate.next(),\n      }),\n    ];\n  }\n\n  public suppressChangeEvents() {\n    this._suppress.next(true);\n  }\n\n  public resumeChangeEvents() {\n    this._suppress.next(false);\n  }\n\n  public getElements({ setType, modelId, categoryId }: { setType: \"always\" | \"never\" } & AlwaysOrNeverDrawnElementsQueryProps): Observable<Id64Set> {\n    const cache = setType === \"always\" ? this._alwaysDrawn : this._neverDrawn;\n    const getElements = categoryId\n      ? (entry: CacheEntry | undefined) => {\n          return entry?.get(modelId)?.get(categoryId) ?? new Set();\n        }\n      : (entry: CacheEntry | undefined) => {\n          const modelEntry = entry?.get(modelId);\n          const elements = new Set<Id64String>();\n          for (const set of modelEntry?.values() ?? []) {\n            set.forEach((id) => elements.add(id));\n          }\n          return elements;\n        };\n\n    return cache.pipe(map(getElements));\n  }\n\n  private createCacheEntryObservable(props: { event: BeEvent<() => void>; getSet(): Id64Set | undefined; id: string }) {\n    const event = props.event;\n    const resultSubject = new BehaviorSubject<CacheEntry | undefined>(undefined);\n\n    const obs = merge(\n      fromEventPattern(\n        (handler) => event.addListener(handler),\n        (handler) => event.removeListener(handler),\n      ),\n      this._forceUpdate,\n    ).pipe(\n      // Fire the observable once at the beginning\n      startWith(undefined),\n      // Stop listening to events when dispose() is called\n      takeUntil(this._disposeSubject),\n      // Reset result subject as soon as a new event is emitted.\n      // This will make newly subscribed observers wait for the debounce period to pass\n      // instead of consuming the cached value which at this point becomes invalid.\n      tap(() => resultSubject.next(undefined)),\n      // Check if cache updates are not suppressed.\n      switchMap(() =>\n        this._suppressors.pipe(\n          filter((suppressors) => suppressors === 0),\n          take(1),\n        ),\n      ),\n      debounceTime(SET_CHANGE_DEBOUNCE_TIME),\n      // Cancel pending request if dispose() is called.\n      takeUntil(this._disposeSubject),\n      // If multiple requests are sent at once, preserve only the result of the newest.\n      switchMap(() => this.queryAlwaysOrNeverDrawnElementInfo(props.getSet(), props.id)),\n      // Share the result by using a subject which always emits the saved result.\n      share({\n        connector: () => resultSubject,\n        resetOnRefCountZero: false,\n      }),\n      // Wait until the result is available.\n      first((x): x is CacheEntry => !!x),\n    );\n    return obs;\n  }\n\n  public dispose(): void {\n    this._subscriptions.forEach((x) => x.unsubscribe());\n    this._subscriptions = [];\n    this._disposeSubject.next();\n  }\n\n  private queryAlwaysOrNeverDrawnElementInfo(set: Id64Set | undefined, requestId: string): Observable<CacheEntry> {\n    const elementInfo = set?.size ? this.queryElementInfo([...set], requestId) : EMPTY;\n    return elementInfo.pipe(\n      reduce((state, val) => {\n        let entry = state.get(val.modelId);\n        if (!entry) {\n          entry = new Map();\n          state.set(val.modelId, entry);\n        }\n        pushToMap(entry, val.categoryId, val.elementId);\n        return state;\n      }, new Map<Id64String, Map<Id64String, Id64Set>>()),\n    );\n  }\n\n  private queryElementInfo(elementIds: Id64Array, requestId: string): Observable<ElementInfo> {\n    const executor = createECSqlQueryExecutor(this._viewport.iModel);\n    const reader = executor.createQueryReader(\n      {\n        ctes: [\n          `\n        ElementInfo(elementId, modelId, categoryId, parentId) AS (\n          SELECT\n            ECInstanceId elementId,\n            Model.Id modelId,\n            Category.Id categoryId,\n            Parent.Id parentId\n          FROM bis.GeometricElement3d\n          WHERE InVirtualSet(?, ECInstanceId)\n\n          UNION ALL\n\n          SELECT\n            e.elementId,\n            e.modelId,\n            p.Category.Id categoryId,\n            p.Parent.Id parentId\n          FROM bis.GeometricElement3d p\n          JOIN ElementInfo e ON p.ECInstanceId = e.parentId\n        )\n        `,\n        ],\n        ecsql: `\n        SELECT elementId, modelId, categoryId\n        FROM ElementInfo\n        WHERE parentId IS NULL\n      `,\n        bindings: [{ type: \"idset\", value: elementIds }],\n      },\n      {\n        restartToken: `ModelsTreeVisibilityHandler/${requestId}`,\n      },\n    );\n\n    return from(reader).pipe(map((row) => ({ elementId: row.elementId, modelId: row.modelId, categoryId: row.categoryId })));\n  }\n}\n"]}

package/lib/esm/components/trees/models-tree/internal/FilteredTree.d.ts

@@ -0,0 +1,25 @@
+import { HierarchyFilteringPath } from "@itwin/presentation-hierarchies";
+import type { Id64String } from "@itwin/core-bentley";
+import type { HierarchyNode } from "@itwin/presentation-hierarchies";
+import type { ECClassHierarchyInspector } from "@itwin/presentation-shared";
+export interface FilteredTree {
+    getVisibilityChangeTargets(node: HierarchyNode): VisibilityChangeTargets;
+}
+export declare const SUBJECT_CLASS_NAME: "BisCore.Subject";
+export declare const MODEL_CLASS_NAME: "BisCore.GeometricModel3d";
+export declare const CATEGORY_CLASS_NAME: "BisCore.SpatialCategory";
+export declare const ELEMENT_CLASS_NAME: "BisCore.GeometricElement3d";
+type CategoryKey = `${Id64String}-${Id64String}`;
+export declare function parseCategoryKey(key: CategoryKey): {
+    modelId: string;
+    categoryId: string;
+};
+interface VisibilityChangeTargets {
+    subjects?: Set<Id64String>;
+    models?: Set<Id64String>;
+    categories?: Set<CategoryKey>;
+    elements?: Map<CategoryKey, Set<Id64String>>;
+}
+export declare function createFilteredTree(imodelAccess: ECClassHierarchyInspector, filteringPaths: HierarchyFilteringPath[]): Promise<FilteredTree>;
+export {};
+//# sourceMappingURL=FilteredTree.d.ts.map

package/lib/esm/components/trees/models-tree/internal/FilteredTree.js

@@ -0,0 +1,173 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+import { assert } from "@itwin/core-bentley";
+import { HierarchyFilteringPath, HierarchyNodeIdentifier, HierarchyNodeKey } from "@itwin/presentation-hierarchies";
+export const SUBJECT_CLASS_NAME = "BisCore.Subject";
+export const MODEL_CLASS_NAME = "BisCore.GeometricModel3d";
+export const CATEGORY_CLASS_NAME = "BisCore.SpatialCategory";
+export const ELEMENT_CLASS_NAME = "BisCore.GeometricElement3d";
+function createCategoryKey(modelId, categoryId) {
+    return `${modelId}-${categoryId}`;
+}
+export function parseCategoryKey(key) {
+    const [modelId, categoryId] = key.split("-");
+    return { modelId, categoryId };
+}
+export async function createFilteredTree(imodelAccess, filteringPaths) {
+    const root = {
+        children: new Map(),
+    };
+    for (const filteringPath of filteringPaths) {
+        const normalizedPath = HierarchyFilteringPath.normalize(filteringPath).path;
+        let parentNode = root;
+        for (let i = 0; i < normalizedPath.length; i++) {
+            if ("type" in parentNode && parentNode.isFilterTarget) {
+                break;
+            }
+            const identifier = normalizedPath[i];
+            if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {
+                break;
+            }
+            const currentNode = parentNode.children?.get(identifier.id);
+            if (currentNode !== undefined) {
+                parentNode = currentNode;
+                continue;
+            }
+            const type = await getType(imodelAccess, identifier.className);
+            const newNode = createFilteredTreeNode({
+                type,
+                id: identifier.id,
+                isFilterTarget: i === normalizedPath.length - 1,
+                parent: parentNode,
+            });
+            (parentNode.children ??= new Map()).set(identifier.id, newNode);
+            parentNode = newNode;
+        }
+    }
+    return {
+        getVisibilityChangeTargets: (node) => getVisibilityChangeTargets(root, node),
+    };
+}
+function getVisibilityChangeTargets(root, node) {
+    let lookupParents = [root];
+    const changeTargets = {};
+    const nodeKey = node.key;
+    if (!HierarchyNodeKey.isInstances(nodeKey)) {
+        return changeTargets;
+    }
+    // find the filtered 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 filtered tree stores only one instance per node, we need to find all matching nodes
+        // and use them when checking for matching node in one level deeper.
+        const parentNodes = findMatchingFilteredNodes(lookupParents, parentKey.instanceKeys);
+        if (parentNodes.length === 0) {
+            return changeTargets;
+        }
+        lookupParents = parentNodes;
+    }
+    // find filtered nodes that match the `node`
+    const filteredNodes = findMatchingFilteredNodes(lookupParents, nodeKey.instanceKeys);
+    if (filteredNodes.length === 0) {
+        return changeTargets;
+    }
+    filteredNodes.forEach((filteredNode) => collectVisibilityChangeTargets(changeTargets, filteredNode));
+    return changeTargets;
+}
+function findMatchingFilteredNodes(lookupParents, keys) {
+    return lookupParents
+        .flatMap((lookup) => keys.map((key) => lookup.children?.get(key.id)))
+        .filter((lookupNode) => lookupNode !== undefined);
+}
+function collectVisibilityChangeTargets(changeTargets, node) {
+    if (node.isFilterTarget) {
+        addTarget(changeTargets, node);
+        return;
+    }
+    if (node.type === "element") {
+        // need to add parent ids as filter target will be an element
+        addTarget(changeTargets, node);
+    }
+    if (!node.children) {
+        return;
+    }
+    for (const child of node.children.values()) {
+        collectVisibilityChangeTargets(changeTargets, child);
+    }
+}
+function addTarget(filterTargets, node) {
+    switch (node.type) {
+        case "subject":
+            (filterTargets.subjects ??= new Set()).add(node.id);
+            return;
+        case "model":
+            (filterTargets.models ??= new Set()).add(node.id);
+            return;
+        case "category":
+            (filterTargets.categories ??= new Set()).add(createCategoryKey(node.modelId, node.id));
+            return;
+        case "element":
+            const categoryKey = createCategoryKey(node.modelId, node.categoryId);
+            const elements = (filterTargets.elements ??= new Map()).get(categoryKey);
+            if (elements) {
+                elements.add(node.id);
+                return;
+            }
+            filterTargets.elements.set(categoryKey, new Set([node.id]));
+            return;
+    }
+}
+function createFilteredTreeNode({ type, id, isFilterTarget, parent, }) {
+    if (type === "subject" || type === "model") {
+        return {
+            id,
+            isFilterTarget,
+            type,
+        };
+    }
+    if (type === "category") {
+        assert("type" in parent && parent.type === "model");
+        return {
+            id,
+            isFilterTarget,
+            type,
+            modelId: parent.id,
+        };
+    }
+    if ("type" in parent && parent.type === "category") {
+        return {
+            id,
+            isFilterTarget,
+            type,
+            modelId: parent.modelId,
+            categoryId: parent.id,
+        };
+    }
+    if ("type" in parent && parent.type === "element") {
+        return {
+            id,
+            isFilterTarget,
+            type,
+            modelId: parent.modelId,
+            categoryId: parent.categoryId,
+        };
+    }
+    throw new Error("Invalid parent node type");
+}
+async function getType(hierarchyChecker, className) {
+    if (await hierarchyChecker.classDerivesFrom(className, SUBJECT_CLASS_NAME)) {
+        return "subject";
+    }
+    if (await hierarchyChecker.classDerivesFrom(className, MODEL_CLASS_NAME)) {
+        return "model";
+    }
+    if (await hierarchyChecker.classDerivesFrom(className, CATEGORY_CLASS_NAME)) {
+        return "category";
+    }
+    return "element";
+}
+//# sourceMappingURL=FilteredTree.js.map

package/lib/esm/components/trees/models-tree/internal/FilteredTree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FilteredTree.js","sourceRoot":"","sources":["../../../../../../src/components/trees/models-tree/internal/FilteredTree.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 { assert } from \"@itwin/core-bentley\";\nimport { HierarchyFilteringPath, HierarchyNodeIdentifier, HierarchyNodeKey } from \"@itwin/presentation-hierarchies\";\n\nimport type { Id64String } from \"@itwin/core-bentley\";\nimport type { HierarchyNode } from \"@itwin/presentation-hierarchies\";\nimport type { ECClassHierarchyInspector, InstanceKey } from \"@itwin/presentation-shared\";\n\ninterface FilteredTreeRootNode {\n  children: Map<Id64String, FilteredTreeNode>;\n}\n\ninterface BaseFilteredTreeNode {\n  id: string;\n  children?: Map<Id64String, FilteredTreeNode>;\n  isFilterTarget: boolean;\n}\n\ninterface GenericFilteredTreeNode extends BaseFilteredTreeNode {\n  type: \"subject\" | \"model\";\n}\n\ninterface CategoryFilteredTreeNode extends BaseFilteredTreeNode {\n  type: \"category\";\n  modelId: Id64String;\n}\n\ninterface ElementFilteredTreeNode extends BaseFilteredTreeNode {\n  type: \"element\";\n  modelId: Id64String;\n  categoryId: Id64String;\n}\n\ntype FilteredTreeNode = GenericFilteredTreeNode | CategoryFilteredTreeNode | ElementFilteredTreeNode;\n\nexport interface FilteredTree {\n  getVisibilityChangeTargets(node: HierarchyNode): VisibilityChangeTargets;\n}\n\nexport const SUBJECT_CLASS_NAME = \"BisCore.Subject\" as const;\nexport const MODEL_CLASS_NAME = \"BisCore.GeometricModel3d\" as const;\nexport const CATEGORY_CLASS_NAME = \"BisCore.SpatialCategory\" as const;\nexport const ELEMENT_CLASS_NAME = \"BisCore.GeometricElement3d\" as const;\n\ntype CategoryKey = `${Id64String}-${Id64String}`;\n\nfunction createCategoryKey(modelId: string, categoryId: string): CategoryKey {\n  return `${modelId}-${categoryId}`;\n}\n\nexport function parseCategoryKey(key: CategoryKey) {\n  const [modelId, categoryId] = key.split(\"-\");\n  return { modelId, categoryId };\n}\n\ninterface VisibilityChangeTargets {\n  subjects?: Set<Id64String>;\n  models?: Set<Id64String>;\n  categories?: Set<CategoryKey>;\n  elements?: Map<CategoryKey, Set<Id64String>>;\n}\n\nexport async function createFilteredTree(imodelAccess: ECClassHierarchyInspector, filteringPaths: HierarchyFilteringPath[]): Promise<FilteredTree> {\n  const root: FilteredTreeRootNode = {\n    children: new Map(),\n  };\n\n  for (const filteringPath of filteringPaths) {\n    const normalizedPath = HierarchyFilteringPath.normalize(filteringPath).path;\n\n    let parentNode: FilteredTreeRootNode | FilteredTreeNode = root;\n    for (let i = 0; i < normalizedPath.length; i++) {\n      if (\"type\" in parentNode && parentNode.isFilterTarget) {\n        break;\n      }\n\n      const identifier = normalizedPath[i];\n      if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {\n        break;\n      }\n\n      const currentNode: FilteredTreeNode | undefined = parentNode.children?.get(identifier.id);\n      if (currentNode !== undefined) {\n        parentNode = currentNode;\n        continue;\n      }\n\n      const type = await getType(imodelAccess, identifier.className);\n      const newNode: FilteredTreeNode = createFilteredTreeNode({\n        type,\n        id: identifier.id,\n        isFilterTarget: i === normalizedPath.length - 1,\n        parent: parentNode as FilteredTreeNode,\n      });\n      (parentNode.children ??= new Map()).set(identifier.id, newNode);\n      parentNode = newNode;\n    }\n  }\n\n  return {\n    getVisibilityChangeTargets: (node: HierarchyNode) => getVisibilityChangeTargets(root, node),\n  };\n}\n\nfunction getVisibilityChangeTargets(root: FilteredTreeRootNode, node: HierarchyNode) {\n  let lookupParents: Array<{ children?: Map<Id64String, FilteredTreeNode> }> = [root];\n  const changeTargets: VisibilityChangeTargets = {};\n\n  const nodeKey = node.key;\n  if (!HierarchyNodeKey.isInstances(nodeKey)) {\n    return changeTargets;\n  }\n\n  // find the filtered parent nodes of the `node`\n  for (const parentKey of node.parentKeys) {\n    if (!HierarchyNodeKey.isInstances(parentKey)) {\n      continue;\n    }\n\n    // tree node might be merged from multiple instances. As filtered tree stores only one instance per node, we need to find all matching nodes\n    // and use them when checking for matching node in one level deeper.\n    const parentNodes = findMatchingFilteredNodes(lookupParents, parentKey.instanceKeys);\n    if (parentNodes.length === 0) {\n      return changeTargets;\n    }\n    lookupParents = parentNodes;\n  }\n\n  // find filtered nodes that match the `node`\n  const filteredNodes = findMatchingFilteredNodes(lookupParents, nodeKey.instanceKeys);\n  if (filteredNodes.length === 0) {\n    return changeTargets;\n  }\n\n  filteredNodes.forEach((filteredNode) => collectVisibilityChangeTargets(changeTargets, filteredNode));\n  return changeTargets;\n}\n\nfunction findMatchingFilteredNodes(lookupParents: Array<{ children?: Map<Id64String, FilteredTreeNode> }>, keys: InstanceKey[]) {\n  return lookupParents\n    .flatMap((lookup) => keys.map((key) => lookup.children?.get(key.id)))\n    .filter((lookupNode): lookupNode is FilteredTreeNode => lookupNode !== undefined);\n}\n\nfunction collectVisibilityChangeTargets(changeTargets: VisibilityChangeTargets, node: FilteredTreeNode) {\n  if (node.isFilterTarget) {\n    addTarget(changeTargets, node);\n    return;\n  }\n\n  if (node.type === \"element\") {\n    // need to add parent ids as filter target will be an element\n    addTarget(changeTargets, node);\n  }\n\n  if (!node.children) {\n    return;\n  }\n\n  for (const child of node.children.values()) {\n    collectVisibilityChangeTargets(changeTargets, child);\n  }\n}\n\nfunction addTarget(filterTargets: VisibilityChangeTargets, node: FilteredTreeNode) {\n  switch (node.type) {\n    case \"subject\":\n      (filterTargets.subjects ??= new Set()).add(node.id);\n      return;\n    case \"model\":\n      (filterTargets.models ??= new Set()).add(node.id);\n      return;\n    case \"category\":\n      (filterTargets.categories ??= new Set()).add(createCategoryKey(node.modelId, node.id));\n      return;\n    case \"element\":\n      const categoryKey = createCategoryKey(node.modelId, node.categoryId);\n      const elements = (filterTargets.elements ??= new Map()).get(categoryKey);\n      if (elements) {\n        elements.add(node.id);\n        return;\n      }\n      filterTargets.elements.set(categoryKey, new Set([node.id]));\n      return;\n  }\n}\n\nfunction createFilteredTreeNode({\n  type,\n  id,\n  isFilterTarget,\n  parent,\n}: {\n  type: FilteredTreeNode[\"type\"];\n  id: string;\n  isFilterTarget: boolean;\n  parent: FilteredTreeNode | FilteredTreeRootNode;\n}): FilteredTreeNode {\n  if (type === \"subject\" || type === \"model\") {\n    return {\n      id,\n      isFilterTarget,\n      type,\n    };\n  }\n\n  if (type === \"category\") {\n    assert(\"type\" in parent && parent.type === \"model\");\n    return {\n      id,\n      isFilterTarget,\n      type,\n      modelId: parent.id,\n    };\n  }\n\n  if (\"type\" in parent && parent.type === \"category\") {\n    return {\n      id,\n      isFilterTarget,\n      type,\n      modelId: parent.modelId,\n      categoryId: parent.id,\n    };\n  }\n\n  if (\"type\" in parent && parent.type === \"element\") {\n    return {\n      id,\n      isFilterTarget,\n      type,\n      modelId: parent.modelId,\n      categoryId: parent.categoryId,\n    };\n  }\n\n  throw new Error(\"Invalid parent node type\");\n}\n\nasync function getType(hierarchyChecker: ECClassHierarchyInspector, className: string) {\n  if (await hierarchyChecker.classDerivesFrom(className, SUBJECT_CLASS_NAME)) {\n    return \"subject\";\n  }\n  if (await hierarchyChecker.classDerivesFrom(className, MODEL_CLASS_NAME)) {\n    return \"model\";\n  }\n  if (await hierarchyChecker.classDerivesFrom(className, CATEGORY_CLASS_NAME)) {\n    return \"category\";\n  }\n  return \"element\";\n}\n"]}

package/lib/esm/components/trees/models-tree/internal/ModelsTreeIdsCache.d.ts

@@ -11,6 +11,7 @@ export declare class ModelsTreeIdsCache {
     private _parentSubjectIds;
     private _modelInfos;
     constructor(_queryExecutor: LimitingECSqlQueryExecutor, _hierarchyConfig: ModelsTreeHierarchyConfiguration);
+    [Symbol.dispose](): void;
     private querySubjects;
     private queryModels;
     private getSubjectInfos;
@@ -36,7 +37,7 @@ export declare class ModelsTreeIdsCache {
     getModelCategories(modelId: Id64String): Promise<Id64Array>;
     getModelElementCount(modelId: Id64String): Promise<number>;
     getModelSubjects(modelId: Id64String): Promise<Id64Array>;
-    private queryCategoryElementsCount;
+    private queryCategoryElementCounts;
     getCategoryElementsCount(modelId: Id64String, categoryId: Id64String): Promise<number>;
     getCategoryModels(categoryId: Id64String): Promise<Id64Array>;
 }

package/lib/esm/components/trees/models-tree/internal/ModelsTreeIdsCache.js

@@ -2,6 +2,7 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
+import { bufferTime, filter, firstValueFrom, mergeAll, mergeMap, ReplaySubject, Subject } from "rxjs";
 import { assert } from "@itwin/core-bentley";
 import { pushToMap } from "../../common/Utils";
 /** @internal */
@@ -9,7 +10,10 @@ export class ModelsTreeIdsCache {
     constructor(_queryExecutor, _hierarchyConfig) {
         this._queryExecutor = _queryExecutor;
         this._hierarchyConfig = _hierarchyConfig;
-        this._categoryElementCounts = new Map();
+        this._categoryElementCounts = new ModelCategoryElementsCountCache(async (input) => this.queryCategoryElementCounts(input));
+    }
+    [Symbol.dispose]() {
+        this._categoryElementCounts[Symbol.dispose]();
     }
     async *querySubjects() {
         const subjectsQuery = `
@@ -258,44 +262,42 @@ export class ModelsTreeIdsCache {
         });
         return result;
     }
-    async queryCategoryElementsCount(modelId, categoryId) {
+    async queryCategoryElementCounts(input) {
         const reader = this._queryExecutor.createQueryReader({
             ctes: [
                 /* sql */ `
-            CategoryElements(id) AS (
-              SELECT ECInstanceId id
+            CategoryElements(id, modelId, categoryId) AS (
+              SELECT ECInstanceId, Model.Id, Category.Id
               FROM ${this._hierarchyConfig.elementClassSpecification}
               WHERE
-                Model.Id = ?
-                AND Category.Id = ?
-                AND Parent.Id IS NULL
+                Parent.Id IS NULL
+                AND (
+                  ${input.map(({ modelId, categoryId }) => `Model.Id = ${modelId} AND Category.Id = ${categoryId}`).join(" OR ")}
+                )
 
               UNION ALL
 
-              SELECT c.ECInstanceId id
+              SELECT c.ECInstanceId, p.modelId, p.categoryId
               FROM ${this._hierarchyConfig.elementClassSpecification} c
               JOIN CategoryElements p ON c.Parent.Id = p.id
             )
           `,
             ],
-            ecsql: `SELECT COUNT(*) FROM CategoryElements`,
-            bindings: [
-                { type: "id", value: modelId },
-                { type: "id", value: categoryId },
-            ],
-        }, { rowFormat: "Indexes", limit: "unbounded" });
-        return (await reader.next()).value[0];
-    }
-    async getCategoryElementsCount(modelId, categoryId) {
-        const cacheKey = `${modelId}${categoryId}`;
-        let result = this._categoryElementCounts.get(cacheKey);
-        if (result !== undefined) {
-            return result;
+            ecsql: `
+          SELECT modelId, categoryId, COUNT(id) elementsCount
+          FROM CategoryElements
+          GROUP BY modelId, categoryId
+        `,
+        }, { rowFormat: "ECSqlPropertyNames", limit: "unbounded" });
+        const result = new Array();
+        for await (const row of reader) {
+            result.push({ modelId: row.modelId, categoryId: row.categoryId, elementsCount: row.elementsCount });
         }
-        result = await this.queryCategoryElementsCount(modelId, categoryId);
-        this._categoryElementCounts.set(cacheKey, result);
         return result;
     }
+    async getCategoryElementsCount(modelId, categoryId) {
+        return this._categoryElementCounts.getCategoryElementsCount(modelId, categoryId);
+    }
     async getCategoryModels(categoryId) {
         const result = new Set();
         const modelInfos = await this.getModelInfos();
@@ -318,4 +320,34 @@ function forEachChildSubject(subjectInfos, parentSubject, cb) {
             forEachChildSubject(subjectInfos, childSubjectInfo, cb);
         });
 }
+class ModelCategoryElementsCountCache {
+    constructor(_loader) {
+        this._loader = _loader;
+        this._cache = new Map();
+        this._requestsStream = new Subject();
+        this._subscription = this._requestsStream
+            .pipe(bufferTime(20), filter((requests) => requests.length > 0), mergeMap(async (requests) => this._loader(requests)), mergeAll())
+            .subscribe({
+            next: ({ modelId, categoryId, elementsCount }) => {
+                const subject = this._cache.get(`${modelId}${categoryId}`);
+                assert(!!subject);
+                subject.next(elementsCount);
+            },
+        });
+    }
+    [Symbol.dispose]() {
+        this._subscription.unsubscribe();
+    }
+    async getCategoryElementsCount(modelId, categoryId) {
+        const cacheKey = `${modelId}${categoryId}`;
+        let result = this._cache.get(cacheKey);
+        if (result !== undefined) {
+            return firstValueFrom(result);
+        }
+        result = new ReplaySubject(1);
+        this._cache.set(cacheKey, result);
+        this._requestsStream.next({ modelId, categoryId });
+        return firstValueFrom(result);
+    }
+}
 //# sourceMappingURL=ModelsTreeIdsCache.js.map