@itwin/unified-selection 0.2.0 → 0.3.0

package/lib/esm/unified-selection/EnableUnifiedSelectionSyncWithIModel.js

@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+import { from, Subject, takeUntil } from "rxjs";
+import { assert, using } from "@itwin/core-bentley";
+import { createCachingHiliteSetProvider } from "./CachingHiliteSetProvider";
+import { createHiliteSetProvider } from "./HiliteSetProvider";
+import { computeSelection } from "./SelectionScope";
+import { CoreSelectionSetEventType } from "./types/IModel";
+/**
+ * Enables synchronization between iModel selection and unified selection.
+ * @returns function for disposing the synchronization.
+ * @beta
+ */
+export function enableUnifiedSelectionSyncWithIModel(props) {
+    const selectionHandler = new IModelSelectionHandler(props);
+    return () => selectionHandler.dispose();
+}
+/**
+ * A handler that syncs selection between unified selection storage
+ * (`SelectionStorage`) and an iModel (`iModel.selectionSet`, `iModel.hilited`).
+ * @internal
+ */
+export class IModelSelectionHandler {
+    _selectionSourceName = "Tool";
+    _imodelAccess;
+    _selectionStorage;
+    _hiliteSetProvider;
+    _cachingHiliteSetProvider;
+    _activeScopeProvider;
+    _isSuspended;
+    _cancelOngoingChanges = new Subject();
+    _unifiedSelectionListenerDisposeFunc;
+    _imodelListenerDisposeFunc;
+    _hasCustomCachingHiliteSetProvider;
+    constructor(props) {
+        this._imodelAccess = props.imodelAccess;
+        this._selectionStorage = props.selectionStorage;
+        this._activeScopeProvider = props.activeScopeProvider;
+        this._isSuspended = false;
+        this._hasCustomCachingHiliteSetProvider = !!props.cachingHiliteSetProvider;
+        this._cachingHiliteSetProvider =
+            props.cachingHiliteSetProvider ??
+                createCachingHiliteSetProvider({
+                    selectionStorage: this._selectionStorage,
+                    imodelProvider: () => this._imodelAccess,
+                });
+        this._hiliteSetProvider = createHiliteSetProvider({ imodelAccess: this._imodelAccess });
+        this._imodelListenerDisposeFunc = this._imodelAccess.selectionSet.onChanged.addListener(this.onIModelSelectionChanged);
+        this._unifiedSelectionListenerDisposeFunc = this._selectionStorage.selectionChangeEvent.addListener(this.onUnifiedSelectionChanged);
+        // stop imodel from syncing tool selection with hilited list - we want to override that behavior
+        this._imodelAccess.hiliteSet.wantSyncWithSelectionSet = false;
+        this.applyCurrentHiliteSet({ activeSelectionAction: "clearAll" });
+    }
+    dispose() {
+        this._cancelOngoingChanges.next();
+        this._imodelListenerDisposeFunc();
+        this._unifiedSelectionListenerDisposeFunc();
+        if (!this._hasCustomCachingHiliteSetProvider) {
+            this._cachingHiliteSetProvider.dispose();
+        }
+    }
+    /** Temporarily suspends tool selection synchronization until the returned `IDisposable` is disposed. */
+    suspendIModelToolSelectionSync() {
+        const wasSuspended = this._isSuspended;
+        this._isSuspended = true;
+        return {
+            dispose: () => (this._isSuspended = wasSuspended),
+        };
+    }
+    handleUnifiedSelectionChange(changeType, selectables, source) {
+        if (changeType === "clear" || changeType === "replace") {
+            this.applyCurrentHiliteSet({ activeSelectionAction: changeType === "replace" && source === "Tool" ? "clearHilited" : "clearAll" });
+            return;
+        }
+        if (changeType === "add") {
+            from(this._hiliteSetProvider.getHiliteSet({ selectables }))
+                .pipe(takeUntil(this._cancelOngoingChanges))
+                .subscribe({
+                next: (set) => {
+                    this.addHiliteSet(set);
+                },
+            });
+            return;
+        }
+        from(this._hiliteSetProvider.getHiliteSet({ selectables }))
+            .pipe(takeUntil(this._cancelOngoingChanges))
+            .subscribe({
+            next: (set) => {
+                this.removeHiliteSet(set);
+            },
+            complete: () => {
+                this.applyCurrentHiliteSet({ activeSelectionAction: "keep" });
+            },
+        });
+    }
+    onUnifiedSelectionChanged = (args) => {
+        // iModels are only interested in top-level selection changes
+        if (args.imodelKey !== this._imodelAccess.key || args.level !== 0) {
+            return;
+        }
+        if (args.changeType === "replace" || args.changeType === "clear") {
+            this._cancelOngoingChanges.next();
+        }
+        this.handleUnifiedSelectionChange(args.changeType, args.selectables, args.source);
+    };
+    applyCurrentHiliteSet({ activeSelectionAction }) {
+        if (activeSelectionAction !== "keep") {
+            using(this.suspendIModelToolSelectionSync(), (_) => {
+                this._imodelAccess.hiliteSet.clear();
+                if (activeSelectionAction === "clearAll") {
+                    this._imodelAccess.selectionSet.emptyAll();
+                }
+            });
+        }
+        from(this._cachingHiliteSetProvider.getHiliteSet({ imodelKey: this._imodelAccess.key }))
+            .pipe(takeUntil(this._cancelOngoingChanges))
+            .subscribe({
+            next: (ids) => {
+                this.addHiliteSet(ids);
+            },
+        });
+    }
+    addHiliteSet(set) {
+        using(this.suspendIModelToolSelectionSync(), (_) => {
+            if (set.models && set.models.length) {
+                this._imodelAccess.hiliteSet.models.addIds(set.models);
+            }
+            if (set.subCategories && set.subCategories.length) {
+                this._imodelAccess.hiliteSet.subcategories.addIds(set.subCategories);
+            }
+            if (set.elements && set.elements.length) {
+                this._imodelAccess.hiliteSet.elements.addIds(set.elements);
+                this._imodelAccess.selectionSet.add(set.elements);
+            }
+        });
+    }
+    removeHiliteSet(set) {
+        using(this.suspendIModelToolSelectionSync(), (_) => {
+            if (set.models.length) {
+                this._imodelAccess.hiliteSet.models.deleteIds(set.models);
+            }
+            if (set.subCategories.length) {
+                this._imodelAccess.hiliteSet.subcategories.deleteIds(set.subCategories);
+            }
+            if (set.elements.length) {
+                this._imodelAccess.hiliteSet.elements.deleteIds(set.elements);
+                this._imodelAccess.selectionSet.remove(set.elements);
+            }
+        });
+    }
+    onIModelSelectionChanged = async (event) => {
+        if (this._isSuspended) {
+            return;
+        }
+        if (CoreSelectionSetEventType.Clear === event.type) {
+            this._selectionStorage.clearSelection({ imodelKey: this._imodelAccess.key, source: this._selectionSourceName });
+            return;
+        }
+        const elementIds = this.getSelectionSetChangeIds(event);
+        const scopedSelection = computeSelection({ queryExecutor: this._imodelAccess, elementIds, scope: this._activeScopeProvider() });
+        await this.handleIModelSelectionChange(event.type, scopedSelection);
+    };
+    async handleIModelSelectionChange(type, iterator) {
+        if (type === CoreSelectionSetEventType.Remove) {
+            for await (const selectable of iterator) {
+                this._selectionStorage.removeFromSelection({ imodelKey: this._imodelAccess.key, source: this._selectionSourceName, selectables: [selectable] });
+            }
+            return;
+        }
+        if (type === CoreSelectionSetEventType.Replace) {
+            this._selectionStorage.clearSelection({ imodelKey: this._imodelAccess.key, source: this._selectionSourceName });
+        }
+        for await (const selectable of iterator) {
+            this._selectionStorage.addToSelection({ imodelKey: this._imodelAccess.key, source: this._selectionSourceName, selectables: [selectable] });
+        }
+    }
+    getSelectionSetChangeIds(event) {
+        switch (event.type) {
+            case CoreSelectionSetEventType.Add:
+            case CoreSelectionSetEventType.Replace:
+                assert(!!event.added);
+                return this.idArgToIds(event.added);
+            default:
+                assert(!!event.removed);
+                return this.idArgToIds(event.removed);
+        }
+    }
+    idArgToIds(ids) {
+        if (typeof ids === "string") {
+            return [ids];
+        }
+        if (ids instanceof Set) {
+            return [...ids];
+        }
+        return ids;
+    }
+}
+//# sourceMappingURL=EnableUnifiedSelectionSyncWithIModel.js.map

