@headless-tree/core 0.0.0-20260107220200 → 0.0.0-20260108010329

package/CHANGELOG.md

@@ -1,10 +1,12 @@
 # @headless-tree/core
 
-## 0.0.0-20260107220200
+## 0.0.0-20260108010329
 
 ### Patch Changes
 
 - 39a8b44: Add skipUpdateTree parameter to `updateCachedChildrenIds` and `updateCachedData` in async tree loader
+- 26ecc1b: Fixed an issue where dropping items inside a collapsed folder will make the tree become un-focusable until a new item is clicked with mouse again. This could break usage with keyboard-only drag operations.
+- 0108b7a: Fixed a bug where some hotkeys (like up/down navigation, search and renaming) doesn't work after items are dragged within the tree (#179)
 - ffd2619: Fixed an issue where `canDropForeignDragObject` was being called in `onDragOver` events without payload. `canDropForeignDragObject` should never be called in `onDragOver` events since there, browsers do not allow access to the data transfer payload. Now, `canDropForeignDragObject` is only called in onDrop events, and `canDragForeignDragObjectOver` is always called in `onDragOver` events.
 
 ## 1.6.1

package/dist/index.d.mts

@@ -68,6 +68,8 @@ type DragAndDropFeatureDef<T> = {
         onCompleteForeignDrop?: (items: ItemInstance<T>[]) => void;
         /** When dragging for this many ms on a closed folder, the folder will automatically open. Set to zero to disable. */
         openOnDropDelay?: number;
+        /** If true, `item.getProps()` will not include drag event handlers. Use `item.getDragHandleProps()` on the handler element. */
+        seperateDragHandle?: boolean;
     };
     treeInstance: {
         getDragTarget: () => DragTarget<T> | null;
@@ -84,6 +86,9 @@ type DragAndDropFeatureDef<T> = {
         isDragTargetAbove: () => boolean;
         isDragTargetBelow: () => boolean;
         isDraggingOver: () => boolean;
+        /** Note that `item.getProps()` already passes in all drag event handlers by default. Set `seperateDragHandle` to true to
+         * disable the default behavior and use this on the handler element instead. */
+        getDragHandleProps: () => Record<string, any>;
     };
     hotkeys: never;
 };
@@ -422,6 +427,7 @@ interface PropMemoizationDataRef {
     memo?: {
         tree?: Record<string, any>;
         item?: Record<string, any>;
+        drag?: Record<string, any>;
         search?: Record<string, any>;
         rename?: Record<string, any>;
     };

package/dist/index.d.ts

@@ -68,6 +68,8 @@ type DragAndDropFeatureDef<T> = {
         onCompleteForeignDrop?: (items: ItemInstance<T>[]) => void;
         /** When dragging for this many ms on a closed folder, the folder will automatically open. Set to zero to disable. */
         openOnDropDelay?: number;
+        /** If true, `item.getProps()` will not include drag event handlers. Use `item.getDragHandleProps()` on the handler element. */
+        seperateDragHandle?: boolean;
     };
     treeInstance: {
         getDragTarget: () => DragTarget<T> | null;
@@ -84,6 +86,9 @@ type DragAndDropFeatureDef<T> = {
         isDragTargetAbove: () => boolean;
         isDragTargetBelow: () => boolean;
         isDraggingOver: () => boolean;
+        /** Note that `item.getProps()` already passes in all drag event handlers by default. Set `seperateDragHandle` to true to
+         * disable the default behavior and use this on the handler element instead. */
+        getDragHandleProps: () => Record<string, any>;
     };
     hotkeys: never;
 };
@@ -422,6 +427,7 @@ interface PropMemoizationDataRef {
     memo?: {
         tree?: Record<string, any>;
         item?: Record<string, any>;
+        drag?: Record<string, any>;
         search?: Record<string, any>;
         rename?: Record<string, any>;
     };

package/dist/index.js

@@ -125,6 +125,7 @@ var poll = (fn, interval = 100, timeout = 1e3) => new Promise((resolve) => {
   }, interval);
   clear = setTimeout(() => {
     clearInterval(i);
+    resolve();
   }, timeout);
 });
 
