react-arborist 3.0.2 → 3.1.0

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

@@ -80,6 +80,7 @@ export declare class TreeApi<T> {
     pageDown(): void;
     select(node: Identity, opts?: {
         align?: Align;
+        focus?: boolean;
     }): void;
     deselect(node: Identity): void;
     selectMulti(identity: Identity): void;

package/dist/module.js

@@ -1453,20 +1453,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 +1726,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) {
@@ -2031,7 +2038,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 +2063,9 @@ function $dac24389e46ba09d$export$c49dab5eb1b4ce0c({ treeProps: treeProps , impe
                         options: {
                             rootElement: api.props.dndRootElement || undefined
                         },
+                        ...treeProps.dndManager && {
+                            manager: treeProps.dndManager
+                        },
                         children: children
                     })
                 })