Skip to content

Commit df7984a

Browse files
committed
revert refactor
1 parent ec9b67e commit df7984a

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/hooks/useCheckedKeys.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@ export default (
1010
keyEntities: Record<SafeKey, DataEntity>,
1111
) =>
1212
React.useMemo(() => {
13-
const getValues = (values: LabeledValueType[]) => values.map(({ value }) => value);
14-
const checkedKeys = getValues(rawLabeledValues);
15-
const halfCheckedKeys = getValues(rawHalfCheckedValues);
13+
let checkedKeys: SafeKey[] = rawLabeledValues.map(({ value }) => value);
14+
let halfCheckedKeys: SafeKey[] = rawHalfCheckedValues.map(({ value }) => value);
1615

1716
const missingValues = checkedKeys.filter(key => !keyEntities[key]);
1817

19-
const finalCheckedKeys = treeConduction
20-
? conductCheck(checkedKeys, true, keyEntities).checkedKeys
21-
: checkedKeys;
18+
if (treeConduction) {
19+
({ checkedKeys, halfCheckedKeys } = conductCheck(checkedKeys, true, keyEntities));
20+
}
2221

2322
return [
24-
Array.from(new Set([...missingValues, ...finalCheckedKeys])),
25-
treeConduction
26-
? conductCheck(checkedKeys, true, keyEntities).halfCheckedKeys
27-
: halfCheckedKeys,
23+
// Checked keys should fill with missing keys which should de-duplicated
24+
Array.from(new Set([...missingValues, ...checkedKeys])),
25+
// Half checked keys
26+
halfCheckedKeys,
2827
];
2928
}, [rawLabeledValues, rawHalfCheckedValues, treeConduction, keyEntities]);

0 commit comments

Comments
 (0)