Skip to content

Commit

Permalink
fix(Tree): fix Tree dont use activable, onClick not trigger (#2568)
Browse files Browse the repository at this point in the history
Co-authored-by: Heising <heising@travelconnect.cn>
  • Loading branch information
HaixingOoO and Heising authored Oct 23, 2023
1 parent 3256566 commit 563f814
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/tree/Tree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,14 @@ const Tree = forwardRef((props: TreeProps, ref: React.Ref<TreeInstanceFunctions>
const { expand, active, e, trigger } = options;
if (expand) setExpanded(node, !node.isExpanded(), { e, trigger });

if (active && !isDisabled) {
setActived(node, !node.isActived(), { e, trigger: 'node-click' });
if (!isDisabled) {
const treeNodeModel = node?.getModel();
onClick?.({ node: treeNodeModel, e });
if (active) {
setActived(node, !node.isActived(), { e, trigger: 'node-click' });
onClick?.({ node: treeNodeModel, e });
} else {
onClick?.({ node: treeNodeModel, e });
}
}
};

Expand Down

0 comments on commit 563f814

Please sign in to comment.