react-arborist 3.2.0 → 3.3.0-rc.1

package/dist/dnd/drop-hook.d.ts

@@ -3,6 +3,6 @@ import { ConnectDropTarget } from "react-dnd";
 import { NodeApi } from "../interfaces/node-api";
 export declare type DropResult = {
     parentId: string | null;
-    index: number;
+    index: number | null;
 };
 export declare function useDropHook(el: RefObject<HTMLElement | null>, node: NodeApi<any>): ConnectDropTarget;

package/dist/index.js

@@ -68,7 +68,7 @@ var $eb5355379510ac9b$exports = {};
 $parcel$export($eb5355379510ac9b$exports, "bound", () => $eb5355379510ac9b$export$adf7c0fe6059d774);
 $parcel$export($eb5355379510ac9b$exports, "isItem", () => $eb5355379510ac9b$export$5318634f2ee07019);
 $parcel$export($eb5355379510ac9b$exports, "isClosed", () => $eb5355379510ac9b$export$4210f5ea57fbae57);
-$parcel$export($eb5355379510ac9b$exports, "isDecendent", () => $eb5355379510ac9b$export$1e38f72c6c546f70);
+$parcel$export($eb5355379510ac9b$exports, "isDescendant", () => $eb5355379510ac9b$export$8503f9d2928f9a64);
 $parcel$export($eb5355379510ac9b$exports, "indexOf", () => $eb5355379510ac9b$export$305f7d4e9d4624f2);
 $parcel$export($eb5355379510ac9b$exports, "noop", () => $eb5355379510ac9b$export$8793edee2d425525);
 $parcel$export($eb5355379510ac9b$exports, "dfs", () => $eb5355379510ac9b$export$51b654aff22fc5a6);
