Skip to content

fix(Tree): add disabled state check for draggable nodes #3690

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
Aug 22, 2025
Merged

fix(Tree): add disabled state check for draggable nodes #3690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9da1de3
fix(Tree): add `disabled` state check for `draggable` nodes
RylanBot Aug 20, 2025
7d7b6e3
fix(Tree): ensure draggable class is only applied to non-disabled nodes
RylanBot Aug 20, 2025
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
4 changes: 3 additions & 1 deletion src/tree/_example/draggable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
transition
expand-all
draggable
check-strictly
:allow-drop="handleAllowDrop"
@drag-start="handleDragStart"
@drag-end="handleDragEnd"
Expand Down Expand Up @@ -51,6 +52,7 @@ export default {
{
value: '1.1.2.1',
label: '1.1.2.1',
disabled: true,
},
{
value: '1.1.2.2',
Expand All @@ -72,7 +74,7 @@ export default {
},
{
value: '2.2',
label: '2.2 不允许拖放为 2.2 的子节点',
label: '2.2 （不允许其它节点拖放为其子节点）',
},
],
},
Expand Down
4 changes: 2 additions & 2 deletions src/tree/hooks/useTreeItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default function useTreeItem(state: TypeTreeItemState) {
[`${classPrefix}-is-disabled`]: node.isDisabled(),
});
list.push({
[`${componentName}__item--draggable`]: node.isDraggable(),
[`${componentName}__item--draggable`]: !node.isDisabled() && node.isDraggable(),
});
if (node.visible) {
list.push(`${componentName}__item--visible`);
Expand Down Expand Up @@ -132,7 +132,7 @@ export default function useTreeItem(state: TypeTreeItemState) {
data-level={level}
style={styles}
onClick={(evt: MouseEvent) => handleClick(evt)}
draggable={node.isDraggable()}
draggable={!node.isDisabled() && node.isDraggable()}
onDragstart={(evt: DragEvent) => handleDragStart(evt)}
onDragend={(evt: DragEvent) => handleDragEnd(evt)}
onDragover={(evt: DragEvent) => handleDragOver(evt)}
Expand Down
8 changes: 4 additions & 4 deletions test/snap/__snapshots__/csr.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122103,10 +122103,10 @@ exports[`csr snapshot test > csr test ./src/tree/_example/draggable.vue 1`] = `
</span>
</div>
<div
class="t-tree__item t-tree__item--open t-tree__item--draggable t-tree__item--visible"
class="t-tree__item t-tree__item--open t-is-disabled t-tree__item--visible"
data-level="3"
data-value="1.1.2.1"
draggable="true"
draggable="false"
style="--level: 3;"
>
<span
Expand Down Expand Up @@ -122221,12 +122221,12 @@ exports[`csr snapshot test > csr test ./src/tree/_example/draggable.vue 1`] = `
/>
<span
class="t-tree__label"
title="2.2 不允许拖放为 2.2 的子节点"
title="2.2 （不允许其它节点拖放为其子节点）"
>
<span
style="position: relative;"
>
2.2 不允许拖放为 2.2 的子节点
2.2 （不允许其它节点拖放为其子节点）
</span>
</span>
</div>
Expand Down
Loading
Loading