@itwin/tree-widget-react 3.4.2 → 3.5.1

package/CHANGELOG.md

@@ -1,12 +1,28 @@
 # Change Log - @itwin/tree-widget-react
 
-This log was last generated on Fri, 14 Feb 2025 15:54:32 GMT and should not be manually modified.
+This log was last generated on Thu, 06 Mar 2025 12:37:28 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 3.5.1
+
+Thu, 06 Mar 2025 12:37:28 GMT
+
+### Patches
+
+- Update import to use `@itwin/core-bentley` for types that are reexported by `@itwin/core-common` ([#1232](https://github.com/iTwin/viewer-components-react/pull/1232))
+
+## 3.5.0
+
+Wed, 19 Feb 2025 21:08:10 GMT
+
+### Minor changes
+
+- `CategoriesTree` component rendered `Categories` as a flat list, where each `Category` had zero or more child `SubCategories`. Some iTwin.js applications started to group `Categories` under `DefinitionContainers` and wanted to see them displayed in `CategoriesTree` component. Added `DefinitionContainers` to `CategoriesTree` component. This change doesn't affect applications that don't have `DefinitionContainers`. ([#1172](https://github.com/iTwin/viewer-components-react/pull/1172))
+
 ## 3.4.2
 
-Fri, 14 Feb 2025 15:54:32 GMT
+Fri, 14 Feb 2025 15:54:49 GMT
 
 ### Patches
 

package/lib/cjs/tree-widget-react/TreeWidget.js

@@ -5,7 +5,7 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TreeWidget = void 0;
-const core_common_1 = require("@itwin/core-common");
+const core_bentley_1 = require("@itwin/core-bentley");
 const core_frontend_1 = require("@itwin/core-frontend");
 /**
  * Entry point for static initialization required by various components used in the package.
@@ -35,7 +35,7 @@ class TreeWidget {
     /** The internationalization service created by the IModelApp. */
     static get i18n() {
         if (!TreeWidget._i18n) {
-            throw new core_common_1.BentleyError(core_common_1.BentleyStatus.ERROR, "TreeWidget not initialized");
+            throw new core_bentley_1.BentleyError(core_bentley_1.BentleyStatus.ERROR, "TreeWidget not initialized");
         }
         return TreeWidget._i18n;
     }

package/lib/cjs/tree-widget-react/TreeWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"TreeWidget.js","sourceRoot":"","sources":["../../../src/tree-widget-react/TreeWidget.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,oDAAiE;AACjE,wDAAiD;AAIjD;;;GAGG;AACH,MAAa,UAAU;IAIrB;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAmB;QAChD,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO;SACR;QAED,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC;QAC/B,UAAU,CAAC,KAAK,GAAG,IAAI,IAAI,yBAAS,CAAC,YAAY,CAAC;QAClD,OAAO,UAAU,CAAC,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,wEAAwE;IACjE,MAAM,CAAC,SAAS;QACrB,IAAI,UAAU,CAAC,KAAK,EAAE;YACpB,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAC/D,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;SAC9B;QAED,UAAU,CAAC,YAAY,GAAG,KAAK,CAAC;IAClC,CAAC;IAED,iEAAiE;IAC1D,MAAM,KAAK,IAAI;QACpB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;YACrB,MAAM,IAAI,0BAAY,CAAC,2BAAa,CAAC,KAAK,EAAE,4BAA4B,CAAC,CAAC;SAC3E;QACD,OAAO,UAAU,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,kDAAkD;IAC3C,MAAM,KAAK,aAAa;QAC7B,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;OACG;IACI,MAAM,CAAC,SAAS,CAAC,GAAsB,EAAE,OAA4B;QAC1E,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,aAAa,IAAI,GAAG,EAAE,CAAC;QACvD,OAAO,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;CACF;AA/CD,gCA+CC","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 { BentleyError, BentleyStatus } from \"@itwin/core-common\";\nimport { IModelApp } from \"@itwin/core-frontend\";\n\nimport type { Localization, TranslationOptions } from \"@itwin/core-common\";\n\n/**\n * Entry point for static initialization required by various components used in the package.\n * @public\n */\nexport class TreeWidget {\n  private static _i18n?: Localization;\n  private static _initialized?: boolean;\n\n  /**\n   * Called by IModelApp to initialize the Tree Widget\n   * @param i18n - The internationalization service created by the IModelApp.\n   */\n  public static async initialize(i18n?: Localization): Promise<void> {\n    if (this._initialized) {\n      return;\n    }\n\n    TreeWidget._initialized = true;\n    TreeWidget._i18n = i18n ?? IModelApp.localization;\n    return TreeWidget._i18n.registerNamespace(TreeWidget.i18nNamespace);\n  }\n\n  /** Unregisters the TreeWidget internationalization service namespace */\n  public static terminate() {\n    if (TreeWidget._i18n) {\n      TreeWidget._i18n.unregisterNamespace(TreeWidget.i18nNamespace);\n      TreeWidget._i18n = undefined;\n    }\n\n    TreeWidget._initialized = false;\n  }\n\n  /** The internationalization service created by the IModelApp. */\n  public static get i18n(): Localization {\n    if (!TreeWidget._i18n) {\n      throw new BentleyError(BentleyStatus.ERROR, \"TreeWidget not initialized\");\n    }\n    return TreeWidget._i18n;\n  }\n\n  /** The internationalization service namespace. */\n  public static get i18nNamespace(): string {\n    return \"TreeWidget\";\n  }\n\n  /** Calls i18n.translateWithNamespace with the \"TreeWidget\" namespace. Do NOT include the namespace in the key.\n   */\n  public static translate(key: string | string[], options?: TranslationOptions): string {\n    const stringKey = `${TreeWidget.i18nNamespace}:${key}`;\n    return TreeWidget.i18n.getLocalizedString(stringKey, options);\n  }\n}\n"]}
+{"version":3,"file":"TreeWidget.js","sourceRoot":"","sources":["../../../src/tree-widget-react/TreeWidget.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,sDAAkE;AAClE,wDAAiD;AAIjD;;;GAGG;AACH,MAAa,UAAU;IAIrB;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAmB;QAChD,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO;SACR;QAED,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC;QAC/B,UAAU,CAAC,KAAK,GAAG,IAAI,IAAI,yBAAS,CAAC,YAAY,CAAC;QAClD,OAAO,UAAU,CAAC,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,wEAAwE;IACjE,MAAM,CAAC,SAAS;QACrB,IAAI,UAAU,CAAC,KAAK,EAAE;YACpB,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAC/D,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;SAC9B;QAED,UAAU,CAAC,YAAY,GAAG,KAAK,CAAC;IAClC,CAAC;IAED,iEAAiE;IAC1D,MAAM,KAAK,IAAI;QACpB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;YACrB,MAAM,IAAI,2BAAY,CAAC,4BAAa,CAAC,KAAK,EAAE,4BAA4B,CAAC,CAAC;SAC3E;QACD,OAAO,UAAU,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,kDAAkD;IAC3C,MAAM,KAAK,aAAa;QAC7B,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;OACG;IACI,MAAM,CAAC,SAAS,CAAC,GAAsB,EAAE,OAA4B;QAC1E,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,aAAa,IAAI,GAAG,EAAE,CAAC;QACvD,OAAO,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;CACF;AA/CD,gCA+CC","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 { BentleyError, BentleyStatus } from \"@itwin/core-bentley\";\nimport { IModelApp } from \"@itwin/core-frontend\";\n\nimport type { Localization, TranslationOptions } from \"@itwin/core-common\";\n\n/**\n * Entry point for static initialization required by various components used in the package.\n * @public\n */\nexport class TreeWidget {\n  private static _i18n?: Localization;\n  private static _initialized?: boolean;\n\n  /**\n   * Called by IModelApp to initialize the Tree Widget\n   * @param i18n - The internationalization service created by the IModelApp.\n   */\n  public static async initialize(i18n?: Localization): Promise<void> {\n    if (this._initialized) {\n      return;\n    }\n\n    TreeWidget._initialized = true;\n    TreeWidget._i18n = i18n ?? IModelApp.localization;\n    return TreeWidget._i18n.registerNamespace(TreeWidget.i18nNamespace);\n  }\n\n  /** Unregisters the TreeWidget internationalization service namespace */\n  public static terminate() {\n    if (TreeWidget._i18n) {\n      TreeWidget._i18n.unregisterNamespace(TreeWidget.i18nNamespace);\n      TreeWidget._i18n = undefined;\n    }\n\n    TreeWidget._initialized = false;\n  }\n\n  /** The internationalization service created by the IModelApp. */\n  public static get i18n(): Localization {\n    if (!TreeWidget._i18n) {\n      throw new BentleyError(BentleyStatus.ERROR, \"TreeWidget not initialized\");\n    }\n    return TreeWidget._i18n;\n  }\n\n  /** The internationalization service namespace. */\n  public static get i18nNamespace(): string {\n    return \"TreeWidget\";\n  }\n\n  /** Calls i18n.translateWithNamespace with the \"TreeWidget\" namespace. Do NOT include the namespace in the key.\n   */\n  public static translate(key: string | string[], options?: TranslationOptions): string {\n    const stringKey = `${TreeWidget.i18nNamespace}:${key}`;\n    return TreeWidget.i18n.getLocalizedString(stringKey, options);\n  }\n}\n"]}

package/lib/cjs/tree-widget-react/components/trees/categories-tree/CategoriesTreeDefinition.d.ts

@@ -1,21 +1,29 @@
 import type { ECClassHierarchyInspector, ECSchemaProvider } from "@itwin/presentation-shared";
+import type { CategoriesTreeIdsCache } from "./internal/CategoriesTreeIdsCache.js";
 import type { DefineHierarchyLevelProps, HierarchyDefinition, HierarchyFilteringPath, HierarchyLevelDefinition, LimitingECSqlQueryExecutor } from "@itwin/presentation-hierarchies";
 interface CategoriesTreeDefinitionProps {
-    imodelAccess: ECSchemaProvider & ECClassHierarchyInspector;
+    imodelAccess: ECSchemaProvider & ECClassHierarchyInspector & LimitingECSqlQueryExecutor;
     viewType: "2d" | "3d";
+    idsCache: CategoriesTreeIdsCache;
 }
 interface CategoriesTreeInstanceKeyPathsFromInstanceLabelProps {
     imodelAccess: ECClassHierarchyInspector & LimitingECSqlQueryExecutor;
     label: string;
     viewType: "2d" | "3d";
+    limit?: number | "unbounded";
+    idsCache: CategoriesTreeIdsCache;
 }
 export declare class CategoriesTreeDefinition implements HierarchyDefinition {
     private _impl;
     private _selectQueryFactory;
     private _nodeLabelSelectClauseFactory;
+    private _idsCache;
+    private _viewType;
+    private _iModelAccess;
     constructor(props: CategoriesTreeDefinitionProps);
+    private getHierarchyDefinition;
     defineHierarchyLevel(props: DefineHierarchyLevelProps): Promise<HierarchyLevelDefinition>;
-    private createRootHierarchyLevelDefinition;
+    private createDefinitionContainersAndCategoriesQuery;
     private createSubcategoryQuery;
     static createInstanceKeyPaths(props: CategoriesTreeInstanceKeyPathsFromInstanceLabelProps): Promise<HierarchyFilteringPath[]>;
 }

package/lib/cjs/tree-widget-react/components/trees/categories-tree/CategoriesTreeDefinition.js

@@ -5,81 +5,154 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CategoriesTreeDefinition = void 0;
+const rxjs_1 = require("rxjs");
 const presentation_hierarchies_1 = require("@itwin/presentation-hierarchies");
 const presentation_shared_1 = require("@itwin/presentation-shared");
 const TreeErrors_js_1 = require("../common/TreeErrors.js");
+const CategoriesTreeIdsCache_js_1 = require("./internal/CategoriesTreeIdsCache.js");
+const ClassNameDefinitions_js_1 = require("./internal/ClassNameDefinitions.js");
 const MAX_FILTERING_INSTANCE_KEY_COUNT = 100;
 class CategoriesTreeDefinition {
     constructor(props) {
-        this._impl = (0, presentation_hierarchies_1.createPredicateBasedHierarchyDefinition)({
-            classHierarchyInspector: props.imodelAccess,
-            hierarchy: {
-                rootNodes: async (requestProps) => this.createRootHierarchyLevelDefinition({ ...requestProps, viewType: props.viewType }),
-                childNodes: [
-                    {
-                        parentInstancesNodePredicate: "BisCore.Category",
-                        definitions: async (requestProps) => this.createSubcategoryQuery(requestProps),
-                    },
-                ],
-            },
-        });
+        this._iModelAccess = props.imodelAccess;
+        this._viewType = props.viewType;
+        this._idsCache = props.idsCache;
         this._nodeLabelSelectClauseFactory = (0, presentation_shared_1.createBisInstanceLabelSelectClauseFactory)({ classHierarchyInspector: props.imodelAccess });
         this._selectQueryFactory = (0, presentation_hierarchies_1.createNodesQueryClauseFactory)({
             imodelAccess: props.imodelAccess,
             instanceLabelSelectClauseFactory: this._nodeLabelSelectClauseFactory,
         });
     }
+    async getHierarchyDefinition() {
+        this._impl ??= (async () => {
+            const isDefinitionContainerSupported = await this._idsCache.getIsDefinitionContainerSupported();
+            return (0, presentation_hierarchies_1.createPredicateBasedHierarchyDefinition)({
+                classHierarchyInspector: this._iModelAccess,
+                hierarchy: {
+                    rootNodes: async (requestProps) => this.createDefinitionContainersAndCategoriesQuery({ ...requestProps, viewType: this._viewType }),
+                    childNodes: [
+                        {
+                            parentInstancesNodePredicate: "BisCore.Category",
+                            definitions: async (requestProps) => this.createSubcategoryQuery(requestProps),
+                        },
+                        ...(isDefinitionContainerSupported
+                            ? [
+                                {
+                                    parentInstancesNodePredicate: ClassNameDefinitions_js_1.DEFINITION_CONTAINER_CLASS,
+                                    definitions: async (requestProps) => this.createDefinitionContainersAndCategoriesQuery({
+                                        ...requestProps,
+                                        viewType: this._viewType,
+                                    }),
+                                },
+                            ]
+                            : []),
+                    ],
+                },
+            });
+        })();
+        return this._impl;
+    }
     async defineHierarchyLevel(props) {
-        return this._impl.defineHierarchyLevel(props);
+        return (await this.getHierarchyDefinition()).defineHierarchyLevel(props);
     }
-    async createRootHierarchyLevelDefinition(props) {
-        const { categoryClass, categoryElementClass } = getClassesByView(props.viewType);
-        const instanceFilterClauses = await this._selectQueryFactory.createFilterClauses({
-            filter: props.instanceFilter,
-            contentClass: { fullName: categoryClass, alias: "this" },
+    async createDefinitionContainersAndCategoriesQuery(props) {
+        const { parentNodeInstanceIds, instanceFilter, viewType } = props;
+        const { definitionContainers, categories } = parentNodeInstanceIds === undefined
+            ? await this._idsCache.getRootDefinitionContainersAndCategories()
+            : await this._idsCache.getDirectChildDefinitionContainersAndCategories(parentNodeInstanceIds);
+        if (categories.length === 0 && definitionContainers.length === 0) {
+            return [];
+        }
+        const categoriesWithSingleChild = new Array();
+        const categoriesWithMultipleChildren = new Array();
+        categories.forEach((category) => {
+            if (category.childCount > 1) {
+                categoriesWithMultipleChildren.push(category.id);
+            }
+            else {
+                categoriesWithSingleChild.push(category.id);
+            }
         });
-        return [
-            {
-                fullClassName: categoryClass,
-                query: {
-                    ecsql: `
-            SELECT
+        const dataToDetermineHasChildren = categoriesWithSingleChild.length > categoriesWithMultipleChildren.length
+            ? { ids: categoriesWithMultipleChildren, ifTrue: 1, ifFalse: 0 }
+            : { ids: categoriesWithSingleChild, ifTrue: 0, ifFalse: 1 };
+        const { categoryClass } = (0, CategoriesTreeIdsCache_js_1.getClassesByView)(viewType);
+        const [categoriesInstanceFilterClauses, definitionContainersInstanceFilterClauses] = await Promise.all([categoryClass, ...(definitionContainers.length > 0 ? [ClassNameDefinitions_js_1.DEFINITION_CONTAINER_CLASS] : [])].map(async (className) => this._selectQueryFactory.createFilterClauses({
+            filter: instanceFilter,
+            contentClass: { fullName: className, alias: "this" },
+        })));
+        const definitionContainersQuery = definitionContainers.length > 0
+            ? `
+          SELECT
+            ${await this._selectQueryFactory.createSelectClause({
+                ecClassId: { selector: presentation_shared_1.ECSql.createRawPropertyValueSelector("this", "ECClassId") },
+                ecInstanceId: { selector: "this.ECInstanceId" },
+                nodeLabel: {
+                    selector: await this._nodeLabelSelectClauseFactory.createSelectClause({
+                        classAlias: "this",
+                        className: ClassNameDefinitions_js_1.DEFINITION_CONTAINER_CLASS,
+                    }),
+                },
+                extendedData: {
+                    isDefinitionContainer: true,
+                    imageId: "icon-definition-container",
+                },
+                hasChildren: true,
+                supportsFiltering: true,
+            })}
+          FROM
+            ${definitionContainersInstanceFilterClauses.from} this
+            ${definitionContainersInstanceFilterClauses.joins}
+          WHERE
+            this.ECInstanceId IN (${definitionContainers.join(", ")})
+            ${definitionContainersInstanceFilterClauses.where ? `AND ${definitionContainersInstanceFilterClauses.where}` : ""}
+        `
+            : undefined;
+        const categoriesQuery = categories.length > 0
+            ? `
+          SELECT
               ${await this._selectQueryFactory.createSelectClause({
-                        ecClassId: { selector: presentation_shared_1.ECSql.createRawPropertyValueSelector("this", "ECClassId") },
-                        ecInstanceId: { selector: "this.ECInstanceId" },
-                        nodeLabel: {
-                            selector: await this._nodeLabelSelectClauseFactory.createSelectClause({
-                                classAlias: "this",
-                                className: categoryClass,
-                            }),
-                        },
+                ecClassId: { selector: presentation_shared_1.ECSql.createRawPropertyValueSelector("this", "ECClassId") },
+                ecInstanceId: { selector: "this.ECInstanceId" },
+                nodeLabel: {
+                    selector: await this._nodeLabelSelectClauseFactory.createSelectClause({
+                        classAlias: "this",
+                        className: categoryClass,
+                    }),
+                },
+                ...(dataToDetermineHasChildren.ids.length > 0
+                    ? {
                         hasChildren: {
                             selector: `
-                    IFNULL((
-                      SELECT 1
-                      FROM (
-                        SELECT COUNT(1) AS ChildCount
-                        FROM BisCore.SubCategory sc
-                        WHERE sc.Parent.Id = this.ECInstanceId
-                      )
-                      WHERE ChildCount > 1
-                    ), 0)
-                  `,
+                            IIF(this.ECInstanceId IN (${dataToDetermineHasChildren.ids.join(",")}),
+                              ${dataToDetermineHasChildren.ifTrue},
+                              ${dataToDetermineHasChildren.ifFalse}
+                            )
+                          `,
                         },
-                        extendedData: {
-                            description: { selector: "this.Description" },
-                        },
-                        supportsFiltering: true,
-                    })}
-            FROM ${instanceFilterClauses.from} this
-            ${instanceFilterClauses.joins}
-            JOIN BisCore.Model m ON m.ECInstanceId = this.Model.Id
+                    }
+                    : { hasChildren: !!dataToDetermineHasChildren.ifFalse }),
+                extendedData: {
+                    description: { selector: "this.Description" },
+                    isCategory: true,
+                    imageId: "icon-layers",
+                },
+                supportsFiltering: true,
+            })}
+            FROM
+              ${categoriesInstanceFilterClauses.from} this
+              ${categoriesInstanceFilterClauses.joins}
             WHERE
-              NOT this.IsPrivate
-              AND (NOT m.IsPrivate OR m.ECClassId IS (BisCore.DictionaryModel))
-              AND EXISTS (SELECT 1 FROM ${categoryElementClass} e WHERE e.Category.Id = this.ECInstanceId)
-              ${instanceFilterClauses.where ? `AND ${instanceFilterClauses.where}` : ""}
-          `,
+              this.ECInstanceId IN (${categories.map((category) => category.id).join(", ")})
+              ${categoriesInstanceFilterClauses.where ? `AND ${categoriesInstanceFilterClauses.where}` : ""}
+        `
+            : undefined;
+        const queries = [categoriesQuery, definitionContainersQuery].filter((query) => query !== undefined);
+        return [
+            {
+                fullClassName: ClassNameDefinitions_js_1.DEFINITION_ELEMENT_CLASS,
+                query: {
+                    ecsql: queries.join(" UNION ALL "),
                 },
             },
         ];
@@ -87,11 +160,11 @@ class CategoriesTreeDefinition {
     async createSubcategoryQuery({ parentNodeInstanceIds: elementIds, instanceFilter, }) {
         const instanceFilterClauses = await this._selectQueryFactory.createFilterClauses({
             filter: instanceFilter,
-            contentClass: { fullName: "BisCore.SubCategory", alias: "this" },
+            contentClass: { fullName: ClassNameDefinitions_js_1.SUB_CATEGORY_CLASS, alias: "this" },
         });
         return [
             {
-                fullClassName: "BisCore.SubCategory",
+                fullClassName: ClassNameDefinitions_js_1.SUB_CATEGORY_CLASS,
                 query: {
                     ecsql: `
             SELECT
@@ -101,11 +174,13 @@ class CategoriesTreeDefinition {
                         nodeLabel: {
                             selector: await this._nodeLabelSelectClauseFactory.createSelectClause({
                                 classAlias: "this",
-                                className: "BisCore.SubCategory",
+                                className: ClassNameDefinitions_js_1.SUB_CATEGORY_CLASS,
                             }),
                         },
                         extendedData: {
                             categoryId: { selector: "printf('0x%x', this.Parent.Id)" },
+                            isSubCategory: true,
+                            imageId: "icon-layers-isolate",
                         },
                         supportsFiltering: false,
                     })}
@@ -122,86 +197,128 @@ class CategoriesTreeDefinition {
     }
     static async createInstanceKeyPaths(props) {
         const labelsFactory = (0, presentation_shared_1.createBisInstanceLabelSelectClauseFactory)({ classHierarchyInspector: props.imodelAccess });
-        return createInstanceKeyPathsFromInstanceLabel({ ...props, labelsFactory });
+        return createInstanceKeyPathsFromInstanceLabel({ ...props, labelsFactory, cache: props.idsCache });
     }
 }
 exports.CategoriesTreeDefinition = CategoriesTreeDefinition;
-function getClassesByView(viewType) {
-    return viewType === "2d"
-        ? { categoryClass: "BisCore.DrawingCategory", categoryElementClass: "BisCore:GeometricElement2d" }
-        : { categoryClass: "BisCore.SpatialCategory", categoryElementClass: "BisCore:GeometricElement3d" };
-}
 async function createInstanceKeyPathsFromInstanceLabel(props) {
-    const { categoryClass, categoryElementClass } = getClassesByView(props.viewType);
+    const { definitionContainers, categories } = await props.cache.getAllDefinitionContainersAndCategories();
+    if (categories.length === 0) {
+        return [];
+    }
+    const { categoryClass } = (0, CategoriesTreeIdsCache_js_1.getClassesByView)(props.viewType);
     const adjustedLabel = props.label.replace(/[%_\\]/g, "\\$&");
-    const reader = props.imodelAccess.createQueryReader({
-        ctes: [
-            `RootCategoriesWithLabels(ClassName, ECInstanceId, ChildCount, DisplayLabel) as (
-          SELECT
-            ec_classname(this.ECClassId, 's.c'),
-            this.ECInstanceId,
-            COUNT(sc.ECInstanceId),
-            ${await props.labelsFactory.createSelectClause({
-                classAlias: "this",
-                className: categoryClass,
-            })}
-          FROM ${categoryClass} this
-          JOIN BisCore.Model m ON m.ECInstanceId = this.Model.Id
-          JOIN BisCore.SubCategory sc ON sc.Parent.Id = this.ECInstanceId
-          WHERE
-            NOT this.IsPrivate
-            AND (NOT m.IsPrivate OR m.ECClassId IS (BisCore.DictionaryModel))
-            AND EXISTS (SELECT 1 FROM ${categoryElementClass} e WHERE e.Category.Id = this.ECInstanceId)
-          GROUP BY this.ECInstanceId
-        )`,
-            `SubCategoriesWithLabels(ClassName, ECInstanceId, ParentId, DisplayLabel) as (
-          SELECT
-            ec_classname(this.ECClassId, 's.c'),
-            this.ECInstanceId,
-            this.Parent.Id,
-            ${await props.labelsFactory.createSelectClause({
-                classAlias: "this",
-                className: "BisCore.SubCategory",
-            })}
-          FROM BisCore.SubCategory this
-          WHERE NOT this.IsPrivate
-        )`,
-        ],
-        ecsql: `
-      SELECT * FROM (
-        SELECT
-          c.ClassName AS CategoryClass,
-          c.ECInstanceId AS CategoryId,
-          sc.ClassName AS SubcategoryClass,
-          sc.ECInstanceId AS SubcategoryId
-        FROM RootCategoriesWithLabels c
-        JOIN SubCategoriesWithLabels sc ON sc.ParentId = c.ECInstanceId
-        WHERE c.ChildCount > 1 AND sc.DisplayLabel LIKE '%' || ? || '%' ESCAPE '\\'
-        UNION ALL
-        SELECT
-          c.ClassName AS CategoryClass,
-          c.ECInstanceId AS CategoryId,
-          CAST(NULL AS TEXT) AS SubcategoryClass,
-          CAST(NULL AS TEXT) AS SubcategoryId
-        FROM RootCategoriesWithLabels c
-        WHERE c.DisplayLabel LIKE '%' || ? || '%' ESCAPE '\\'
+    const CATEGORIES_WITH_LABELS_CTE = "CategoriesWithLabels";
+    const SUBCATEGORIES_WITH_LABELS_CTE = "SubCategoriesWithLabels";
+    const DEFINITION_CONTAINERS_WITH_LABELS_CTE = "DefinitionContainersWithLabels";
+    const [categoryLabelSelectClause, subCategoryLabelSelectClause, definitionContainerLabelSelectClause] = await Promise.all([categoryClass, ClassNameDefinitions_js_1.SUB_CATEGORY_CLASS, ...(definitionContainers.length > 0 ? [ClassNameDefinitions_js_1.DEFINITION_CONTAINER_CLASS] : [])].map(async (className) => props.labelsFactory.createSelectClause({ classAlias: "this", className })));
+    return (0, rxjs_1.lastValueFrom)((0, rxjs_1.defer)(() => {
+        const ctes = [
+            `${CATEGORIES_WITH_LABELS_CTE}(ClassName, ECInstanceId, ChildCount, DisplayLabel) AS (
+            SELECT
+              'c',
+              this.ECInstanceId,
+              COUNT(sc.ECInstanceId),
+              ${categoryLabelSelectClause}
+            FROM
+              ${categoryClass} this
+              JOIN ${ClassNameDefinitions_js_1.SUB_CATEGORY_CLASS} sc ON sc.Parent.Id = this.ECInstanceId
+            WHERE
+              this.ECInstanceId IN (${categories.join(", ")})
+              GROUP BY this.ECInstanceId
+          )`,
+            `${SUBCATEGORIES_WITH_LABELS_CTE}(ClassName, ECInstanceId, ParentId, DisplayLabel) AS (
+            SELECT
+              'sc',
+              this.ECInstanceId,
+              this.Parent.Id,
+              ${subCategoryLabelSelectClause}
+            FROM
+              ${ClassNameDefinitions_js_1.SUB_CATEGORY_CLASS} this
+            WHERE
+              NOT this.IsPrivate
+              AND this.Parent.Id IN (${categories.join(", ")})
+          )`,
+            ...(definitionContainers.length > 0
+                ? [
+                    `${DEFINITION_CONTAINERS_WITH_LABELS_CTE}(ClassName, ECInstanceId, DisplayLabel) AS (
+                SELECT
+                  'dc',
+                  this.ECInstanceId,
+                  ${definitionContainerLabelSelectClause}
+                FROM
+                  ${ClassNameDefinitions_js_1.DEFINITION_CONTAINER_CLASS} this
+                WHERE
+                  this.ECInstanceId IN (${definitionContainers.join(", ")})
+              )`,
+                ]
+                : []),
+        ];
+        const ecsql = `
+        SELECT * FROM (
+            SELECT
+              sc.ClassName AS ClassName,
+              sc.ECInstanceId AS ECInstanceId
+            FROM
+              ${CATEGORIES_WITH_LABELS_CTE} c
+              JOIN ${SUBCATEGORIES_WITH_LABELS_CTE} sc ON sc.ParentId = c.ECInstanceId
+            WHERE
+              c.ChildCount > 1
+              AND sc.DisplayLabel LIKE '%' || ? || '%' ESCAPE '\\'
+
+            UNION ALL
+
+            SELECT
+              c.ClassName AS ClassName,
+              c.ECInstanceId AS ECInstanceId
+            FROM
+              ${CATEGORIES_WITH_LABELS_CTE} c
+            WHERE
+              c.DisplayLabel LIKE '%' || ? || '%' ESCAPE '\\'
+
+            ${definitionContainers.length > 0
+            ? `
+                  UNION ALL
+                  SELECT
+                    dc.ClassName AS ClassName,
+                    dc.ECInstanceId AS ECInstanceId
+                  FROM
+                    ${DEFINITION_CONTAINERS_WITH_LABELS_CTE} dc
+                  WHERE
+                    dc.DisplayLabel LIKE '%' || ? || '%' ESCAPE '\\'
+                `
+            : ""}
         )
-        LIMIT ${MAX_FILTERING_INSTANCE_KEY_COUNT + 1}
-      `,
-        bindings: [
+        ${props.limit === undefined ? `LIMIT ${MAX_FILTERING_INSTANCE_KEY_COUNT + 1}` : props.limit !== "unbounded" ? `LIMIT ${props.limit}` : ""}
+      `;
+        const bindings = [
             { type: "string", value: adjustedLabel },
             { type: "string", value: adjustedLabel },
-        ],
-    }, { restartToken: "tree-widget/categories-tree/filter-by-label-query" });
-    const paths = [];
-    for await (const row of reader) {
-        const path = { path: [{ className: row.CategoryClass, id: row.CategoryId }], options: { autoExpand: true } };
-        row.SubcategoryId && path.path.push({ className: row.SubcategoryClass, id: row.SubcategoryId });
-        paths.push(path);
+            ...(definitionContainers.length > 0 ? [{ type: "string", value: adjustedLabel }] : []),
+        ];
+        return props.imodelAccess.createQueryReader({ ctes, ecsql, bindings }, { restartToken: "tree-widget/categories-tree/filter-by-label-query", limit: props.limit });
+    }).pipe((0, rxjs_1.map)((row) => ({
+        className: row.ClassName === "c" ? categoryClass : row.ClassName === "sc" ? ClassNameDefinitions_js_1.SUB_CATEGORY_CLASS : ClassNameDefinitions_js_1.DEFINITION_CONTAINER_CLASS,
+        id: row.ECInstanceId,
+    })), (0, rxjs_1.toArray)(), (0, rxjs_1.mergeMap)((targetItems) => createInstanceKeyPathsFromTargetItems({ ...props, targetItems })), (0, rxjs_1.toArray)()));
+}
+function createInstanceKeyPathsFromTargetItems(props) {
+    const { limit, targetItems, viewType, idsCache } = props;
+    if (limit !== "unbounded" && targetItems.length > (limit ?? MAX_FILTERING_INSTANCE_KEY_COUNT)) {
+        throw new TreeErrors_js_1.FilterLimitExceededError(limit ?? MAX_FILTERING_INSTANCE_KEY_COUNT);
     }
-    if (paths.length > MAX_FILTERING_INSTANCE_KEY_COUNT) {
-        throw new TreeErrors_js_1.FilterLimitExceededError(MAX_FILTERING_INSTANCE_KEY_COUNT);
+    if (targetItems.length === 0) {
+        return rxjs_1.EMPTY;
     }
-    return paths;
+    const { categoryClass } = (0, CategoriesTreeIdsCache_js_1.getClassesByView)(viewType);
+    return (0, rxjs_1.from)(targetItems).pipe((0, rxjs_1.mergeMap)(async (targetItem) => {
+        if (targetItem.className === ClassNameDefinitions_js_1.SUB_CATEGORY_CLASS) {
+            return { path: await idsCache.getInstanceKeyPaths({ subCategoryId: targetItem.id }), options: { autoExpand: true } };
+        }
+        if (targetItem.className === categoryClass) {
+            return { path: await idsCache.getInstanceKeyPaths({ categoryId: targetItem.id }), options: { autoExpand: true } };
+        }
+        return { path: await idsCache.getInstanceKeyPaths({ definitionContainerId: targetItem.id }), options: { autoExpand: true } };
+    }));
 }
 //# sourceMappingURL=CategoriesTreeDefinition.js.map