@react-aria/dnd 3.1.1-nightly.3787 → 3.1.1-nightly.3804

package/dist/import.mjs

@@ -3116,6 +3116,9 @@ function $4b52e4eff84e5217$export$f4e2f423c21f7b04(props, state, ref) {
             // is some indication that items were added.
             if (state.selectionManager.focusedKey === droppingState.current.focusedKey) {
                 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, $fP8tg$setInteractionModality)("keyboard");
             }
@@ -3503,9 +3506,10 @@ function $ddf25448c71fc93a$export$8d0e41d2815afac5(props, state, ref) {
     let dragSession = $67560de7c78cb232$export$418e185dd3f1b968();
     let { dropProps: dropProps  } = (0, $bfaab576ce1c580e$export$f7b0c5d28b66b6a5)(props, state, ref);
     let id = (0, $fP8tg$useId)();
+    var _collection_getTextValue;
     let getText = (key)=>{
-        var _collection_getItem;
-        return (_collection_getItem = collection.getItem(key)) === null || _collection_getItem === void 0 ? void 0 : _collection_getItem.textValue;
+        var _collection_getTextValue1, _collection_getItem;
+        return (_collection_getTextValue = (_collection_getTextValue1 = collection.getTextValue) === null || _collection_getTextValue1 === void 0 ? void 0 : _collection_getTextValue1.call(collection, key)) !== null && _collection_getTextValue !== void 0 ? _collection_getTextValue : (_collection_getItem = collection.getItem(key)) === null || _collection_getItem === void 0 ? void 0 : _collection_getItem.textValue;
     };
     let label = "";
     let labelledBy;
@@ -3620,7 +3624,6 @@ function $fd98cf7cbf233429$export$b35afafff42da2d9(props, state) {
     let description;
     // Override description to include selected item count.
     let modality = (0, $7252cd45fc48c07c$export$49bac5d6d4b352ea)();
-    var _item_textValue;
     if (!props.hasDragButton && state.selectionManager.selectionMode !== "none") {
         let msg = $fd98cf7cbf233429$var$MESSAGES[modality][isSelected ? "selected" : "notSelected"];
         if (props.hasAction && modality === "keyboard") msg += "Alt";
@@ -3634,9 +3637,14 @@ function $fd98cf7cbf233429$export$b35afafff42da2d9(props, state) {
     } else if (isSelected) dragButtonLabel = stringFormatter.format("dragSelectedItems", {
         count: numKeysForDrag
     });
-    else dragButtonLabel = stringFormatter.format("dragItem", {
-        itemText: (_item_textValue = item === null || item === void 0 ? void 0 : item.textValue) !== null && _item_textValue !== void 0 ? _item_textValue : ""
-    });
+    else {
+        var _state_collection, _state_collection_getTextValue;
+        var _state_collection_getTextValue1, _ref;
+        let itemText = (_ref = (_state_collection_getTextValue1 = (_state_collection_getTextValue = (_state_collection = state.collection).getTextValue) === null || _state_collection_getTextValue === void 0 ? void 0 : _state_collection_getTextValue.call(_state_collection, props.key)) !== null && _state_collection_getTextValue1 !== void 0 ? _state_collection_getTextValue1 : item === null || item === void 0 ? void 0 : item.textValue) !== null && _ref !== void 0 ? _ref : "";
+        dragButtonLabel = stringFormatter.format("dragItem", {
+            itemText: itemText
+        });
+    }
     let descriptionProps = (0, $fP8tg$useDescription)(description);
     if (description) Object.assign(dragProps, descriptionProps);
     if (!props.hasDragButton && props.hasAction) {

package/dist/main.js

@@ -3135,6 +3135,9 @@ function $7f93a158ac20b90a$export$f4e2f423c21f7b04(props, state, ref) {
             // is some indication that items were added.
             if (state.selectionManager.focusedKey === droppingState.current.focusedKey) {
                 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, $4vY0V$reactariainteractions.setInteractionModality)("keyboard");
             }
@@ -3522,9 +3525,10 @@ function $c5557edbed563ebf$export$8d0e41d2815afac5(props, state, ref) {
     let dragSession = $28e10663603f5ea1$export$418e185dd3f1b968();
     let { dropProps: dropProps  } = (0, $fc1876157e07bcec$export$f7b0c5d28b66b6a5)(props, state, ref);
     let id = (0, $4vY0V$reactariautils.useId)();
+    var _collection_getTextValue;
     let getText = (key)=>{
-        var _collection_getItem;
-        return (_collection_getItem = collection.getItem(key)) === null || _collection_getItem === void 0 ? void 0 : _collection_getItem.textValue;
+        var _collection_getTextValue1, _collection_getItem;
+        return (_collection_getTextValue = (_collection_getTextValue1 = collection.getTextValue) === null || _collection_getTextValue1 === void 0 ? void 0 : _collection_getTextValue1.call(collection, key)) !== null && _collection_getTextValue !== void 0 ? _collection_getTextValue : (_collection_getItem = collection.getItem(key)) === null || _collection_getItem === void 0 ? void 0 : _collection_getItem.textValue;
     };
     let label = "";
     let labelledBy;
@@ -3639,7 +3643,6 @@ function $0cbbd00cda972c67$export$b35afafff42da2d9(props, state) {
     let description;
     // Override description to include selected item count.
     let modality = (0, $4620ae0dc40f0031$export$49bac5d6d4b352ea)();
-    var _item_textValue;
     if (!props.hasDragButton && state.selectionManager.selectionMode !== "none") {
         let msg = $0cbbd00cda972c67$var$MESSAGES[modality][isSelected ? "selected" : "notSelected"];
         if (props.hasAction && modality === "keyboard") msg += "Alt";
@@ -3653,9 +3656,14 @@ function $0cbbd00cda972c67$export$b35afafff42da2d9(props, state) {
     } else if (isSelected) dragButtonLabel = stringFormatter.format("dragSelectedItems", {
         count: numKeysForDrag
     });
-    else dragButtonLabel = stringFormatter.format("dragItem", {
-        itemText: (_item_textValue = item === null || item === void 0 ? void 0 : item.textValue) !== null && _item_textValue !== void 0 ? _item_textValue : ""
-    });
+    else {
+        var _state_collection, _state_collection_getTextValue;
+        var _state_collection_getTextValue1, _ref;
+        let itemText = (_ref = (_state_collection_getTextValue1 = (_state_collection_getTextValue = (_state_collection = state.collection).getTextValue) === null || _state_collection_getTextValue === void 0 ? void 0 : _state_collection_getTextValue.call(_state_collection, props.key)) !== null && _state_collection_getTextValue1 !== void 0 ? _state_collection_getTextValue1 : item === null || item === void 0 ? void 0 : item.textValue) !== null && _ref !== void 0 ? _ref : "";
+        dragButtonLabel = stringFormatter.format("dragItem", {
+            itemText: itemText
+        });
+    }
     let descriptionProps = (0, $4vY0V$reactariautils.useDescription)(description);
     if (description) Object.assign(dragProps, descriptionProps);
     if (!props.hasDragButton && props.hasAction) {