package/lib/esm/unified-selection/EnableUnifiedSelectionSyncWithIModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnableUnifiedSelectionSyncWithIModel.js","sourceRoot":"","sources":["../../../src/unified-selection/EnableUnifiedSelectionSyncWithIModel.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,EAAE,MAAM,EAAW,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAA4B,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AACtG,OAAO,EAAE,uBAAuB,EAAgC,MAAM,qBAAqB,CAAC;AAG5F,OAAO,EAAE,gBAAgB,EAAyB,MAAM,kBAAkB,CAAC;AAE3E,OAAO,EAA+C,yBAAyB,EAA+B,MAAM,gBAAgB,CAAC;AAoDrI;;;;GAIG;AACH,MAAM,UAAU,oCAAoC,CAAC,KAAgD;IACnG,MAAM,gBAAgB,GAAG,IAAI,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC3D,OAAO,GAAG,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,MAAM,OAAO,sBAAsB;IACzB,oBAAoB,GAAG,MAAM,CAAC;IAE9B,aAAa,CAA4D;IACzE,iBAAiB,CAAmB;IACpC,kBAAkB,CAAoB;IACtC,yBAAyB,CAA2B;IACpD,oBAAoB,CAAuC;IAE3D,YAAY,CAAU;IACtB,qBAAqB,GAAG,IAAI,OAAO,EAAQ,CAAC;IAC5C,oCAAoC,CAAa;IACjD,0BAA0B,CAAa;IACvC,kCAAkC,CAAU;IAEpD,YAAmB,KAAgD;QACjE,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAChD,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC,mBAAmB,CAAC;QACtD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,kCAAkC,GAAG,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC;QAE3E,IAAI,CAAC,yBAAyB;YAC5B,KAAK,CAAC,wBAAwB;gBAC9B,8BAA8B,CAAC;oBAC7B,gBAAgB,EAAE,IAAI,CAAC,iBAAiB;oBACxC,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa;iBACzC,CAAC,CAAC;QAEL,IAAI,CAAC,kBAAkB,GAAG,uBAAuB,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACvH,IAAI,CAAC,oCAAoC,GAAG,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAEpI,gGAAgG;QAChG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,wBAAwB,GAAG,KAAK,CAAC;QAC9D,IAAI,CAAC,qBAAqB,CAAC,EAAE,qBAAqB,EAAE,UAAU,EAAE,CAAC,CAAC;IACpE,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QAClC,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAClC,IAAI,CAAC,oCAAoC,EAAE,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,kCAAkC,EAAE,CAAC;YAC7C,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,wGAAwG;IACjG,8BAA8B;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO;YACL,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;SAClD,CAAC;IACJ,CAAC;IAEO,4BAA4B,CAAC,UAAsC,EAAE,WAAwB,EAAE,MAAc;QACnH,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACvD,IAAI,CAAC,qBAAqB,CAAC,EAAE,qBAAqB,EAAE,UAAU,KAAK,SAAS,IAAI,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;YACnI,OAAO;QACT,CAAC;QAED,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;iBACxD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;iBAC3C,SAAS,CAAC;gBACT,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;oBACZ,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC;aACF,CAAC,CAAC;YACL,OAAO;QACT,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;aACxD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;aAC3C,SAAS,CAAC;YACT,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;gBACZ,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;YACD,QAAQ,EAAE,GAAG,EAAE;gBACb,IAAI,CAAC,qBAAqB,CAAC,EAAE,qBAAqB,EAAE,MAAM,EAAE,CAAC,CAAC;YAChE,CAAC;SACF,CAAC,CAAC;IACP,CAAC;IAEO,yBAAyB,GAAG,CAAC,IAAqC,EAAE,EAAE;QAC5E,6DAA6D;QAC7D,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YAClE,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;YACjE,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpF,CAAC,CAAC;IAEM,qBAAqB,CAAC,EAAE,qBAAqB,EAAmE;QACtH,IAAI,qBAAqB,KAAK,MAAM,EAAE,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE;gBACjD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;gBACrC,IAAI,qBAAqB,KAAK,UAAU,EAAE,CAAC;oBACzC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC7C,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;aACrF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;aAC3C,SAAS,CAAC;YACT,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;gBACZ,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;SACF,CAAC,CAAC;IACP,CAAC;IAEO,YAAY,CAAC,GAAc;QACjC,KAAK,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE;YACjD,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACpC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACzD,CAAC;YACD,IAAI,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBAClD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACvE,CAAC;YACD,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACxC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC3D,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,GAAc;QACpC,KAAK,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE;YACjD,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACtB,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBAC7B,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC1E,CAAC;YACD,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACxB,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC9D,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACvD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,wBAAwB,GAAG,KAAK,EAAE,KAAmC,EAAiB,EAAE;QAC9F,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,IAAI,yBAAyB,CAAC,KAAK,KAAK,KAAM,CAAC,IAAI,EAAE,CAAC;YACpD,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;YAChH,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,KAAM,CAAC,CAAC;QACzD,MAAM,eAAe,GAAG,gBAAgB,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;QAChI,MAAM,IAAI,CAAC,2BAA2B,CAAC,KAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACvE,CAAC,CAAC;IAEM,KAAK,CAAC,2BAA2B,CAAC,IAA+B,EAAE,QAAsD;QAC/H,IAAI,IAAI,KAAK,yBAAyB,CAAC,MAAM,EAAE,CAAC;YAC9C,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,QAAQ,EAAE,CAAC;gBACxC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAClJ,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,IAAI,KAAK,yBAAyB,CAAC,OAAO,EAAE,CAAC;YAC/C,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAClH,CAAC;QAED,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,QAAQ,EAAE,CAAC;YACxC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC7I,CAAC;IACH,CAAC;IAEO,wBAAwB,CAAC,KAAkC;QACjE,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,yBAAyB,CAAC,GAAG,CAAC;YACnC,KAAK,yBAAyB,CAAC,OAAO;gBACpC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC;gBACE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACxB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAEO,UAAU,CAAC,GAAY;QAC7B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QACD,IAAI,GAAG,YAAY,GAAG,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC;QAClB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF","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 { from, Subject, takeUntil } from \"rxjs\";\nimport { assert, Id64Arg, using } from \"@itwin/core-bentley\";\nimport { ECSchemaProvider, ECSqlQueryExecutor } from \"@itwin/presentation-shared\";\nimport { CachingHiliteSetProvider, createCachingHiliteSetProvider } from \"./CachingHiliteSetProvider\";\nimport { createHiliteSetProvider, HiliteSet, HiliteSetProvider } from \"./HiliteSetProvider\";\nimport { SelectableInstanceKey, Selectables } from \"./Selectable\";\nimport { StorageSelectionChangeEventArgs, StorageSelectionChangeType } from \"./SelectionChangeEvent\";\nimport { computeSelection, ComputeSelectionProps } from \"./SelectionScope\";\nimport { SelectionStorage } from \"./SelectionStorage\";\nimport { CoreIModelHiliteSet, CoreIModelSelectionSet, CoreSelectionSetEventType, CoreSelectionSetEventUnsafe } from \"./types/IModel\";\n\n/**\n * Props for `enableUnifiedSelectionSyncWithIModel`.\n * @internal Not exported through barrel, but used in public API as an argument. May be supplemented with optional attributes any time.\n */\nexport interface EnableUnifiedSelectionSyncWithIModelProps {\n  /**\n   * Provides access to different iModel's features: query executing, metadata access, selection and hilite sets.\n   * It's recommended to use `@itwin/presentation-core-interop` to create `ECSqlQueryExecutor` and `ECSchemaProvider` from\n   * [IModelConnection](https://www.itwinjs.org/reference/core-frontend/imodelconnection/imodelconnection/) and map its `key`,\n   * `hilited` and `selectionSet` attributes like this:\n   *\n   * ```ts\n   * import { createECSqlQueryExecutor, createECSchemaProvider } from \"@itwin/presentation-core-interop\";\n   * import { IModelConnection } from \"@itwin/core-frontend\";\n   *\n   * const imodel: IModelConnection = ...\n   * const imodelAccess = {\n   *   ...createECSqlQueryExecutor(imodel),\n   *   ...createECSchemaProvider(MyAppFrontend.getSchemaContext(imodel)),\n   *   key: imodel.key,\n   *   hiliteSet: imodel.hilited,\n   *   selectionSet: imodel.selectionSet,\n   * };\n   * ```.\n   */\n  imodelAccess: ECSqlQueryExecutor &\n    ECSchemaProvider & {\n      /** Key of the iModel. Generally taken from `IModelConnection.key`. */\n      readonly key: string;\n      /** The set of currently hilited elements taken from `IModelConnection.hilited`. */\n      readonly hiliteSet: CoreIModelHiliteSet;\n      /** The set of currently selected elements taken from `IModelConnection.selectionSet`. */\n      readonly selectionSet: CoreIModelSelectionSet;\n    };\n\n  /** Selection storage to synchronize IModel's tool selection with. */\n  selectionStorage: SelectionStorage;\n\n  /** Active scope provider. */\n  activeScopeProvider: () => ComputeSelectionProps[\"scope\"];\n\n  /**\n   * A caching hilite set provider used to retrieve hilite sets for an iModel. If not provided, a new `CachingHiliteSetProvider`\n   * will be created for the given iModel using the provided `imodelAccess`.\n   * If the consuming application already has a `CachingHiliteSetProvider` defined, it should be provided instead\n   * to reuse the cache and avoid creating new providers for each iModel.\n   */\n  cachingHiliteSetProvider?: CachingHiliteSetProvider;\n}\n\n/**\n * Enables synchronization between iModel selection and unified selection.\n * @returns function for disposing the synchronization.\n * @beta\n */\nexport function enableUnifiedSelectionSyncWithIModel(props: EnableUnifiedSelectionSyncWithIModelProps): () => void {\n  const selectionHandler = new IModelSelectionHandler(props);\n  return () => selectionHandler.dispose();\n}\n\n/**\n * A handler that syncs selection between unified selection storage\n * (`SelectionStorage`) and an iModel (`iModel.selectionSet`, `iModel.hilited`).\n * @internal\n */\nexport class IModelSelectionHandler {\n  private _selectionSourceName = \"Tool\";\n\n  private _imodelAccess: EnableUnifiedSelectionSyncWithIModelProps[\"imodelAccess\"];\n  private _selectionStorage: SelectionStorage;\n  private _hiliteSetProvider: HiliteSetProvider;\n  private _cachingHiliteSetProvider: CachingHiliteSetProvider;\n  private _activeScopeProvider: () => ComputeSelectionProps[\"scope\"];\n\n  private _isSuspended: boolean;\n  private _cancelOngoingChanges = new Subject<void>();\n  private _unifiedSelectionListenerDisposeFunc: () => void;\n  private _imodelListenerDisposeFunc: () => void;\n  private _hasCustomCachingHiliteSetProvider: boolean;\n\n  public constructor(props: EnableUnifiedSelectionSyncWithIModelProps) {\n    this._imodelAccess = props.imodelAccess;\n    this._selectionStorage = props.selectionStorage;\n    this._activeScopeProvider = props.activeScopeProvider;\n    this._isSuspended = false;\n    this._hasCustomCachingHiliteSetProvider = !!props.cachingHiliteSetProvider;\n\n    this._cachingHiliteSetProvider =\n      props.cachingHiliteSetProvider ??\n      createCachingHiliteSetProvider({\n        selectionStorage: this._selectionStorage,\n        imodelProvider: () => this._imodelAccess,\n      });\n\n    this._hiliteSetProvider = createHiliteSetProvider({ imodelAccess: this._imodelAccess });\n    this._imodelListenerDisposeFunc = this._imodelAccess.selectionSet.onChanged.addListener(this.onIModelSelectionChanged);\n    this._unifiedSelectionListenerDisposeFunc = this._selectionStorage.selectionChangeEvent.addListener(this.onUnifiedSelectionChanged);\n\n    // stop imodel from syncing tool selection with hilited list - we want to override that behavior\n    this._imodelAccess.hiliteSet.wantSyncWithSelectionSet = false;\n    this.applyCurrentHiliteSet({ activeSelectionAction: \"clearAll\" });\n  }\n\n  public dispose() {\n    this._cancelOngoingChanges.next();\n    this._imodelListenerDisposeFunc();\n    this._unifiedSelectionListenerDisposeFunc();\n    if (!this._hasCustomCachingHiliteSetProvider) {\n      this._cachingHiliteSetProvider.dispose();\n    }\n  }\n\n  /** Temporarily suspends tool selection synchronization until the returned `IDisposable` is disposed. */\n  public suspendIModelToolSelectionSync() {\n    const wasSuspended = this._isSuspended;\n    this._isSuspended = true;\n    return {\n      dispose: () => (this._isSuspended = wasSuspended),\n    };\n  }\n\n  private handleUnifiedSelectionChange(changeType: StorageSelectionChangeType, selectables: Selectables, source: string) {\n    if (changeType === \"clear\" || changeType === \"replace\") {\n      this.applyCurrentHiliteSet({ activeSelectionAction: changeType === \"replace\" && source === \"Tool\" ? \"clearHilited\" : \"clearAll\" });\n      return;\n    }\n\n    if (changeType === \"add\") {\n      from(this._hiliteSetProvider.getHiliteSet({ selectables }))\n        .pipe(takeUntil(this._cancelOngoingChanges))\n        .subscribe({\n          next: (set) => {\n            this.addHiliteSet(set);\n          },\n        });\n      return;\n    }\n\n    from(this._hiliteSetProvider.getHiliteSet({ selectables }))\n      .pipe(takeUntil(this._cancelOngoingChanges))\n      .subscribe({\n        next: (set) => {\n          this.removeHiliteSet(set);\n        },\n        complete: () => {\n          this.applyCurrentHiliteSet({ activeSelectionAction: \"keep\" });\n        },\n      });\n  }\n\n  private onUnifiedSelectionChanged = (args: StorageSelectionChangeEventArgs) => {\n    // iModels are only interested in top-level selection changes\n    if (args.imodelKey !== this._imodelAccess.key || args.level !== 0) {\n      return;\n    }\n\n    if (args.changeType === \"replace\" || args.changeType === \"clear\") {\n      this._cancelOngoingChanges.next();\n    }\n    this.handleUnifiedSelectionChange(args.changeType, args.selectables, args.source);\n  };\n\n  private applyCurrentHiliteSet({ activeSelectionAction }: { activeSelectionAction: \"clearAll\" | \"clearHilited\" | \"keep\" }) {\n    if (activeSelectionAction !== \"keep\") {\n      using(this.suspendIModelToolSelectionSync(), (_) => {\n        this._imodelAccess.hiliteSet.clear();\n        if (activeSelectionAction === \"clearAll\") {\n          this._imodelAccess.selectionSet.emptyAll();\n        }\n      });\n    }\n\n    from(this._cachingHiliteSetProvider.getHiliteSet({ imodelKey: this._imodelAccess.key }))\n      .pipe(takeUntil(this._cancelOngoingChanges))\n      .subscribe({\n        next: (ids) => {\n          this.addHiliteSet(ids);\n        },\n      });\n  }\n\n  private addHiliteSet(set: HiliteSet) {\n    using(this.suspendIModelToolSelectionSync(), (_) => {\n      if (set.models && set.models.length) {\n        this._imodelAccess.hiliteSet.models.addIds(set.models);\n      }\n      if (set.subCategories && set.subCategories.length) {\n        this._imodelAccess.hiliteSet.subcategories.addIds(set.subCategories);\n      }\n      if (set.elements && set.elements.length) {\n        this._imodelAccess.hiliteSet.elements.addIds(set.elements);\n        this._imodelAccess.selectionSet.add(set.elements);\n      }\n    });\n  }\n\n  private removeHiliteSet(set: HiliteSet) {\n    using(this.suspendIModelToolSelectionSync(), (_) => {\n      if (set.models.length) {\n        this._imodelAccess.hiliteSet.models.deleteIds(set.models);\n      }\n      if (set.subCategories.length) {\n        this._imodelAccess.hiliteSet.subcategories.deleteIds(set.subCategories);\n      }\n      if (set.elements.length) {\n        this._imodelAccess.hiliteSet.elements.deleteIds(set.elements);\n        this._imodelAccess.selectionSet.remove(set.elements);\n      }\n    });\n  }\n\n  private onIModelSelectionChanged = async (event?: CoreSelectionSetEventUnsafe): Promise<void> => {\n    if (this._isSuspended) {\n      return;\n    }\n\n    if (CoreSelectionSetEventType.Clear === event!.type) {\n      this._selectionStorage.clearSelection({ imodelKey: this._imodelAccess.key, source: this._selectionSourceName });\n      return;\n    }\n\n    const elementIds = this.getSelectionSetChangeIds(event!);\n    const scopedSelection = computeSelection({ queryExecutor: this._imodelAccess, elementIds, scope: this._activeScopeProvider() });\n    await this.handleIModelSelectionChange(event!.type, scopedSelection);\n  };\n\n  private async handleIModelSelectionChange(type: CoreSelectionSetEventType, iterator: AsyncIterableIterator<SelectableInstanceKey>) {\n    if (type === CoreSelectionSetEventType.Remove) {\n      for await (const selectable of iterator) {\n        this._selectionStorage.removeFromSelection({ imodelKey: this._imodelAccess.key, source: this._selectionSourceName, selectables: [selectable] });\n      }\n      return;\n    }\n\n    if (type === CoreSelectionSetEventType.Replace) {\n      this._selectionStorage.clearSelection({ imodelKey: this._imodelAccess.key, source: this._selectionSourceName });\n    }\n\n    for await (const selectable of iterator) {\n      this._selectionStorage.addToSelection({ imodelKey: this._imodelAccess.key, source: this._selectionSourceName, selectables: [selectable] });\n    }\n  }\n\n  private getSelectionSetChangeIds(event: CoreSelectionSetEventUnsafe): string[] {\n    switch (event.type) {\n      case CoreSelectionSetEventType.Add:\n      case CoreSelectionSetEventType.Replace:\n        assert(!!event.added);\n        return this.idArgToIds(event.added);\n      default:\n        assert(!!event.removed);\n        return this.idArgToIds(event.removed);\n    }\n  }\n\n  private idArgToIds(ids: Id64Arg): string[] {\n    if (typeof ids === \"string\") {\n      return [ids];\n    }\n    if (ids instanceof Set) {\n      return [...ids];\n    }\n    return ids;\n  }\n}\n"]}

