@react-aria/dnd 3.9.2 → 3.10.0

package/dist/useDroppableCollection.mjs

@@ -1,5 +1,6 @@
 import {clearGlobalDnDState as $7252cd45fc48c07c$export$70936501603e6c57, DIRECTORY_DRAG_TYPE as $7252cd45fc48c07c$export$990fced5dfac2637, droppableCollectionMap as $7252cd45fc48c07c$export$dfdf5deeaf27473f, getTypes as $7252cd45fc48c07c$export$e1d41611756c6326, globalDndState as $7252cd45fc48c07c$export$6ca6700462636d0b, isInternalDropOperation as $7252cd45fc48c07c$export$78bf638634500fa5, setDropCollectionRef as $7252cd45fc48c07c$export$dac8db29d42db9a1} from "./utils.mjs";
 import {registerDropTarget as $67560de7c78cb232$export$c28d9fb4a54e471a} from "./DragManager.mjs";
+import {navigate as $e154566cef11553b$export$ff7962acd6052c28} from "./DropTargetKeyboardNavigation.mjs";
 import {useAutoScroll as $80d9daea3067eff3$export$6323452ca4533ed8} from "./useAutoScroll.mjs";
 import {useDrop as $5c06e4929e123553$export$ccdee5eaf73cf661} from "./useDrop.mjs";
 import {useRef as $4ZR0C$useRef, useCallback as $4ZR0C$useCallback, useEffect as $4ZR0C$useEffect} from "react";
@@ -25,16 +26,7 @@ import {useLocale as $4ZR0C$useLocale} from "@react-aria/i18n";
 
 
 
