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 examples/debug.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ const Demo = () => {
allowClear
// defaultValue={multiple ? [defaultValue] : defaultValue}
// defaultValue={[['not', 'yet'], ['exist']]}
defaultValue={[['empty']]}
// defaultValue={[['empty']]}
defaultValue={[['fj', 'fuzhou']]}
showSearch
// showSearch={{ limit: 1 }}
open
Expand Down
1 change: 1 addition & 0 deletions src/Cascader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
deDuplicatedValues,
mergedOptions,
mergedFieldNames,
multiple,
displayRender,
);

Expand Down
51 changes: 29 additions & 22 deletions src/hooks/useDisplayValues.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,39 @@ export default (
rawValues: SingleValueType[],
options: DefaultOptionType[],
fieldNames: InternalFieldNames,
displayRender: CascaderProps['displayRender'] = labels => {
const SPLIT = ' / ';

if (labels.every(label => ['string', 'number'].includes(typeof label))) {
return labels.join(SPLIT);
}

// If exist non-string value, use ReactNode instead
return labels.reduce((list, label, index) => {
const keyedLabel = React.isValidElement(label)
? React.cloneElement(label, { key: index })
: label;

if (index === 0) {
return [keyedLabel];
}

return [...list, SPLIT, keyedLabel];
}, []);
},
multiple: boolean,
displayRender: CascaderProps['displayRender'],
) => {
return React.useMemo(() => {
const mergedDisplayRender =
displayRender ||
// Default displayRender
(labels => {
const mergedLabels = multiple ? labels.slice(-1) : labels;
const SPLIT = ' / ';

if (mergedLabels.every(label => ['string', 'number'].includes(typeof label))) {
return mergedLabels.join(SPLIT);
}

// If exist non-string value, use ReactNode instead
return mergedLabels.reduce((list, label, index) => {
const keyedLabel = React.isValidElement(label)
? React.cloneElement(label, { key: index })
: label;

if (index === 0) {
return [keyedLabel];
}

return [...list, SPLIT, keyedLabel];
}, []);
});

return rawValues.map(valueCells => {
const valueOptions = toPathOptions(valueCells, options, fieldNames);

const label = displayRender(
const label = mergedDisplayRender(
valueOptions.map(({ option, value }) => option?.[fieldNames.label] ?? value),
valueOptions.map(({ option }) => option),
);
Expand All @@ -48,5 +55,5 @@ export default (
valueCells,
};
});
}, [rawValues, options, fieldNames, displayRender]);
}, [rawValues, options, fieldNames, displayRender, multiple]);
};
82 changes: 54 additions & 28 deletions tests/index.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -711,34 +711,60 @@ describe('Cascader.Basic', () => {
expect(wrapper.find('ul.rc-cascader-menu')).toHaveLength(1);
});

it('ReactNode label should not be [object]', () => {
const wrapper = mount(
<Cascader
options={[
{ label: <span>Parent</span>, value: 'parent' },
{
label: 'Normal',
value: 'normal',
children: [
{
label: <span>Child</span>,
value: 'child',
},
{
label: 'Child2',
value: 'child2',
},
],
},
]}
value={[['parent'], ['normal', 'child']]}
checkable
/>,
);
describe('ReactNode label should not be [object]', () => {
it('single', () => {
const wrapper = mount(
<Cascader
options={[
{
label: 'Normal',
value: 'normal',
children: [
{
label: <span>Child</span>,
value: 'child',
},
{
label: 'Child2',
value: 'child2',
},
],
},
]}
value={['normal', 'child']}
/>,
);

expect(wrapper.find('.rc-cascader-selection-item-content').first().text()).toEqual('Parent');
expect(wrapper.find('.rc-cascader-selection-item-content').last().text()).toEqual(
'Normal / Child',
);
expect(wrapper.find('.rc-cascader-selection-item').text()).toEqual('Normal / Child');
});

it('multiple', () => {
const wrapper = mount(
<Cascader
options={[
{ label: <span>Parent</span>, value: 'parent' },
{
label: 'Normal',
value: 'normal',
children: [
{
label: <span>Child</span>,
value: 'child',
},
{
label: 'Child2',
value: 'child2',
},
],
},
]}
value={[['parent'], ['normal', 'child']]}
checkable
/>,
);

expect(wrapper.find('.rc-cascader-selection-item-content').first().text()).toEqual('Parent');
expect(wrapper.find('.rc-cascader-selection-item-content').last().text()).toEqual('Child');
});
});
});