@headless-tree/core 0.0.5 → 0.0.7

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

@@ -10,9 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { makeStateUpdater, memo, poll } from "../../utils";
 export const treeFeature = {
     key: "tree",
-    dependingFeatures: ["main"],
     getInitialState: (initialState) => (Object.assign({ expandedItems: [], focusedItem: null }, initialState)),
     getDefaultConfig: (defaultConfig, tree) => (Object.assign({ setExpandedItems: makeStateUpdater("expandedItems", tree), setFocusedItem: makeStateUpdater("focusedItem", tree) }, defaultConfig)),
+    stateHandlerNames: {
+        expandedItems: "setExpandedItems",
+        focusedItem: "setFocusedItem",
+    },
     createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { retrieveItemData: () => {
             throw new Error("No data-loader registered");
         }, retrieveChildrenIds: () => {
@@ -20,7 +23,6 @@ export const treeFeature = {
         }, isItemExpanded: (itemId) => instance.getState().expandedItems.includes(itemId), getItemsMeta: () => {
             const { rootItemId } = instance.getConfig();
             const { expandedItems } = instance.getState();
-            // console.log("!", instance.getConfig());
             const flatItems = [];
             const recursiveAdd = (itemId, parentId, level, setSize, posInSet) => {
                 var _a;
@@ -47,23 +49,23 @@ export const treeFeature = {
             }
             return flatItems;
         }, expandItem: (itemId) => {
-            var _a, _b, _c;
+            var _a;
             if (!instance.getItemInstance(itemId).isFolder()) {
                 return;
             }
             if ((_a = instance.getState().loadingItems) === null || _a === void 0 ? void 0 : _a.includes(itemId)) {
                 return;
             }
-            (_c = (_b = instance
-                .getConfig()).setExpandedItems) === null || _c === void 0 ? void 0 : _c.call(_b, (expandedItems) => [...expandedItems, itemId]);
+            instance.applySubStateUpdate("expandedItems", (expandedItems) => [
+                ...expandedItems,
+                itemId,
+            ]);
             instance.rebuildTree();
         }, collapseItem: (itemId) => {
-            var _a, _b;
             if (!instance.getItemInstance(itemId).isFolder()) {
                 return;
             }
-            (_b = (_a = instance
-                .getConfig()).setExpandedItems) === null || _b === void 0 ? void 0 : _b.call(_a, (expandedItems) => expandedItems.filter((id) => id !== itemId));
+            instance.applySubStateUpdate("expandedItems", (expandedItems) => expandedItems.filter((id) => id !== itemId));
             instance.rebuildTree();
         }, 
         // TODO memo
@@ -71,8 +73,7 @@ export const treeFeature = {
             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) => {
-            var _a, _b;
-            (_b = (_a = instance.getConfig()).setFocusedItem) === null || _b === void 0 ? void 0 : _b.call(_a, itemId);
+            instance.applySubStateUpdate("focusedItem", itemId);
         }, focusNextItem: () => {
             const { index } = instance.getFocusedItem().getItemMeta();
             const nextIndex = Math.min(index + 1, instance.getItems().length - 1);
@@ -81,7 +82,7 @@ export const treeFeature = {
             const { index } = instance.getFocusedItem().getItemMeta();
             const nextIndex = Math.max(index - 1, 0);
             instance.focusItem(instance.getItems()[nextIndex].getId());
-        }, updateDomFocus: (scrollIntoView) => {
+        }, updateDomFocus: () => {
             // 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;
@@ -92,9 +93,6 @@ export const treeFeature = {
                 if (!focusedElement)
                     return;
                 focusedElement.focus();
-                // if (scrollIntoView) {
-                //   focusedElement.scrollIntoView();
-                // }
             }));
         }, getContainerProps: () => {
             var _a;
@@ -102,11 +100,15 @@ export const treeFeature = {
         } })),
     createItemInstance: (prev, item, tree) => (Object.assign(Object.assign({}, prev), { isLoading: () => {
             throw new Error("No data-loader registered");
-        }, getId: () => item.getItemMeta().itemId, getProps: () => {
+        }, 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);
+            yield poll(() => item.getElement() !== null, 20);
+            item.getElement().scrollIntoView(scrollIntoViewArg);
+        }), getId: () => item.getItemMeta().itemId, getProps: () => {
             var _a;
             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) => {
-                    console.log("onClick", item.getId());
+            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) => {
                     item.setFocused();
                     item.primaryAction();
                     if (e.ctrlKey || e.shiftKey || e.metaKey) {
@@ -135,12 +137,9 @@ export const treeFeature = {
                 }
             }
             return tree.getItemInstance(tree.getConfig().rootItemId);
-        }, () => [item.getItemMeta()]), getIndexInParent: () => {
-            var _a, _b;
-            return item.getItemMeta().index -
-                ((_b = (_a = item.getParent()) === null || _a === void 0 ? void 0 : _a.getItemMeta().index) !== null && _b !== void 0 ? _b : 0) -
-                1;
-        }, getChildren: () => tree
+        }, () => [item.getItemMeta()]), 
+        // TODO remove
+        getIndexInParent: () => item.getItemMeta().posInSet, getChildren: () => 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) => {
             var _a, _b, _c, _d, _e;
@@ -203,7 +202,7 @@ export const treeFeature = {
                 if ((!item.isExpanded() || !item.isFolder()) &&
                     item.getItemMeta().level !== 0) {
                     (_a = item.getParent()) === null || _a === void 0 ? void 0 : _a.setFocused();
-                    tree.updateDomFocus(true);
+                    tree.updateDomFocus();
                 }
                 else {
                     item.collapse();

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

@@ -34,8 +34,7 @@ export type TreeFeatureDef<T> = {
         getFocusedItem: () => ItemInstance<any>;
         focusNextItem: () => void;
         focusPreviousItem: () => void;
-        scrollToItem: (item: ItemInstance<any>) => void;
-        updateDomFocus: (scrollIntoView?: boolean) => void;
+        updateDomFocus: () => void;
         getContainerProps: () => Record<string, any>;
     };
     itemInstance: {
@@ -57,6 +56,7 @@ export type TreeFeatureDef<T> = {
         getItemAbove: () => ItemInstance<T> | null;
         getItemBelow: () => ItemInstance<T> | null;
         getMemoizedProp: <X>(name: string, create: () => X, deps?: any[]) => X;
+        scrollTo: (scrollIntoViewArg?: boolean | ScrollIntoViewOptions) => Promise<void>;
     };
     hotkeys: "focusNextItem" | "focusPreviousItem" | "expandOrDown" | "collapseOrUp" | "focusFirstItem" | "focusLastItem";
 };

package/lib/esm/index.d.ts

@@ -18,4 +18,6 @@ export * from "./features/drag-and-drop/feature";
 export * from "./features/search/feature";
 export * from "./features/renaming/feature";
 export * from "./features/expand-all/feature";
-export * from "./data-adapters/nested-data-adapter";
+export * from "./utilities/create-on-drop-handler";
+export * from "./utilities/insert-items-at-target";
+export * from "./utilities/remove-items-from-parents";

package/lib/esm/index.js

@@ -18,4 +18,6 @@ export * from "./features/drag-and-drop/feature";
 export * from "./features/search/feature";
 export * from "./features/renaming/feature";
 export * from "./features/expand-all/feature";
-export * from "./data-adapters/nested-data-adapter";
+export * from "./utilities/create-on-drop-handler";
+export * from "./utilities/insert-items-at-target";
+export * from "./utilities/remove-items-from-parents";

package/lib/esm/types/core.d.ts

@@ -51,7 +51,9 @@ export type HotkeysConfig<T, F extends FeatureDef = FeatureDefs<T>> = Record<Hot
 export type CustomHotkeysConfig<T, F extends FeatureDef = FeatureDefs<T>> = Partial<Record<HotkeyName<F> | `custom${string}`, Partial<HotkeyConfig<T>>>>;
 export type FeatureImplementation<T = any, D extends FeatureDef = any, F extends FeatureDef = EmptyFeatureDef> = {
     key?: string;
-    dependingFeatures?: string[];
+    deps?: string[];
+    overwrites?: string[];
+    stateHandlerNames?: Partial<Record<keyof MergedFeatures<F>["state"], keyof MergedFeatures<F>["config"]>>;
     getInitialState?: (initialState: Partial<MergedFeatures<F>["state"]>, tree: MergedFeatures<F>["treeInstance"]) => Partial<D["state"] & MergedFeatures<F>["state"]>;
     getDefaultConfig?: (defaultConfig: Partial<MergedFeatures<F>["config"]>, tree: MergedFeatures<F>["treeInstance"]) => Partial<D["config"] & MergedFeatures<F>["config"]>;
     createTreeInstance?: (prev: MergedFeatures<F>["treeInstance"], instance: MergedFeatures<F>["treeInstance"]) => D["treeInstance"] & MergedFeatures<F>["treeInstance"];
@@ -60,9 +62,6 @@ export type FeatureImplementation<T = any, D extends FeatureDef = any, F extends
     onTreeUnmount?: (instance: MergedFeatures<F>["treeInstance"], treeElement: HTMLElement) => void;
     onItemMount?: (instance: MergedFeatures<F>["itemInstance"], itemElement: HTMLElement, tree: MergedFeatures<F>["treeInstance"]) => void;
     onItemUnmount?: (instance: MergedFeatures<F>["itemInstance"], itemElement: HTMLElement, tree: MergedFeatures<F>["treeInstance"]) => void;
-    setState?: (instance: MergedFeatures<F>["treeInstance"]) => void;
-    onConfigChange?: (instance: MergedFeatures<F>["treeInstance"]) => void;
-    onStateOrConfigChange?: (instance: MergedFeatures<F>["treeInstance"]) => void;
     hotkeys?: HotkeysConfig<T, D>;
 };
 export {};

package/lib/esm/utilities/create-on-drop-handler.d.ts

@@ -0,0 +1,3 @@
+import { ItemInstance } from "../types/core";
+import { DropTarget } from "../features/drag-and-drop/types";
+export declare const createOnDropHandler: <T>(onChangeChildren: (item: ItemInstance<T>, newChildren: string[]) => void) => (items: ItemInstance<T>[], target: DropTarget<T>) => void;

package/lib/esm/utilities/create-on-drop-handler.js

@@ -0,0 +1,7 @@
+import { removeItemsFromParents } from "./remove-items-from-parents";
+import { insertItemsAtTarget } from "./insert-items-at-target";
+export const createOnDropHandler = (onChangeChildren) => (items, target) => {
+    const itemIds = items.map((item) => item.getId());
+    removeItemsFromParents(items, onChangeChildren);
+    insertItemsAtTarget(itemIds, target, onChangeChildren);
+};

package/lib/esm/utilities/insert-items-at-target.d.ts

@@ -0,0 +1,3 @@
+import { ItemInstance } from "../types/core";
+import { DropTarget } from "../features/drag-and-drop/types";
+export declare const insertItemsAtTarget: <T>(itemIds: string[], target: DropTarget<T>, onChangeChildren: (item: ItemInstance<T>, newChildrenIds: string[]) => void) => void;

package/lib/esm/utilities/insert-items-at-target.js

@@ -0,0 +1,20 @@
+export const insertItemsAtTarget = (itemIds, target, onChangeChildren) => {
+    // add moved items to new common parent, if dropped onto parent
+    if (target.childIndex === null) {
+        onChangeChildren(target.item, [
+            ...target.item.getChildren().map((item) => item.getId()),
+            ...itemIds,
+        ]);
+        // TODO items[0].getTree().rebuildTree();
+        return;
+    }
+    // add moved items to new common parent, if dropped between siblings
+    const oldChildren = target.item.getChildren();
+    const newChildren = [
+        ...oldChildren.slice(0, target.insertionIndex).map((item) => item.getId()),
+        ...itemIds,
+        ...oldChildren.slice(target.insertionIndex).map((item) => item.getId()),
+    ];
+    onChangeChildren(target.item, newChildren);
+    target.item.getTree().rebuildTree();
+};

package/lib/esm/utilities/remove-items-from-parents.d.ts

@@ -0,0 +1,2 @@
+import { ItemInstance } from "../types/core";
+export declare const removeItemsFromParents: <T>(movedItems: ItemInstance<T>[], onChangeChildren: (item: ItemInstance<T>, newChildrenIds: string[]) => void) => void;

package/lib/esm/utilities/remove-items-from-parents.js

@@ -0,0 +1,13 @@
+export const removeItemsFromParents = (movedItems, onChangeChildren) => {
+    var _a;
+    // TODO bulk sibling changes together
+    for (const item of movedItems) {
+        const siblings = (_a = item.getParent()) === null || _a === void 0 ? void 0 : _a.getChildren();
+        if (siblings) {
+            onChangeChildren(item.getParent(), siblings
+                .filter((sibling) => sibling.getId() !== item.getId())
+                .map((i) => i.getId()));
+        }
+    }
+    movedItems[0].getTree().rebuildTree();
+};

package/lib/esm/utils.d.ts

@@ -1,9 +1,6 @@
-import { ItemInstance, TreeState, Updater } from "./types/core";
-import { DropTarget } from "./features/drag-and-drop/types";
+import { TreeState, Updater } from "./types/core";
 export type NoInfer<T> = [T][T extends any ? 0 : never];
 export declare const memo: <D extends readonly any[], R>(fn: (...args_0: D) => R, deps: () => [...D]) => () => R;
 export declare function functionalUpdate<T>(updater: Updater<T>, input: T): T;
 export declare function makeStateUpdater<K extends keyof TreeState<any>>(key: K, instance: unknown): (updater: Updater<TreeState<any>[K]>) => void;
-export declare const scrollIntoView: (element: Element | undefined | null) => void;
-export declare const performItemsMove: <T>(items: ItemInstance<T>[], target: DropTarget<T>, onChangeChildren: (item: ItemInstance<T>, newChildren: ItemInstance<T>[]) => void) => void;
 export declare const poll: (fn: () => boolean, interval?: number, timeout?: number) => Promise<void>;

package/lib/esm/utils.js

@@ -31,56 +31,6 @@ export function makeStateUpdater(key, instance) {
         });
     };
 }
