@headless-tree/core 0.0.10 → 0.0.11

package/lib/esm/features/renaming/feature.js

@@ -6,34 +6,49 @@ export const renamingFeature = {
         renamingItem: "setRenamingItem",
         renamingValue: "setRenamingValue",
     },
-    createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { startRenamingItem: (itemId) => {
-            const item = instance.getItemInstance(itemId);
+    treeInstance: {
+        startRenamingItem: ({ tree }, itemId) => {
+            const item = tree.getItemInstance(itemId);
             if (!item.canRename()) {
                 return;
             }
-            instance.applySubStateUpdate("renamingItem", itemId);
-            instance.applySubStateUpdate("renamingValue", item.getItemName());
-        }, getRenamingItem: () => {
-            const itemId = instance.getState().renamingItem;
-            return itemId ? instance.getItemInstance(itemId) : null;
-        }, getRenamingValue: () => instance.getState().renamingValue || "", abortRenaming: () => {
-            instance.applySubStateUpdate("renamingItem", null);
-        }, completeRenaming: () => {
+            tree.applySubStateUpdate("renamingItem", itemId);
+            tree.applySubStateUpdate("renamingValue", item.getItemName());
+        },
+        getRenamingItem: ({ tree }) => {
+            const itemId = tree.getState().renamingItem;
+            return itemId ? tree.getItemInstance(itemId) : null;
+        },
+        getRenamingValue: ({ tree }) => tree.getState().renamingValue || "",
+        abortRenaming: ({ tree }) => {
+            tree.applySubStateUpdate("renamingItem", null);
+            tree.updateDomFocus();
+        },
+        completeRenaming: ({ tree }) => {
             var _a;
-            const config = instance.getConfig();
-            const item = instance.getRenamingItem();
+            const config = tree.getConfig();
+            const item = tree.getRenamingItem();
             if (item) {
-                (_a = config.onRename) === null || _a === void 0 ? void 0 : _a.call(config, item, instance.getState().renamingValue || "");
+                (_a = config.onRename) === null || _a === void 0 ? void 0 : _a.call(config, item, tree.getState().renamingValue || "");
             }
-            instance.applySubStateUpdate("renamingItem", null);
-        }, isRenamingItem: () => !!instance.getState().renamingItem })),
-    createItemInstance: (prev, instance, tree) => (Object.assign(Object.assign({}, prev), { getRenameInputProps: () => ({
+            tree.applySubStateUpdate("renamingItem", null);
+            tree.updateDomFocus();
+        },
+        isRenamingItem: ({ tree }) => !!tree.getState().renamingItem,
+    },
+    itemInstance: {
+        getRenameInputProps: ({ tree }) => ({
             onBlur: () => tree.abortRenaming(),
             value: tree.getRenamingValue(),
             onChange: (e) => {
-                tree.applySubStateUpdate("renamingValue", e.target.value);
+                var _a;
+                // TODO custom type with e.target.value
+                tree.applySubStateUpdate("renamingValue", (_a = e.target) === null || _a === void 0 ? void 0 : _a.value);
             },
-        }), canRename: () => { var _a, _b, _c; return (_c = (_b = (_a = tree.getConfig()).canRename) === null || _b === void 0 ? void 0 : _b.call(_a, instance)) !== null && _c !== void 0 ? _c : true; }, isRenaming: () => instance.getId() === tree.getState().renamingItem })),
+        }),
+        canRename: ({ tree, item }) => { var _a, _b, _c; return (_c = (_b = (_a = tree.getConfig()).canRename) === null || _b === void 0 ? void 0 : _b.call(_a, item)) !== null && _c !== void 0 ? _c : true; },
+        isRenaming: ({ tree, item }) => item.getId() === tree.getState().renamingItem,
+    },
     hotkeys: {
         renameItem: {
             hotkey: "F2",

package/lib/esm/features/renaming/types.d.ts

@@ -5,7 +5,7 @@ export type RenamingFeatureDef<T> = {
         renamingValue?: string;
     };
     config: {
-        setRenamingItem?: SetStateFn<string | null>;
+        setRenamingItem?: SetStateFn<string | null | undefined>;
         setRenamingValue?: SetStateFn<string | undefined>;
         canRename?: (item: ItemInstance<T>) => boolean;
         onRename?: (item: ItemInstance<T>, value: string) => void;

package/lib/esm/features/search/feature.js

@@ -7,39 +7,53 @@ export const searchFeature = {
     stateHandlerNames: {
         search: "setSearch",
     },
-    createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { setSearch: (search) => {
+    treeInstance: {
+        setSearch: ({ tree }, search) => {
             var _a;
-            instance.applySubStateUpdate("search", search);
-            (_a = instance
+            tree.applySubStateUpdate("search", search);
+            (_a = tree
                 .getItems()
-                .find((item) => {
-                var _a, _b;
-                return (_b = (_a = instance
-                    .getConfig()).isSearchMatchingItem) === null || _b === void 0 ? void 0 : _b.call(_a, instance.getSearchValue(), item);
-            })) === null || _a === void 0 ? void 0 : _a.setFocused();
-        }, openSearch: (initialValue = "") => {
-            instance.setSearch(initialValue);
+                .find((item) => { var _a, _b; return (_b = (_a = tree.getConfig()).isSearchMatchingItem) === null || _b === void 0 ? void 0 : _b.call(_a, tree.getSearchValue(), item); })) === null || _a === void 0 ? void 0 : _a.setFocused();
+        },
+        openSearch: ({ tree }, initialValue = "") => {
+            var _a, _b;
+            tree.setSearch(initialValue);
+            (_b = (_a = tree.getConfig()).onOpenSearch) === null || _b === void 0 ? void 0 : _b.call(_a);
             setTimeout(() => {
                 var _a;
-                (_a = instance
-                    .getDataRef()
-                    .current.searchInput) === null || _a === void 0 ? void 0 : _a.focus();
+                (_a = tree.getDataRef().current.searchInput) === null || _a === void 0 ? void 0 : _a.focus();
             });
-        }, closeSearch: () => {
-            instance.setSearch(null);
-            instance.updateDomFocus();
-        }, isSearchOpen: () => instance.getState().search !== null, getSearchValue: () => instance.getState().search || "", registerSearchInputElement: (element) => {
-            const dataRef = instance.getDataRef();
+        },
+        closeSearch: ({ tree }) => {
+            var _a, _b;
+            tree.setSearch(null);
+            (_b = (_a = tree.getConfig()).onCloseSearch) === null || _b === void 0 ? void 0 : _b.call(_a);
+            tree.updateDomFocus();
+        },
+        isSearchOpen: ({ tree }) => tree.getState().search !== null,
+        getSearchValue: ({ tree }) => tree.getState().search || "",
+        registerSearchInputElement: ({ tree }, element) => {
+            const dataRef = tree.getDataRef();
             dataRef.current.searchInput = element;
             if (element && dataRef.current.keydownHandler) {
                 element.addEventListener("keydown", dataRef.current.keydownHandler);
             }
-        }, getSearchInputElement: () => { var _a; return (_a = instance.getDataRef().current.searchInput) !== null && _a !== void 0 ? _a : null; }, getSearchInputElementProps: () => ({
-            value: instance.getSearchValue(),
-            onChange: (e) => instance.setSearch(e.target.value),
-            onBlur: () => instance.closeSearch(),
-        }), getSearchMatchingItems: memo((search, items) => items.filter((item) => { var _a, _b; return search && ((_b = (_a = instance.getConfig()).isSearchMatchingItem) === null || _b === void 0 ? void 0 : _b.call(_a, search, item)); }), () => [instance.getSearchValue(), instance.getItems()]) })),
-    createItemInstance: (prev, item, tree) => (Object.assign(Object.assign({}, prev), { isMatchingSearch: () => tree.getSearchMatchingItems().some((i) => i.getId() === item.getId()) })),
+        },
+        getSearchInputElement: ({ tree }) => { var _a; return (_a = tree.getDataRef().current.searchInput) !== null && _a !== void 0 ? _a : null; },
+        getSearchInputElementProps: ({ tree }) => ({
+            value: tree.getSearchValue(),
+            onChange: (e) => tree.setSearch(e.target.value),
+            onBlur: () => tree.closeSearch(),
+        }),
+        getSearchMatchingItems: memo(({ tree }) => [
+            tree.getSearchValue(),
+            tree.getItems(),
+            tree.getConfig().isSearchMatchingItem,
+        ], (search, items, isSearchMatchingItem) => items.filter((item) => search && (isSearchMatchingItem === null || isSearchMatchingItem === void 0 ? void 0 : isSearchMatchingItem(search, item)))),
+    },
+    itemInstance: {
+        isMatchingSearch: ({ tree, item }) => tree.getSearchMatchingItems().some((i) => i.getId() === item.getId()),
+    },
     hotkeys: {
         openSearch: {
             hotkey: "LetterOrNumber",

package/lib/esm/features/search/types.d.ts

@@ -12,7 +12,6 @@ export type SearchFeatureDef<T> = {
         setSearch?: SetStateFn<string | null>;
         onOpenSearch?: () => void;
         onCloseSearch?: () => void;
-        onSearchMatchesItems?: (search: string, items: ItemInstance<T>[]) => void;
         isSearchMatchingItem?: (search: string, item: ItemInstance<T>) => boolean;
     };
     treeInstance: {

package/lib/esm/features/selection/feature.js

@@ -6,25 +6,31 @@ export const selectionFeature = {
     stateHandlerNames: {
         selectedItems: "setSelectedItems",
     },
-    createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { setSelectedItems: (selectedItems) => {
-            instance.applySubStateUpdate("selectedItems", selectedItems);
-        }, 
+    treeInstance: {
+        setSelectedItems: ({ tree }, selectedItems) => {
+            tree.applySubStateUpdate("selectedItems", selectedItems);
+        },
         // TODO memo
-        getSelectedItems: () => {
-            return instance.getState().selectedItems.map(instance.getItemInstance);
-        } })),
-    createItemInstance: (prev, item, tree) => (Object.assign(Object.assign({}, prev), { select: () => {
+        getSelectedItems: ({ tree }) => {
+            return tree.getState().selectedItems.map(tree.getItemInstance);
+        },
+    },
+    itemInstance: {
+        select: ({ tree, item }) => {
             const { selectedItems } = tree.getState();
             tree.setSelectedItems(selectedItems.includes(item.getItemMeta().itemId)
                 ? selectedItems
                 : [...selectedItems, item.getItemMeta().itemId]);
-        }, deselect: () => {
+        },
+        deselect: ({ tree, item }) => {
             const { selectedItems } = tree.getState();
             tree.setSelectedItems(selectedItems.filter((id) => id !== item.getItemMeta().itemId));
-        }, isSelected: () => {
+        },
+        isSelected: ({ tree, item }) => {
             const { selectedItems } = tree.getState();
             return selectedItems.includes(item.getItemMeta().itemId);
-        }, selectUpTo: (ctrl) => {
+        },
+        selectUpTo: ({ tree, item }, ctrl) => {
             const indexA = item.getItemMeta().index;
             // TODO dont use focused item as anchor, but last primary-clicked item
             const indexB = tree.getFocusedItem().getItemMeta().index;
@@ -42,14 +48,16 @@ export const selectionFeature = {
                 ...new Set([...selectedItems, ...newSelectedItems]),
             ];
             tree.setSelectedItems(uniqueSelectedItems);
-        }, toggleSelect: () => {
+        },
+        toggleSelect: ({ item }) => {
             if (item.isSelected()) {
                 item.deselect();
             }
             else {
                 item.select();
             }
-        }, getProps: () => (Object.assign(Object.assign({}, prev.getProps()), { "aria-selected": item.isSelected() ? "true" : "false", onClick: item.getMemoizedProp("selection/onClick", () => (e) => {
+        },
+        getProps: ({ tree, item, prev }) => (Object.assign(Object.assign({}, prev === null || prev === void 0 ? void 0 : prev()), { "aria-selected": item.isSelected() ? "true" : "false", onClick: item.getMemoizedProp("selection/onClick", () => (e) => {
                 var _a, _b;
                 if (e.shiftKey) {
                     item.selectUpTo(e.ctrlKey || e.metaKey);
@@ -60,8 +68,9 @@ export const selectionFeature = {
                 else {
                     tree.setSelectedItems([item.getItemMeta().itemId]);
                 }
-                (_b = (_a = prev.getProps()).onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
-            }) })) })),
+                (_b = (_a = prev === null || prev === void 0 ? void 0 : prev()) === null || _a === void 0 ? void 0 : _a.onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
+            }) })),
+    },
     hotkeys: {
         // setSelectedItem: {
         //   hotkey: "space",

package/lib/esm/features/sync-data-loader/feature.js

@@ -6,6 +6,11 @@ export const syncDataLoaderFeature = {
     stateHandlerNames: {
         loadingItems: "setLoadingItems",
     },
-    createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { retrieveItemData: (itemId) => instance.getConfig().dataLoader.getItem(itemId), retrieveChildrenIds: (itemId) => instance.getConfig().dataLoader.getChildren(itemId) })),
-    createItemInstance: (prev) => (Object.assign(Object.assign({}, prev), { isLoading: () => false })),
+    treeInstance: {
+        retrieveItemData: ({ tree }, itemId) => tree.getConfig().dataLoader.getItem(itemId),
+        retrieveChildrenIds: ({ tree }, itemId) => tree.getConfig().dataLoader.getChildren(itemId),
+    },
+    itemInstance: {
+        isLoading: () => false,
+    },
 };

package/lib/esm/features/tree/feature.d.ts

@@ -3,4 +3,5 @@ import { TreeFeatureDef } from "./types";
 import { MainFeatureDef } from "../main/types";
 import { HotkeysCoreFeatureDef } from "../hotkeys-core/types";
 import { SyncDataLoaderFeatureDef } from "../sync-data-loader/types";
-export declare const treeFeature: FeatureImplementation<any, TreeFeatureDef<any>, MainFeatureDef | TreeFeatureDef<any> | HotkeysCoreFeatureDef<any> | SyncDataLoaderFeatureDef<any>>;
+import { SearchFeatureDef } from "../search/types";
+export declare const treeFeature: FeatureImplementation<any, TreeFeatureDef<any>, MainFeatureDef | TreeFeatureDef<any> | HotkeysCoreFeatureDef<any> | SyncDataLoaderFeatureDef<any> | SearchFeatureDef<any>>;

package/lib/esm/features/tree/feature.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { makeStateUpdater, memo, poll } from "../../utils";
+import { makeStateUpdater, poll } from "../../utils";
 export const treeFeature = {
     key: "tree",
     getInitialState: (initialState) => (Object.assign({ expandedItems: [], focusedItem: null }, initialState)),
@@ -16,14 +16,13 @@ export const treeFeature = {
         expandedItems: "setExpandedItems",
         focusedItem: "setFocusedItem",
     },
-    createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { retrieveItemData: () => {
-            throw new Error("No data-loader registered");
-        }, retrieveChildrenIds: () => {
-            throw new Error("No data-loader registered");
-        }, isItemExpanded: (itemId) => instance.getState().expandedItems.includes(itemId), getItemsMeta: () => {
-            const { rootItemId } = instance.getConfig();
-            const { expandedItems } = instance.getState();
+    treeInstance: {
+        isItemExpanded: ({ tree }, itemId) => tree.getState().expandedItems.includes(itemId),
+        getItemsMeta: ({ tree }) => {
+            const { rootItemId } = tree.getConfig();
+            const { expandedItems } = tree.getState();
             const flatItems = [];
+            const expandedItemsSet = new Set(expandedItems);
             const recursiveAdd = (itemId, parentId, level, setSize, posInSet) => {
                 var _a;
                 flatItems.push({
@@ -34,81 +33,89 @@ export const treeFeature = {
                     setSize,
                     posInSet,
                 });
-                if (expandedItems.includes(itemId)) {
-                    const children = (_a = instance.retrieveChildrenIds(itemId)) !== null && _a !== void 0 ? _a : [];
+                if (expandedItemsSet.has(itemId)) {
+                    // TODO THIS MADE A HUGE DIFFERENCE!
+                    const children = (_a = tree.retrieveChildrenIds(itemId)) !== null && _a !== void 0 ? _a : [];
                     let i = 0;
                     for (const childId of children) {
                         recursiveAdd(childId, itemId, level + 1, children.length, i++);
                     }
                 }
             };
-            const children = instance.retrieveChildrenIds(rootItemId);
+            const children = tree.retrieveChildrenIds(rootItemId);
             let i = 0;
             for (const itemId of children) {
                 recursiveAdd(itemId, rootItemId, 0, children.length, i++);
             }
             return flatItems;
-        }, expandItem: (itemId) => {
+        },
+        expandItem: ({ tree }, itemId) => {
             var _a;
-            if (!instance.getItemInstance(itemId).isFolder()) {
+            if (!tree.getItemInstance(itemId).isFolder()) {
                 return;
             }
-            if ((_a = instance.getState().loadingItems) === null || _a === void 0 ? void 0 : _a.includes(itemId)) {
+            if ((_a = tree.getState().loadingItems) === null || _a === void 0 ? void 0 : _a.includes(itemId)) {
                 return;
             }
-            instance.applySubStateUpdate("expandedItems", (expandedItems) => [
+            tree.applySubStateUpdate("expandedItems", (expandedItems) => [
                 ...expandedItems,
                 itemId,
             ]);
-            instance.rebuildTree();
-        }, collapseItem: (itemId) => {
-            if (!instance.getItemInstance(itemId).isFolder()) {
+            tree.rebuildTree();
+        },
+        collapseItem: ({ tree }, itemId) => {
+            if (!tree.getItemInstance(itemId).isFolder()) {
                 return;
             }
-            instance.applySubStateUpdate("expandedItems", (expandedItems) => expandedItems.filter((id) => id !== itemId));
-            instance.rebuildTree();
-        }, 
+            tree.applySubStateUpdate("expandedItems", (expandedItems) => expandedItems.filter((id) => id !== itemId));
+            tree.rebuildTree();
+        },
         // TODO memo
-        getFocusedItem: () => {
+        getFocusedItem: ({ tree }) => {
             var _a, _b;
-            return ((_b = instance.getItemInstance((_a = instance.getState().focusedItem) !== null && _a !== void 0 ? _a : "")) !== null && _b !== void 0 ? _b : instance.getItems()[0]);
-        }, focusItem: (itemId) => {
-            instance.applySubStateUpdate("focusedItem", itemId);
-        }, focusNextItem: () => {
-            const { index } = instance.getFocusedItem().getItemMeta();
-            const nextIndex = Math.min(index + 1, instance.getItems().length - 1);
-            instance.focusItem(instance.getItems()[nextIndex].getId());
-        }, focusPreviousItem: () => {
-            const { index } = instance.getFocusedItem().getItemMeta();
+            return ((_b = tree.getItemInstance((_a = tree.getState().focusedItem) !== null && _a !== void 0 ? _a : "")) !== null && _b !== void 0 ? _b : tree.getItems()[0]);
+        },
+        focusItem: ({ tree }, itemId) => {
+            tree.applySubStateUpdate("focusedItem", itemId);
+        },
+        focusNextItem: ({ tree }) => {
+            const { index } = tree.getFocusedItem().getItemMeta();
+            const nextIndex = Math.min(index + 1, tree.getItems().length - 1);
+            tree.focusItem(tree.getItems()[nextIndex].getId());
+        },
+        focusPreviousItem: ({ tree }) => {
+            const { index } = tree.getFocusedItem().getItemMeta();
             const nextIndex = Math.max(index - 1, 0);
-            instance.focusItem(instance.getItems()[nextIndex].getId());
-        }, updateDomFocus: () => {
+            tree.focusItem(tree.getItems()[nextIndex].getId());
+        },
+        updateDomFocus: ({ tree }) => {
             // Required because if the state is managed outside in react, the state only updated during next render
             setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
                 var _a, _b;
-                const focusedItem = instance.getFocusedItem();
-                (_b = (_a = instance.getConfig()).scrollToItem) === null || _b === void 0 ? void 0 : _b.call(_a, focusedItem);
+                const focusedItem = tree.getFocusedItem();
+                (_b = (_a = tree.getConfig()).scrollToItem) === null || _b === void 0 ? void 0 : _b.call(_a, focusedItem);
                 yield poll(() => focusedItem.getElement() !== null, 20);
                 const focusedElement = focusedItem.getElement();
                 if (!focusedElement)
                     return;
                 focusedElement.focus();
             }));
-        }, getContainerProps: () => {
-            var _a;
-            return (Object.assign(Object.assign({}, (_a = prev.getContainerProps) === null || _a === void 0 ? void 0 : _a.call(prev)), { role: "tree", ariaLabel: "", ariaActivedescendant: "" }));
-        } })),
-    createItemInstance: (prev, item, tree) => (Object.assign(Object.assign({}, prev), { isLoading: () => {
-            throw new Error("No data-loader registered");
-        }, scrollTo: (scrollIntoViewArg) => __awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b;
-            (_b = (_a = tree.getConfig()).scrollToItem) === null || _b === void 0 ? void 0 : _b.call(_a, item);
+        },
+        getContainerProps: ({ prev }) => (Object.assign(Object.assign({}, prev === null || prev === void 0 ? void 0 : prev()), { role: "tree", ariaLabel: "", ariaActivedescendant: "" })),
+        // relevant for hotkeys of this feature
+        isSearchOpen: () => false,
+    },
+    itemInstance: {
+        scrollTo: (_a, scrollIntoViewArg_1) => __awaiter(void 0, [_a, scrollIntoViewArg_1], void 0, function* ({ tree, item }, scrollIntoViewArg) {
+            var _b, _c, _d;
+            (_c = (_b = tree.getConfig()).scrollToItem) === null || _c === void 0 ? void 0 : _c.call(_b, item);
             yield poll(() => item.getElement() !== null, 20);
-            item.getElement().scrollIntoView(scrollIntoViewArg);
-        }), getId: () => item.getItemMeta().itemId, getProps: () => {
-            var _a;
+            (_d = item.getElement()) === null || _d === void 0 ? void 0 : _d.scrollIntoView(scrollIntoViewArg);
+        }),
+        getId: ({ item }) => item.getItemMeta().itemId,
+        getProps: ({ item, prev }) => {
             const itemMeta = item.getItemMeta();
-            return Object.assign(Object.assign({}, (_a = prev.getProps) === null || _a === void 0 ? void 0 : _a.call(prev)), { role: "treeitem", "aria-setsize": itemMeta.setSize, "aria-posinset": itemMeta.posInSet, "aria-selected": "false", "aria-label": item.getItemName(), "aria-level": itemMeta.level, tabIndex: item.isFocused() ? 0 : -1, onClick: item.getMemoizedProp("tree/onClick", () => (e) => {
+            return Object.assign(Object.assign({}, prev === null || prev === void 0 ? void 0 : prev()), { role: "treeitem", "aria-setsize": itemMeta.setSize, "aria-posinset": itemMeta.posInSet, "aria-selected": "false", "aria-label": item.getItemName(), "aria-level": itemMeta.level, tabIndex: item.isFocused() ? 0 : -1, onClick: item.getMemoizedProp("tree/onClick", () => (e) => {
                     item.setFocused();
                     item.primaryAction();
                     if (e.ctrlKey || e.shiftKey || e.metaKey) {
@@ -124,24 +131,38 @@ export const treeFeature = {
                         item.expand();
                     }
                 }) });
-        }, expand: () => tree.expandItem(item.getItemMeta().itemId), collapse: () => tree.collapseItem(item.getItemMeta().itemId), getItemData: () => tree.retrieveItemData(item.getItemMeta().itemId), isExpanded: () => tree.getState().expandedItems.includes(item.getItemMeta().itemId), isFocused: () => tree.getState().focusedItem === item.getItemMeta().itemId ||
-            (tree.getState().focusedItem === null && item.getItemMeta().index === 0), isFolder: () => item.getItemMeta().level === -1 ||
-            tree.getConfig().isItemFolder(item), getItemName: () => {
+        },
+        expand: ({ tree, item }) => tree.expandItem(item.getItemMeta().itemId),
+        collapse: ({ tree, item }) => tree.collapseItem(item.getItemMeta().itemId),
+        getItemData: ({ tree, item }) => tree.retrieveItemData(item.getItemMeta().itemId),
+        equals: ({ item }, other) => item.getId() === (other === null || other === void 0 ? void 0 : other.getId()),
+        isExpanded: ({ tree, item }) => tree.getState().expandedItems.includes(item.getItemMeta().itemId),
+        isDescendentOf: ({ item }, parentId) => {
+            const parent = item.getParent();
+            return Boolean((parent === null || parent === void 0 ? void 0 : parent.getId()) === parentId || (parent === null || parent === void 0 ? void 0 : parent.isDescendentOf(parentId)));
+        },
+        isFocused: ({ tree, item }) => tree.getState().focusedItem === item.getItemMeta().itemId ||
+            (tree.getState().focusedItem === null && item.getItemMeta().index === 0),
+        isFolder: ({ tree, item }) => item.getItemMeta().level === -1 ||
+            tree.getConfig().isItemFolder(item),
+        getItemName: ({ tree, item }) => {
             const config = tree.getConfig();
             return config.getItemName(item);
-        }, setFocused: () => tree.focusItem(item.getItemMeta().itemId), primaryAction: () => { var _a, _b; return (_b = (_a = tree.getConfig()).onPrimaryAction) === null || _b === void 0 ? void 0 : _b.call(_a, item); }, getParent: memo((itemMeta) => {
-            for (let i = itemMeta.index - 1; i >= 0; i--) {
-                const potentialParent = tree.getItems()[i];
-                if (potentialParent.getItemMeta().level < itemMeta.level) {
-                    return potentialParent;
-                }
-            }
-            return tree.getItemInstance(tree.getConfig().rootItemId);
-        }, () => [item.getItemMeta()]), 
+        },
+        setFocused: ({ tree, item }) => tree.focusItem(item.getItemMeta().itemId),
+        primaryAction: ({ tree, item }) => { var _a, _b; return (_b = (_a = tree.getConfig()).onPrimaryAction) === null || _b === void 0 ? void 0 : _b.call(_a, item); },
+        getParent: ({ tree, item }) => item.getItemMeta().parentId
+            ? tree.getItemInstance(item.getItemMeta().parentId)
+            : undefined,
         // TODO remove
-        getIndexInParent: () => item.getItemMeta().posInSet, getChildren: () => tree
+        getIndexInParent: ({ item }) => item.getItemMeta().posInSet,
+        getChildren: ({ tree, item }) => tree
             .retrieveChildrenIds(item.getItemMeta().itemId)
-            .map((id) => tree.getItemInstance(id)), getTree: () => tree, getItemAbove: () => tree.getItems()[item.getItemMeta().index - 1], getItemBelow: () => tree.getItems()[item.getItemMeta().index + 1], getMemoizedProp: (name, create, deps) => {
+            .map((id) => tree.getItemInstance(id)),
+        getTree: ({ tree }) => tree,
+        getItemAbove: ({ tree, item }) => tree.getItems()[item.getItemMeta().index - 1],
+        getItemBelow: ({ tree, item }) => tree.getItems()[item.getItemMeta().index + 1],
+        getMemoizedProp: ({ item }, name, create, deps) => {
             var _a, _b, _c, _d, _e;
             var _f, _g;
             const data = item.getDataRef();
@@ -157,13 +178,14 @@ export const treeFeature = {
             data.current.memoizedDeps[name] = deps;
             data.current.memoizedValues[name] = value;
             return value;
-        } })),
+        },
+    },
     hotkeys: {
         focusNextItem: {
             hotkey: "ArrowDown",
             canRepeat: true,
             preventDefault: true,
-            isEnabled: (tree) => { var _a, _b; return !((_b = (_a = tree.isSearchOpen) === null || _a === void 0 ? void 0 : _a.call(tree)) !== null && _b !== void 0 ? _b : false) && !tree.getState().dnd; },
+            isEnabled: (tree) => { var _a, _b; return !((_b = (_a = tree.isSearchOpen) === null || _a === void 0 ? void 0 : _a.call(tree)) !== null && _b !== void 0 ? _b : false) && !tree.getState().dnd; }, // TODO what happens when the feature doesnt exist? proxy method still claims to exist
             handler: (e, tree) => {
                 tree.focusNextItem();
                 tree.updateDomFocus();

package/lib/esm/features/tree/types.d.ts

@@ -42,19 +42,21 @@ export type TreeFeatureDef<T> = {
         getProps: () => Record<string, any>;
         getItemName: () => string;
         getItemData: () => T;
+        equals: (other?: ItemInstance<any> | null) => boolean;
         expand: () => void;
         collapse: () => void;
         isExpanded: () => boolean;
+        isDescendentOf: (parentId: string) => boolean;
         isFocused: () => boolean;
         isFolder: () => boolean;
         setFocused: () => void;
-        getParent: () => ItemInstance<T>;
+        getParent: () => ItemInstance<T> | undefined;
         getChildren: () => ItemInstance<T>[];
         getIndexInParent: () => number;
         primaryAction: () => void;
         getTree: () => TreeInstance<T>;
-        getItemAbove: () => ItemInstance<T> | null;
-        getItemBelow: () => ItemInstance<T> | null;
+        getItemAbove: () => ItemInstance<T> | undefined;
+        getItemBelow: () => ItemInstance<T> | undefined;
         getMemoizedProp: <X>(name: string, create: () => X, deps?: any[]) => X;
         scrollTo: (scrollIntoViewArg?: boolean | ScrollIntoViewOptions) => Promise<void>;
     };

package/lib/esm/index.d.ts

@@ -1,7 +1,7 @@
 export * from "./types/core";
 export * from "./core/create-tree";
 export * from "./features/tree/types";
-export * from "./features/main/types";
+export { MainFeatureDef, InstanceBuilder } from "./features/main/types";
 export * from "./features/drag-and-drop/types";
 export * from "./features/selection/types";
 export * from "./features/async-data-loader/types";
@@ -21,3 +21,5 @@ export * from "./features/expand-all/feature";
 export * from "./utilities/create-on-drop-handler";
 export * from "./utilities/insert-items-at-target";
 export * from "./utilities/remove-items-from-parents";
+export * from "./core/build-proxified-instance";
+export * from "./core/build-static-instance";

package/lib/esm/index.js

@@ -1,7 +1,6 @@
 export * from "./types/core";
 export * from "./core/create-tree";
 export * from "./features/tree/types";
-export * from "./features/main/types";
 export * from "./features/drag-and-drop/types";
 export * from "./features/selection/types";
 export * from "./features/async-data-loader/types";
@@ -21,3 +20,5 @@ export * from "./features/expand-all/feature";
 export * from "./utilities/create-on-drop-handler";
 export * from "./utilities/insert-items-at-target";
 export * from "./utilities/remove-items-from-parents";
+export * from "./core/build-proxified-instance";
+export * from "./core/build-static-instance";

package/lib/esm/test-utils/test-tree-do.d.ts

@@ -0,0 +1,23 @@
+import { DragEvent } from "react";
+import { TestTree } from "./test-tree";
+import { HotkeyName } from "../types/core";
+export declare class TestTreeDo<T> {
+    protected tree: TestTree<T>;
+    protected itemInstance(itemId: string): import("../types/core").ItemInstance<any>;
+    protected itemProps(itemId: string): Record<string, any>;
+    constructor(tree: TestTree<T>);
+    selectItem(id: string): void;
+    shiftSelectItem(id: string): void;
+    ctrlSelectItem(id: string): void;
+    ctrlShiftSelectItem(id: string): void;
+    selectMultiple(...ids: string[]): void;
+    hotkey(hotkey: HotkeyName, e?: Partial<KeyboardEvent>): void;
+    startDrag(itemId: string, event?: DragEvent): DragEvent<Element>;
+    dragOver(itemId: string, event?: DragEvent): DragEvent<Element>;
+    dragOverNotAllowed(itemId: string, event?: DragEvent): DragEvent<Element>;
+    dragLeave(itemId: string): void;
+    dragEnd(itemId: string, event?: DragEvent): DragEvent<Element>;
+    drop(itemId: string, event?: DragEvent): DragEvent<Element>;
+    dragOverAndDrop(itemId: string, event?: DragEvent): DragEvent<Element>;
+    private consistentCalls;
+}