Skip to content

[WIP]fix:parent node not disabled when child nodes count greater than maxCount #642

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[WIP]fix:parent node not disabled when child nodes count greater than maxCount #642

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdff8c1
fix:parent node not disabled when child nodes count greater than `max…
yellowryan Apr 22, 2025
fa85621
perf: code optimization
yellowryan Apr 22, 2025
b69ed2b
chore: unchange demo
yellowryan Apr 23, 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
35 changes: 26 additions & 9 deletions src/OptionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { RefOptionListProps } from '@rc-component/select/lib/OptionList';
import type { TreeProps } from '@rc-component/tree';
import Tree from '@rc-component/tree';
import { UnstableContext } from '@rc-component/tree';
import type { EventDataNode, ScrollTo } from '@rc-component/tree/lib/interface';
import type { DataEntity, EventDataNode, ScrollTo } from '@rc-component/tree/lib/interface';
import KeyCode from '@rc-component/util/lib/KeyCode';
import useMemo from '@rc-component/util/lib/hooks/useMemo';
import * as React from 'react';
Expand Down Expand Up @@ -178,14 +178,31 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
const isLeaf = (entity.children || []).length === 0;

if (!isLeaf) {
const checkableChildren = entity.children.filter(
childTreeNode =>
!childTreeNode.node.disabled &&
!childTreeNode.node.disableCheckbox &&
!checkedKeys.includes(childTreeNode.node[fieldNames.value]),
);

const checkableChildrenCount = checkableChildren.length;
const getLeafCheckableCount = (children: DataEntity<DataNode>[]): number => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这样会有性能问题，最好是收集可见区域的节点，通过染色来做标记。避免递归产生大量的性能损耗。

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

那是不是可以通过栈+染色的形式来进行一个优化

return children.reduce((count, current) => {
const currentValue = current.node[fieldNames.value];
const currentEntity = valueEntities.get(currentValue);
const isCurrentLeaf = (currentEntity.children || []).length === 0;

if (isCurrentLeaf) {
if (
!current.node.disabled &&
!current.node.disableCheckbox &&
!checkedKeys.includes(currentValue)
) {
return count + 1;
}
} else if (
!current.node.disabled &&
!current.node.disableCheckbox &&
!checkedKeys.includes(currentValue)
) {
return count + getLeafCheckableCount(currentEntity.children);
}
return count;
}, 0);
};
const checkableChildrenCount = getLeafCheckableCount(entity.children);
disabledCache.set(value, checkableChildrenCount > leftMaxCount);
} else {
disabledCache.set(value, false);
Expand Down