Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/OptionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ const OptionList: React.RefForwardingComponent<
const valueKeys = React.useMemo(
() =>
checkedKeys.map(val => {
const entity = getEntityByValue(val);
// We should keep disabled value entity here
const entity = getEntityByValue(val, undefined, true);
return entity ? entity.key : null;
}),
[checkedKeys, getEntityByValue],
Expand Down
1 change: 1 addition & 0 deletions src/generate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ export default function generate(config: {
}
return [newRawValues, valueHalfCheckedKeys];
}, [value, mergedMultiple, mergedLabelInValue, treeCheckable, treeCheckStrictly]);

const selectValues = useSelectValues(rawValues, {
treeConduction,
value,
Expand Down
28 changes: 28 additions & 0 deletions tests/Select.checkable.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -684,4 +684,32 @@ describe('TreeSelect.checkable', () => {
wrapper.selectNode(1);
expect(onChange).toHaveBeenCalledWith([], expect.anything(), expect.anything());
});

it('disabled option should keep check', () => {
const wrapper = mount(
<TreeSelect
open
treeCheckable
showCheckedStrategy={TreeSelect.SHOW_PARENT}
value={['child']}
treeDefaultExpandAll
treeData={[
{
label: 'parent',
value: 'parent',
disabled: true,
children: [
{
label: 'child',
value: 'child',
disabled: true,
},
],
},
]}
/>,
);

expect(wrapper.exists('.rc-tree-select-tree-treenode-checkbox-checked')).toBeTruthy();
});
});