mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-27 12:39:49 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

♻️ refactor: Defensive programming (#51360)

Browse Source
This commit is contained in:
𝑾𝒖𝒙𝒉 2024-10-23 22:18:55 +08:00 committed by GitHub
parent 02fc70eb4b
commit 5a5a412a3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/table/hooks/useFilter/FilterDropdown.tsx
View File

@ -6,6 +6,7 @@ import type { FieldDataNode } from 'rc-tree';
import isEqual from 'rc-util/lib/isEqual';
import type { FilterState } from '.';
import extendsObject from '../../../_util/extendsObject';
import useSyncState from '../../../_util/hooks/useSyncState';
import { devUseWarning } from '../../../_util/warning';
import Button from '../../../button';
@ -549,22 +550,26 @@ const FilterDropdown = <RecordType extends AnyObject = AnyObject>(
);
};
const mergedDropdownProps: DropdownProps = {
trigger: ['click'],
placement: direction === 'rtl' ? 'bottomLeft' : 'bottomRight',
children: getDropdownTrigger(),
getPopupContainer,
...filterDropdownProps,
rootClassName: classNames(rootClassName, filterDropdownProps.rootClassName),
open: mergedVisible,
onOpenChange: onVisibleChange,
dropdownRender: () => {
if (typeof filterDropdownProps?.dropdownRender === 'function') {
return filterDropdownProps.dropdownRender(dropdownContent);
}
return dropdownContent;
const mergedDropdownProps = extendsObject<DropdownProps>(
{
trigger: ['click'],
placement: direction === 'rtl' ? 'bottomLeft' : 'bottomRight',
children: getDropdownTrigger(),
getPopupContainer,
},
};
{
...filterDropdownProps,
rootClassName: classNames(rootClassName, filterDropdownProps.rootClassName),
open: mergedVisible,
onOpenChange: onVisibleChange,
dropdownRender: () => {
if (typeof filterDropdownProps?.dropdownRender === 'function') {
return filterDropdownProps.dropdownRender(dropdownContent);
}
return dropdownContent;
},
},
);
return (
<div className={`${prefixCls}-column`}>