-const $4b52e4eff84e5217$var$DROP_POSITIONS = [
-    'before',
-    'on',
-    'after'
-];
-const $4b52e4eff84e5217$var$DROP_POSITIONS_RTL = [
-    'after',
-    'on',
-    'before'
-];
+
 function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
     let localState = (0, $4ZR0C$useRef)({
         props: props,
@@ -45,7 +37,7 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
     localState.props = props;
     localState.state = state;
     let defaultOnDrop = (0, $4ZR0C$useCallback)(async (e)=>{
-        let { onInsert: onInsert, onRootDrop: onRootDrop, onItemDrop: onItemDrop, onReorder: onReorder, acceptedDragTypes: acceptedDragTypes = 'all', shouldAcceptItemDrop: shouldAcceptItemDrop } = localState.props;
+        let { onInsert: onInsert, onRootDrop: onRootDrop, onItemDrop: onItemDrop, onReorder: onReorder, onMove: onMove, acceptedDragTypes: acceptedDragTypes = 'all', shouldAcceptItemDrop: shouldAcceptItemDrop } = localState.props;
         let { draggingKeys: draggingKeys } = (0, $7252cd45fc48c07c$export$6ca6700462636d0b);
         let isInternal = (0, $7252cd45fc48c07c$export$78bf638634500fa5)(ref);
         let { target: target, dropOperation: dropOperation, items: items } = e;
@@ -78,6 +70,11 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
                     isInternal: isInternal,
                     target: target
                 });
+                if (onMove && isInternal) await onMove({
+                    keys: draggingKeys,
+                    dropOperation: dropOperation,
+                    target: target
+                });
                 if (target.dropPosition !== 'on') {
                     if (!isInternal && onInsert) await onInsert({
                         items: filteredItems,
@@ -158,8 +155,8 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
             autoScroll.stop();
         },
         onDropActivate (e) {
-            var _state_target, _state_target1;
-            if (((_state_target = state.target) === null || _state_target === void 0 ? void 0 : _state_target.type) === 'item' && ((_state_target1 = state.target) === null || _state_target1 === void 0 ? void 0 : _state_target1.dropPosition) === 'on' && typeof props.onDropActivate === 'function') props.onDropActivate({
+            var _state_target;
+            if (((_state_target = state.target) === null || _state_target === void 0 ? void 0 : _state_target.type) === 'item' && typeof props.onDropActivate === 'function') props.onDropActivate({
                 type: 'dropactivate',
                 x: e.x,
                 y: e.y,
@@ -193,11 +190,16 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
                 // is some indication that items were added.
                 if (state.selectionManager.focusedKey === prevFocusedKey) {
                     let first = newKeys.keys().next().value;
-                    let item = state.collection.getItem(first);
-                    // If this is a cell, focus the parent row.
-                    if ((item === null || item === void 0 ? void 0 : item.type) === 'cell') first = item.parentKey;
-                    state.selectionManager.setFocusedKey(first);
-                    if (state.selectionManager.selectionMode === 'none') (0, $4ZR0C$setInteractionModality)('keyboard');
+                    if (first != null) {
+                        let item = state.collection.getItem(first);
+                        // If this is a cell, focus the parent row.
+                        // eslint-disable-next-line max-depth
+                        if ((item === null || item === void 0 ? void 0 : item.type) === 'cell') first = item.parentKey;
+                        // eslint-disable-next-line max-depth
+                        if (first != null) state.selectionManager.setFocusedKey(first);
+                        // eslint-disable-next-line max-depth
+                        if (state.selectionManager.selectionMode === 'none') (0, $4ZR0C$setInteractionModality)('keyboard');
+                    }
                 }
             } else if (prevFocusedKey != null && state.selectionManager.focusedKey === prevFocusedKey && isInternal && target.type === 'item' && target.dropPosition !== 'on' && draggingKeys.has((_state_collection_getItem = state.collection.getItem(prevFocusedKey)) === null || _state_collection_getItem === void 0 ? void 0 : _state_collection_getItem.parentKey)) {
                 var _state_collection_getItem1;
@@ -263,84 +265,11 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
     let { direction: direction } = (0, $4ZR0C$useLocale)();
     (0, $4ZR0C$useEffect)(()=>{
         if (!ref.current) return;
-        let getNextTarget = (target, wrap = true, horizontal = false)=>{
-            var _keyboardDelegate_getKeyRightOf, _keyboardDelegate_getKeyBelow, _keyboardDelegate_getLastKey, _keyboardDelegate_getFirstKey;
-            if (!target) return {
-                type: 'root'
-            };
-            let { keyboardDelegate: keyboardDelegate } = localState.props;
-            let nextKey;
-            if ((target === null || target === void 0 ? void 0 : target.type) === 'item') nextKey = horizontal ? (_keyboardDelegate_getKeyRightOf = keyboardDelegate.getKeyRightOf) === null || _keyboardDelegate_getKeyRightOf === void 0 ? void 0 : _keyboardDelegate_getKeyRightOf.call(keyboardDelegate, target.key) : (_keyboardDelegate_getKeyBelow = keyboardDelegate.getKeyBelow) === null || _keyboardDelegate_getKeyBelow === void 0 ? void 0 : _keyboardDelegate_getKeyBelow.call(keyboardDelegate, target.key);
-            else nextKey = horizontal && direction === 'rtl' ? (_keyboardDelegate_getLastKey = keyboardDelegate.getLastKey) === null || _keyboardDelegate_getLastKey === void 0 ? void 0 : _keyboardDelegate_getLastKey.call(keyboardDelegate) : (_keyboardDelegate_getFirstKey = keyboardDelegate.getFirstKey) === null || _keyboardDelegate_getFirstKey === void 0 ? void 0 : _keyboardDelegate_getFirstKey.call(keyboardDelegate);
-            let dropPositions = horizontal && direction === 'rtl' ? $4b52e4eff84e5217$var$DROP_POSITIONS_RTL : $4b52e4eff84e5217$var$DROP_POSITIONS;
-            let dropPosition = dropPositions[0];
-            if (target.type === 'item') {
-                // If the the keyboard delegate returned the next key in the collection,
-                // first try the other positions in the current key. Otherwise (e.g. in a grid layout),
-                // jump to the same drop position in the new key.
-                let nextCollectionKey = horizontal && direction === 'rtl' ? localState.state.collection.getKeyBefore(target.key) : localState.state.collection.getKeyAfter(target.key);
-                if (nextKey == null || nextKey === nextCollectionKey) {
-                    let positionIndex = dropPositions.indexOf(target.dropPosition);
-                    let nextDropPosition = dropPositions[positionIndex + 1];
-                    if (positionIndex < dropPositions.length - 1 && !(nextDropPosition === dropPositions[2] && nextKey != null)) return {
-                        type: 'item',
-                        key: target.key,
-                        dropPosition: nextDropPosition
-                    };
-                    // If the last drop position was 'after', then 'before' on the next key is equivalent.
-                    // Switch to 'on' instead.
-                    if (target.dropPosition === dropPositions[2]) dropPosition = 'on';
-                } else dropPosition = target.dropPosition;
-            }
-            if (nextKey == null) {
-                if (wrap) return {
-                    type: 'root'
-                };
-                return null;
-            }
-            return {
-                type: 'item',
-                key: nextKey,
-                dropPosition: dropPosition
-            };
+        let getNextTarget = (target, wrap = true, key = 'down')=>{
+            return (0, $e154566cef11553b$export$ff7962acd6052c28)(localState.props.keyboardDelegate, localState.state.collection, target, key, direction === 'rtl', wrap);
         };
-        let getPreviousTarget = (target, wrap = true, horizontal = false)=>{
-            var _keyboardDelegate_getKeyLeftOf, _keyboardDelegate_getKeyAbove, _keyboardDelegate_getFirstKey, _keyboardDelegate_getLastKey;
-            let { keyboardDelegate: keyboardDelegate } = localState.props;
-            let nextKey;
-            if ((target === null || target === void 0 ? void 0 : target.type) === 'item') nextKey = horizontal ? (_keyboardDelegate_getKeyLeftOf = keyboardDelegate.getKeyLeftOf) === null || _keyboardDelegate_getKeyLeftOf === void 0 ? void 0 : _keyboardDelegate_getKeyLeftOf.call(keyboardDelegate, target.key) : (_keyboardDelegate_getKeyAbove = keyboardDelegate.getKeyAbove) === null || _keyboardDelegate_getKeyAbove === void 0 ? void 0 : _keyboardDelegate_getKeyAbove.call(keyboardDelegate, target.key);
-            else nextKey = horizontal && direction === 'rtl' ? (_keyboardDelegate_getFirstKey = keyboardDelegate.getFirstKey) === null || _keyboardDelegate_getFirstKey === void 0 ? void 0 : _keyboardDelegate_getFirstKey.call(keyboardDelegate) : (_keyboardDelegate_getLastKey = keyboardDelegate.getLastKey) === null || _keyboardDelegate_getLastKey === void 0 ? void 0 : _keyboardDelegate_getLastKey.call(keyboardDelegate);
-            let dropPositions = horizontal && direction === 'rtl' ? $4b52e4eff84e5217$var$DROP_POSITIONS_RTL : $4b52e4eff84e5217$var$DROP_POSITIONS;
-            let dropPosition = !target || target.type === 'root' ? dropPositions[2] : 'on';
-            if ((target === null || target === void 0 ? void 0 : target.type) === 'item') {
-                // If the the keyboard delegate returned the previous key in the collection,
-                // first try the other positions in the current key. Otherwise (e.g. in a grid layout),
-                // jump to the same drop position in the new key.
-                let prevCollectionKey = horizontal && direction === 'rtl' ? localState.state.collection.getKeyAfter(target.key) : localState.state.collection.getKeyBefore(target.key);
-                if (nextKey == null || nextKey === prevCollectionKey) {
-                    let positionIndex = dropPositions.indexOf(target.dropPosition);
-                    let nextDropPosition = dropPositions[positionIndex - 1];
-                    if (positionIndex > 0 && nextDropPosition !== dropPositions[2]) return {
-                        type: 'item',
-                        key: target.key,
-                        dropPosition: nextDropPosition
-                    };
-                    // If the last drop position was 'before', then 'after' on the previous key is equivalent.
-                    // Switch to 'on' instead.
-                    if (target.dropPosition === dropPositions[0]) dropPosition = 'on';
-                } else dropPosition = target.dropPosition;
-            }
-            if (nextKey == null) {
-                if (wrap) return {
-                    type: 'root'
-                };
-                return null;
-            }
-            return {
-                type: 'item',
-                key: nextKey,
-                dropPosition: dropPosition
-            };
+        let getPreviousTarget = (target, wrap = true)=>{
+            return getNextTarget(target, wrap, 'up');
         };
         let nextValidTarget = (target, types, allowedDropOperations, getNextTarget, wrap = true)=>{
             let seenRoot = 0;
@@ -434,13 +363,12 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
             onDropTargetEnter (target) {
                 localState.state.setTarget(target);
             },
-            onDropActivate (e) {
-                var _localState_state_target, _localState_state_target1;
-                if (((_localState_state_target = localState.state.target) === null || _localState_state_target === void 0 ? void 0 : _localState_state_target.type) === 'item' && ((_localState_state_target1 = localState.state.target) === null || _localState_state_target1 === void 0 ? void 0 : _localState_state_target1.dropPosition) === 'on' && typeof localState.props.onDropActivate === 'function') localState.props.onDropActivate({
+            onDropActivate (e, target) {
+                if ((target === null || target === void 0 ? void 0 : target.type) === 'item' && (target === null || target === void 0 ? void 0 : target.dropPosition) === 'on' && typeof localState.props.onDropActivate === 'function') localState.props.onDropActivate({
                     type: 'dropactivate',
                     x: e.x,
                     y: e.y,
-                    target: localState.state.target
+                    target: target
                 });
             },
             onDrop (e, target) {
@@ -448,30 +376,31 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
                 if (localState.state.target) onDrop(e, target || localState.state.target);
             },
             onKeyDown (e, drag) {
+                var _localState_props_onKeyDown, _localState_props;
                 let { keyboardDelegate: keyboardDelegate } = localState.props;
                 let types = (0, $7252cd45fc48c07c$export$e1d41611756c6326)(drag.items);
                 switch(e.key){
                     case 'ArrowDown':
                         if (keyboardDelegate.getKeyBelow) {
-                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, getNextTarget);
+                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, 'down'));
                             localState.state.setTarget(target);
                         }
                         break;
                     case 'ArrowUp':
                         if (keyboardDelegate.getKeyAbove) {
-                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, getPreviousTarget);
+                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, 'up'));
                             localState.state.setTarget(target);
                         }
                         break;
                     case 'ArrowLeft':
                         if (keyboardDelegate.getKeyLeftOf) {
-                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getPreviousTarget(target, wrap, true));
+                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, 'left'));
                             localState.state.setTarget(target);
                         }
                         break;
                     case 'ArrowRight':
                         if (keyboardDelegate.getKeyRightOf) {
-                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, true));
+                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, 'right'));
                             localState.state.setTarget(target);
                         }
                         break;
@@ -573,6 +502,7 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
                             break;
                         }
                 }
+                (_localState_props_onKeyDown = (_localState_props = localState.props).onKeyDown) === null || _localState_props_onKeyDown === void 0 ? void 0 : _localState_props_onKeyDown.call(_localState_props, e);
             }
         });
     }, [

package/dist/useDroppableCollection.module.js

@@ -1,5 +1,6 @@
 import {clearGlobalDnDState as $7252cd45fc48c07c$export$70936501603e6c57, DIRECTORY_DRAG_TYPE as $7252cd45fc48c07c$export$990fced5dfac2637, droppableCollectionMap as $7252cd45fc48c07c$export$dfdf5deeaf27473f, getTypes as $7252cd45fc48c07c$export$e1d41611756c6326, globalDndState as $7252cd45fc48c07c$export$6ca6700462636d0b, isInternalDropOperation as $7252cd45fc48c07c$export$78bf638634500fa5, setDropCollectionRef as $7252cd45fc48c07c$export$dac8db29d42db9a1} from "./utils.module.js";
 import {registerDropTarget as $67560de7c78cb232$export$c28d9fb4a54e471a} from "./DragManager.module.js";
+import {navigate as $e154566cef11553b$export$ff7962acd6052c28} from "./DropTargetKeyboardNavigation.module.js";
 import {useAutoScroll as $80d9daea3067eff3$export$6323452ca4533ed8} from "./useAutoScroll.module.js";
 import {useDrop as $5c06e4929e123553$export$ccdee5eaf73cf661} from "./useDrop.module.js";
 import {useRef as $4ZR0C$useRef, useCallback as $4ZR0C$useCallback, useEffect as $4ZR0C$useEffect} from "react";
@@ -25,16 +26,7 @@ import {useLocale as $4ZR0C$useLocale} from "@react-aria/i18n";
 
 
 
-const $4b52e4eff84e5217$var$DROP_POSITIONS = [
-    'before',
-    'on',
-    'after'
-];
-const $4b52e4eff84e5217$var$DROP_POSITIONS_RTL = [
-    'after',
-    'on',
-    'before'
-];
+
 function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
     let localState = (0, $4ZR0C$useRef)({
         props: props,
@@ -45,7 +37,7 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
     localState.props = props;
     localState.state = state;
     let defaultOnDrop = (0, $4ZR0C$useCallback)(async (e)=>{
-        let { onInsert: onInsert, onRootDrop: onRootDrop, onItemDrop: onItemDrop, onReorder: onReorder, acceptedDragTypes: acceptedDragTypes = 'all', shouldAcceptItemDrop: shouldAcceptItemDrop } = localState.props;
+        let { onInsert: onInsert, onRootDrop: onRootDrop, onItemDrop: onItemDrop, onReorder: onReorder, onMove: onMove, acceptedDragTypes: acceptedDragTypes = 'all', shouldAcceptItemDrop: shouldAcceptItemDrop } = localState.props;
         let { draggingKeys: draggingKeys } = (0, $7252cd45fc48c07c$export$6ca6700462636d0b);
         let isInternal = (0, $7252cd45fc48c07c$export$78bf638634500fa5)(ref);
         let { target: target, dropOperation: dropOperation, items: items } = e;
@@ -78,6 +70,11 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
                     isInternal: isInternal,
                     target: target
                 });
+                if (onMove && isInternal) await onMove({
+                    keys: draggingKeys,
+                    dropOperation: dropOperation,
+                    target: target
+                });
                 if (target.dropPosition !== 'on') {
                     if (!isInternal && onInsert) await onInsert({
                         items: filteredItems,
@@ -158,8 +155,8 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
             autoScroll.stop();
         },
         onDropActivate (e) {
-            var _state_target, _state_target1;
-            if (((_state_target = state.target) === null || _state_target === void 0 ? void 0 : _state_target.type) === 'item' && ((_state_target1 = state.target) === null || _state_target1 === void 0 ? void 0 : _state_target1.dropPosition) === 'on' && typeof props.onDropActivate === 'function') props.onDropActivate({
+            var _state_target;
+            if (((_state_target = state.target) === null || _state_target === void 0 ? void 0 : _state_target.type) === 'item' && typeof props.onDropActivate === 'function') props.onDropActivate({
                 type: 'dropactivate',
                 x: e.x,
                 y: e.y,
@@ -193,11 +190,16 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
                 // is some indication that items were added.
                 if (state.selectionManager.focusedKey === prevFocusedKey) {
                     let first = newKeys.keys().next().value;
-                    let item = state.collection.getItem(first);
-                    // If this is a cell, focus the parent row.
-                    if ((item === null || item === void 0 ? void 0 : item.type) === 'cell') first = item.parentKey;
-                    state.selectionManager.setFocusedKey(first);
-                    if (state.selectionManager.selectionMode === 'none') (0, $4ZR0C$setInteractionModality)('keyboard');
+                    if (first != null) {
+                        let item = state.collection.getItem(first);
+                        // If this is a cell, focus the parent row.
+                        // eslint-disable-next-line max-depth
+                        if ((item === null || item === void 0 ? void 0 : item.type) === 'cell') first = item.parentKey;
+                        // eslint-disable-next-line max-depth
+                        if (first != null) state.selectionManager.setFocusedKey(first);
+                        // eslint-disable-next-line max-depth
+                        if (state.selectionManager.selectionMode === 'none') (0, $4ZR0C$setInteractionModality)('keyboard');
+                    }
                 }
             } else if (prevFocusedKey != null && state.selectionManager.focusedKey === prevFocusedKey && isInternal && target.type === 'item' && target.dropPosition !== 'on' && draggingKeys.has((_state_collection_getItem = state.collection.getItem(prevFocusedKey)) === null || _state_collection_getItem === void 0 ? void 0 : _state_collection_getItem.parentKey)) {
                 var _state_collection_getItem1;
@@ -263,84 +265,11 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
     let { direction: direction } = (0, $4ZR0C$useLocale)();
     (0, $4ZR0C$useEffect)(()=>{
         if (!ref.current) return;
-        let getNextTarget = (target, wrap = true, horizontal = false)=>{
-            var _keyboardDelegate_getKeyRightOf, _keyboardDelegate_getKeyBelow, _keyboardDelegate_getLastKey, _keyboardDelegate_getFirstKey;
-            if (!target) return {
-                type: 'root'
-            };
-            let { keyboardDelegate: keyboardDelegate } = localState.props;
-            let nextKey;
-            if ((target === null || target === void 0 ? void 0 : target.type) === 'item') nextKey = horizontal ? (_keyboardDelegate_getKeyRightOf = keyboardDelegate.getKeyRightOf) === null || _keyboardDelegate_getKeyRightOf === void 0 ? void 0 : _keyboardDelegate_getKeyRightOf.call(keyboardDelegate, target.key) : (_keyboardDelegate_getKeyBelow = keyboardDelegate.getKeyBelow) === null || _keyboardDelegate_getKeyBelow === void 0 ? void 0 : _keyboardDelegate_getKeyBelow.call(keyboardDelegate, target.key);
-            else nextKey = horizontal && direction === 'rtl' ? (_keyboardDelegate_getLastKey = keyboardDelegate.getLastKey) === null || _keyboardDelegate_getLastKey === void 0 ? void 0 : _keyboardDelegate_getLastKey.call(keyboardDelegate) : (_keyboardDelegate_getFirstKey = keyboardDelegate.getFirstKey) === null || _keyboardDelegate_getFirstKey === void 0 ? void 0 : _keyboardDelegate_getFirstKey.call(keyboardDelegate);
-            let dropPositions = horizontal && direction === 'rtl' ? $4b52e4eff84e5217$var$DROP_POSITIONS_RTL : $4b52e4eff84e5217$var$DROP_POSITIONS;
-            let dropPosition = dropPositions[0];
-            if (target.type === 'item') {
-                // If the the keyboard delegate returned the next key in the collection,
-                // first try the other positions in the current key. Otherwise (e.g. in a grid layout),
-                // jump to the same drop position in the new key.
-                let nextCollectionKey = horizontal && direction === 'rtl' ? localState.state.collection.getKeyBefore(target.key) : localState.state.collection.getKeyAfter(target.key);
-                if (nextKey == null || nextKey === nextCollectionKey) {
-                    let positionIndex = dropPositions.indexOf(target.dropPosition);
-                    let nextDropPosition = dropPositions[positionIndex + 1];
-                    if (positionIndex < dropPositions.length - 1 && !(nextDropPosition === dropPositions[2] && nextKey != null)) return {
-                        type: 'item',
-                        key: target.key,
-                        dropPosition: nextDropPosition
-                    };
-                    // If the last drop position was 'after', then 'before' on the next key is equivalent.
-                    // Switch to 'on' instead.
-                    if (target.dropPosition === dropPositions[2]) dropPosition = 'on';
-                } else dropPosition = target.dropPosition;
-            }
-            if (nextKey == null) {
-                if (wrap) return {
-                    type: 'root'
-                };
-                return null;
-            }
-            return {
-                type: 'item',
-                key: nextKey,
-                dropPosition: dropPosition
-            };
+        let getNextTarget = (target, wrap = true, key = 'down')=>{
+            return (0, $e154566cef11553b$export$ff7962acd6052c28)(localState.props.keyboardDelegate, localState.state.collection, target, key, direction === 'rtl', wrap);
         };
-        let getPreviousTarget = (target, wrap = true, horizontal = false)=>{
-            var _keyboardDelegate_getKeyLeftOf, _keyboardDelegate_getKeyAbove, _keyboardDelegate_getFirstKey, _keyboardDelegate_getLastKey;
-            let { keyboardDelegate: keyboardDelegate } = localState.props;
-            let nextKey;
-            if ((target === null || target === void 0 ? void 0 : target.type) === 'item') nextKey = horizontal ? (_keyboardDelegate_getKeyLeftOf = keyboardDelegate.getKeyLeftOf) === null || _keyboardDelegate_getKeyLeftOf === void 0 ? void 0 : _keyboardDelegate_getKeyLeftOf.call(keyboardDelegate, target.key) : (_keyboardDelegate_getKeyAbove = keyboardDelegate.getKeyAbove) === null || _keyboardDelegate_getKeyAbove === void 0 ? void 0 : _keyboardDelegate_getKeyAbove.call(keyboardDelegate, target.key);
-            else nextKey = horizontal && direction === 'rtl' ? (_keyboardDelegate_getFirstKey = keyboardDelegate.getFirstKey) === null || _keyboardDelegate_getFirstKey === void 0 ? void 0 : _keyboardDelegate_getFirstKey.call(keyboardDelegate) : (_keyboardDelegate_getLastKey = keyboardDelegate.getLastKey) === null || _keyboardDelegate_getLastKey === void 0 ? void 0 : _keyboardDelegate_getLastKey.call(keyboardDelegate);
-            let dropPositions = horizontal && direction === 'rtl' ? $4b52e4eff84e5217$var$DROP_POSITIONS_RTL : $4b52e4eff84e5217$var$DROP_POSITIONS;
-            let dropPosition = !target || target.type === 'root' ? dropPositions[2] : 'on';
-            if ((target === null || target === void 0 ? void 0 : target.type) === 'item') {
-                // If the the keyboard delegate returned the previous key in the collection,
-                // first try the other positions in the current key. Otherwise (e.g. in a grid layout),
-                // jump to the same drop position in the new key.
-                let prevCollectionKey = horizontal && direction === 'rtl' ? localState.state.collection.getKeyAfter(target.key) : localState.state.collection.getKeyBefore(target.key);
-                if (nextKey == null || nextKey === prevCollectionKey) {
-                    let positionIndex = dropPositions.indexOf(target.dropPosition);
-                    let nextDropPosition = dropPositions[positionIndex - 1];
-                    if (positionIndex > 0 && nextDropPosition !== dropPositions[2]) return {
-                        type: 'item',
-                        key: target.key,
-                        dropPosition: nextDropPosition
-                    };
-                    // If the last drop position was 'before', then 'after' on the previous key is equivalent.
-                    // Switch to 'on' instead.
-                    if (target.dropPosition === dropPositions[0]) dropPosition = 'on';
-                } else dropPosition = target.dropPosition;
-            }
-            if (nextKey == null) {
-                if (wrap) return {
-                    type: 'root'
-                };
-                return null;
-            }
-            return {
-                type: 'item',
-                key: nextKey,
-                dropPosition: dropPosition
-            };
+        let getPreviousTarget = (target, wrap = true)=>{
+            return getNextTarget(target, wrap, 'up');
         };
         let nextValidTarget = (target, types, allowedDropOperations, getNextTarget, wrap = true)=>{
             let seenRoot = 0;
@@ -434,13 +363,12 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
             onDropTargetEnter (target) {
                 localState.state.setTarget(target);
             },
-            onDropActivate (e) {
-                var _localState_state_target, _localState_state_target1;
-                if (((_localState_state_target = localState.state.target) === null || _localState_state_target === void 0 ? void 0 : _localState_state_target.type) === 'item' && ((_localState_state_target1 = localState.state.target) === null || _localState_state_target1 === void 0 ? void 0 : _localState_state_target1.dropPosition) === 'on' && typeof localState.props.onDropActivate === 'function') localState.props.onDropActivate({
+            onDropActivate (e, target) {
+                if ((target === null || target === void 0 ? void 0 : target.type) === 'item' && (target === null || target === void 0 ? void 0 : target.dropPosition) === 'on' && typeof localState.props.onDropActivate === 'function') localState.props.onDropActivate({
                     type: 'dropactivate',
                     x: e.x,
                     y: e.y,
-                    target: localState.state.target
+                    target: target
                 });
             },
             onDrop (e, target) {
@@ -448,30 +376,31 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
                 if (localState.state.target) onDrop(e, target || localState.state.target);
             },
             onKeyDown (e, drag) {
+                var _localState_props_onKeyDown, _localState_props;
                 let { keyboardDelegate: keyboardDelegate } = localState.props;
                 let types = (0, $7252cd45fc48c07c$export$e1d41611756c6326)(drag.items);
                 switch(e.key){
                     case 'ArrowDown':
                         if (keyboardDelegate.getKeyBelow) {
-                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, getNextTarget);
+                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, 'down'));
                             localState.state.setTarget(target);
                         }
                         break;
                     case 'ArrowUp':
                         if (keyboardDelegate.getKeyAbove) {
-                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, getPreviousTarget);
+                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, 'up'));
                             localState.state.setTarget(target);
                         }
                         break;
                     case 'ArrowLeft':
                         if (keyboardDelegate.getKeyLeftOf) {
-                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getPreviousTarget(target, wrap, true));
+                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, 'left'));
                             localState.state.setTarget(target);
                         }
                         break;
                     case 'ArrowRight':
                         if (keyboardDelegate.getKeyRightOf) {
-                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, true));
+                            let target = nextValidTarget(localState.state.target, types, drag.allowedDropOperations, (target, wrap)=>getNextTarget(target, wrap, 'right'));
                             localState.state.setTarget(target);
                         }
                         break;
@@ -573,6 +502,7 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
                             break;
                         }
                 }
+                (_localState_props_onKeyDown = (_localState_props = localState.props).onKeyDown) === null || _localState_props_onKeyDown === void 0 ? void 0 : _localState_props_onKeyDown.call(_localState_props, e);
             }
         });
     }, [