adjustments

Author: MartynasStrazdas

packages/itwin/tree-widget/src/test/trees/models-tree/ModelsTreeFiltering.test.ts

@@ -30,7 +30,7 @@ import {
 } from "../../IModelUtils.js";
 import { createIModelAccess } from "../Common.js";
 import { NodeValidators, validateHierarchy } from "../HierarchyValidation.js";
-import { createClassGroupingHierarchyNode, createModelsTreeProvider, getGroupingNodeParentKeys } from "./Utils.js";
+import { createClassGroupingHierarchyNode, createModelsTreeProvider, getNodeParentKeys } from "./Utils.js";
 
 import type { Id64String } from "@itwin/core-bentley";
 import type { IModelConnection } from "@itwin/core-frontend";
@@ -1115,7 +1115,7 @@ describe("Models tree", () => {
               modelId: model.id,
               categoryId: category.id,
               elements: [testElement1.id, testElement2.id],
-              parentKeys: getGroupingNodeParentKeys([adjustedModelKey(model), category, groupingNode.key, adjustedElementKey(rootElement)]),
+              parentKeys: getNodeParentKeys([adjustedModelKey(model), category, groupingNode.key, adjustedElementKey(rootElement)]),
             });
             return { rootSubject, model, category, rootElement, testElement1, testElement2, pathUntilTargetElement, targetGroupingNode };
           },
@@ -1219,22 +1219,22 @@ describe("Models tree", () => {
               modelId: model.id,
               categoryId: category.id,
               elements: [rootElement.id],
-              parentKeys: getGroupingNodeParentKeys([adjustedModelKey(model), category]),
+              parentKeys: getNodeParentKeys([adjustedModelKey(model), category]),
             });
 
             const physicalElementGroupingNode = createClassGroupingHierarchyNode({
               className: physicalElement1.className,
               modelId: model.id,
               categoryId: category.id,
               elements: [physicalElement1.id, physicalElement2.id],
-              parentKeys: getGroupingNodeParentKeys([adjustedModelKey(model), category, groupingNode.key, adjustedElementKey(rootElement)]),
+              parentKeys: getNodeParentKeys([adjustedModelKey(model), category, groupingNode.key, adjustedElementKey(rootElement)]),
             });
             const testElementGroupingNode = createClassGroupingHierarchyNode({
               className: testElement1.className,
               modelId: model.id,
               categoryId: category.id,
               elements: [testElement1.id, testElement2.id],
-              parentKeys: getGroupingNodeParentKeys([adjustedModelKey(model), category, groupingNode.key, adjustedElementKey(rootElement)]),
+              parentKeys: getNodeParentKeys([adjustedModelKey(model), category, groupingNode.key, adjustedElementKey(rootElement)]),
             });
             return {
               rootSubject,
@@ -1343,21 +1343,21 @@ describe("Models tree", () => {
               modelId: model.id,
               categoryId: category.id,
               elements: [parentElement.id],
-              parentKeys: getGroupingNodeParentKeys(pathUntilParentElement),
+              parentKeys: getNodeParentKeys(pathUntilParentElement),
             });
             const middleElementGroupingNode = createClassGroupingHierarchyNode({
               className: middleElement.className,
               modelId: model.id,
               categoryId: category.id,
               elements: [middleElement.id],
-              parentKeys: getGroupingNodeParentKeys([...pathUntilParentElement, parentElementGroupingNode.key, parentElement]),
+              parentKeys: getNodeParentKeys([...pathUntilParentElement, parentElementGroupingNode.key, parentElement]),
             });
             const childElementGroupingNode = createClassGroupingHierarchyNode({
               className: childElement.className,
               modelId: model.id,
               categoryId: category.id,
               elements: [childElement.id],
-              parentKeys: getGroupingNodeParentKeys([
+              parentKeys: getNodeParentKeys([
                 ...pathUntilParentElement,
                 parentElementGroupingNode.key,
                 parentElement,

packages/itwin/tree-widget/src/test/trees/models-tree/Utils.ts

@@ -21,6 +21,7 @@ import type { IModelConnection } from "@itwin/core-frontend";
 import type {
   ClassGroupingNodeKey,
   GroupingHierarchyNode,
+  GroupingNodeKey,
   HierarchyFilteringPath,
   HierarchyNodeKey,
   HierarchyProvider,
@@ -207,9 +208,9 @@ export function createClassGroupingHierarchyNode({
   };
 }
 
-export function getGroupingNodeParentKeys(
+export function getNodeParentKeys(
   keys: (
-    | ClassGroupingNodeKey
+    | GroupingNodeKey
     | {
         className: string;
         id: string;

packages/itwin/tree-widget/src/tree-widget-react/components/trees/common/components/TreeNodeVisibilityButton.tsx

@@ -36,7 +36,11 @@ export interface TreeItemVisibilityButtonProps {
   reserveSpace?: true;
 }
 
-/** @beta */
+/**
+ * React component that renders a visibility action for a tree item.
+ * Should be used with `VisibilityTreeRenderer`.
+ * @beta
+ */
 export const VisibilityAction = memo(function VisibilityAction({ node, reserveSpace }: TreeItemVisibilityButtonProps & { node: PresentationHierarchyNode }) {
   const context = useVisibilityContext();
   const state = context?.getVisibilityButtonState(node);

packages/itwin/tree-widget/src/tree-widget-react/components/trees/index.ts

@@ -26,6 +26,7 @@ export { FocusedInstancesContextProvider, useFocusedInstancesContext } from "./c
 
 export { Tree } from "./common/components/Tree.js";
 export { VisibilityTree } from "./common/components/VisibilityTree.js";
+export { VisibilityAction } from "./common/components/TreeNodeVisibilityButton.js";
 export { TreeRenderer } from "./common/components/TreeRenderer.js";
 export { VisibilityTreeRenderer } from "./common/components/VisibilityTreeRenderer.js";
 export { HierarchyVisibilityHandler, VisibilityStatus } from "./common/UseHierarchyVisibility.js";