@headless-tree/core 1.0.0 → 1.1.0

package/src/features/tree/feature.ts

@@ -1,6 +1,7 @@
 import { FeatureImplementation, ItemInstance } from "../../types/core";
 import { ItemMeta } from "./types";
 import { makeStateUpdater, poll } from "../../utils";
+import { logWarning } from "../../utilities/errors";
 
 export const treeFeature: FeatureImplementation<any> = {
   key: "tree",
@@ -31,16 +32,21 @@ export const treeFeature: FeatureImplementation<any> = {
 
       const recursiveAdd = (
         itemId: string,
-        parentId: string,
+        path: string[],
         level: number,
         setSize: number,
         posInSet: number,
       ) => {
+        if (path.includes(itemId)) {
+          logWarning(`Circular reference for ${path.join(".")}`);
+          return;
+        }
+
         flatItems.push({
           itemId,
           level,
           index: flatItems.length,
-          parentId,
+          parentId: path.at(-1) as string,
           setSize,
           posInSet,
         });
@@ -49,7 +55,13 @@ export const treeFeature: FeatureImplementation<any> = {
           const children = tree.retrieveChildrenIds(itemId) ?? [];
           let i = 0;
           for (const childId of children) {
-            recursiveAdd(childId, itemId, level + 1, children.length, i++);
+            recursiveAdd(
+              childId,
+              path.concat(itemId),
+              level + 1,
+              children.length,
+              i++,
+            );
           }
         }
       };
@@ -57,7 +69,7 @@ export const treeFeature: FeatureImplementation<any> = {
       const children = tree.retrieveChildrenIds(rootItemId);
       let i = 0;
       for (const itemId of children) {
-        recursiveAdd(itemId, rootItemId, 0, children.length, i++);
+        recursiveAdd(itemId, [rootItemId], 0, children.length, i++);
       }
 
       return flatItems;
@@ -71,14 +83,16 @@ export const treeFeature: FeatureImplementation<any> = {
     },
 
     focusNextItem: ({ tree }) => {
-      const { index } = tree.getFocusedItem().getItemMeta();
-      const nextIndex = Math.min(index + 1, tree.getItems().length - 1);
+      const focused = tree.getFocusedItem().getItemMeta();
+      if (!focused) return;
+      const nextIndex = Math.min(focused.index + 1, tree.getItems().length - 1);
       tree.getItems()[nextIndex]?.setFocused();
     },
 
     focusPreviousItem: ({ tree }) => {
-      const { index } = tree.getFocusedItem().getItemMeta();
-      const nextIndex = Math.max(index - 1, 0);
+      const focused = tree.getFocusedItem().getItemMeta();
+      if (!focused) return;
+      const nextIndex = Math.max(focused.index - 1, 0);
       tree.getItems()[nextIndex]?.setFocused();
     },
 

package/src/test-utils/test-tree-expect.ts

@@ -82,6 +82,7 @@ export class TestTreeExpect<T> {
       top: 0,
     });
     expect(this.tree.instance.getDragLineStyle(0, 0)).toEqual({
+      position: "absolute",
       left: `${indent * 20}px`,
       pointerEvents: "none",
       top: "0px",

package/src/utilities/errors.ts

@@ -1,2 +1,6 @@
-export const throwError = (message: string) =>
-  Error(`Headless Tree: ${message}`);
+const prefix = "Headless Tree: ";
+
+export const throwError = (message: string) => Error(prefix + message);
+
+// eslint-disable-next-line no-console
+export const logWarning = (message: string) => console.warn(prefix + message);