Skip to content

fix: the parent is half checked when it has an unchecked disabled child #649

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 1 commit into
base: master
Choose a base branch
from
Open

fix: the parent is half checked when it has an unchecked disabled child #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions docs/examples/basic.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const treeData = [

class Demo extends React.Component {
static defaultProps = {
keys: ['0-0-0-0'],
keys: ['0-0-0-0', '0-0-1-0'],
};

constructor(props) {
Expand Down Expand Up @@ -117,7 +117,7 @@ class Demo extends React.Component {
<TreeNode title="parent 1" key="0-0">
<TreeNode title={customLabel} key="0-0-0">
<TreeNode title="leaf" key="0-0-0-0" style={{ background: 'rgba(255, 0, 0, 0.1)' }} />
<TreeNode title="leaf" key="0-0-0-1" />
<TreeNode title="leaf" key="0-0-0-1" disabled />
</TreeNode>
<TreeNode title="parent 1-1" key="0-0-1">
<TreeNode title="parent 1-1-0" key="0-0-1-0" disableCheckbox />
Expand Down
8 changes: 6 additions & 2 deletions src/Tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,10 +909,14 @@ class Tree<TreeDataType extends DataNode | BasicDataNode = DataNode> extends Rea
keyEntities,
);

// If remove, we do it again to correction
if (!checked) {
const isHafCheckedAndNothingToCheckMore = treeNode.halfChecked && oriCheckedKeys.length === checkedKeys.length;

// If remove or halfChecked was triggered and nothing changed,
// we do it again to correction
if (!checked || isHafCheckedAndNothingToCheckMore) {
const keySet = new Set(checkedKeys);
keySet.delete(key);
halfCheckedKeys = halfCheckedKeys.filter(item => item !== key);
({ checkedKeys, halfCheckedKeys } = conductCheck(
Array.from(keySet),
{ checked: false, halfCheckedKeys },
Expand Down
80 changes: 46 additions & 34 deletions src/utils/conductUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,29 @@ function fillConductCheck<TreeDataType extends BasicDataNode = DataNode>(
}

let allChecked = true;
let partialChecked = false;

(parent.children || [])
.filter(childEntity => !syntheticGetCheckDisabled(childEntity.node))
.forEach(({ key }) => {
const checked = checkedKeys.has(key);
if (allChecked && !checked) {
allChecked = false;
}
if (!partialChecked && (checked || halfCheckedKeys.has(key))) {
partialChecked = true;
}
});
let hasChecked = false;

(parent.children || []).forEach(({ key }) => {
const checked = checkedKeys.has(key);
if (checked) {
hasChecked = true;
} else if (halfCheckedKeys.has(key)) {
hasChecked = true;
allChecked = false;
} else {
allChecked = false;
}
});

if (allChecked) {
checkedKeys.add(parent.key);
}
if (partialChecked) {
halfCheckedKeys.delete(parent.key);
} else if (hasChecked) {
halfCheckedKeys.add(parent.key);
checkedKeys.delete(parent.key);
} else {
halfCheckedKeys.delete(parent.key);
checkedKeys.delete(parent.key);
}

visitedKeys.add(parent.key);
Expand All @@ -93,7 +97,7 @@ function fillConductCheck<TreeDataType extends BasicDataNode = DataNode>(

return {
checkedKeys: Array.from(checkedKeys),
halfCheckedKeys: Array.from(removeFromCheckedKeys(halfCheckedKeys, checkedKeys)),
halfCheckedKeys: Array.from(halfCheckedKeys),
};
}

Expand All @@ -108,6 +112,9 @@ function cleanConductCheck<TreeDataType extends BasicDataNode = DataNode>(
const checkedKeys = new Set<Key>(keys);
let halfCheckedKeys = new Set<Key>(halfKeys);

console.log({keys,
halfKeys})

// Remove checked keys from top to bottom
for (let level = 0; level <= maxLevel; level += 1) {
const entities = levelEntities.get(level) || new Set();
Expand All @@ -118,6 +125,7 @@ function cleanConductCheck<TreeDataType extends BasicDataNode = DataNode>(
children
.filter(childEntity => !syntheticGetCheckDisabled(childEntity.node))
.forEach(childEntity => {
halfCheckedKeys.delete(childEntity.key);
checkedKeys.delete(childEntity.key);
});
}
Expand Down Expand Up @@ -145,25 +153,29 @@ function cleanConductCheck<TreeDataType extends BasicDataNode = DataNode>(
}

let allChecked = true;
let partialChecked = false;

(parent.children || [])
.filter(childEntity => !syntheticGetCheckDisabled(childEntity.node))
.forEach(({ key }) => {
const checked = checkedKeys.has(key);
if (allChecked && !checked) {
allChecked = false;
}
if (!partialChecked && (checked || halfCheckedKeys.has(key))) {
partialChecked = true;
}
});

if (!allChecked) {
checkedKeys.delete(parent.key);
}
if (partialChecked) {
let hasChecked = false;

(parent.children || []).forEach(({ key }) => {
const checked = checkedKeys.has(key);
if (checked) {
hasChecked = true;
} else if (halfCheckedKeys.has(key)) {
hasChecked = true;
allChecked = false;
} else {
allChecked = false;
}
});

if (allChecked) {
checkedKeys.add(parent.key);
halfCheckedKeys.delete(parent.key);
} else if (hasChecked) {
halfCheckedKeys.add(parent.key);
checkedKeys.delete(parent.key);
} else {
halfCheckedKeys.delete(parent.key);
checkedKeys.delete(parent.key);
}

visitedKeys.add(parent.key);
Expand Down