@@ -214,12 +215,16 @@ var treeFeature = {
     },
     updateDomFocus: ({ tree }) => {
       setTimeout(() => __async(null, null, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const focusedItem = tree.getFocusedItem();
         (_b = (_a = tree.getConfig()).scrollToItem) == null ? void 0 : _b.call(_a, focusedItem);
-        yield poll(() => focusedItem.getElement() !== null, 20);
+        yield poll(() => focusedItem.getElement() !== null, 20, 500);
         const focusedElement = focusedItem.getElement();
-        if (!focusedElement) return;
+        if (!focusedElement) {
+          (_c = tree.getItems()[0]) == null ? void 0 : _c.setFocused();
+          (_e = (_d = tree.getItems()[0]) == null ? void 0 : _d.getElement()) == null ? void 0 : _e.focus();
+          return;
+        }
         focusedElement.focus();
       }));
     },
@@ -1615,36 +1620,8 @@ var dragAndDropFeature = {
     }
   },
   itemInstance: {
-    getProps: ({ tree, item, prev }) => __spreadProps(__spreadValues({}, prev == null ? void 0 : prev()), {
-      draggable: true,
+    getProps: ({ tree, item, prev }) => __spreadProps(__spreadValues(__spreadValues({}, prev == null ? void 0 : prev()), tree.getConfig().seperateDragHandle ? {} : item.getDragHandleProps()), {
       onDragEnter: (e) => e.preventDefault(),
-      onDragStart: (e) => {
-        var _a, _b, _c, _d;
-        const selectedItems = tree.getSelectedItems ? tree.getSelectedItems() : [tree.getFocusedItem()];
-        const items = selectedItems.includes(item) ? selectedItems : [item];
-        const config = tree.getConfig();
-        if (!selectedItems.includes(item)) {
-          (_a = tree.setSelectedItems) == null ? void 0 : _a.call(tree, [item.getItemMeta().itemId]);
-        }
-        if (!((_c = (_b = config.canDrag) == null ? void 0 : _b.call(config, items)) != null ? _c : true)) {
-          e.preventDefault();
-          return;
-        }
-        if (config.setDragImage) {
-          const { imgElement, xOffset, yOffset } = config.setDragImage(items);
-          (_d = e.dataTransfer) == null ? void 0 : _d.setDragImage(imgElement, xOffset != null ? xOffset : 0, yOffset != null ? yOffset : 0);
-        }
-        if (config.createForeignDragObject && e.dataTransfer) {
-          const { format, data, dropEffect, effectAllowed } = config.createForeignDragObject(items);
-          e.dataTransfer.setData(format, data);
-          if (dropEffect) e.dataTransfer.dropEffect = dropEffect;
-          if (effectAllowed) e.dataTransfer.effectAllowed = effectAllowed;
-        }
-        tree.applySubStateUpdate("dnd", {
-          draggedItems: items,
-          draggingOverItem: tree.getFocusedItem()
-        });
-      },
       onDragOver: (e) => {
         var _a, _b, _c;
         e.stopPropagation();
@@ -1688,19 +1665,6 @@ var dragAndDropFeature = {
           }));
         }, 100);
       },
-      onDragEnd: (e) => {
-        var _a, _b;
-        const { onCompleteForeignDrop, canDragForeignDragObjectOver } = tree.getConfig();
-        const draggedItems = (_a = tree.getState().dnd) == null ? void 0 : _a.draggedItems;
-        if (((_b = e.dataTransfer) == null ? void 0 : _b.dropEffect) === "none" || !draggedItems) {
-          return;
-        }
-        const target = getDragTarget(e, item, tree, false);
-        if (canDragForeignDragObjectOver && e.dataTransfer && !canDragForeignDragObjectOver(e.dataTransfer, target)) {
-          return;
-        }
-        onCompleteForeignDrop == null ? void 0 : onCompleteForeignDrop(draggedItems);
-      },
       onDrop: (e) => __async(null, null, function* () {
         var _a, _b, _c;
         e.stopPropagation();
@@ -1721,11 +1685,57 @@ var dragAndDropFeature = {
         dataRef.current.lastDragCode = void 0;
         if (draggedItems) {
           yield (_b = config.onDrop) == null ? void 0 : _b.call(config, draggedItems, target);
+          draggedItems[0].setFocused();
         } else if (e.dataTransfer) {
           yield (_c = config.onDropForeignDragObject) == null ? void 0 : _c.call(config, e.dataTransfer, target);
         }
+        tree.applySubStateUpdate("dnd", null);
+        tree.updateDomFocus();
       })
     }),
