Bump hierarchies versions and update comments

Author: JonasDov

apps/learning-snippets/package.json

@@ -40,7 +40,7 @@
     "@itwin/presentation-components": "^5.12.4",
     "@itwin/presentation-frontend": "^5.0.0",
     "@itwin/presentation-testing": "^5.4.5",
-    "@itwin/presentation-hierarchies": "^1.6.1",
+    "@itwin/presentation-hierarchies": "^1.7.0",
     "@itwin/presentation-shared": "^1.2.2",
     "@itwin/unified-selection": "^1.4.2",
     "@testing-library/dom": "^10.4.0",

apps/learning-snippets/pnpm-lock.yaml

@@ -29,7 +29,7 @@
     "@itwin/eslint-plugin": "^5.2.0",
     "@itwin/presentation-common": "^5.0.0",
     "@itwin/presentation-core-interop": "^1.3.3",
-    "@itwin/presentation-hierarchies": "^1.6.1",
+    "@itwin/presentation-hierarchies": "^1.7.0",
     "@itwin/presentation-testing": "^5.4.5",
     "@itwin/tree-widget-react": "workspace:*",
     "@itwin/presentation-shared": "^1.2.2",

apps/performance-tests/package.json

@@ -38,8 +38,8 @@
     "@itwin/presentation-components": "^5.12.4",
     "@itwin/presentation-frontend": "^5.0.2",
     "@itwin/presentation-testing": "^5.4.5",
-    "@itwin/presentation-hierarchies": "^1.6.1",
-    "@itwin/presentation-hierarchies-react": "^1.7.1",
+    "@itwin/presentation-hierarchies": "^1.7.0",
+    "@itwin/presentation-hierarchies-react": "^1.7.2",
     "@itwin/presentation-shared": "^1.2.2",
     "@itwin/property-grid-react": "workspace:*",
     "@itwin/reports-config-widget-react": "workspace:*",

apps/performance-tests/pnpm-lock.yaml

@@ -1,6 +1,6 @@
 {
   "type": "minor",
-  "comment": "Added `getSubTreePaths` option to `UseModelsTreeProps` for restricting the visible hierarchy to a subTree of nodes based on instance keys. Unlike `getFilteredPaths`, which controls filtering logic, `getSubTreePaths` limits the scope of the hierarchy itself, allowing filtering within the specified subTree.",
+  "comment": "Added `getSubTreePaths` option to `UseModelsTreeProps` for restricting the visible hierarchy to a sub-tree of nodes based on instance keys. Unlike `getFilteredPaths`, which controls filtering logic, `getSubTreePaths` limits the scope of the hierarchy, allowing filtering within the specified sub-tree.",
   "packageName": "@itwin/tree-widget-react",
   "email": "100586436+JonasDov@users.noreply.github.com",
   "dependentChangeType": "patch"

apps/test-viewer/package.json

@@ -78,8 +78,8 @@
     "@itwin/itwinui-icons-react": "^2.9.0",
     "@itwin/itwinui-illustrations-react": "^2.1.0",
     "@itwin/presentation-core-interop": "^1.3.2",
-    "@itwin/presentation-hierarchies": "^1.6.1",
-    "@itwin/presentation-hierarchies-react": "^1.7.1",
+    "@itwin/presentation-hierarchies": "^1.7.0",
+    "@itwin/presentation-hierarchies-react": "^1.7.2",
     "@itwin/presentation-shared": "^1.2.2",
     "@itwin/unified-selection": "^1.4.2",
     "classnames": "^2.5.1",

apps/test-viewer/pnpm-lock.yaml

@@ -7,7 +7,7 @@ import { useEffect, useRef } from "react";
 import { HierarchyFilteringPath, HierarchyNodeIdentifier } from "@itwin/presentation-hierarchies";
 
 import type { Id64Array, Id64String } from "@itwin/core-bentley";
-import type { HierarchyNodeIdentifiersPath } from "@itwin/presentation-hierarchies";
+import type { HierarchyFilteringPathOptions, HierarchyNodeIdentifiersPath } from "@itwin/presentation-hierarchies";
 
 /** @beta */
 export type FunctionProps<THook extends (props: any) => any> = Parameters<THook>[0];
@@ -62,7 +62,7 @@ export function joinHierarchyFilteringPaths(subTreePaths: HierarchyNodeIdentifie
   const filteringPathsToIncludeIndexes = new Set<number>();
 
   subTreePaths.forEach((subTreePath) => {
-    let depth = 0;
+    let options: HierarchyFilteringPathOptions | undefined;
     let addSubTreePathToResult = false;
 
     for (let i = 0; i < normalizedFilteringPaths.length; ++i) {
@@ -80,14 +80,12 @@ export function joinHierarchyFilteringPaths(subTreePaths: HierarchyNodeIdentifie
         // filtering paths that are shorter or equal than subTree paths length don't need to be added to the result
         if (normalizedFilteringPath.path.length === j + 1) {
           addSubTreePathToResult = true;
-          depth = Math.max(
-            depth,
-            !normalizedFilteringPath.options?.autoExpand
-              ? 0
-              : normalizedFilteringPath.options.autoExpand === true
-                ? normalizedFilteringPath.path.length - 1
-                : normalizedFilteringPath.options.autoExpand.depth,
-          );
+          // If filtering path has autoExpand set to true, it means that we should expand only to the targeted filtered node
+          // This is done by setting depthInPath
+          options =
+            normalizedFilteringPath.options?.autoExpand !== true
+              ? HierarchyFilteringPath.mergeOptions(options, normalizedFilteringPath.options)
+              : { autoExpand: { depthInPath: normalizedFilteringPath.path.length - 1 } };
           break;
         }
 
@@ -102,7 +100,7 @@ export function joinHierarchyFilteringPaths(subTreePaths: HierarchyNodeIdentifie
     if (addSubTreePathToResult) {
       result.push({
         path: subTreePath,
-        options: depth === 0 ? undefined : { autoExpand: depth >= subTreePath.length - 1 ? true : { depth } },
+        options,
       });
     }
   });