feat: do not use redundant drop target at bottom of folder (#363)

Author: lukasbach

next-release-notes.md

@@ -1,10 +1,5 @@
-<!--
-### Breaking Changes
-
-### Features
-
 ### Bug Fixes and Improvements
- - Added some documentation on the data structure required by a StaticDataProvider.
+- Improved keyboard-controlled drag and drop behavior to not show redundant drop target directly below opened folder item (#363)
 
 ### Other Changes
--->
+ - Added some documentation on the data structure required by a StaticDataProvider.

packages/core/src/drag/useGetViableDragPositions.ts

@@ -85,16 +85,18 @@ export const useGetViableDragPositions = () => {
           treeId,
         };
 
-        const skipTopPosition =
-          depth === (linearItems[linearIndex - 1]?.depth ?? -1);
+        const depthOfItemAbove = linearItems[linearIndex - 1]?.depth ?? -1;
+        const depthOfItemBelow = linearItems[linearIndex + 1]?.depth ?? -1;
+        const isWithinFolder = depth === depthOfItemAbove;
+        const isBelowOpenFolder = depth === depthOfItemBelow - 1;
 
-        if (!skipTopPosition && canDropAt(topPosition, draggingItems)) {
+        if (!isWithinFolder && canDropAt(topPosition, draggingItems)) {
           targets.push(topPosition);
         }
         if (canDropAt(itemPosition, draggingItems)) {
           targets.push(itemPosition);
         }
-        if (canDropAt(bottomPosition, draggingItems)) {
+        if (!isBelowOpenFolder && canDropAt(bottomPosition, draggingItems)) {
           targets.push(bottomPosition);
         }
       }

packages/core/src/hotkeys/defaultKeyboardBindings.ts

@@ -11,7 +11,7 @@ export const defaultKeyboardBindings: Required<KeyboardBindings> = {
   abortSearch: ['escape', 'enter'],
   startSearch: [],
   selectAll: ['control+a'],
-  startProgrammaticDnd: ['control+d'],
+  startProgrammaticDnd: ['control+shift+d'],
   completeProgrammaticDnd: ['enter'],
   abortProgrammaticDnd: ['escape'],
 };