+    getDragHandleProps: ({ tree, item, prev }) => __spreadProps(__spreadValues({}, prev == null ? void 0 : prev()), {
+      draggable: true,
+      onDragStart: (e) => {
+        var _a, _b, _c, _d;
+        const selectedItems = tree.getSelectedItems ? tree.getSelectedItems() : [tree.getFocusedItem()];
+        const items = selectedItems.includes(item) ? selectedItems : [item];
+        const config = tree.getConfig();
+        if (!selectedItems.includes(item)) {
+          (_a = tree.setSelectedItems) == null ? void 0 : _a.call(tree, [item.getItemMeta().itemId]);
+        }
+        if (!((_c = (_b = config.canDrag) == null ? void 0 : _b.call(config, items)) != null ? _c : true)) {
+          e.preventDefault();
+          return;
+        }
+        if (config.setDragImage) {
+          const { imgElement, xOffset, yOffset } = config.setDragImage(items);
+          (_d = e.dataTransfer) == null ? void 0 : _d.setDragImage(imgElement, xOffset != null ? xOffset : 0, yOffset != null ? yOffset : 0);
+        }
+        if (config.createForeignDragObject && e.dataTransfer) {
+          const { format, data, dropEffect, effectAllowed } = config.createForeignDragObject(items);
+          e.dataTransfer.setData(format, data);
+          if (dropEffect) e.dataTransfer.dropEffect = dropEffect;
+          if (effectAllowed) e.dataTransfer.effectAllowed = effectAllowed;
+        }
+        tree.applySubStateUpdate("dnd", {
+          draggedItems: items,
+          draggingOverItem: tree.getFocusedItem()
+        });
+      },
+      onDragEnd: (e) => {
+        var _a, _b;
+        const { onCompleteForeignDrop, canDragForeignDragObjectOver } = tree.getConfig();
+        const draggedItems = (_a = tree.getState().dnd) == null ? void 0 : _a.draggedItems;
+        if (((_b = e.dataTransfer) == null ? void 0 : _b.dropEffect) === "none" || !draggedItems) {
+          return;
+        }
+        const target = getDragTarget(e, item, tree, false);
+        if (canDragForeignDragObjectOver && e.dataTransfer && !canDragForeignDragObjectOver(e.dataTransfer, target)) {
+          return;
+        }
+        onCompleteForeignDrop == null ? void 0 : onCompleteForeignDrop(draggedItems);
+      }
+    }),
     isDragTarget: ({ tree, item }) => {
       const target = tree.getDragTarget();
       return target ? target.item.getId() === item.getId() : false;
@@ -1949,6 +1959,7 @@ var keyboardDragAndDropFeature = {
         } else if (dataTransfer) {
           yield (_d = config.onDropForeignDragObject) == null ? void 0 : _d.call(config, dataTransfer, target);
         }
+        tree.updateDomFocus();
         tree.applySubStateUpdate(
           "assistiveDndState",
           3 /* Completed */
@@ -2299,6 +2310,14 @@ var propMemoizationFeature = {
       (_e = (_d = dataRef.current.memo).item) != null ? _e : _d.item = {};
       return memoize(props, dataRef.current.memo.item);
     },
+    getDragHandleProps: ({ item, prev }) => {
+      var _a, _b, _c, _d, _e;
+      const dataRef = item.getDataRef();
+      const props = (_a = prev == null ? void 0 : prev()) != null ? _a : {};
+      (_c = (_b = dataRef.current).memo) != null ? _c : _b.memo = {};
+      (_e = (_d = dataRef.current.memo).drag) != null ? _e : _d.drag = {};
+      return memoize(props, dataRef.current.memo.drag);
+    },
     getRenameInputProps: ({ item, prev }) => {
       var _a, _b, _c, _d, _e;
       const dataRef = item.getDataRef();

package/dist/index.mjs

@@ -81,6 +81,7 @@ var poll = (fn, interval = 100, timeout = 1e3) => new Promise((resolve) => {
   }, interval);
   clear = setTimeout(() => {
     clearInterval(i);
+    resolve();
   }, timeout);
 });
 
@@ -170,12 +171,16 @@ var treeFeature = {
     },
     updateDomFocus: ({ tree }) => {
       setTimeout(() => __async(null, null, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const focusedItem = tree.getFocusedItem();
         (_b = (_a = tree.getConfig()).scrollToItem) == null ? void 0 : _b.call(_a, focusedItem);
-        yield poll(() => focusedItem.getElement() !== null, 20);
+        yield poll(() => focusedItem.getElement() !== null, 20, 500);
         const focusedElement = focusedItem.getElement();
-        if (!focusedElement) return;
+        if (!focusedElement) {
+          (_c = tree.getItems()[0]) == null ? void 0 : _c.setFocused();
+          (_e = (_d = tree.getItems()[0]) == null ? void 0 : _d.getElement()) == null ? void 0 : _e.focus();
+          return;
+        }
         focusedElement.focus();
       }));
     },
