@headless-tree/core 1.4.0 → 1.5.0

package/src/features/checkboxes/checkboxes.spec.ts

@@ -3,147 +3,136 @@ import { TestTree } from "../../test-utils/test-tree";
 import { checkboxesFeature } from "./feature";
 import { CheckedState } from "./types";
 
-const factory = TestTree.default({})
-  .withFeatures(checkboxesFeature)
-  .suits.sync().tree;
+const factory = TestTree.default({
+  propagateCheckedState: true,
+  canCheckFolders: false,
+}).withFeatures(checkboxesFeature);
 
 describe("core-feature/checkboxes", () => {
-  it("should initialize with no checked items", async () => {
-    const tree = await factory.createTestCaseTree();
-    expect(tree.instance.getState().checkedItems).toEqual([]);
-  });
-
-  it("should check items", async () => {
-    const tree = await factory.createTestCaseTree();
-    tree.item("x111").setChecked();
-    tree.item("x112").setChecked();
-    expect(tree.instance.getState().checkedItems).toEqual(["x111", "x112"]);
-  });
-
-  it("should uncheck an item", async () => {
-    const tree = await factory
-      .with({ state: { checkedItems: ["x111"] } })
-      .createTestCaseTree();
-    tree.item("x111").setUnchecked();
-    expect(tree.instance.getState().checkedItems).not.toContain("x111");
-  });
-
-  it("should toggle checked state", async () => {
-    const tree = await factory.createTestCaseTree();
-    const item = tree.item("x111");
+  factory.forSuits((tree) => {
+    it("should initialize with no checked items", async () => {
+      expect(tree.instance.getState().checkedItems).toEqual([]);
+    });
 
-    item.toggleCheckedState();
-    expect(tree.instance.getState().checkedItems).toContain("x111");
+    it("should check items", async () => {
+      await tree.item("x111").setChecked();
+      await tree.item("x112").setChecked();
+      expect(tree.instance.getState().checkedItems).toEqual(["x111", "x112"]);
+    });
 
-    item.toggleCheckedState();
-    expect(tree.instance.getState().checkedItems).not.toContain("x111");
-  });
+    it("should uncheck an item", async () => {
+      await tree.item("x111").setChecked();
+      await tree.item("x111").setUnchecked();
+      expect(tree.instance.getState().checkedItems).not.toContain("x111");
+    });
 
-  describe("props", () => {
     it("should toggle checked state", async () => {
-      const tree = await factory.createTestCaseTree();
       const item = tree.item("x111");
-
-      item.getCheckboxProps().onChange();
+      await item.toggleCheckedState();
       expect(tree.instance.getState().checkedItems).toContain("x111");
-
-      item.getCheckboxProps().onChange();
+      await item.toggleCheckedState();
       expect(tree.instance.getState().checkedItems).not.toContain("x111");
     });
 
-    it("should return checked state in props", async () => {
-      const tree = await factory.createTestCaseTree();
-      tree.item("x111").setChecked();
-      expect(tree.item("x111").getCheckboxProps().checked).toBe(true);
-      expect(tree.item("x112").getCheckboxProps().checked).toBe(false);
+    describe("props", () => {
+      it("should toggle checked state", async () => {
+        const item = tree.item("x111");
+        item.getCheckboxProps().onChange();
+        expect(tree.instance.getState().checkedItems).toContain("x111");
+        item.getCheckboxProps().onChange();
+        expect(tree.instance.getState().checkedItems).not.toContain("x111");
+      });
+
+      it("should return checked state in props", async () => {
+        tree.item("x111").setChecked();
+        expect(tree.item("x111").getCheckboxProps().checked).toBe(true);
+        expect(tree.item("x112").getCheckboxProps().checked).toBe(false);
+      });
+
+      it("should create indeterminate state", async () => {
+        await tree.item("x111").setChecked();
+        const refObject = { indeterminate: undefined };
+        tree.item("x11").getCheckboxProps().ref(refObject);
+        expect(refObject.indeterminate).toBe(true);
+      });
+
+      it("should not create indeterminate state", async () => {
+        const refObject = { indeterminate: undefined };
+        tree.item("x11").getCheckboxProps().ref(refObject);
+        expect(refObject.indeterminate).toBe(false);
+      });
     });
 
-    it("should create indeterminate state", async () => {
-      const tree = await factory.createTestCaseTree();
-      tree.item("x111").setChecked();
-      const refObject = { indeterminate: undefined };
-      tree.item("x11").getCheckboxProps().ref(refObject);
-      expect(refObject.indeterminate).toBe(true);
+    it("should handle folder checking", async () => {
+      const testTree = await tree
+        .with({ canCheckFolders: true, propagateCheckedState: false })
+        .createTestCaseTree();
+      testTree.item("x11").setChecked();
+      expect(testTree.instance.getState().checkedItems).toContain("x11");
     });
 
-    it("should not create indeterminate state", async () => {
-      const tree = await factory.createTestCaseTree();
-      const refObject = { indeterminate: undefined };
-      tree.item("x11").getCheckboxProps().ref(refObject);
-      expect(refObject.indeterminate).toBe(false);
+    it("should not check folders if disabled", async () => {
+      const testTree = await tree
+        .with({ canCheckFolders: false, propagateCheckedState: false })
+        .createTestCaseTree();
+      testTree.item("x11").setChecked();
+      expect(testTree.instance.getState().checkedItems.length).toBe(0);
     });
-  });
-
-  it("should handle folder checking", async () => {
-    const tree = await factory
-      .with({ canCheckFolders: true, propagateCheckedState: false })
-      .createTestCaseTree();
-
-    tree.item("x11").setChecked();
-    expect(tree.instance.getState().checkedItems).toContain("x11");
-  });
 
-  it("should not check folders if disabled", async () => {
-    const tree = await factory
-      .with({ canCheckFolders: false, propagateCheckedState: false })
-      .createTestCaseTree();
-
-    tree.item("x11").setChecked();
-    expect(tree.instance.getState().checkedItems.length).toBe(0);
-  });
-
-  it("should propagate checked state", async () => {
-    const tree = await factory
-      .with({ propagateCheckedState: true })
-      .createTestCaseTree();
-
-    tree.item("x11").setChecked();
-    expect(tree.instance.getState().checkedItems).toEqual(
-      expect.arrayContaining(["x111", "x112", "x113", "x114"]),
-    );
-  });
-
-  it("should turn folder indeterminate", async () => {
-    const tree = await factory
-      .with({ propagateCheckedState: true })
-      .createTestCaseTree();
-
-    tree.item("x111").setChecked();
-    expect(tree.item("x11").getCheckedState()).toBe(CheckedState.Indeterminate);
-  });
-
-  it("should turn folder checked if all children are checked", async () => {
-    const tree = await factory
-      .with({
-        isItemFolder: (item) => item.getItemData().length < 4,
-        propagateCheckedState: true,
-        canCheckFolders: false,
-      })
-      .createTestCaseTree();
-
-    tree.item("x11").setChecked();
-    tree.item("x12").setChecked();
-    tree.item("x13").setChecked();
-    expect(tree.item("x1").getCheckedState()).toBe(CheckedState.Indeterminate);
-    tree.do.selectItem("x14");
-    tree.item("x141").setChecked();
-    tree.item("x142").setChecked();
-    tree.item("x143").setChecked();
-    expect(tree.item("x1").getCheckedState()).toBe(CheckedState.Indeterminate);
-    tree.item("x144").setChecked();
-    expect(tree.item("x1").getCheckedState()).toBe(CheckedState.Checked);
-  });
-
-  it("should return correct checked state for items", async () => {
-    const tree = await factory.createTestCaseTree();
-    const item = tree.instance.getItemInstance("x111");
+    it("should propagate checked state", async () => {
+      const testTree = await tree
+        .with({ propagateCheckedState: true })
+        .createTestCaseTree();
+      await testTree.item("x11").setChecked();
+      expect(testTree.instance.getState().checkedItems).toEqual(
+        expect.arrayContaining(["x111", "x112", "x113", "x114"]),
+      );
+    });
 
-    expect(item.getCheckedState()).toBe(CheckedState.Unchecked);
+    it("should turn folder indeterminate", async () => {
+      const testTree = await tree
+        .with({ propagateCheckedState: true })
+        .createTestCaseTree();
+      testTree.item("x111").setChecked();
+      expect(testTree.item("x11").getCheckedState()).toBe(
+        CheckedState.Indeterminate,
+      );
+    });
 
-    item.setChecked();
-    expect(item.getCheckedState()).toBe(CheckedState.Checked);
+    it("should turn folder checked if all children are checked", async () => {
+      const testTree = await tree
+        .with({
+          isItemFolder: (item: any) => item.getItemData().length < 4,
+          propagateCheckedState: true,
+          canCheckFolders: false,
+        })
+        .createTestCaseTree();
+      testTree.do.selectItem("x14"); // all leafs must be loaded initially, checkpropagation check only respects visibly loaded items
+      // TODO ^ might be a restriction we want to avoid
+      await testTree.resolveAsyncVisibleItems();
+      await testTree.runWhileResolvingItems(testTree.item("x11").setChecked);
+      await testTree.runWhileResolvingItems(testTree.item("x12").setChecked);
+      await testTree.runWhileResolvingItems(testTree.item("x13").setChecked);
+      expect(testTree.item("x1").getCheckedState()).toBe(
+        CheckedState.Indeterminate,
+      );
+      await testTree.runWhileResolvingItems(testTree.item("x141").setChecked);
+      await testTree.runWhileResolvingItems(testTree.item("x142").setChecked);
+      await testTree.runWhileResolvingItems(testTree.item("x143").setChecked);
+      expect(testTree.item("x1").getCheckedState()).toBe(
+        CheckedState.Indeterminate,
+      );
+      await testTree.runWhileResolvingItems(testTree.item("x144").setChecked);
+      expect(testTree.item("x1").getCheckedState()).toBe(CheckedState.Checked);
+    });
 
-    item.setUnchecked();
-    expect(item.getCheckedState()).toBe(CheckedState.Unchecked);
+    it("should return correct checked state for items", async () => {
+      const item = tree.instance.getItemInstance("x111");
+      expect(item.getCheckedState()).toBe(CheckedState.Unchecked);
+      item.setChecked();
+      expect(item.getCheckedState()).toBe(CheckedState.Checked);
+      item.setUnchecked();
+      expect(item.getCheckedState()).toBe(CheckedState.Unchecked);
+    });
   });
 });

package/src/features/checkboxes/feature.ts

@@ -1,7 +1,6 @@
-import { FeatureImplementation, TreeInstance } from "../../types/core";
+import { type FeatureImplementation, TreeInstance } from "../../types/core";
 import { makeStateUpdater } from "../../utils";
 import { CheckedState } from "./types";
-import { throwError } from "../../utilities/errors";
 
 const getAllLoadedDescendants = <T>(
   tree: TreeInstance<T>,
@@ -12,12 +11,50 @@ const getAllLoadedDescendants = <T>(
     return [itemId];
   }
   const descendants = tree
-    .retrieveChildrenIds(itemId)
+    .retrieveChildrenIds(itemId, true)
     .map((child) => getAllLoadedDescendants(tree, child, includeFolders))
     .flat();
   return includeFolders ? [itemId, ...descendants] : descendants;
 };
 
+const getAllDescendants = async <T>(
+  tree: TreeInstance<T>,
+  itemId: string,
+  includeFolders = false,
+): Promise<string[]> => {
+  await tree.loadItemData(itemId);
+  if (!tree.getConfig().isItemFolder(tree.getItemInstance(itemId))) {
+    return [itemId];
+  }
+  const childrenIds = await tree.loadChildrenIds(itemId);
+  const descendants = (
+    await Promise.all(
+      childrenIds.map((child) =>
+        getAllDescendants(tree, child, includeFolders),
+      ),
+    )
+  ).flat();
+  return includeFolders ? [itemId, ...descendants] : descendants;
+};
+
+const withLoadingState = async <T>(
+  tree: TreeInstance<T>,
+  itemId: string,
+  callback: () => Promise<void>,
+) => {
+  tree.applySubStateUpdate("loadingCheckPropagationItems", (items) => [
+    ...items,
+    itemId,
+  ]);
+  try {
+    await callback();
+  } finally {
+    tree.applySubStateUpdate("loadingCheckPropagationItems", (items) =>
+      items.filter((id) => id !== itemId),
+    );
+  }
+};
+
 export const checkboxesFeature: FeatureImplementation = {
   key: "checkboxes",
 
@@ -25,22 +62,20 @@ export const checkboxesFeature: FeatureImplementation = {
 
   getInitialState: (initialState) => ({
     checkedItems: [],
+    loadingCheckPropagationItems: [],
     ...initialState,
   }),
 
   getDefaultConfig: (defaultConfig, tree) => {
-    const hasAsyncLoader = defaultConfig.features?.some(
-      (f) => f.key === "async-data-loader",
-    );
-    if (hasAsyncLoader && defaultConfig.propagateCheckedState) {
-      throwError(`propagateCheckedState not supported with async trees`);
-    }
-    const propagateCheckedState =
-      defaultConfig.propagateCheckedState ?? !hasAsyncLoader;
+    const propagateCheckedState = defaultConfig.propagateCheckedState ?? true;
     const canCheckFolders =
       defaultConfig.canCheckFolders ?? !propagateCheckedState;
     return {
       setCheckedItems: makeStateUpdater("checkedItems", tree),
+      setLoadingCheckPropagationItems: makeStateUpdater(
+        "loadingCheckPropagationItems",
+        tree,
+      ),
       propagateCheckedState,
       canCheckFolders,
       ...defaultConfig,
@@ -49,6 +84,7 @@ export const checkboxesFeature: FeatureImplementation = {
 
   stateHandlerNames: {
     checkedItems: "setCheckedItems",
+    loadingCheckPropagationItems: "setLoadingCheckPropagationItems",
   },
 
   treeInstance: {
@@ -71,11 +107,11 @@ export const checkboxesFeature: FeatureImplementation = {
       };
     },
 
-    toggleCheckedState: ({ item }) => {
+    toggleCheckedState: async ({ item }) => {
       if (item.getCheckedState() === CheckedState.Checked) {
-        item.setUnchecked();
+        await item.setUnchecked();
       } else {
-        item.setChecked();
+        await item.setChecked();
       }
     },
 
@@ -90,6 +126,7 @@ export const checkboxesFeature: FeatureImplementation = {
 
       if (item.isFolder() && propagateCheckedState) {
         const descendants = getAllLoadedDescendants(tree, itemId);
+        if (descendants.length === 0) return CheckedState.Unchecked;
         if (descendants.every((d) => checkedItems.includes(d))) {
           return CheckedState.Checked;
         }
@@ -101,34 +138,46 @@ export const checkboxesFeature: FeatureImplementation = {
       return CheckedState.Unchecked;
     },
 
-    setChecked: ({ item, tree, itemId }) => {
-      const { propagateCheckedState, canCheckFolders } = tree.getConfig();
-      if (item.isFolder() && propagateCheckedState) {
-        tree.applySubStateUpdate("checkedItems", (items) => [
-          ...items,
-          ...getAllLoadedDescendants(tree, itemId, canCheckFolders),
-        ]);
-      } else if (!item.isFolder() || canCheckFolders) {
-        tree.applySubStateUpdate("checkedItems", (items) => [...items, itemId]);
-      }
+    setChecked: async ({ item, tree, itemId }) => {
+      await withLoadingState(tree, itemId, async () => {
+        const { propagateCheckedState, canCheckFolders } = tree.getConfig();
+        if (item.isFolder() && propagateCheckedState) {
+          const descendants = await getAllDescendants(
+            tree,
+            itemId,
+            canCheckFolders,
+          );
+          tree.applySubStateUpdate("checkedItems", (items) => [
+            ...items,
+            ...descendants,
+          ]);
+        } else if (!item.isFolder() || canCheckFolders) {
+          tree.applySubStateUpdate("checkedItems", (items) => [
+            ...items,
+            itemId,
+          ]);
+        }
+      });
     },
 
-    setUnchecked: ({ item, tree, itemId }) => {
-      const { propagateCheckedState, canCheckFolders } = tree.getConfig();
-      if (item.isFolder() && propagateCheckedState) {
-        const descendants = getAllLoadedDescendants(
-          tree,
-          itemId,
-          canCheckFolders,
-        );
-        tree.applySubStateUpdate("checkedItems", (items) =>
-          items.filter((id) => !descendants.includes(id) && id !== itemId),
-        );
-      } else {
-        tree.applySubStateUpdate("checkedItems", (items) =>
-          items.filter((id) => id !== itemId),
-        );
-      }
+    setUnchecked: async ({ item, tree, itemId }) => {
+      await withLoadingState(tree, itemId, async () => {
+        const { propagateCheckedState, canCheckFolders } = tree.getConfig();
+        if (item.isFolder() && propagateCheckedState) {
+          const descendants = await getAllDescendants(
+            tree,
+            itemId,
+            canCheckFolders,
+          );
+          tree.applySubStateUpdate("checkedItems", (items) =>
+            items.filter((id) => !descendants.includes(id) && id !== itemId),
+          );
+        } else {
+          tree.applySubStateUpdate("checkedItems", (items) =>
+            items.filter((id) => id !== itemId),
+          );
+        }
+      });
     },
   },
 };

package/src/features/checkboxes/types.ts

@@ -9,9 +9,11 @@ export enum CheckedState {
 export type CheckboxesFeatureDef<T> = {
   state: {
     checkedItems: string[];
+    loadingCheckPropagationItems: string[];
   };
   config: {
     setCheckedItems?: SetStateFn<string[]>;
+    setLoadingCheckPropagationItems?: SetStateFn<string[]>;
     canCheckFolders?: boolean;
     propagateCheckedState?: boolean;
   };
@@ -19,11 +21,22 @@ export type CheckboxesFeatureDef<T> = {
     setCheckedItems: (checkedItems: string[]) => void;
   };
   itemInstance: {
-    setChecked: () => void;
-    setUnchecked: () => void;
-    toggleCheckedState: () => void;
+    /** Will recursively load descendants if propagateCheckedState=true and async data loader is used. If not,
+     * this will return immediately. */
+    setChecked: () => Promise<void>;
+
+    /** Will recursively load descendants if propagateCheckedState=true and async data loader is used. If not,
+     * this will return immediately. */
+    setUnchecked: () => Promise<void>;
+
+    /** Will recursively load descendants if propagateCheckedState=true and async data loader is used. If not,
+     * this will return immediately. */
+    toggleCheckedState: () => Promise<void>;
+
     getCheckedState: () => CheckedState;
     getCheckboxProps: () => Record<string, any>;
+
+    isLoadingCheckPropagation: () => boolean;
   };
   hotkeys: never;
 };

package/src/features/drag-and-drop/feature.ts

@@ -332,6 +332,13 @@ export const dragAndDropFeature: FeatureImplementation = {
       return target ? target.item.getId() === item.getId() : false;
     },
 
+    isUnorderedDragTarget: ({ tree, item }) => {
+      const target = tree.getDragTarget();
+      return target
+        ? !isOrderedDragTarget(target) && target.item.getId() === item.getId()
+        : false;
+    },
+
     isDragTargetAbove: ({ tree, item }) => {
       const target = tree.getDragTarget();
 

package/src/features/drag-and-drop/types.ts

@@ -108,7 +108,13 @@ export type DragAndDropFeatureDef<T> = {
     ) => Record<string, any>;
   };
   itemInstance: {
+    /** Checks if the user is dragging in a way which makes this the new parent of the dragged items, either by dragging on top of
+     * this item, or by dragging inbetween children of this item. See @{isUnorderedDragTarget} if the latter is undesirable. */
     isDragTarget: () => boolean;
+
+    /** As opposed to @{isDragTarget}, this will not be true if the target is inbetween children of this item. This returns only true
+     * if the user is dragging directly on top of this item. */
+    isUnorderedDragTarget: () => boolean;
     isDragTargetAbove: () => boolean;
     isDragTargetBelow: () => boolean;
     isDraggingOver: () => boolean;

package/src/features/hotkeys-core/feature.ts

@@ -13,6 +13,7 @@ const specialKeys: Record<string, RegExp> = {
   minus: /^(NumpadSubtract|Minus)$/,
   control: /^(ControlLeft|ControlRight)$/,
   shift: /^(ShiftLeft|ShiftRight)$/,
+  metaorcontrol: /^(MetaLeft|MetaRight|ControlLeft|ControlRight)$/,
 };
 
 const testHotkeyMatch = (

package/src/features/main/types.ts

@@ -10,6 +10,11 @@ import {
 } from "../../types/core";
 import { ItemMeta } from "../tree/types";
 
+export interface TreeDataRef {
+  isMounted?: boolean;
+  waitingForMount?: (() => void)[];
+}
+
 export type InstanceTypeMap = {
   itemInstance: ItemInstance<any>;
   treeInstance: TreeInstance<any>;
@@ -49,6 +54,10 @@ export type MainFeatureDef<T = any> = {
     /* @internal */
     getHotkeyPresets: () => HotkeysConfig<T>;
     rebuildTree: () => void;
+    /** @deprecated Experimental feature, might get removed or changed in the future. */
+    scheduleRebuildTree: () => void;
+    /** @internal */
+    setMounted: (isMounted: boolean) => void;
   };
   itemInstance: {
     registerElement: (element: HTMLElement | null) => void;

package/src/features/sync-data-loader/types.ts

@@ -18,7 +18,13 @@ export type SyncDataLoaderFeatureDef<T> = {
   };
   treeInstance: {
     retrieveItemData: (itemId: string) => T;
-    retrieveChildrenIds: (itemId: string) => string[];
+
+    /** Retrieve children Ids. If an async data loader is used, skipFetch is set to true, and children have not been retrieved
+     * yet for this item, this will initiate fetching the children, and return an empty array. Once the children have loaded,
+     * a rerender will be triggered.
+     * @param skipFetch - Defaults to false.
+     */
+    retrieveChildrenIds: (itemId: string, skipFetch?: boolean) => string[];
   };
   itemInstance: {
     isLoading: () => boolean;

package/src/mddocs-entry.ts

@@ -10,6 +10,7 @@ import { SyncDataLoaderFeatureDef } from "./features/sync-data-loader/types";
 import { TreeFeatureDef } from "./features/tree/types";
 import { PropMemoizationFeatureDef } from "./features/prop-memoization/types";
 import { KeyboardDragAndDropFeatureDef } from "./features/keyboard-drag-and-drop/types";
+import type { CheckboxesFeatureDef } from "./features/checkboxes/types";
 
 export * from ".";
 
@@ -167,3 +168,15 @@ export type TreeFeatureTreeInstance<T> = TreeFeatureDef<T>["treeInstance"];
 /** @interface */
 export type TreeFeatureItemInstance<T> = TreeFeatureDef<T>["itemInstance"];
 export type TreeFeatureHotkeys<T> = TreeFeatureDef<T>["hotkeys"];
+
+/** @interface */
+export type CheckboxesFeatureConfig<T> = CheckboxesFeatureDef<T>["config"];
+/** @interface */
+export type CheckboxesFeatureState<T> = CheckboxesFeatureDef<T>["state"];
+/** @interface */
+export type CheckboxesFeatureTreeInstance<T> =
+  CheckboxesFeatureDef<T>["treeInstance"];
+/** @interface */
+export type CheckboxesFeatureItemInstance<T> =
+  CheckboxesFeatureDef<T>["itemInstance"];
+export type CheckboxesFeatureHotkeys<T> = CheckboxesFeatureDef<T>["hotkeys"];

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

@@ -135,4 +135,10 @@ export class TestTreeDo<T> {
       "function called with inconsistent parameters",
     ).toBeOneOf([0, 1]);
   }
+
+  async awaitNextTick() {
+    await new Promise((r) => {
+      setTimeout(r);
+    });
+  }
 }

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

@@ -78,6 +78,7 @@ export class TestTree<T = string> {
   get instance() {
     if (!this.treeInstance) {
       this.treeInstance = createTree(this.config);
+      this.treeInstance.setMounted(true);
       this.treeInstance.rebuildTree();
     }
     return this.treeInstance;
@@ -87,10 +88,9 @@ export class TestTree<T = string> {
 
   static async resolveAsyncLoaders() {
     do {
+      await vi.advanceTimersToNextTimerAsync();
       TestTree.asyncLoaderResolvers.shift()?.();
-      await new Promise<void>((r) => {
-        setTimeout(r);
-      });
+      await vi.advanceTimersToNextTimerAsync();
     } while (TestTree.asyncLoaderResolvers.length);
   }
 
@@ -101,6 +101,17 @@ export class TestTree<T = string> {
     await TestTree.resolveAsyncLoaders();
   }
 
+  async runWhileResolvingItems(cb: () => Promise<void>) {
+    const interval = setInterval(() => {
+      TestTree.resolveAsyncLoaders();
+    }, 5);
+    try {
+      await cb();
+    } finally {
+      clearInterval(interval);
+    }
+  }
+
   static default(config: Partial<TreeConfig<string>>) {
     return new TestTree({
       rootItemId: "x",

package/src/types/core.ts

@@ -93,11 +93,11 @@ type MayReturnNull<T extends (...x: any[]) => any> = (
   ...args: Parameters<T>
 ) => ReturnType<T> | null;
 
-export type ItemInstanceOpts<Key extends keyof ItemInstance<any>> = {
-  item: ItemInstance<any>;
-  tree: TreeInstance<any>;
+export type ItemInstanceOpts<T, Key extends keyof ItemInstance<any>> = {
+  item: ItemInstance<T>;
+  tree: TreeInstance<T>;
   itemId: string;
-  prev?: MayReturnNull<ItemInstance<any>[Key]>;
+  prev?: MayReturnNull<ItemInstance<T>[Key]>;
 };
 
 export type TreeInstanceOpts<Key extends keyof TreeInstance<any>> = {
@@ -131,7 +131,7 @@ export type FeatureImplementation<T = any> = {
 
   itemInstance?: {
     [key in keyof ItemInstance<T>]?: (
-      opts: ItemInstanceOpts<key>,
+      opts: ItemInstanceOpts<T, key>,
       ...args: Parameters<ItemInstance<T>[key]>
     ) => void;
   };