diff --git a/package.json b/package.json index e3f143b9..b2fe1cf5 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,13 @@ "@types/react": "^16.8.19", "@types/react-dom": "^17.0.11", "@types/warning": "^3.0.0", + "@umijs/fabric": "^2.10.1", "cross-env": "^7.0.0", "dumi": "^1.1.12", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.0.2", "enzyme-to-json": "^3.2.1", + "eslint": "^7.1.0", "father": "^2.13.2", "gh-pages": "^3.1.0", "glob": "^7.1.6", diff --git a/src/Cascader.tsx b/src/Cascader.tsx index 59460104..5cf335d1 100644 --- a/src/Cascader.tsx +++ b/src/Cascader.tsx @@ -305,7 +305,6 @@ const Cascader = React.forwardRef((props, re deDuplicatedValues, mergedOptions, mergedFieldNames, - multiple, displayRender, ); diff --git a/src/hooks/useDisplayValues.ts b/src/hooks/useDisplayValues.ts index 64ed1ead..e56668a4 100644 --- a/src/hooks/useDisplayValues.ts +++ b/src/hooks/useDisplayValues.ts @@ -12,7 +12,6 @@ export default ( rawValues: SingleValueType[], options: DefaultOptionType[], fieldNames: InternalFieldNames, - multiple: boolean, displayRender: CascaderProps['displayRender'], ) => { return React.useMemo(() => { @@ -20,15 +19,14 @@ export default ( 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 (labels.every(label => ['string', 'number'].includes(typeof label))) { + return labels.join(SPLIT); } // If exist non-string value, use ReactNode instead - return mergedLabels.reduce((list, label, index) => { + return labels.reduce((list, label, index) => { const keyedLabel = React.isValidElement(label) ? React.cloneElement(label, { key: index }) : label; @@ -55,5 +53,5 @@ export default ( valueCells, }; }); - }, [rawValues, options, fieldNames, displayRender, multiple]); + }, [rawValues, options, fieldNames, displayRender]); }; diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx index 74298da3..8352f4de 100644 --- a/tests/index.spec.tsx +++ b/tests/index.spec.tsx @@ -764,7 +764,7 @@ describe('Cascader.Basic', () => { ); expect(wrapper.find('.rc-cascader-selection-item-content').first().text()).toEqual('Parent'); - expect(wrapper.find('.rc-cascader-selection-item-content').last().text()).toEqual('Child'); + expect(wrapper.find('.rc-cascader-selection-item-content').last().text()).toEqual('Normal / Child'); }); }); });