@@ -1571,36 +1576,8 @@ var dragAndDropFeature = {
     }
   },
   itemInstance: {
-    getProps: ({ tree, item, prev }) => __spreadProps(__spreadValues({}, prev == null ? void 0 : prev()), {
-      draggable: true,
+    getProps: ({ tree, item, prev }) => __spreadProps(__spreadValues(__spreadValues({}, prev == null ? void 0 : prev()), tree.getConfig().seperateDragHandle ? {} : item.getDragHandleProps()), {
       onDragEnter: (e) => e.preventDefault(),
-      onDragStart: (e) => {
-        var _a, _b, _c, _d;
-        const selectedItems = tree.getSelectedItems ? tree.getSelectedItems() : [tree.getFocusedItem()];
-        const items = selectedItems.includes(item) ? selectedItems : [item];
-        const config = tree.getConfig();
-        if (!selectedItems.includes(item)) {
-          (_a = tree.setSelectedItems) == null ? void 0 : _a.call(tree, [item.getItemMeta().itemId]);
-        }
-        if (!((_c = (_b = config.canDrag) == null ? void 0 : _b.call(config, items)) != null ? _c : true)) {
-          e.preventDefault();
-          return;
-        }
-        if (config.setDragImage) {
-          const { imgElement, xOffset, yOffset } = config.setDragImage(items);
-          (_d = e.dataTransfer) == null ? void 0 : _d.setDragImage(imgElement, xOffset != null ? xOffset : 0, yOffset != null ? yOffset : 0);
-        }
-        if (config.createForeignDragObject && e.dataTransfer) {
-          const { format, data, dropEffect, effectAllowed } = config.createForeignDragObject(items);
-          e.dataTransfer.setData(format, data);
-          if (dropEffect) e.dataTransfer.dropEffect = dropEffect;
-          if (effectAllowed) e.dataTransfer.effectAllowed = effectAllowed;
-        }
-        tree.applySubStateUpdate("dnd", {
-          draggedItems: items,
-          draggingOverItem: tree.getFocusedItem()
-        });
-      },
       onDragOver: (e) => {
         var _a, _b, _c;
         e.stopPropagation();
@@ -1644,19 +1621,6 @@ var dragAndDropFeature = {
           }));
         }, 100);
       },
-      onDragEnd: (e) => {
-        var _a, _b;
-        const { onCompleteForeignDrop, canDragForeignDragObjectOver } = tree.getConfig();
-        const draggedItems = (_a = tree.getState().dnd) == null ? void 0 : _a.draggedItems;
-        if (((_b = e.dataTransfer) == null ? void 0 : _b.dropEffect) === "none" || !draggedItems) {
-          return;
-        }
-        const target = getDragTarget(e, item, tree, false);
-        if (canDragForeignDragObjectOver && e.dataTransfer && !canDragForeignDragObjectOver(e.dataTransfer, target)) {
-          return;
-        }
-        onCompleteForeignDrop == null ? void 0 : onCompleteForeignDrop(draggedItems);
-      },
       onDrop: (e) => __async(null, null, function* () {
         var _a, _b, _c;
         e.stopPropagation();
@@ -1677,11 +1641,57 @@ var dragAndDropFeature = {
         dataRef.current.lastDragCode = void 0;
         if (draggedItems) {
           yield (_b = config.onDrop) == null ? void 0 : _b.call(config, draggedItems, target);
+          draggedItems[0].setFocused();
         } else if (e.dataTransfer) {
           yield (_c = config.onDropForeignDragObject) == null ? void 0 : _c.call(config, e.dataTransfer, target);
         }
+        tree.applySubStateUpdate("dnd", null);
+        tree.updateDomFocus();
       })
     }),
