Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export class TreeDropTargetDelegate<T> {
if (potentialTargets.length === 1) {
let nextKey = collection.getKeyAfter(target.key);
let nextNode = nextKey ? collection.getItem(nextKey) : null;
if (nextKey != null && nextNode && currentItem && nextNode.level != null && currentItem.level != null && nextNode.level > currentItem.level) {
if (nextKey != null && nextNode && currentItem && nextNode.type === 'item' && nextNode.level != null && currentItem.level != null && nextNode.level > currentItem.level) {
let beforeTarget = {
type: 'item',
key: nextKey,
Expand Down
59 changes: 59 additions & 0 deletions packages/react-aria-components/test/Tree.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2045,6 +2045,65 @@ describe('Tree', () => {
expect(getItems).toHaveBeenCalledTimes(1);
expect(getItems).toHaveBeenCalledWith(new Set(['projects', 'reports']));
});

it('should allow dropping a child before its parent when parent is the only root node', () => {
let onMove = jest.fn();
let items = [
{id: 'projects', name: 'Projects', childItems: [
{id: 'project-1', name: 'Project 1'}
]}
];

let realGetBoundingClientRect = window.HTMLElement.prototype.getBoundingClientRect;
let rectSpy = jest.spyOn(window.HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (this: HTMLElement): DOMRect {
let rect = realGetBoundingClientRect.call(this);

if (this.getAttribute('role') === 'treegrid') {
return {...rect, top: 0, left: 0, width: 100, height: 100, bottom: 100, right: 100};
}

if (this.getAttribute('data-key') === 'projects') {
return {...rect, top: 10, left: 0, width: 100, height: 20, bottom: 30, right: 100};
}

if (this.getAttribute('data-key') === 'project-1') {
return {...rect, top: 30, left: 0, width: 100, height: 20, bottom: 50, right: 100};
}

return rect;
});

function SingleRootDraggableTree() {
let {dragAndDropHooks} = useDragAndDrop({
getItems: (keys) => [...keys].map((key) => ({'text/plain': key.toString()})),
onMove
});

return <DynamicTree treeProps={{dragAndDropHooks, items}} />;
}

let {getByRole} = render(<SingleRootDraggableTree />);

let tree = getByRole('treegrid');
let project1Row = getByRole('row', {name: 'Project 1'});
let dataTransfer = new DataTransfer();

fireEvent(project1Row, new DragEvent('dragstart', {dataTransfer, clientX: 50, clientY: 35}));
act(() => jest.runAllTimers());

fireEvent(tree, new DragEvent('dragenter', {dataTransfer, clientX: 50, clientY: 0}));
fireEvent(tree, new DragEvent('dragover', {dataTransfer, clientX: 50, clientY: 0}));

fireEvent(tree, new DragEvent('drop', {dataTransfer, clientX: 50, clientY: 0}));
fireEvent(project1Row, new DragEvent('dragend', {dataTransfer, clientX: 50, clientY: 0}));
act(() => jest.runAllTimers());

expect(onMove).toHaveBeenCalledTimes(1);
expect(onMove.mock.calls[0][0].keys).toEqual(new Set(['project-1']));
expect(onMove.mock.calls[0][0].target).toEqual({type: 'item', key: 'projects', dropPosition: 'before'});

rectSpy.mockRestore();
});
});

describe('press events', () => {
Expand Down
Loading