Skip to content

Commit 953d96d

Browse files
committed
Revert "Revert "fix: disabled draggable node should have draggable className (#632)""
This reverts commit 654edb7.
1 parent a486403 commit 953d96d

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.fatherrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export default {
33
esm: { type: 'babel', importLibToEs: true },
44
preCommit: {
55
eslint: true,
6-
prettier: true,
6+
prettier: false,
77
},
88
runtimeHelpers: true,
99
};

src/TreeNode.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ class InternalTreeNode extends React.Component<InternalTreeNodeProps, TreeNodeSt
577577
[`${prefixCls}-treenode-loading`]: loading,
578578
[`${prefixCls}-treenode-active`]: active,
579579
[`${prefixCls}-treenode-leaf-last`]: isEndNode,
580-
[`${prefixCls}-treenode-draggable`]: draggableWithoutDisabled,
580+
[`${prefixCls}-treenode-draggable`]: mergedDraggable,
581581

582582
dragging,
583583
'drop-target': dropTargetKey === eventKey,

tests/TreeDraggable.spec.tsx

+12
Original file line numberDiff line numberDiff line change
@@ -1135,4 +1135,16 @@ describe('Tree Draggable', () => {
11351135
// Should not break
11361136
fireEvent.dragEnd(container.querySelector('.test'));
11371137
});
1138+
1139+
it('disabled item should have draggable className', () => {
1140+
const { container } = render(
1141+
<Tree draggable defaultExpandAll>
1142+
<TreeNode title="parent 1" key="0-0">
1143+
<TreeNode title="leaf" key="0-0-0" disabled />
1144+
<TreeNode title="leaf" key="0-0-1" />
1145+
</TreeNode>
1146+
</Tree>,
1147+
);
1148+
expect(container.querySelectorAll('.rc-tree-treenode-draggable').length).toBe(3);
1149+
});
11381150
});

0 commit comments

Comments
 (0)