Models Tree, Example

packages/changed-elements-react/package.json

@@ -41,16 +41,16 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "@itwin/appui-abstract": "^4.0.6",
-    "@itwin/components-react": "^4.3.0",
-    "@itwin/core-bentley": "^4.0.6",
-    "@itwin/core-common": "^4.0.6",
-    "@itwin/core-frontend": "^4.0.6",
-    "@itwin/core-geometry": "^4.0.6",
-    "@itwin/core-react": "^4.3.0",
-    "@itwin/presentation-common": "^4.0.6",
-    "@itwin/presentation-components": "^4.0.1",
-    "@itwin/presentation-frontend": "^4.0.6",
+    "@itwin/appui-abstract": "^4.9.4",
+    "@itwin/components-react": "^4.16.1",
+    "@itwin/core-bentley": "^4.9.4",
+    "@itwin/core-common": "^4.9.4",
+    "@itwin/core-frontend": "^4.9.4",
+    "@itwin/core-geometry": "^4.9.4",
+    "@itwin/core-react": "^4.16.1",
+    "@itwin/presentation-common": "^4.9.4",
+    "@itwin/presentation-components": "^5.4.2",
+    "@itwin/presentation-frontend": "^4.9.4",
     "@testing-library/react": "^12.1.5",
     "@types/react": "^17.0.0",
     "@types/react-redux": "^7.1.25",
@@ -71,24 +71,31 @@
     "vitest": "^0.34.6"
   },
   "peerDependencies": {
-    "@itwin/appui-abstract": "^4.0.6",
-    "@itwin/components-react": "^4.3.0",
-    "@itwin/core-bentley": "^4.0.6",
-    "@itwin/core-common": "^4.0.6",
-    "@itwin/core-frontend": "^4.0.6",
-    "@itwin/core-geometry": "^4.0.6",
-    "@itwin/core-react": "^4.3.0",
-    "@itwin/presentation-common": "^4.0.6",
-    "@itwin/presentation-components": "^4.0.1",
-    "@itwin/presentation-frontend": "^4.0.6",
+    "@itwin/appui-abstract": "^4.9.4",
+    "@itwin/components-react": "^4.16.1",
+    "@itwin/core-bentley": "^4.9.4",
+    "@itwin/core-common": "^4.9.4",
+    "@itwin/core-frontend": "^4.9.4",
+    "@itwin/core-geometry": "^4.9.4",
+    "@itwin/core-react": "^4.16.1",
+    "@itwin/presentation-common": "^4.9.4",
+    "@itwin/presentation-components": "^5.4.2",
+    "@itwin/presentation-frontend": "^4.9.4",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@itwin/itwinui-icons-react": "^2.2.0",
-    "@itwin/itwinui-react": "^2.11.11",
+    "@itwin/core-orbitgt": "4.9.4",
+    "@itwin/ecschema-metadata": "^4.9.4",
+    "@itwin/ecschema-rpcinterface-common": "^4.9.4",
+    "@itwin/itwinui-icons-react": "^2.9.0",
+    "@itwin/itwinui-react": "^3.13.4",
+    "@itwin/tree-widget-react": "3.0.2",
+    "@itwin/unified-selection": "^0.5.0",
     "react-table": "^7.8.0",
-    "react-window": "^1.8.8",
-    "react-window-infinite-loader": "^1.0.8"
+    "react-window": "^1.8.10",
+    "react-window-infinite-loader": "^1.0.9",
+    "uuid": "^10.0.0",
+    "@itwin/presentation-hierarchies": "1.1.0"
   }
 }

packages/changed-elements-react/src/api/ChangedElementEntryCache.ts

@@ -71,6 +71,12 @@ export class ChangedElementEntryCache {
   public get labels(): ChangedElementsLabelsCache | undefined {
     return this._labels;
   }
+
+  private _subjectIds: Set<string> = new Set<string>();
+  public get subjectIds(): Set<string> {
+    return this._subjectIds;
+  }
+
   private _childrenCache: ChangedElementsChildrenCache | undefined;
   public get childrenCache(): ChangedElementsChildrenCache | undefined {
     return this._childrenCache;
@@ -128,11 +134,12 @@ export class ChangedElementEntryCache {
    * Initialize the changed elmeent entry cache with a bunch of changed elmeents
    * @param elements Map of changed elements
    */
-  public initialize(
+  public async initialize(
     currentIModel: IModelConnection,
     targetIModel: IModelConnection,
     elements: Map<string, ChangedElement>,
     progressLoadingEvent?: BeEvent<(message: string) => void>,
+    cacheLabelsAndChildrenOfEntries = true,
   ) {
     this._progressLoadingEvent = progressLoadingEvent;
     elements.forEach((element: ChangedElement, elementId: string) => {
@@ -149,15 +156,16 @@ export class ChangedElementEntryCache {
       };
       this._changedElementEntries.set(elementId, entry);
     });
-
-    this._currentIModel = currentIModel;
-    this._targetIModel = targetIModel;
-    this._labels = new ChangedElementsLabelsCache(currentIModel, targetIModel);
-    this._childrenCache = new ChangedElementsChildrenCache(
-      currentIModel,
-      targetIModel,
-      elements,
-    );
+    if (cacheLabelsAndChildrenOfEntries) {
+      this._currentIModel = currentIModel;
+      this._targetIModel = targetIModel;
+      this._labels = new ChangedElementsLabelsCache(currentIModel, targetIModel);
+      this._childrenCache = new ChangedElementsChildrenCache(
+        currentIModel,
+        targetIModel,
+        elements,
+      );
+    }
   }
 
   /**
@@ -348,6 +356,16 @@ export class ChangedElementEntryCache {
     return this._getCachedEntriesByIds(elementIds);
   }
 
+  /**
+ * Gets changed element entries for the given element Ids.
+ * @param elementId Element Id to obtain entry
+ */
+  public getSynchronous(elementId: string): ChangedElementEntry | undefined {
+    // Return the entries since they should be cached now
+    return this._changedElementEntries.get(elementId)
+  }
+
+
   /**
    * Initially loads the given element ids to be visualized and displayed in UI
    * @param elementIds