react-arborist 2.0.0-rc.1 → 2.0.0

package/dist/interfaces/node-api.d.ts

@@ -27,21 +27,26 @@ export declare class NodeApi<T extends IdObj = IdObj> {
     get isLeaf(): boolean;
     get isInternal(): boolean;
     get isOpen(): boolean;
+    get isClosed(): boolean;
     get isEditing(): boolean;
     get isSelected(): boolean;
+    get isOnlySelection(): boolean;
     get isSelectedStart(): boolean;
     get isSelectedEnd(): boolean;
     get isFocused(): boolean;
     get isDragging(): boolean;
     get willReceiveDrop(): boolean;
     get state(): {
-        isEditing: boolean;
+        isClosed: boolean;
         isDragging: boolean;
-        isSelected: boolean;
-        isSelectedStart: boolean;
-        isSelectedEnd: boolean;
+        isEditing: boolean;
         isFocused: boolean;
+        isInternal: boolean;
+        isLeaf: boolean;
         isOpen: boolean;
+        isSelected: boolean;
+        isSelectedEnd: boolean;
+        isSelectedStart: boolean;
         willReceiveDrop: boolean;
     };
     get childIndex(): number;

package/dist/interfaces/tree-api.d.ts

@@ -59,7 +59,11 @@ export declare class TreeApi<T extends IdObj> {
     get editingId(): string | null;
     createInternal(): Promise<void>;
     createLeaf(): Promise<void>;
-    private create;
+    create(opts?: {
+        type?: "internal" | "leaf";
+        parentId?: null | string;
+        index?: null | number;
+    }): Promise<void>;
     delete(node: string | IdObj | null | string[] | IdObj[]): Promise<void>;
     edit(node: string | IdObj): Promise<EditResult>;
     submit(node: Identity, value: string): Promise<void>;
@@ -90,10 +94,15 @@ export declare class TreeApi<T extends IdObj> {
     toggle(identity: Identity): void;
     openParents(identity: Identity): void;
     openSiblings(node: NodeApi<T>): void;
+    openAll(): void;
+    closeAll(): void;
     scrollTo(identity: Identity, align?: Align): Promise<void> | undefined;
     get isEditing(): boolean;
     get isFiltered(): boolean;
     get hasFocus(): boolean;
+    get hasNoSelection(): boolean;
+    get hasOneSelection(): boolean;
+    get hasMultipleSelections(): boolean;
     isSelected(id?: string): boolean;
     isOpen(id?: string): boolean;
     isDraggable(data: T): boolean;
@@ -109,5 +118,5 @@ export declare class TreeApi<T extends IdObj> {
     get renderRow(): import("react").ElementType<import("..").RowRendererProps<T>> | typeof DefaultRow;
     get renderNode(): import("react").ElementType<import("..").NodeRendererProps<T>> | typeof DefaultNode;
     get renderDragPreview(): import("react").ComponentType<import("..").DragPreviewProps> | typeof DefaultDragPreview;
-    get renderCursor(): import("react").ComponentType<import("..").DropCursorProps> | import("react").NamedExoticComponent<import("..").DropCursorProps>;
+    get renderCursor(): import("react").ComponentType<import("..").CursorProps> | import("react").NamedExoticComponent<import("..").CursorProps>;
 }

package/dist/module.js

@@ -51,6 +51,7 @@ $parcel$export($0e6083160f4b36ed$exports, "isDecendent", () => $0e6083160f4b36ed
 $parcel$export($0e6083160f4b36ed$exports, "indexOf", () => $0e6083160f4b36ed$export$305f7d4e9d4624f2);
 $parcel$export($0e6083160f4b36ed$exports, "noop", () => $0e6083160f4b36ed$export$8793edee2d425525);
 $parcel$export($0e6083160f4b36ed$exports, "dfs", () => $0e6083160f4b36ed$export$51b654aff22fc5a6);
+$parcel$export($0e6083160f4b36ed$exports, "walk", () => $0e6083160f4b36ed$export$588732934346abbf);
 $parcel$export($0e6083160f4b36ed$exports, "focusNextElement", () => $0e6083160f4b36ed$export$3b0237e8566c8d65);
 $parcel$export($0e6083160f4b36ed$exports, "focusPrevElement", () => $0e6083160f4b36ed$export$33b47db07a82b2fb);
 $parcel$export($0e6083160f4b36ed$exports, "access", () => $0e6083160f4b36ed$export$9bb0e144ba4929ca);
@@ -59,6 +60,8 @@ $parcel$export($0e6083160f4b36ed$exports, "identify", () => $0e6083160f4b36ed$ex
 $parcel$export($0e6083160f4b36ed$exports, "mergeRefs", () => $0e6083160f4b36ed$export$c9058316764c140e);
 $parcel$export($0e6083160f4b36ed$exports, "safeRun", () => $0e6083160f4b36ed$export$c6d63370cef03886);
 $parcel$export($0e6083160f4b36ed$exports, "waitFor", () => $0e6083160f4b36ed$export$9bbfceb27f687c1b);
+$parcel$export($0e6083160f4b36ed$exports, "getInsertIndex", () => $0e6083160f4b36ed$export$e12bf2314d0bc2a9);
+$parcel$export($0e6083160f4b36ed$exports, "getInsertParentId", () => $0e6083160f4b36ed$export$58fe32731f07ed56);
 function $0e6083160f4b36ed$export$adf7c0fe6059d774(n, min, max) {
     return Math.max(Math.min(n, max), min);
 }
@@ -90,6 +93,10 @@ function $0e6083160f4b36ed$export$51b654aff22fc5a6(node, id) {
     }
     return null;
 }
+function $0e6083160f4b36ed$export$588732934346abbf(node, fn) {
+    fn(node);
+    if (node.children) for (let child of node.children)$0e6083160f4b36ed$export$588732934346abbf(child, fn);
+}
 function $0e6083160f4b36ed$export$3b0237e8566c8d65(target) {
     const elements = $0e6083160f4b36ed$var$getFocusable(target);
     let next;
@@ -162,6 +169,20 @@ function $0e6083160f4b36ed$export$9bbfceb27f687c1b(fn) {
         check();
     });
 }
+function $0e6083160f4b36ed$export$e12bf2314d0bc2a9(tree) {
+    const focus = tree.focusedNode;
+    if (!focus) return tree.root.children?.length ?? 0;
+    if (focus.isOpen) return 0;
+    if (focus.parent) return focus.childIndex + 1;
+    return 0;
+}
+function $0e6083160f4b36ed$export$58fe32731f07ed56(tree) {
+    const focus = tree.focusedNode;
+    if (!focus) return null;
+    if (focus.isOpen) return focus.id;
+    if (focus.parent) return focus.parent.id;
+    return null;
+}
 
 
 
@@ -347,12 +368,18 @@ class $096e74084443e9a3$export$d4b903da0f522dc8 {
     get isOpen() {
         return this.isLeaf ? false : this.tree.isOpen(this.id);
     }
+    get isClosed() {
+        return this.isLeaf ? false : !this.tree.isOpen(this.id);
+    }
     get isEditing() {
         return this.tree.editingId === this.id;
     }
     get isSelected() {
         return this.tree.isSelected(this.id);
     }
+    get isOnlySelection() {
+        return this.isSelected && this.tree.hasOneSelection;
+    }
     get isSelectedStart() {
         return this.isSelected && !this.prev?.isSelected;
     }
@@ -370,13 +397,16 @@ class $096e74084443e9a3$export$d4b903da0f522dc8 {
     }
     get state() {
         return {
-            isEditing: this.isEditing,
+            isClosed: this.isClosed,
             isDragging: this.isDragging,
-            isSelected: this.isSelected,
-            isSelectedStart: this.isSelectedStart,
-            isSelectedEnd: this.isSelectedEnd,
+            isEditing: this.isEditing,
             isFocused: this.isFocused,
+            isInternal: this.isInternal,
+            isLeaf: this.isLeaf,
             isOpen: this.isOpen,
+            isSelected: this.isSelected,
+            isSelectedEnd: this.isSelectedEnd,
+            isSelectedStart: this.isSelectedStart,
             willReceiveDrop: this.willReceiveDrop
         };
     }
@@ -812,7 +842,7 @@ const $77d34d95e44d2f58$var$PreviewNode = /*#__PURE__*/ (0, $g00cZ$memo)(functio
 
 
 
-function $f608be224a71d6f5$export$ef961593063b03e8() {
+function $f608be224a71d6f5$export$b6a79797ad180576() {
     const tree = (0, $89e93131aae74bd9$export$367b0f2231a90ba0)();
     const state = (0, $89e93131aae74bd9$export$4930f6bf413be70e)();
     const cursor = state.cursor;
@@ -855,10 +885,7 @@ const $05f64c7ebcbad8b5$var$DropContainer = ()=>{
             left: "0",
             right: "0"
         },
-        onClick: (e)=>{
-            console.log(e.currentTarget, e.target);
-        },
-        children: /*#__PURE__*/ (0, $g00cZ$jsx)((0, $f608be224a71d6f5$export$ef961593063b03e8), {})
+        children: /*#__PURE__*/ (0, $g00cZ$jsx)((0, $f608be224a71d6f5$export$b6a79797ad180576), {})
     });
 };
 
@@ -1207,7 +1234,8 @@ const $8c3aed0a01f84486$export$a9754b3c8daa5172 = /*#__PURE__*/ (0, $g00cZ$react
         "aria-level": node.level,
         "aria-selected": node.isSelected,
         style: rowStyle,
-        tabIndex: -1
+        tabIndex: -1,
+        className: tree.props.rowClassName
     };
     (0, $g00cZ$useEffect)(()=>{
         if (!node.isEditing && node.isFocused) el.current?.focus();
@@ -1509,16 +1537,16 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
         return this.state.nodes.open.unfiltered;
     }
     /* Tree Props */ get width() {
-        return this.props.width || 300;
+        return this.props.width ?? 300;
     }
     get height() {
-        return this.props.height || 500;
+        return this.props.height ?? 500;
     }
     get indent() {
-        return this.props.indent || 24;
+        return this.props.indent ?? 24;
     }
     get rowHeight() {
-        return this.props.rowHeight || 24;
+        return this.props.rowHeight ?? 24;
     }
     get searchTerm() {
         return (this.props.searchTerm || "").trim();
@@ -1588,31 +1616,20 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
         return this.state.nodes.edit.id;
     }
     createInternal() {
-        return this.create("internal");
+        return this.create({
+            type: "internal"
+        });
     }
     createLeaf() {
-        return this.create("leaf");
-    }
-    async create(type) {
-        let index;
-        let parentId;
-        const focus = this.focusedNode;
-        if (focus && focus.parent) {
-            if (focus.isInternal && focus.isOpen) {
-                parentId = focus.id;
-                index = 0;
-            } else {
-                index = focus.childIndex + 1;
-                parentId = focus.parent.isRoot ? null : focus.parent.id;
-            }
-        } else {
-            index = this.root?.children?.length || -1;
-            parentId = null;
-        }
+        return this.create({
+            type: "leaf"
+        });
+    }
+    async create(opts = {}) {
         const data = await $bfece7c4aed4e9c4$var$safeRun(this.props.onCreate, {
-            parentId: parentId,
-            index: index,
-            type: type
+            type: opts.type ?? "leaf",
+            parentId: opts.parentId === undefined ? $0e6083160f4b36ed$exports.getInsertParentId(this) : opts.parentId,
+            index: opts.index ?? $0e6083160f4b36ed$exports.getInsertIndex(this)
         });
         if (data) {
             this.focus(data);
@@ -1695,6 +1712,7 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
         else {
             this.dispatch((0, $c27b8e9863235052$export$d7ddd398f22d79ef)($bfece7c4aed4e9c4$var$identify(node)));
             if (opts.scroll !== false) this.scrollTo(node);
+            if (this.focusedNode) $bfece7c4aed4e9c4$var$safeRun(this.props.onFocus, this.focusedNode);
         }
     }
     pageUp() {
@@ -1723,6 +1741,7 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
         this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).anchor(id));
         this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).mostRecent(id));
         this.scrollTo(id, opts.align);
+        if (this.focusedNode) $bfece7c4aed4e9c4$var$safeRun(this.props.onFocus, this.focusedNode);
         $bfece7c4aed4e9c4$var$safeRun(this.props.onSelect, this.selectedNodes);
     }
     deselect(node) {
@@ -1738,6 +1757,7 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
         this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).anchor(node.id));
         this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).mostRecent(node.id));
         this.scrollTo(node);
+        if (this.focusedNode) $bfece7c4aed4e9c4$var$safeRun(this.props.onFocus, this.focusedNode);
         $bfece7c4aed4e9c4$var$safeRun(this.props.onSelect, this.selectedNodes);
     }
     selectContiguous(identity) {
@@ -1749,6 +1769,7 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
         this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).add(this.nodesBetween(anchor, $bfece7c4aed4e9c4$var$identifyNull(id))));
         this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).mostRecent(id));
         this.scrollTo(id);
+        if (this.focusedNode) $bfece7c4aed4e9c4$var$safeRun(this.props.onFocus, this.focusedNode);
         $bfece7c4aed4e9c4$var$safeRun(this.props.onSelect, this.selectedNodes);
     }
     deselectAll() {
@@ -1762,6 +1783,7 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
         this.dispatch((0, $c27b8e9863235052$export$d7ddd398f22d79ef)(this.lastNode?.id));
         this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).anchor(this.firstNode));
         this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).mostRecent(this.lastNode));
+        if (this.focusedNode) $bfece7c4aed4e9c4$var$safeRun(this.props.onFocus, this.focusedNode);
         $bfece7c4aed4e9c4$var$safeRun(this.props.onSelect, this.selectedNodes);
     }
     /* Drag and Drop */ get cursorParentId() {
@@ -1787,12 +1809,16 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
     /* Visibility */ open(identity) {
         const id = $bfece7c4aed4e9c4$var$identifyNull(identity);
         if (!id) return;
+        if (this.isOpen(id)) return;
         this.dispatch((0, $3c0bad2888bcd4bc$export$e324594224ef24da).open(id, this.isFiltered));
+        $bfece7c4aed4e9c4$var$safeRun(this.props.onToggle, id);
     }
     close(identity) {
         const id = $bfece7c4aed4e9c4$var$identifyNull(identity);
         if (!id) return;
+        if (!this.isOpen(id)) return;
         this.dispatch((0, $3c0bad2888bcd4bc$export$e324594224ef24da).close(id, this.isFiltered));
+        $bfece7c4aed4e9c4$var$safeRun(this.props.onToggle, id);
     }
     toggle(identity) {
         const id = $bfece7c4aed4e9c4$var$identifyNull(identity);
@@ -1818,6 +1844,16 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
             this.scrollTo(this.focusedNode);
         }
     }
+    openAll() {
+        $0e6083160f4b36ed$exports.walk(this.root, (node)=>{
+            if (node.isInternal) node.open();
+        });
+    }
+    closeAll() {
+        $0e6083160f4b36ed$exports.walk(this.root, (node)=>{
+            if (node.isInternal) node.close();
+        });
+    }
     /* Scrolling */ scrollTo(identity, align = "smart") {
         if (!identity) return;
         const id = $bfece7c4aed4e9c4$var$identify(identity);
@@ -1839,6 +1875,15 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
     get hasFocus() {
         return this.state.nodes.focus.treeFocused;
     }
+    get hasNoSelection() {
+        return this.state.nodes.selection.ids.size === 0;
+    }
+    get hasOneSelection() {
+        return this.state.nodes.selection.ids.size === 1;
+    }
+    get hasMultipleSelections() {
+        return this.state.nodes.selection.ids.size > 1;
+    }
     isSelected(id) {
         if (!id) return false;
         return this.state.nodes.selection.ids.has(id);
@@ -2012,6 +2057,7 @@ function $dac24389e46ba09d$export$c49dab5eb1b4ce0c({ treeProps: treeProps , impe
 
 
 
+
 function $e739455e59c6aed3$export$5a6c424b1725f44f() {
     const tree = (0, $89e93131aae74bd9$export$367b0f2231a90ba0)();
     // In case we drop an item at the bottom of the list
@@ -2021,9 +2067,28 @@ function $e739455e59c6aed3$export$5a6c424b1725f44f() {
                 if (!m.isOver({
                     shallow: true
                 })) return;
+                if (m.canDrop()) {
+                    const offset = m.getClientOffset();
+                    if (!tree.listEl.current || !offset) return;
+                    const { cursor: cursor  } = (0, $2db980bfed6822da$export$f502ca02ebb85a1c)({
+                        element: tree.listEl.current,
+                        offset: offset,
+                        indent: tree.indent,
+                        node: null,
+                        prevNode: tree.visibleNodes[tree.visibleNodes.length - 1],
+                        nextNode: null
+                    });
+                    if (cursor) tree.showCursor(cursor);
+                } else tree.hideCursor();
+            },
+            canDrop: (item, m)=>{
+                if (!m.isOver({
+                    shallow: true
+                })) return false;
+                if (tree.isFiltered) return false;
                 const offset = m.getClientOffset();
-                if (!tree.listEl.current || !offset) return;
-                const { cursor: cursor  } = (0, $2db980bfed6822da$export$f502ca02ebb85a1c)({
+                if (!tree.listEl.current || !offset) return false;
+                const { drop: drop  } = (0, $2db980bfed6822da$export$f502ca02ebb85a1c)({
                     element: tree.listEl.current,
                     offset: offset,
                     indent: tree.indent,
@@ -2031,12 +2096,15 @@ function $e739455e59c6aed3$export$5a6c424b1725f44f() {
                     prevNode: tree.visibleNodes[tree.visibleNodes.length - 1],
                     nextNode: null
                 });
-                if (cursor) tree.showCursor(cursor);
-            },
-            canDrop: (item, m)=>{
-                return m.isOver({
-                    shallow: true
-                });
+                if (!drop) return false;
+                const dropParent = tree.get(drop.parentId) ?? tree.root;
+                for (let id of item.dragIds){
+                    const drag = tree.get(id);
+                    if (!drag) return false;
+                    if (!dropParent) return false;
+                    if (drag.isInternal && (0, $0e6083160f4b36ed$export$1e38f72c6c546f70)(dropParent, drag)) return false;
+                }
+                return true;
             },
             drop: (item, m)=>{
                 if (m.didDrop()) return;