react-arborist 3.4.1 → 3.4.3

package/dist/main/components/row-container.js

@@ -68,6 +68,7 @@ exports.RowContainer = react_1.default.memo(function RowContainer({ index, style
         role: "treeitem",
         "aria-level": node.level + 1,
         "aria-selected": node.isSelected,
+        "aria-expanded": node.isOpen,
         style: rowStyle,
         tabIndex: -1,
         className: tree.props.rowClassName,

package/dist/main/dnd/drag-hook.js

@@ -6,8 +6,6 @@ const react_dnd_1 = require("react-dnd");
 const react_dnd_html5_backend_1 = require("react-dnd-html5-backend");
 const context_1 = require("../context");
 const dnd_slice_1 = require("../state/dnd-slice");
-const utils_1 = require("../utils");
-const create_root_1 = require("../data/create-root");
 function useDragHook(node) {
     const tree = (0, context_1.useTreeApi)();
     const ids = tree.selectedIds;
@@ -22,19 +20,6 @@ function useDragHook(node) {
         },
         end: () => {
             tree.hideCursor();
-            let { parentId, index, dragIds } = tree.state.dnd;
-            // If they held down meta, we need to create a copy
-            // if (drop.dropEffect === "copy")
-            if (tree.canDrop()) {
-                (0, utils_1.safeRun)(tree.props.onMove, {
-                    dragIds,
-                    parentId: parentId === create_root_1.ROOT_ID ? null : parentId,
-                    index: index === null ? 0 : index, // When it's null it was dropped over a folder
-                    dragNodes: tree.dragNodes,
-                    parentNode: tree.get(parentId),
-                });
-                tree.open(parentId);
-            }
             tree.dispatch(dnd_slice_1.actions.dragEnd());
         },
     }), [ids, node]);

package/dist/main/dnd/drop-hook.js

@@ -5,6 +5,8 @@ const react_dnd_1 = require("react-dnd");
 const context_1 = require("../context");
 const compute_drop_1 = require("./compute-drop");
 const dnd_slice_1 = require("../state/dnd-slice");
+const utils_1 = require("../utils");
+const create_root_1 = require("../data/create-root");
 function useDropHook(el, node) {
     const tree = (0, context_1.useTreeApi)();
     const [_, dropRef] = (0, react_dnd_1.useDrop)(() => ({
@@ -35,6 +37,15 @@ function useDropHook(el, node) {
         drop: (_, m) => {
             if (!m.canDrop())
                 return null;
+            let { parentId, index, dragIds } = tree.state.dnd;
+            (0, utils_1.safeRun)(tree.props.onMove, {
+                dragIds,
+                parentId: parentId === create_root_1.ROOT_ID ? null : parentId,
+                index: index === null ? 0 : index, // When it's null it was dropped over a folder
+                dragNodes: tree.dragNodes,
+                parentNode: tree.get(parentId),
+            });
+            tree.open(parentId);
         },
     }), [node, el.current, tree.props]);
     return dropRef;

package/dist/main/interfaces/tree-api.js

@@ -347,6 +347,7 @@ class TreeApi {
             return;
         const id = identify(node);
         this.dispatch(selection_slice_1.actions.remove(id));
+        safeRun(this.props.onSelect, this.selectedNodes);
     }
     selectMulti(identity) {
         const node = this.get(identifyNull(identity));

package/dist/module/components/row-container.js

@@ -42,6 +42,7 @@ export const RowContainer = React.memo(function RowContainer({ index, style, })
         role: "treeitem",
         "aria-level": node.level + 1,
         "aria-selected": node.isSelected,
+        "aria-expanded": node.isOpen,
         style: rowStyle,
         tabIndex: -1,
         className: tree.props.rowClassName,

package/dist/module/dnd/drag-hook.js

@@ -3,8 +3,6 @@ import { useDrag } from "react-dnd";
 import { getEmptyImage } from "react-dnd-html5-backend";
 import { useTreeApi } from "../context";
 import { actions as dnd } from "../state/dnd-slice";
-import { safeRun } from "../utils";
-import { ROOT_ID } from "../data/create-root";
 export function useDragHook(node) {
     const tree = useTreeApi();
     const ids = tree.selectedIds;
@@ -19,19 +17,6 @@ export function useDragHook(node) {
         },
         end: () => {
             tree.hideCursor();
-            let { parentId, index, dragIds } = tree.state.dnd;
-            // If they held down meta, we need to create a copy
-            // if (drop.dropEffect === "copy")
-            if (tree.canDrop()) {
-                safeRun(tree.props.onMove, {
-                    dragIds,
-                    parentId: parentId === ROOT_ID ? null : parentId,
-                    index: index === null ? 0 : index, // When it's null it was dropped over a folder
-                    dragNodes: tree.dragNodes,
-                    parentNode: tree.get(parentId),
-                });
-                tree.open(parentId);
-            }
             tree.dispatch(dnd.dragEnd());
         },
     }), [ids, node]);

package/dist/module/dnd/drop-hook.js

@@ -2,6 +2,8 @@ import { useDrop } from "react-dnd";
 import { useTreeApi } from "../context";
 import { computeDrop } from "./compute-drop";
 import { actions as dnd } from "../state/dnd-slice";
+import { safeRun } from "../utils";
+import { ROOT_ID } from "../data/create-root";
 export function useDropHook(el, node) {
     const tree = useTreeApi();
     const [_, dropRef] = useDrop(() => ({
@@ -32,6 +34,15 @@ export function useDropHook(el, node) {
         drop: (_, m) => {
             if (!m.canDrop())
                 return null;
+            let { parentId, index, dragIds } = tree.state.dnd;
+            safeRun(tree.props.onMove, {
+                dragIds,
+                parentId: parentId === ROOT_ID ? null : parentId,
+                index: index === null ? 0 : index, // When it's null it was dropped over a folder
+                dragNodes: tree.dragNodes,
+                parentNode: tree.get(parentId),
+            });
+            tree.open(parentId);
         },
     }), [node, el.current, tree.props]);
     return dropRef;

package/dist/module/interfaces/tree-api.js

@@ -321,6 +321,7 @@ export class TreeApi {
             return;
         const id = identify(node);
         this.dispatch(selection.remove(id));
+        safeRun(this.props.onSelect, this.selectedNodes);
     }
     selectMulti(identity) {
         const node = this.get(identifyNull(identity));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-arborist",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "license": "MIT",
   "source": "src/index.ts",
   "main": "dist/main/index.js",
@@ -40,7 +40,7 @@
   "dependencies": {
     "react-dnd": "^14.0.3",
     "react-dnd-html5-backend": "^14.0.3",
-    "react-window": "^1.8.10",
+    "react-window": "^1.8.11",
     "redux": "^5.0.0",
     "use-sync-external-store": "^1.2.0"
   },

package/src/components/row-container.tsx

@@ -60,6 +60,7 @@ export const RowContainer = React.memo(function RowContainer<T>({
     role: "treeitem",
     "aria-level": node.level + 1,
     "aria-selected": node.isSelected,
+    "aria-expanded": node.isOpen,
     style: rowStyle,
     tabIndex: -1,
     className: tree.props.rowClassName,

package/src/dnd/drag-hook.ts

@@ -6,8 +6,6 @@ import { NodeApi } from "../interfaces/node-api";
 import { DragItem } from "../types/dnd";
 import { DropResult } from "./drop-hook";
 import { actions as dnd } from "../state/dnd-slice";
-import { safeRun } from "../utils";
-import { ROOT_ID } from "../data/create-root";
 
 export function useDragHook<T>(node: NodeApi<T>): ConnectDragSource {
   const tree = useTreeApi();
@@ -24,23 +22,10 @@ export function useDragHook<T>(node: NodeApi<T>): ConnectDragSource {
       },
       end: () => {
         tree.hideCursor();
-        let { parentId, index, dragIds } = tree.state.dnd;
-        // If they held down meta, we need to create a copy
-        // if (drop.dropEffect === "copy")
-        if (tree.canDrop()) {
-          safeRun(tree.props.onMove, {
-            dragIds,
-            parentId: parentId === ROOT_ID ? null : parentId,
-            index: index === null ? 0 : index, // When it's null it was dropped over a folder
-            dragNodes: tree.dragNodes,
-            parentNode: tree.get(parentId),
-          });
-          tree.open(parentId);
-        }
         tree.dispatch(dnd.dragEnd());
       },
     }),
-    [ids, node]
+    [ids, node],
   );
 
   useEffect(() => {

package/src/dnd/drop-hook.ts

@@ -5,6 +5,8 @@ import { NodeApi } from "../interfaces/node-api";
 import { DragItem } from "../types/dnd";
 import { computeDrop } from "./compute-drop";
 import { actions as dnd } from "../state/dnd-slice";
+import { safeRun } from "../utils";
+import { ROOT_ID } from "../data/create-root";
 
 export type DropResult = {
   parentId: string | null;
@@ -13,7 +15,7 @@ export type DropResult = {
 
 export function useDropHook(
   el: RefObject<HTMLElement | null>,
-  node: NodeApi<any>
+  node: NodeApi<any>,
 ): ConnectDropTarget {
   const tree = useTreeApi();
   const [_, dropRef] = useDrop<DragItem, DropResult | null, void>(
@@ -41,9 +43,18 @@ export function useDropHook(
       },
       drop: (_, m) => {
         if (!m.canDrop()) return null;
+        let { parentId, index, dragIds } = tree.state.dnd;
+        safeRun(tree.props.onMove, {
+          dragIds,
+          parentId: parentId === ROOT_ID ? null : parentId,
+          index: index === null ? 0 : index, // When it's null it was dropped over a folder
+          dragNodes: tree.dragNodes,
+          parentNode: tree.get(parentId),
+        });
+        tree.open(parentId);
       },
     }),
-    [node, el.current, tree.props]
+    [node, el.current, tree.props],
   );
 
   return dropRef;

package/src/interfaces/tree-api.ts

@@ -342,6 +342,7 @@ export class TreeApi<T> {
     if (!node) return;
     const id = identify(node);
     this.dispatch(selection.remove(id));
+    safeRun(this.props.onSelect, this.selectedNodes);
   }
 
   selectMulti(identity: Identity) {