Skip to content

Fixing aria reorderable story #3838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 13, 2022
Merged

Fixing aria reorderable story #3838

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b1aa5a
Update reorderable story to fit updated DnD api
LFDanLu Dec 12, 2022
d3ed3cc
Merge branch 'main' into fix_aria_reorderable_story
LFDanLu Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions packages/@react-aria/dnd/stories/Reorderable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,20 @@ function ReorderableGrid(props) {
});
useDraggableCollection({}, dragState, ref);

let onDrop = async (e) => {
if (e.target.type !== 'root' && e.target.dropPosition !== 'on' && props.onMove) {
let keys = [];
for (let item of e.items) {
if (item.kind === 'text' && item.types.has(dragType)) {
let key = JSON.parse(await item.getText(dragType));
keys.push(key);
}
}

props.onMove(keys, e.target);
}
};

let dropState = useDroppableCollectionState({
collection: gridState.collection,
selectionManager: gridState.selectionManager,
Expand All @@ -118,26 +132,15 @@ function ReorderableGrid(props) {
}

return 'move';
}
},
onDrop
});

let {collectionProps} = useDroppableCollection({
keyboardDelegate,
dropTargetDelegate: new ListDropTargetDelegate(state.collection, ref),
onDropActivate: chain(action('onDropActivate'), console.log),
onDrop: async e => {
if (e.target.type !== 'root' && e.target.dropPosition !== 'on' && props.onMove) {
let keys = [];
for (let item of e.items) {
if (item.kind === 'text' && item.types.has(dragType)) {
let key = JSON.parse(await item.getText(dragType));
keys.push(key);
}
}

props.onMove(keys, e.target);
}
}
onDrop
}, dropState, ref);

let {gridProps} = useGrid({
Expand Down