-export const scrollIntoView = (element) => {
-    if (!element) {
-        return;
-    }
-    if (element.scrollIntoViewIfNeeded) {
-        element.scrollIntoViewIfNeeded();
-    }
-    else {
-        const boundingBox = element.getBoundingClientRect();
-        const isElementInViewport = boundingBox.top >= 0 &&
-            boundingBox.left >= 0 &&
-            boundingBox.bottom <=
-                (window.innerHeight || document.documentElement.clientHeight) &&
-            boundingBox.right <=
-                (window.innerWidth || document.documentElement.clientWidth);
-        if (!isElementInViewport) {
-            element.scrollIntoView();
-        }
-    }
-};
-export const performItemsMove = (items, target, onChangeChildren) => {
-    var _a;
-    const numberOfDragItemsBeforeTarget = !target.childIndex
-        ? 0
-        : target.item
-            .getChildren()
-            .slice(0, target.childIndex)
-            .filter((child) => items.some((item) => item.getId() === child.getId()))
-            .length;
-    // TODO bulk sibling changes together
-    for (const item of items) {
-        const siblings = (_a = item.getParent()) === null || _a === void 0 ? void 0 : _a.getChildren();
-        if (siblings) {
-            onChangeChildren(item.getParent(), siblings.filter((sibling) => sibling.getId() !== item.getId()));
-        }
-    }
-    if (target.childIndex === null) {
-        onChangeChildren(target.item, [...target.item.getChildren(), ...items]);
-        items[0].getTree().rebuildTree();
-        return;
-    }
-    const oldChildren = target.item.getChildren();
-    const newChildren = [
-        ...oldChildren.slice(0, target.childIndex - numberOfDragItemsBeforeTarget),
-        ...items,
-        ...oldChildren.slice(target.childIndex - numberOfDragItemsBeforeTarget),
-    ];
-    onChangeChildren(target.item, newChildren);
-    items[0].getTree().rebuildTree();
-};
 export const poll = (fn, interval = 100, timeout = 1000) => new Promise((resolve) => {
     let clear;
     const i = setInterval(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-tree/core",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "main": "lib/cjs/index.js",
   "module": "lib/esm/index.js",
   "types": "lib/esm/index.d.ts",

package/src/core/create-tree.ts

@@ -30,12 +30,42 @@ const buildItemInstance = (
   return itemInstance;
 };
 
+const verifyFeatures = (features: FeatureImplementation[] | undefined) => {
+  const loadedFeatures = features?.map((feature) => feature.key);
+  for (const feature of features ?? []) {
+    const missingDependency = feature.deps?.find(
+      (dep) => !loadedFeatures?.includes(dep)
+    );
+    if (missingDependency) {
+      throw new Error(`${feature.key} needs ${missingDependency}`);
+    }
+  }
+};
+
+const compareFeatures = (
+  feature1: FeatureImplementation,
+  feature2: FeatureImplementation
+) => {
+  if (feature2.key && feature1.overwrites?.includes(feature2.key)) {
+    return 1;
+  }
+  return -1;
+};
+
+const sortFeatures = (features: FeatureImplementation[] = []) =>
+  features.sort(compareFeatures);
+
 export const createTree = <T>(
   initialConfig: TreeConfig<T>
 ): TreeInstance<T> => {
   const treeInstance: TreeInstance<T> = {} as any;
 
-  const additionalFeatures = [treeFeature, ...(initialConfig.features ?? [])];
+  const additionalFeatures = [
+    treeFeature,
+    ...sortFeatures(initialConfig.features),
+  ];
+  verifyFeatures(additionalFeatures);
+
   let state = additionalFeatures.reduce(
     (acc, feature) => feature.getInitialState?.(acc, treeInstance) ?? acc,
     initialConfig.initialState ?? initialConfig.state ?? {}
@@ -44,6 +74,10 @@ export const createTree = <T>(
     (acc, feature) => feature.getDefaultConfig?.(acc, treeInstance) ?? acc,
     initialConfig
   ) as TreeConfig<T>;
+  const stateHandlerNames = additionalFeatures.reduce(
+    (acc, feature) => ({ ...acc, ...feature.stateHandlerNames }),
+    {} as Record<string, string>
+  );
 
   let treeElement: HTMLElement | undefined | null;
   const treeDataRef: { current: any } = { current: {} };
@@ -109,10 +143,14 @@ export const createTree = <T>(
       ...prev,
       getState: () => state,
       setState: (updater) => {
-        state = typeof updater === "function" ? updater(state) : updater;
+        // Not necessary, since I think the subupdate below keeps the state fresh anyways?
+        // state = typeof updater === "function" ? updater(state) : updater;
         config.setState?.(state);
-        eachFeature((feature) => feature.setState?.(treeInstance));
-        eachFeature((feature) => feature.onStateOrConfigChange?.(treeInstance));
+      },
+      applySubStateUpdate: (stateName, updater) => {
+        state[stateName] =
+          typeof updater === "function" ? updater(state[stateName]) : updater;
+        config[stateHandlerNames[stateName]]!(state[stateName]);
       },
       rebuildTree: () => {
         rebuildItemMeta(mainFeature);
@@ -124,11 +162,7 @@ export const createTree = <T>(
 
         if (config.state) {
           state = { ...state, ...config.state };
-          eachFeature((feature) => feature.setState?.(treeInstance));
         }
-
-        eachFeature((feature) => feature.onConfigChange?.(treeInstance));
-        eachFeature((feature) => feature.onStateOrConfigChange?.(treeInstance));
       },
       getItemInstance: (itemId) => itemInstancesMap[itemId],
       getItems: () => itemInstances,
@@ -178,7 +212,6 @@ export const createTree = <T>(
     }),
   };
 
-  // todo sort features
   const features = [mainFeature, ...additionalFeatures];
 
   for (const feature of features) {

package/src/features/async-data-loader/feature.ts

@@ -10,7 +10,6 @@ export const asyncDataLoaderFeature: FeatureImplementation<
   MainFeatureDef | TreeFeatureDef<any> | AsyncDataLoaderFeatureDef<any>
 > = {
   key: "async-data-loader",
-  dependingFeatures: ["main"],
 
   getInitialState: (initialState) => ({
     loadingItems: [],
@@ -22,6 +21,10 @@ export const asyncDataLoaderFeature: FeatureImplementation<
     ...defaultConfig,
   }),
 
+  stateHandlerNames: {
+    loadingItems: "setLoadingItems",
+  },
+
   createTreeInstance: (prev, instance) => ({
     ...prev,
 
@@ -36,11 +39,14 @@ export const asyncDataLoaderFeature: FeatureImplementation<
       }
 
       if (!instance.getState().loadingItems.includes(itemId)) {
-        config.setLoadingItems?.((loadingItems) => [...loadingItems, itemId]);
+        instance.applySubStateUpdate("loadingItems", (loadingItems) => [
+          ...loadingItems,
+          itemId,
+        ]);
         config.asyncDataLoader?.getItem(itemId).then((item) => {
           dataRef.current.itemData[itemId] = item;
           config.onLoadedItem?.(itemId, item);
-          config.setLoadingItems?.((loadingItems) =>
+          instance.applySubStateUpdate("loadingItems", (loadingItems) =>
             loadingItems.filter((id) => id !== itemId)
           );
         });
@@ -62,7 +68,10 @@ export const asyncDataLoaderFeature: FeatureImplementation<
         return [];
       }
 
-      config.setLoadingItems?.((loadingItems) => [...loadingItems, itemId]);
+      instance.applySubStateUpdate("loadingItems", (loadingItems) => [
+        ...loadingItems,
+        itemId,
+      ]);
 
       if (config.asyncDataLoader?.getChildrenWithData) {
         config.asyncDataLoader?.getChildrenWithData(itemId).then((children) => {
@@ -73,7 +82,7 @@ export const asyncDataLoaderFeature: FeatureImplementation<
           const childrenIds = children.map(({ id }) => id);
           dataRef.current.childrenIds[itemId] = childrenIds;
           config.onLoadedChildren?.(itemId, childrenIds);
-          config.setLoadingItems?.((loadingItems) =>
+          instance.applySubStateUpdate("loadingItems", (loadingItems) =>
             loadingItems.filter((id) => id !== itemId)
           );
           instance.rebuildTree();
@@ -82,7 +91,7 @@ export const asyncDataLoaderFeature: FeatureImplementation<
         config.asyncDataLoader?.getChildren(itemId).then((childrenIds) => {
           dataRef.current.childrenIds[itemId] = childrenIds;
           config.onLoadedChildren?.(itemId, childrenIds);
-          config.setLoadingItems?.((loadingItems) =>
+          instance.applySubStateUpdate("loadingItems", (loadingItems) =>
             loadingItems.filter((id) => id !== itemId)
           );
           instance.rebuildTree();

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

@@ -1,5 +1,5 @@
 import { FeatureDefs, FeatureImplementation } from "../../types/core";
-import { DndDataRef, DragAndDropFeatureDef } from "./types";
+import { DndDataRef, DragAndDropFeatureDef, DragLineData } from "./types";
 import { canDrop, getDragCode, getDropTarget } from "./utils";
 import { makeStateUpdater } from "../../utils";
 
@@ -9,20 +9,64 @@ export const dragAndDropFeature: FeatureImplementation<
   FeatureDefs<any>
 > = {
   key: "dragAndDrop",
-  dependingFeatures: ["main", "tree", "selection"],
+  deps: ["selection"],
 
   getDefaultConfig: (defaultConfig, tree) => ({
     canDrop: (_, target) => target.item.isFolder(),
+    canDropForeignDragObject: () => false,
     setDndState: makeStateUpdater("dnd", tree),
     ...defaultConfig,
   }),
 
+  stateHandlerNames: {
+    dnd: "setDndState",
+  },
+
   createTreeInstance: (prev, tree) => ({
     ...prev,
 
     getDropTarget: () => {
       return tree.getState().dnd?.dragTarget ?? null;
     },
+
+    getDragLineData: (): DragLineData | null => {
+      const target = tree.getDropTarget();
+      const intend = (target?.item.getItemMeta().level ?? 0) + 1;
+
+      if (!target || target.childIndex === null) return null;
+
+      const children = target.item.getChildren();
+
+      if (target.childIndex === children.length) {
+        const bb = children[target.childIndex - 1]
+          ?.getElement()
+          ?.getBoundingClientRect();
+
+        if (bb) {
+          return {
+            intend,
+            top: bb.bottom,
+            left: bb.left,
+            right: bb.right,
+          };
+        }
+      }
+
+      const bb = children[target.childIndex]
+        ?.getElement()
+        ?.getBoundingClientRect();
+
+      if (bb) {
+        return {
+          intend,
+          top: bb.top,
+          left: bb.left,
+          right: bb.right,
+        };
+      }
+
+      return null;
+    },
   }),
 
   createItemInstance: (prev, item, tree) => ({
@@ -52,7 +96,7 @@ export const dragAndDropFeature: FeatureImplementation<
           e.dataTransfer?.setData(format, data);
         }
 
-        tree.getConfig().setDndState?.({
+        tree.applySubStateUpdate("dnd", {
           draggedItems: items,
           draggingOverItem: tree.getFocusedItem(),
         });
@@ -82,7 +126,7 @@ export const dragAndDropFeature: FeatureImplementation<
 
         dataRef.current.lastDragCode = nextDragCode;
 
-        tree.getConfig().setDndState?.((state) => ({
+        tree.applySubStateUpdate("dnd", (state) => ({
           ...state,
           dragTarget: target,
           draggingOverItem: item,
@@ -92,13 +136,24 @@ export const dragAndDropFeature: FeatureImplementation<
       onDragLeave: item.getMemoizedProp("dnd/onDragLeave", () => () => {
         const dataRef = tree.getDataRef<DndDataRef>();
         dataRef.current.lastDragCode = "no-drag";
-        tree.getConfig().setDndState?.((state) => ({
+        tree.applySubStateUpdate("dnd", (state) => ({
           ...state,
           draggingOverItem: undefined,
           dragTarget: undefined,
         }));
       }),
 
+      onDragEnd: item.getMemoizedProp("dnd/onDragEnd", () => (e) => {
+        const draggedItems = tree.getState().dnd?.draggedItems;
+        tree.applySubStateUpdate("dnd", null);
+
+        if (e.dataTransfer.dropEffect === "none" || !draggedItems) {
+          return;
+        }
+
+        tree.getConfig().onCompleteForeignDrop?.(draggedItems);
+      }),
+
       onDrop: item.getMemoizedProp("dnd/onDrop", () => (e) => {
         const dataRef = tree.getDataRef<DndDataRef>();
         const target = getDropTarget(e, item, tree);
@@ -112,7 +167,7 @@ export const dragAndDropFeature: FeatureImplementation<
         const draggedItems = tree.getState().dnd?.draggedItems;
 
         dataRef.current.lastDragCode = undefined;
-        tree.getConfig().setDndState?.(null);
+        tree.applySubStateUpdate("dnd", null);
 
         if (draggedItems) {
           config.onDrop?.(draggedItems, target);
@@ -131,19 +186,25 @@ export const dragAndDropFeature: FeatureImplementation<
     isDropTargetAbove: () => {
       const target = tree.getDropTarget();
 
-      if (!target || target.childIndex === null) return false;
-      const targetIndex = target.item.getItemMeta().index;
-
-      return targetIndex + target.childIndex + 1 === item.getItemMeta().index;
+      if (
+        !target ||
+        target.childIndex === null ||
+        target.item !== item.getParent()
+      )
+        return false;
+      return target.childIndex === item.getItemMeta().posInSet;
     },
 
     isDropTargetBelow: () => {
       const target = tree.getDropTarget();
 
-      if (!target || target.childIndex === null) return false;
-      const targetIndex = target.item.getItemMeta().index;
-
-      return targetIndex + target.childIndex === item.getItemMeta().index;
+      if (
+        !target ||
+        target.childIndex === null ||
+        target.item !== item.getParent()
+      )
+        return false;
+      return target.childIndex - 1 === item.getItemMeta().posInSet;
     },
 
     isDraggingOver: () => {