mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-28 21:19:37 +08:00
Code Issues Actions 50 Packages Projects Releases Wiki Activity

🐛 Fix Cascader broken when option children is null

Browse Source 
close #17735
This commit is contained in:
afc163 2019-07-20 12:20:00 +08:00
parent 32f1e333ca
commit 93e41ed593
No known key found for this signature in database
GPG Key ID: 5F00908D72002306
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/cascader/__tests__/index.test.js
View File

@ -451,4 +451,24 @@ describe('Cascader', () => {
); );
errorSpy.mockRestore(); errorSpy.mockRestore();
}); });
// https://github.com/ant-design/ant-design/issues/17690
it('should not breaks when children is null', () => {
const optionsWithChildrenNull = [
{
value: 'zhejiang',
label: 'Zhejiang',
children: [
{
value: 'hangzhou',
label: 'Hangzhou',
children: null,
},
],
},
];
expect(() => {
mount(<Cascader options={optionsWithChildrenNull} />);
}).not.toThrow();
});
}); });

4
components/cascader/index.tsx
View File

@ -206,8 +206,8 @@ function flattenTree(
const defaultDisplayRender = (label: string[]) => label.join(' / '); const defaultDisplayRender = (label: string[]) => label.join(' / ');
function warningValueNotExist(list: CascaderOptionType[] = [], fieldNames: FieldNamesType = {}) { function warningValueNotExist(list: CascaderOptionType[], fieldNames: FieldNamesType = {}) {
list.forEach(item => { (list || []).forEach(item => {
const valueFieldName = fieldNames.value || 'value'; const valueFieldName = fieldNames.value || 'value';
warning(valueFieldName in item, 'Cascader', 'Not found `value` in `options`.'); warning(valueFieldName in item, 'Cascader', 'Not found `value` in `options`.');
warningValueNotExist(item[fieldNames.children || 'children'], fieldNames); warningValueNotExist(item[fieldNames.children || 'children'], fieldNames);