@react-aria/dnd 3.1.1-nightly.3764 → 3.1.1-nightly.3785

package/dist/import.mjs

@@ -2366,7 +2366,7 @@ function $8253ed7ece74b463$export$7941f8aafa4b6021(options) {
                 y = size.height / 2;
             }
             // Rounding height to an even number prevents blurry preview seen on some screens
-            let height = 2 * Math.round(rect.height / 2);
+            let height = 2 * Math.round(size.height / 2);
             node.style.height = `${height}px`;
             e.dataTransfer.setDragImage(node, x, y);
         });
@@ -3051,11 +3051,17 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
     });
     let droppingState = (0, $fP8tg$useRef)(null);
     let onDrop = (0, $fP8tg$useCallback)((e, target)=>{
+        var _state_collection_getItem;
         let { state: state  } = localState;
         // Focus the collection.
         state.selectionManager.setFocused(true);
         // Save some state of the collection/selection before the drop occurs so we can compare later.
         let focusedKey = state.selectionManager.focusedKey;
+        // If parent key was dragged, we want to use it instead (i.e. focus row instead of cell after dropping)
+        if ((0, $7252cd45fc48c07c$export$6ca6700462636d0b).draggingKeys.has((_state_collection_getItem = state.collection.getItem(focusedKey)) === null || _state_collection_getItem === void 0 ? void 0 : _state_collection_getItem.parentKey)) {
+            focusedKey = state.collection.getItem(focusedKey).parentKey;
+            state.selectionManager.setFocusedKey(focusedKey);
+        }
         droppingState.current = {
             timeout: null,
             focusedKey: focusedKey,
@@ -3510,8 +3516,12 @@ function $ddf25448c71fc93a$export$8d0e41d2815afac5(props, state, ref) {
         itemText: getText(target.key)
     });
     else {
-        let before = target.dropPosition === "before" ? collection.getKeyBefore(target.key) : target.key;
-        let after = target.dropPosition === "after" ? collection.getKeyAfter(target.key) : target.key;
+        let before;
+        let after;
+        if (collection.getFirstKey() === target.key && target.dropPosition === "before") before = null;
+        else before = target.dropPosition === "before" ? collection.getKeyBefore(target.key) : target.key;
+        if (collection.getLastKey() === target.key && target.dropPosition === "after") after = null;
+        else after = target.dropPosition === "after" ? collection.getKeyAfter(target.key) : target.key;
         if (before && after) label = stringFormatter.format("insertBetween", {
             beforeItemText: getText(before),
             afterItemText: getText(after)

package/dist/main.js

@@ -2385,7 +2385,7 @@ function $dc204e8ec58447a6$export$7941f8aafa4b6021(options) {
                 y = size.height / 2;
             }
             // Rounding height to an even number prevents blurry preview seen on some screens
-            let height = 2 * Math.round(rect.height / 2);
+            let height = 2 * Math.round(size.height / 2);
             node.style.height = `${height}px`;
             e.dataTransfer.setDragImage(node, x, y);
         });
@@ -3070,11 +3070,17 @@ function $7f93a158ac20b90a$export$f4e2f423c21f7b04(props, state, ref) {
     });
     let droppingState = (0, $4vY0V$react.useRef)(null);
     let onDrop = (0, $4vY0V$react.useCallback)((e, target)=>{
+        var _state_collection_getItem;
         let { state: state  } = localState;
         // Focus the collection.
         state.selectionManager.setFocused(true);
         // Save some state of the collection/selection before the drop occurs so we can compare later.
         let focusedKey = state.selectionManager.focusedKey;
+        // If parent key was dragged, we want to use it instead (i.e. focus row instead of cell after dropping)
+        if ((0, $4620ae0dc40f0031$export$6ca6700462636d0b).draggingKeys.has((_state_collection_getItem = state.collection.getItem(focusedKey)) === null || _state_collection_getItem === void 0 ? void 0 : _state_collection_getItem.parentKey)) {
+            focusedKey = state.collection.getItem(focusedKey).parentKey;
+            state.selectionManager.setFocusedKey(focusedKey);
+        }
         droppingState.current = {
             timeout: null,
             focusedKey: focusedKey,
@@ -3529,8 +3535,12 @@ function $c5557edbed563ebf$export$8d0e41d2815afac5(props, state, ref) {
         itemText: getText(target.key)
     });
     else {
-        let before = target.dropPosition === "before" ? collection.getKeyBefore(target.key) : target.key;
-        let after = target.dropPosition === "after" ? collection.getKeyAfter(target.key) : target.key;
+        let before;
+        let after;
+        if (collection.getFirstKey() === target.key && target.dropPosition === "before") before = null;
+        else before = target.dropPosition === "before" ? collection.getKeyBefore(target.key) : target.key;
+        if (collection.getLastKey() === target.key && target.dropPosition === "after") after = null;
+        else after = target.dropPosition === "after" ? collection.getKeyAfter(target.key) : target.key;
         if (before && after) label = stringFormatter.format("insertBetween", {
             beforeItemText: getText(before),
             afterItemText: getText(after)