@@ -92,7 +92,7 @@ function $eb5355379510ac9b$export$5318634f2ee07019(node) {
 function $eb5355379510ac9b$export$4210f5ea57fbae57(node) {
     return node && node.isInternal && !node.isOpen;
 }
-const $eb5355379510ac9b$export$1e38f72c6c546f70 = (a, b)=>{
+const $eb5355379510ac9b$export$8503f9d2928f9a64 = (a, b)=>{
     let n = a;
     while(n){
         if (n.id === b.id) return true;
@@ -449,6 +449,15 @@ class $9b37fe5960a1a3c6$export$d4b903da0f522dc8 {
         const i = this.childIndex;
         return this.parent?.children[i + 1] ?? null;
     }
+    isAncestorOf(node) {
+        if (!node) return false;
+        let ancestor = node;
+        while(ancestor){
+            if (ancestor.id === this.id) return true;
+            ancestor = ancestor.parent;
+        }
+        return false;
+    }
     select() {
         this.tree.select(this);
     }
@@ -623,7 +632,9 @@ const $9d556ecd8e421ffe$export$d4c72bab9d6cc13a = (props)=>({
             },
             drag: {
                 id: null,
-                idWillReceiveDrop: null
+                selectedIds: [],
+                destinationParentId: null,
+                destinationIndex: null
             },
             selection: {
                 ids: new Set(),
@@ -982,7 +993,7 @@ function $74bee24dbb0f3e2b$export$715c0d031ede7907(node) {
                     (0, $eb5355379510ac9b$export$c6d63370cef03886)(tree.props.onMove, {
                         dragIds: dragIds,
                         parentId: parentId === (0, $0d7f39915c1a8ae9$export$ec71a3379b43ae5c) ? null : parentId,
-                        index: index,
+                        index: index === null ? 0 : index,
                         dragNodes: tree.dragNodes,
                         parentNode: tree.get(parentId)
                     });
@@ -1027,7 +1038,7 @@ function $462841de7cc5b715$var$measureHover(el, offset) {
     };
 }
 function $462841de7cc5b715$var$getNodesAroundCursor(node, prev, next, hover) {
-    if (!node) // We're hoving over the empty part of the list, not over an item,
+    if (!node) // We're hovering over the empty part of the list, not over an item,
     // Put the cursor below the last item which is "prev"
     return [
         prev,
@@ -1111,7 +1122,7 @@ function $462841de7cc5b715$export$f502ca02ebb85a1c(args) {
     const { node: node , nextNode: nextNode , prevNode: prevNode  } = args;
     const [above, below] = $462841de7cc5b715$var$getNodesAroundCursor(node, prevNode, nextNode, hover);
     /* Hovering over the middle of a folder */ if (node && node.isInternal && hover.inMiddle) return {
-        drop: $462841de7cc5b715$var$dropAt(node.id, 0),
+        drop: $462841de7cc5b715$var$dropAt(node.id, null),
         cursor: $462841de7cc5b715$var$highlightCursor(node.id)
     };
     /* At the top of the list */ if (!above) return {
@@ -1831,6 +1842,15 @@ class $5c74fef433be2b0a$export$e2da3477247342d1 {
     get dragNodes() {
         return this.state.dnd.dragIds.map((id)=>this.get(id)).filter((n)=>!!n);
     }
+    get dragNode() {
+        return this.get(this.state.nodes.drag.id);
+    }
+    get dragDestinationParent() {
+        return this.get(this.state.nodes.drag.destinationParentId);
+    }
+    get dragDestinationIndex() {
+        return this.state.nodes.drag.destinationIndex;
+    }
     canDrop() {
         if (this.isFiltered) return false;
         const parentNode = this.get(this.state.dnd.parentId) ?? this.root;
@@ -1839,13 +1859,13 @@ class $5c74fef433be2b0a$export$e2da3477247342d1 {
         for (const drag of dragNodes){
             if (!drag) return false;
             if (!parentNode) return false;
-            if (drag.isInternal && $eb5355379510ac9b$exports.isDecendent(parentNode, drag)) return false;
+            if (drag.isInternal && $eb5355379510ac9b$exports.isDescendant(parentNode, drag)) return false;
         }
         // Allow the user to insert their own logic
         if (typeof isDisabled == "function") return !isDisabled({
             parentNode: parentNode,
             dragNodes: this.dragNodes,
-            index: this.state.dnd.index
+            index: this.state.dnd.index || 0
         });
         else if (typeof isDisabled == "string") // @ts-ignore
         return !parentNode.data[isDisabled];
@@ -1971,7 +1991,8 @@ class $5c74fef433be2b0a$export$e2da3477247342d1 {
     willReceiveDrop(node) {
         const id = $5c74fef433be2b0a$var$identifyNull(node);
         if (!id) return false;
-        return id === this.state.nodes.drag.idWillReceiveDrop;
+        const { destinationParentId: destinationParentId , destinationIndex: destinationIndex  } = this.state.nodes.drag;
+        return id === destinationParentId && destinationIndex === null;
     }
     /* Tree Event Handlers */ onFocus() {
         const node = this.focusedNode || this.firstNode;
@@ -2009,30 +2030,28 @@ class $5c74fef433be2b0a$export$e2da3477247342d1 {
 
 
 
-function $2f73c1963cd9aa06$export$1650419e431d3ba3(state = {
-    id: null,
-    idWillReceiveDrop: null
-}, action) {
+
+function $2f73c1963cd9aa06$export$1650419e431d3ba3(state = (0, $9d556ecd8e421ffe$export$d4c72bab9d6cc13a)().nodes.drag, action) {
     switch(action.type){
         case "DND_DRAG_START":
             return {
                 ...state,
-                id: action.id
+                id: action.id,
+                selectedIds: action.dragIds
             };
         case "DND_DRAG_END":
             return {
                 ...state,
-                id: null
-            };
-        case "DND_CURSOR":
-            const c = action.cursor;
-            if (c.type === "highlight" && c.id !== state.idWillReceiveDrop) return {
-                ...state,
-                idWillReceiveDrop: c.id
+                id: null,
+                destinationParentId: null,
+                destinationIndex: null,
+                selectedIds: []
             };
-            else if (c.type !== "highlight" && state.idWillReceiveDrop !== null) return {
+        case "DND_HOVERING":
+            if (action.parentId !== state.destinationParentId || action.index != state.destinationIndex) return {
                 ...state,
-                idWillReceiveDrop: null
+                destinationParentId: action.parentId,
+                destinationIndex: action.index
             };
             else return state;
         default: