react-arborist 3.0.2 → 3.2.0

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

@@ -80,12 +80,18 @@ export declare class TreeApi<T> {
     pageDown(): void;
     select(node: Identity, opts?: {
         align?: Align;
+        focus?: boolean;
     }): void;
     deselect(node: Identity): void;
     selectMulti(identity: Identity): void;
     selectContiguous(identity: Identity): void;
     deselectAll(): void;
     selectAll(): void;
+    setSelection(args: {
+        ids: (IdObj | string)[] | null;
+        anchor: IdObj | string | null;
+        mostRecent: IdObj | string | null;
+    }): void;
     get cursorParentId(): string | null;
     get cursorOverFolder(): boolean;
     get dragNodes(): NodeApi<T>[];

package/dist/module.js

@@ -642,9 +642,9 @@ const $37bc167debff36d2$export$e324594224ef24da = {
                 id
             ]).map((0, $0e6083160f4b36ed$export$65e5b62a4c490288))
         }),
-    set: (ids)=>({
+    set: (args)=>({
             type: "SELECTION_SET",
-            ids: ids
+            ...args
         }),
     mostRecent: (id)=>({
             type: "SELECTION_MOST_RECENT",
@@ -687,7 +687,9 @@ function $37bc167debff36d2$export$1650419e431d3ba3(state = (0, $6ad32e02250c922e
         case "SELECTION_SET":
             return {
                 ...state,
-                ids: new Set(action.ids)
+                ids: action.ids,
+                mostRecent: action.mostRecent,
+                anchor: action.anchor
             };
         case "SELECTION_MOST_RECENT":
             return {
@@ -1453,20 +1455,26 @@ function $749bc746798c29ad$var$flattenTree(root) {
     return list;
 }
 function $749bc746798c29ad$var$flattenAndFilterTree(root, isMatch) {
-    function collect(node) {
-        let result = [];
+    const matches = {};
+    const list = [];
+    function markMatch(node) {
         const yes = !node.isRoot && isMatch(node);
-        if (node.children) for (let child of node.children)result = result.concat(collect(child));
-        if (result.length) {
-            if (!node.isRoot) result.unshift(node);
-            return result;
+        if (yes) {
+            matches[node.id] = true;
+            let parent = node.parent;
+            while(parent){
+                matches[parent.id] = true;
+                parent = parent.parent;
+            }
         }
-        if (yes) return [
-            node
-        ];
-        else return [];
+        if (node.children) for (let child of node.children)markMatch(child);
     }
-    const list = collect(root).filter((n)=>n.parent?.isOpen);
+    function collect(node) {
+        if (node.level >= 0 && matches[node.id]) list.push(node);
+        if (node.isOpen) node.children?.forEach(collect);
+    }
+    markMatch(root);
+    collect(root);
     list.forEach($749bc746798c29ad$var$assignRowIndex);
     return list;
 }
@@ -1720,13 +1728,14 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
     }
     select(node, opts = {}) {
         if (!node) return;
+        const changeFocus = opts.focus !== false;
         const id = $bfece7c4aed4e9c4$var$identify(node);
-        this.dispatch((0, $c27b8e9863235052$export$d7ddd398f22d79ef)(id));
+        if (changeFocus) this.dispatch((0, $c27b8e9863235052$export$d7ddd398f22d79ef)(id));
         this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).only(id));
         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);
+        if (this.focusedNode && changeFocus) $bfece7c4aed4e9c4$var$safeRun(this.props.onFocus, this.focusedNode);
         $bfece7c4aed4e9c4$var$safeRun(this.props.onSelect, this.selectedNodes);
     }
     deselect(node) {
@@ -1758,19 +1767,34 @@ class $bfece7c4aed4e9c4$export$e2da3477247342d1 {
         $bfece7c4aed4e9c4$var$safeRun(this.props.onSelect, this.selectedNodes);
     }
     deselectAll() {
-        this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).clear());
-        this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).anchor(null));
-        this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).mostRecent(null));
+        this.setSelection({
+            ids: [],
+            anchor: null,
+            mostRecent: null
+        });
         $bfece7c4aed4e9c4$var$safeRun(this.props.onSelect, this.selectedNodes);
     }
     selectAll() {
-        this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).set(new Set(Object.keys(this.idToIndex))));
+        this.setSelection({
+            ids: Object.keys(this.idToIndex),
+            anchor: this.firstNode,
+            mostRecent: this.lastNode
+        });
         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);
     }
+    setSelection(args) {
+        const ids = new Set(args.ids?.map($bfece7c4aed4e9c4$var$identify));
+        const anchor = $bfece7c4aed4e9c4$var$identifyNull(args.anchor);
+        const mostRecent = $bfece7c4aed4e9c4$var$identifyNull(args.mostRecent);
+        this.dispatch((0, $37bc167debff36d2$export$e324594224ef24da).set({
+            ids: ids,
+            anchor: anchor,
+            mostRecent: mostRecent
+        }));
+        $bfece7c4aed4e9c4$var$safeRun(this.props.onSelect, this.selectedNodes);
+    }
     /* Drag and Drop */ get cursorParentId() {
         const { cursor: cursor  } = this.state.dnd;
         switch(cursor.type){
@@ -2031,7 +2055,9 @@ function $dac24389e46ba09d$export$c49dab5eb1b4ce0c({ treeProps: treeProps , impe
     ]);
     /* Expose the tree api */ (0, $g00cZ$useImperativeHandle)(imperativeHandle, ()=>api);
     /* Change selection based on props */ (0, $g00cZ$useEffect)(()=>{
-        if (api.props.selection) api.select(api.props.selection);
+        if (api.props.selection) api.select(api.props.selection, {
+            focus: false
+        });
         else api.deselectAll();
     }, [
         api.props.selection
@@ -2054,6 +2080,9 @@ function $dac24389e46ba09d$export$c49dab5eb1b4ce0c({ treeProps: treeProps , impe
                         options: {
                             rootElement: api.props.dndRootElement || undefined
                         },
+                        ...treeProps.dndManager && {
+                            manager: treeProps.dndManager
+                        },
                         children: children
                     })
                 })