+    getDragHandleProps: ({ tree, item, prev }) => __spreadProps(__spreadValues({}, prev == null ? void 0 : prev()), {
+      draggable: true,
+      onDragStart: (e) => {
+        var _a, _b, _c, _d;
+        const selectedItems = tree.getSelectedItems ? tree.getSelectedItems() : [tree.getFocusedItem()];
+        const items = selectedItems.includes(item) ? selectedItems : [item];
+        const config = tree.getConfig();
+        if (!selectedItems.includes(item)) {
+          (_a = tree.setSelectedItems) == null ? void 0 : _a.call(tree, [item.getItemMeta().itemId]);
+        }
+        if (!((_c = (_b = config.canDrag) == null ? void 0 : _b.call(config, items)) != null ? _c : true)) {
+          e.preventDefault();
+          return;
+        }
+        if (config.setDragImage) {
+          const { imgElement, xOffset, yOffset } = config.setDragImage(items);
+          (_d = e.dataTransfer) == null ? void 0 : _d.setDragImage(imgElement, xOffset != null ? xOffset : 0, yOffset != null ? yOffset : 0);
+        }
+        if (config.createForeignDragObject && e.dataTransfer) {
+          const { format, data, dropEffect, effectAllowed } = config.createForeignDragObject(items);
+          e.dataTransfer.setData(format, data);
+          if (dropEffect) e.dataTransfer.dropEffect = dropEffect;
+          if (effectAllowed) e.dataTransfer.effectAllowed = effectAllowed;
+        }
+        tree.applySubStateUpdate("dnd", {
+          draggedItems: items,
+          draggingOverItem: tree.getFocusedItem()
+        });
+      },
+      onDragEnd: (e) => {
+        var _a, _b;
+        const { onCompleteForeignDrop, canDragForeignDragObjectOver } = tree.getConfig();
+        const draggedItems = (_a = tree.getState().dnd) == null ? void 0 : _a.draggedItems;
+        if (((_b = e.dataTransfer) == null ? void 0 : _b.dropEffect) === "none" || !draggedItems) {
+          return;
+        }
+        const target = getDragTarget(e, item, tree, false);
+        if (canDragForeignDragObjectOver && e.dataTransfer && !canDragForeignDragObjectOver(e.dataTransfer, target)) {
+          return;
+        }
+        onCompleteForeignDrop == null ? void 0 : onCompleteForeignDrop(draggedItems);
+      }
+    }),
     isDragTarget: ({ tree, item }) => {
       const target = tree.getDragTarget();
       return target ? target.item.getId() === item.getId() : false;
@@ -1905,6 +1915,7 @@ var keyboardDragAndDropFeature = {
         } else if (dataTransfer) {
           yield (_d = config.onDropForeignDragObject) == null ? void 0 : _d.call(config, dataTransfer, target);
         }
+        tree.updateDomFocus();
         tree.applySubStateUpdate(
           "assistiveDndState",
           3 /* Completed */
@@ -2255,6 +2266,14 @@ var propMemoizationFeature = {
       (_e = (_d = dataRef.current.memo).item) != null ? _e : _d.item = {};
       return memoize(props, dataRef.current.memo.item);
     },
+    getDragHandleProps: ({ item, prev }) => {
+      var _a, _b, _c, _d, _e;
+      const dataRef = item.getDataRef();
+      const props = (_a = prev == null ? void 0 : prev()) != null ? _a : {};
+      (_c = (_b = dataRef.current).memo) != null ? _c : _b.memo = {};
+      (_e = (_d = dataRef.current.memo).drag) != null ? _e : _d.drag = {};
+      return memoize(props, dataRef.current.memo.drag);
+    },
     getRenameInputProps: ({ item, prev }) => {
       var _a, _b, _c, _d, _e;
       const dataRef = item.getDataRef();

package/package.json

@@ -13,7 +13,7 @@
     "checkbox",
     "hook"
   ],
-  "version": "0.0.0-20260107220200",
+  "version": "0.0.0-20260108010329",
   "main": "dist/index.d.ts",
   "module": "dist/index.mjs",
   "types": "dist/index.d.mts",

package/src/features/drag-and-drop/drag-and-drop.spec.ts

@@ -729,6 +729,54 @@ describe("core-feature/drag-and-drop", () => {
       });
     });
 
