Skip to content

Commit 1b87df9

Browse files
committed
fix: preserve drag text set by consumers
1 parent 2492cbc commit 1b87df9

2 files changed

Lines changed: 26 additions & 1 deletion

File tree

‎src/TreeNode.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ const TreeNode: React.FC<Readonly<TreeNodeProps>> = props => {
129129
const onDragStart = (e: React.DragEvent<HTMLDivElement>) => {
130130
e.stopPropagation();
131131
setDragNodeHighlight(true);
132-
context.onNodeDragStart(e, props);
133132
try {
134133
// ie throw error
135134
// firefox-need-it
136135
e.dataTransfer.setData('text/plain', '');
137136
} catch {
138137
// empty
139138
}
139+
context.onNodeDragStart(e, props);
140140
};
141141

142142
const onDragEnter = (e: React.DragEvent<HTMLDivElement>) => {

‎tests/TreeDraggable.spec.tsx‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,31 @@ describe('Tree Draggable', () => {
4646
);
4747
});
4848

49+
it('preserves text data set by onDragStart', () => {
50+
const data = new Map<string, string>();
51+
const dataTransfer = {
52+
setData: jest.fn((type: string, value: string) => data.set(type, value)),
53+
getData: jest.fn((type: string) => data.get(type) || ''),
54+
};
55+
const onDragStart = jest.fn(({ event }) => {
56+
event.dataTransfer.setData('text/plain', 'custom drag data');
57+
});
58+
const { container } = render(createTree({ onDragStart }));
59+
const treeNode = container.querySelector(
60+
'.dragTarget > .rc-tree-node-content-wrapper',
61+
) as HTMLElement;
62+
const event = createEvent.dragStart(treeNode);
63+
Object.defineProperty(event, 'dataTransfer', { value: dataTransfer });
64+
65+
fireEvent(treeNode, event);
66+
67+
expect(dataTransfer.setData.mock.calls).toEqual([
68+
['text/plain', ''],
69+
['text/plain', 'custom drag data'],
70+
]);
71+
expect(dataTransfer.getData('text/plain')).toBe('custom drag data');
72+
});
73+
4974
it('fires dragEnter event', async () => {
5075
const onDragEnter = jest.fn();
5176
const { container } = render(createTree({ onDragEnter }));

0 commit comments

Comments
 (0)