package/lib/esm/unified-selection/HiliteSetProvider.d.ts

@@ -1,5 +1,4 @@
-import { IMetadataProvider } from "./queries/ECMetadata";
-import { IECSqlQueryExecutor } from "./queries/ECSqlCore";
+import { ECSchemaProvider, ECSqlQueryExecutor } from "@itwin/presentation-shared";
 import { Selectables } from "./Selectable";
 /**
  * A set of model, subcategory and element ids that can be used for specifying hilite.
@@ -16,8 +15,7 @@ export interface HiliteSet {
  * @internal Not exported through barrel, but used in public API as an argument. May be supplemented with optional attributes any time.
  */
 export interface HiliteSetProviderProps {
-    queryExecutor: IECSqlQueryExecutor;
-    metadataProvider: IMetadataProvider;
+    imodelAccess: ECSchemaProvider & ECSqlQueryExecutor;
 }
 /**
  * Defines return value of `createHiliteSetProvider`.

package/lib/esm/unified-selection/HiliteSetProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HiliteSetProvider.d.ts","sourceRoot":"","sources":["../../../src/unified-selection/HiliteSetProvider.ts"],"names":[],"mappings":"AAWA,OAAO,EAAW,iBAAiB,EAAsB,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAgC,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAyB,WAAW,EAAE,MAAM,cAAc,CAAC;AAIlE;;;;GAIG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,mBAAmB,CAAC;IACnC,gBAAgB,EAAE,iBAAiB,CAAC;CACrC;AAED;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,mEAAmE;IACnE,YAAY,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,WAAW,CAAA;KAAE,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;CACrF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,sBAAsB,GAAG,iBAAiB,CAExF"}
+{"version":3,"file":"HiliteSetProvider.d.ts","sourceRoot":"","sources":["../../../src/unified-selection/HiliteSetProvider.ts"],"names":[],"mappings":"AAOA,OAAO,EAAM,gBAAgB,EAAgB,kBAAkB,EAAsB,MAAM,4BAA4B,CAAC;AACxH,OAAO,EAAyB,WAAW,EAAE,MAAM,cAAc,CAAC;AAKlE;;;;GAIG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,gBAAgB,GAAG,kBAAkB,CAAC;CACrD;AAED;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,mEAAmE;IACnE,YAAY,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,WAAW,CAAA;KAAE,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;CACrF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,sBAAsB,GAAG,iBAAiB,CAExF"}

package/lib/esm/unified-selection/HiliteSetProvider.js

@@ -2,13 +2,10 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-/** @packageDocumentation
- * @module UnifiedSelection
- */
 import { EMPTY, filter, forkJoin, from, map, merge, mergeMap, scan, shareReplay, Subject, toArray } from "rxjs";
 import { eachValueFrom } from "rxjs-for-await";