+    describe("seperateDragHandle", () => {
+      it("includes all drag handlers in getProps() when seperateDragHandle is false", () => {
+        const props = tree.instance.getItemInstance("x111").getProps();
+        expect(props.draggable).toBe(true);
+        expect(props.onDragStart).toBeDefined();
+        expect(props.onDragEnd).toBeDefined();
+        expect(props.onDragEnter).toBeDefined();
+        expect(props.onDragOver).toBeDefined();
+        expect(props.onDragLeave).toBeDefined();
+        expect(props.onDrop).toBeDefined();
+      });
+
+      it("includes drag handle handlers in getDragHandleProps() when seperateDragHandle is false", () => {
+        const props = tree.instance
+          .getItemInstance("x111")
+          .getDragHandleProps();
+        expect(props.draggable).toBe(true);
+        expect(props.onDragStart).toBeDefined();
+        expect(props.onDragEnd).toBeDefined();
+      });
+
+      it("excludes drag handle handlers from getProps() but includes drop handlers when seperateDragHandle is true", async () => {
+        const testTree = await tree
+          .with({ seperateDragHandle: true })
+          .createTestCaseTree();
+        const props = testTree.instance.getItemInstance("x111").getProps();
+        expect(props.draggable).toBeUndefined();
+        expect(props.onDragStart).toBeUndefined();
+        expect(props.onDragEnd).toBeUndefined();
+        expect(props.onDragEnter).toBeDefined();
+        expect(props.onDragOver).toBeDefined();
+        expect(props.onDragLeave).toBeDefined();
+        expect(props.onDrop).toBeDefined();
+      });
+
+      it("includes drag handle handlers in getDragHandleProps() when seperateDragHandle is true", async () => {
+        const testTree = await tree
+          .with({ seperateDragHandle: true })
+          .createTestCaseTree();
+        const props = testTree.instance
+          .getItemInstance("x111")
+          .getDragHandleProps();
+        expect(props.draggable).toBe(true);
+        expect(props.onDragStart).toBeDefined();
+        expect(props.onDragEnd).toBeDefined();
+      });
+    });
+
     describe("retains last drag state with dragcode", () => {
       it("uses constant number of calls to canDrop", () => {
         const canDrop = tree.mockedHandler("canDrop").mockReturnValue(true);

package/src/features/drag-and-drop/feature.ts

@@ -178,47 +178,10 @@ export const dragAndDropFeature: FeatureImplementation = {
   itemInstance: {
     getProps: ({ tree, item, prev }) => ({
       ...prev?.(),
-
-      draggable: true,
+      ...(tree.getConfig().seperateDragHandle ? {} : item.getDragHandleProps()),
 
       onDragEnter: (e: DragEvent) => e.preventDefault(),
 
-      onDragStart: (e: DragEvent) => {
-        const selectedItems = tree.getSelectedItems
-          ? tree.getSelectedItems()
-          : [tree.getFocusedItem()];
-        const items = selectedItems.includes(item) ? selectedItems : [item];
-        const config = tree.getConfig();
-
-        if (!selectedItems.includes(item)) {
-          tree.setSelectedItems?.([item.getItemMeta().itemId]);
-        }
-
-        if (!(config.canDrag?.(items) ?? true)) {
-          e.preventDefault();
-          return;
-        }
-
-        if (config.setDragImage) {
-          const { imgElement, xOffset, yOffset } = config.setDragImage(items);
-          e.dataTransfer?.setDragImage(imgElement, xOffset ?? 0, yOffset ?? 0);
-        }
-
-        if (config.createForeignDragObject && e.dataTransfer) {
-          const { format, data, dropEffect, effectAllowed } =
-            config.createForeignDragObject(items);
-          e.dataTransfer.setData(format, data);
-
-          if (dropEffect) e.dataTransfer.dropEffect = dropEffect;
-          if (effectAllowed) e.dataTransfer.effectAllowed = effectAllowed;
-        }
-
-        tree.applySubStateUpdate("dnd", {
-          draggedItems: items,
-          draggingOverItem: tree.getFocusedItem(),
-        });
-      },
-
       onDragOver: (e: DragEvent) => {
         e.stopPropagation(); // don't bubble up to container dragover
         const dataRef = tree.getDataRef<DndDataRef>();
@@ -277,27 +240,6 @@ export const dragAndDropFeature: FeatureImplementation = {
         }, 100);
       },
 
-      onDragEnd: (e: DragEvent) => {
-        const { onCompleteForeignDrop, canDragForeignDragObjectOver } =
-          tree.getConfig();
-        const draggedItems = tree.getState().dnd?.draggedItems;
-
-        if (e.dataTransfer?.dropEffect === "none" || !draggedItems) {
-          return;
-        }
-
-        const target = getDragTarget(e, item, tree, false);
-        if (
-          canDragForeignDragObjectOver &&
-          e.dataTransfer &&
-          !canDragForeignDragObjectOver(e.dataTransfer, target)
-        ) {
-          return;
-        }
-
-        onCompleteForeignDrop?.(draggedItems);
-      },
-
       onDrop: async (e: DragEvent) => {
         e.stopPropagation();
         const dataRef = tree.getDataRef<DndDataRef>();
@@ -322,9 +264,76 @@ export const dragAndDropFeature: FeatureImplementation = {
 
         if (draggedItems) {
           await config.onDrop?.(draggedItems, target);
+          draggedItems[0].setFocused();
         } else if (e.dataTransfer) {
           await config.onDropForeignDragObject?.(e.dataTransfer, target);
         }
+
+        tree.applySubStateUpdate("dnd", null);
+        tree.updateDomFocus();
+      },
+    }),
+
+    getDragHandleProps: ({ tree, item, prev }) => ({
+      ...prev?.(),
+
+      draggable: true,
+
+      onDragStart: (e: DragEvent) => {
+        const selectedItems = tree.getSelectedItems
+          ? tree.getSelectedItems()
+          : [tree.getFocusedItem()];
+        const items = selectedItems.includes(item) ? selectedItems : [item];
+        const config = tree.getConfig();
+
+        if (!selectedItems.includes(item)) {
+          tree.setSelectedItems?.([item.getItemMeta().itemId]);
+        }
+
+        if (!(config.canDrag?.(items) ?? true)) {
+          e.preventDefault();
+          return;
+        }
+
+        if (config.setDragImage) {
+          const { imgElement, xOffset, yOffset } = config.setDragImage(items);
+          e.dataTransfer?.setDragImage(imgElement, xOffset ?? 0, yOffset ?? 0);
+        }
+
+        if (config.createForeignDragObject && e.dataTransfer) {
+          const { format, data, dropEffect, effectAllowed } =
+            config.createForeignDragObject(items);
+          e.dataTransfer.setData(format, data);
+
+          if (dropEffect) e.dataTransfer.dropEffect = dropEffect;
+          if (effectAllowed) e.dataTransfer.effectAllowed = effectAllowed;
+        }
+
+        tree.applySubStateUpdate("dnd", {
+          draggedItems: items,
+          draggingOverItem: tree.getFocusedItem(),
+        });
+      },
+
+      onDragEnd: (e: DragEvent) => {
+        const { onCompleteForeignDrop, canDragForeignDragObjectOver } =
+          tree.getConfig();
+        const draggedItems = tree.getState().dnd?.draggedItems;
+
+        if (e.dataTransfer?.dropEffect === "none" || !draggedItems) {
+          return;
+        }
+
+        const target = getDragTarget(e, item, tree, false);
+        if (
+          canDragForeignDragObjectOver &&
+          e.dataTransfer &&
+          !canDragForeignDragObjectOver(e.dataTransfer, target)
+        ) {
+          return;
+        }
+
+        onCompleteForeignDrop?.(draggedItems);
       },
     }),
 

package/src/features/drag-and-drop/types.ts

@@ -97,6 +97,9 @@ export type DragAndDropFeatureDef<T> = {
 
     /** When dragging for this many ms on a closed folder, the folder will automatically open. Set to zero to disable. */
     openOnDropDelay?: number;
+
+    /** If true, `item.getProps()` will not include drag event handlers. Use `item.getDragHandleProps()` on the handler element. */
+    seperateDragHandle?: boolean;
   };
   treeInstance: {
     getDragTarget: () => DragTarget<T> | null;
@@ -118,6 +121,10 @@ export type DragAndDropFeatureDef<T> = {
     isDragTargetAbove: () => boolean;
     isDragTargetBelow: () => boolean;
     isDraggingOver: () => boolean;
+
+    /** Note that `item.getProps()` already passes in all drag event handlers by default. Set `seperateDragHandle` to true to
+     * disable the default behavior and use this on the handler element instead. */
+    getDragHandleProps: () => Record<string, any>;
   };
   hotkeys: never;
 };

package/src/features/keyboard-drag-and-drop/feature.ts

@@ -254,6 +254,7 @@ export const keyboardDragAndDropFeature: FeatureImplementation = {
           await config.onDropForeignDragObject?.(dataTransfer, target);
         }
 
+        tree.updateDomFocus();
         tree.applySubStateUpdate(
           "assistiveDndState",
           AssistiveDndState.Completed,

package/src/features/prop-memoization/feature.ts

@@ -59,6 +59,14 @@ export const propMemoizationFeature: FeatureImplementation = {
       return memoize(props, dataRef.current.memo.item);
     },
 
+    getDragHandleProps: ({ item, prev }) => {
+      const dataRef = item.getDataRef<PropMemoizationDataRef>();
+      const props = prev?.() ?? {};
+      dataRef.current.memo ??= {};
+      dataRef.current.memo.drag ??= {};
+      return memoize(props, dataRef.current.memo.drag);
+    },
+
     getRenameInputProps: ({ item, prev }) => {
       const dataRef = item.getDataRef<PropMemoizationDataRef>();
       const props = prev?.() ?? {};

package/src/features/prop-memoization/types.ts

@@ -2,6 +2,7 @@ export interface PropMemoizationDataRef {
   memo?: {
     tree?: Record<string, any>;
     item?: Record<string, any>;
+    drag?: Record<string, any>;
     search?: Record<string, any>;
     rename?: Record<string, any>;
   };

package/src/features/tree/feature.ts

@@ -107,9 +107,13 @@ export const treeFeature: FeatureImplementation<any> = {
       setTimeout(async () => {
         const focusedItem = tree.getFocusedItem();
         tree.getConfig().scrollToItem?.(focusedItem);
-        await poll(() => focusedItem.getElement() !== null, 20);
+        await poll(() => focusedItem.getElement() !== null, 20, 500);
         const focusedElement = focusedItem.getElement();
-        if (!focusedElement) return;
+        if (!focusedElement) {
+          tree.getItems()[0]?.setFocused();
+          tree.getItems()[0]?.getElement()?.focus();
+          return;
+        }
         focusedElement.focus();
       });
     },

package/src/utils.ts

@@ -64,5 +64,6 @@ export const poll = (fn: () => boolean, interval = 100, timeout = 1000) =>
     }, interval);
     clear = setTimeout(() => {
       clearInterval(i);
+      resolve();
     }, timeout);
   });