-import { parseFullClassName } from "./queries/ECMetadata";
-import { formIdBindings } from "./queries/ECSqlCore";
+import { parseFullClassName } from "@itwin/presentation-shared";
+import { formIdBindings } from "./Utils";
 const HILITE_SET_EMIT_FREQUENCY = 20;
 /**
  * Creates a hilite set provider that returns a `HiliteSet` for given selectables.
@@ -18,13 +15,11 @@ export function createHiliteSetProvider(props) {
     return new HiliteSetProviderImpl(props);
 }
 class HiliteSetProviderImpl {
-    _queryExecutor;
-    _metadataProvider;
+    _imodelAccess;
     // Map between a class name and its type
     _classRelationCache;
     constructor(props) {
-        this._queryExecutor = props.queryExecutor;
-        this._metadataProvider = props.metadataProvider;
+        this._imodelAccess = props.imodelAccess;
         this._classRelationCache = new Map();
     }
     /**
@@ -126,24 +121,37 @@ class HiliteSetProviderImpl {
                 return EMPTY;
             }
             const bindings = [];
-            const query = `WITH RECURSIVE
-                    ChildSubjects (ECInstanceId, JsonProperties) AS (
-                      SELECT ECInstanceId, JsonProperties FROM BisCore.Subject WHERE ${formIdBindings("ECInstanceId", subjectKeys, bindings)}
-                      UNION ALL
-                      SELECT r.ECInstanceId, r.JsonProperties FROM ChildSubjects s
-                        JOIN BisCore.Subject r ON r.Parent.Id = s.ECInstanceId
-                    ),
-                    Models (ECInstanceId) AS (
-                      SELECT s.ECInstanceId as \`ECInstanceId\` FROM BisCore.Model s
-                      WHERE ${formIdBindings("ECInstanceId", modelKeys, bindings)}
-                    )
-                    SELECT r.ECInstanceId as \`ECInstanceId\` FROM ChildSubjects s
-                      JOIN BisCore.PhysicalPartition r
-                        ON r.Parent.Id = s.ECInstanceId
-                        OR json_extract(s.JsonProperties,'$.Subject.Model.TargetPartition') = printf('0x%x', r.ECInstanceId)
-                    UNION
-                    SELECT ECInstanceId FROM Models;`;
-            return from(this._queryExecutor.createQueryReader(query, bindings));
+            const ctes = [
+                `
+            ChildSubjects(ECInstanceId, JsonProperties) AS (
+              SELECT ECInstanceId, JsonProperties
+              FROM BisCore.Subject
+              WHERE ${formIdBindings("ECInstanceId", subjectKeys, bindings)}
+              UNION ALL
+              SELECT r.ECInstanceId, r.JsonProperties
+              FROM ChildSubjects s
+              JOIN BisCore.Subject r ON r.Parent.Id = s.ECInstanceId
+            )
+          `,
+                `
+            Models(ECInstanceId) AS (
+              SELECT s.ECInstanceId AS ECInstanceId
+              FROM BisCore.Model s
+              WHERE ${formIdBindings("ECInstanceId", modelKeys, bindings)}
+            )
+          `,
+            ];
+            const ecsql = [
+                `
+            SELECT r.ECInstanceId AS ECInstanceId
+            FROM ChildSubjects s
+            JOIN BisCore.PhysicalPartition r ON r.Parent.Id = s.ECInstanceId OR json_extract(s.JsonProperties,'$.Subject.Model.TargetPartition') = printf('0x%x', r.ECInstanceId)
+          `,
+                `
+            SELECT ECInstanceId FROM Models
+          `,
+            ].join(" UNION ");
+            return from(this._imodelAccess.createQueryReader({ ctes, ecsql, bindings }));
         }), map((row) => row.ECInstanceId));
     }
     getHilitedSubCategories(instancesByType) {
@@ -155,20 +163,25 @@ class HiliteSetProviderImpl {
                 return EMPTY;
             }
             const bindings = [];
-            const query = `WITH
-                    CategorySubCategories (ECInstanceId) AS (
-                      SELECT r.ECInstanceId as \`ECInstanceId\` FROM BisCore.Category s
-                        JOIN BisCore.SubCategory r ON r.Parent.Id = s.ECInstanceId
-                      WHERE ${formIdBindings("s.ECInstanceId", categoryKeys, bindings)}
-                    ),
-                    SubCategories (ECInstanceId) AS (
-                      SELECT s.ECInstanceId as \`ECInstanceId\` FROM BisCore.SubCategory s
-                      WHERE ${formIdBindings("s.ECInstanceId", subCategoryKeys, bindings)}
-                    )
-                   SELECT ECInstanceId FROM CategorySubCategories
-                   UNION
-                   SELECT ECInstanceId FROM SubCategories;`;
-            return from(this._queryExecutor.createQueryReader(query, bindings));
+            const ctes = [
+                `
+            CategorySubCategories(ECInstanceId) AS (
+              SELECT r.ECInstanceId AS ECInstanceId
+              FROM BisCore.Category s
+              JOIN BisCore.SubCategory r ON r.Parent.Id = s.ECInstanceId
+              WHERE ${formIdBindings("s.ECInstanceId", categoryKeys, bindings)}
+            )
+          `,
+                `
+            SubCategories(ECInstanceId) AS (
+              SELECT s.ECInstanceId AS ECInstanceId
+              FROM BisCore.SubCategory s
+              WHERE ${formIdBindings("s.ECInstanceId", subCategoryKeys, bindings)}
+            )
+          `,
+            ];
+            const ecsql = [`SELECT ECInstanceId FROM CategorySubCategories`, `SELECT ECInstanceId FROM SubCategories`].join(" UNION ");
+            return from(this._imodelAccess.createQueryReader({ ctes, ecsql, bindings }));
         }), map((row) => row.ECInstanceId));
     }
     getHilitedElements(instancesByType) {
@@ -183,80 +196,113 @@ class HiliteSetProviderImpl {
                 return EMPTY;
             }
             const bindings = [];
-            const query = `WITH RECURSIVE
-                    ${hasFunctionalElements ? this.getHilitedFunctionalElementsQuery(functionalElements, bindings) : ""}
-                    GroupMembers (ECInstanceId, ECClassId) AS (
-                      SELECT TargetECInstanceId, TargetECClassId FROM BisCore.ElementGroupsMembers
-                      WHERE ${formIdBindings("SourceECInstanceId", groupInformationElementKeys, bindings)}
-                    ),
-                    GroupGeometricElements (ECInstanceId, ECClassId) AS (
-                      SELECT ECInstanceId, ECClassId FROM GroupMembers
-                      UNION ALL
-                      SELECT r.ECInstanceId, r.ECClassId FROM GroupGeometricElements s
-                        JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
-                    ),
-                    ElementGeometricElements (ECInstanceId, ECClassId) AS (
-                      SELECT ECInstanceId, ECClassId FROM BisCore.Element WHERE ${formIdBindings("ECInstanceId", elementKeys, bindings)}
-                      UNION ALL
-                      SELECT r.ECInstanceId, r.ECClassId FROM ElementGeometricElements s
-                        JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
-                    ),
-                    GeometricElementGeometricElements (ECInstanceId, ECClassId) AS (
-                      SELECT ECInstanceId, ECClassId FROM BisCore.GeometricElement WHERE ${formIdBindings("ECInstanceId", geometricElementKeys, bindings)}
-                      UNION ALL
-                      SELECT r.ECInstanceId, r.ECClassId FROM GeometricElementGeometricElements s
-                        JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
-                    )
-                   ${hasFunctionalElements
-                ? `
-                   SELECT ECInstanceId FROM FunctionalElementChildGeometricElements WHERE ECClassId IS (BisCore.GeometricElement)
-                   UNION
-                   `
-                : ``}
-                   SELECT ECInstanceId FROM GeometricElementGeometricElements WHERE ECClassId IS (BisCore.GeometricElement)
-                   UNION
-                   SELECT ECInstanceId FROM GroupGeometricElements WHERE ECClassId IS (BisCore.GeometricElement)
-                   UNION
-                   SELECT ECInstanceId FROM ElementGeometricElements WHERE ECClassId IS (BisCore.GeometricElement);`;
-            return from(this._queryExecutor.createQueryReader(query, bindings));
-        }), map((row) => row.ECInstanceId));
-    }
-    getHilitedFunctionalElementsQuery(functionalElements, bindings) {
-        return `ChildFunctionalElements (ECInstanceId, ECClassId) AS (
-              SELECT ECInstanceId, ECClassId FROM Functional.FunctionalElement WHERE ${formIdBindings("ECInstanceId", functionalElements, bindings)}
+            const ctes = [
+                ...(hasFunctionalElements ? this.getHilitedFunctionalElementsQueryCTEs(functionalElements, bindings) : []),
+                `
+            GroupMembers(ECInstanceId, ECClassId) AS (
+              SELECT TargetECInstanceId, TargetECClassId
+              FROM BisCore.ElementGroupsMembers
+              WHERE ${formIdBindings("SourceECInstanceId", groupInformationElementKeys, bindings)}
+            )
+          `,
+                `
+            GroupGeometricElements(ECInstanceId, ECClassId) AS (
+              SELECT ECInstanceId, ECClassId FROM GroupMembers
               UNION ALL
-              SELECT r.ECInstanceId, r.ECClassId FROM ChildFunctionalElements s
-                JOIN Functional.FunctionalElement r ON r.Parent.Id = s.ECInstanceId
-            ),
-            PhysicalElements (ECInstanceId, ECClassId) AS (
-              SELECT r.SourceECInstanceId, r.SourceECClassId FROM ChildFunctionalElements s
-                JOIN Functional.PhysicalElementFulfillsFunction r ON r.TargetECInstanceId = s.ECInstanceId
-            ),
-            DrawingGraphicElements (ECInstanceId, ECClassId) AS (
-              SELECT r.SourceECInstanceId, r.SourceECClassId FROM ChildFunctionalElements s
-                JOIN Functional.DrawingGraphicRepresentsFunctionalElement r ON r.TargetECInstanceId = s.ECInstanceId
-            ),
-            PhysicalElementGeometricElements (ECInstanceId, ECClassId) AS (
-              SELECT ECInstanceId, ECClassId FROM PhysicalElements
+              SELECT r.ECInstanceId, r.ECClassId
+              FROM GroupGeometricElements s
+              JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
+            )
+          `,
+                `
+            ElementGeometricElements(ECInstanceId, ECClassId) AS (
+              SELECT ECInstanceId, ECClassId
+              FROM BisCore.Element
+              WHERE ${formIdBindings("ECInstanceId", elementKeys, bindings)}
               UNION ALL
-              SELECT r.ECInstanceId, r.ECClassId FROM PhysicalElementGeometricElements s
-                JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
-            ),
-            DrawingGraphicElementGeometricElements (ECInstanceId, ECClassId) AS (
-              SELECT ECInstanceId, ECClassId FROM DrawingGraphicElements
+              SELECT r.ECInstanceId, r.ECClassId
+              FROM ElementGeometricElements s
+              JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
+            )
+          `,
+                `
+            GeometricElementGeometricElements(ECInstanceId, ECClassId) AS (
+              SELECT ECInstanceId, ECClassId
+              FROM BisCore.GeometricElement
+              WHERE ${formIdBindings("ECInstanceId", geometricElementKeys, bindings)}
               UNION ALL
-              SELECT r.ECInstanceId, r.ECClassId FROM DrawingGraphicElementGeometricElements s
-                JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
-            ),
-            FunctionalElementChildGeometricElements (ECInstanceId, ECClassId) AS (
-              SELECT ECInstanceId, ECClassId FROM PhysicalElementGeometricElements
-              UNION
-              SELECT ECInstanceId, ECClassId FROM DrawingGraphicElementGeometricElements
-            ),`;
+              SELECT r.ECInstanceId, r.ECClassId
+              FROM GeometricElementGeometricElements s
+              JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
+            )
+          `,
+            ];
+            const ecsql = [
+                ...(hasFunctionalElements ? ["SELECT ECInstanceId FROM FunctionalElementChildGeometricElements WHERE ECClassId IS (BisCore.GeometricElement)"] : []),
+                "SELECT ECInstanceId FROM GeometricElementGeometricElements WHERE ECClassId IS (BisCore.GeometricElement)",
+                "SELECT ECInstanceId FROM GroupGeometricElements WHERE ECClassId IS (BisCore.GeometricElement)",
+                "SELECT ECInstanceId FROM ElementGeometricElements WHERE ECClassId IS (BisCore.GeometricElement)",
+            ].join(" UNION ");
+            return from(this._imodelAccess.createQueryReader({ ctes, ecsql, bindings }));
+        }), map((row) => row.ECInstanceId));
+    }
+    getHilitedFunctionalElementsQueryCTEs(functionalElements, bindings) {
+        return [
+            `
+        ChildFunctionalElements(ECInstanceId, ECClassId) AS (
+          SELECT ECInstanceId, ECClassId
+          FROM Functional.FunctionalElement
+          WHERE ${formIdBindings("ECInstanceId", functionalElements, bindings)}
+          UNION ALL
+          SELECT r.ECInstanceId, r.ECClassId
+          FROM ChildFunctionalElements s
+          JOIN Functional.FunctionalElement r ON r.Parent.Id = s.ECInstanceId
+        )
+      `,
+            `
+        PhysicalElements(ECInstanceId, ECClassId) AS (
+          SELECT r.SourceECInstanceId, r.SourceECClassId
+          FROM ChildFunctionalElements s
+          JOIN Functional.PhysicalElementFulfillsFunction r ON r.TargetECInstanceId = s.ECInstanceId
+        )
+      `,
+            `
+        DrawingGraphicElements(ECInstanceId, ECClassId) AS (
+          SELECT r.SourceECInstanceId, r.SourceECClassId
+          FROM ChildFunctionalElements s
+          JOIN Functional.DrawingGraphicRepresentsFunctionalElement r ON r.TargetECInstanceId = s.ECInstanceId
+        )
+      `,
+            `
+        PhysicalElementGeometricElements(ECInstanceId, ECClassId) AS (
+          SELECT ECInstanceId, ECClassId FROM PhysicalElements
+          UNION ALL
+          SELECT r.ECInstanceId, r.ECClassId
+          FROM PhysicalElementGeometricElements s
+          JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
+        )
+      `,
+            `
+        DrawingGraphicElementGeometricElements(ECInstanceId, ECClassId) AS (
+          SELECT ECInstanceId, ECClassId FROM DrawingGraphicElements
+          UNION ALL
+          SELECT r.ECInstanceId, r.ECClassId
+          FROM DrawingGraphicElementGeometricElements s
+          JOIN BisCore.Element r ON r.Parent.Id = s.ECInstanceId
+        )
+      `,
+            `
+        FunctionalElementChildGeometricElements(ECInstanceId, ECClassId) AS (
+          SELECT ECInstanceId, ECClassId FROM PhysicalElementGeometricElements
+          UNION
+          SELECT ECInstanceId, ECClassId FROM DrawingGraphicElementGeometricElements
+        )
+      `,
+        ];
     }
     async getClass(fullClassName) {
         const { schemaName, className } = parseFullClassName(fullClassName);
-        const schema = await this._metadataProvider.getSchema(schemaName);
+        const schema = await this._imodelAccess.getSchema(schemaName);
         if (!schema) {
             return undefined;
         }