mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-11 11:32:52 +08:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

refactor: use optional chaining instead of if (#29368)

Browse Source 
* refactor: use optional chaining instead of if

* revert some code
This commit is contained in:
afc163 2021-02-19 18:26:53 +08:00 committed by GitHub
parent 2e0915e70f
commit 99c2c2ff0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 98 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/affix/index.tsx
View File

@ -215,9 +215,7 @@ class Affix extends React.Component<AffixProps, AffixState> {
// Test if `updatePosition` called // Test if `updatePosition` called
if (process.env.NODE_ENV === 'test') { if (process.env.NODE_ENV === 'test') {
const { onTestUpdatePosition } = this.props as any; const { onTestUpdatePosition } = this.props as any;
if (onTestUpdatePosition) { onTestUpdatePosition?.();
onTestUpdatePosition();
}
} }
}; };

4
components/anchor/Anchor.tsx
View File

@ -235,9 +235,7 @@ export default class Anchor extends React.Component<AnchorProps, AnchorState, Co
this.setState({ this.setState({
activeLink: link, activeLink: link,
}); });
if (onChange) { onChange?.(link);
onChange(link);
}
} }
}; };

4
components/anchor/AnchorLink.tsx
View File

@ -41,9 +41,7 @@ class AnchorLink extends React.Component<AnchorLinkProps, any, AntAnchor> {
handleClick = (e: React.MouseEvent<HTMLElement>) => { handleClick = (e: React.MouseEvent<HTMLElement>) => {
const { scrollTo, onClick } = this.context; const { scrollTo, onClick } = this.context;
const { href, title } = this.props; const { href, title } = this.props;
if (onClick) { onClick?.(e, { title, href });
onClick(e, { title, href });
}
scrollTo(href); scrollTo(href);
}; };

4
components/button/button.tsx
View File

@ -197,9 +197,7 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
if (innerLoading) { if (innerLoading) {
return; return;
} }
if (onClick) { (onClick as React.MouseEventHandler<HTMLButtonElement | HTMLAnchorElement>)?.(e);
(onClick as React.MouseEventHandler<HTMLButtonElement | HTMLAnchorElement>)(e);
}
}; };
devWarning( devWarning(

12
components/calendar/generateCalendar.tsx
View File

@ -135,9 +135,7 @@ function generateCalendar<DateType>(generateConfig: GenerateConfig<DateType>) {
// ====================== Events ====================== // ====================== Events ======================
const triggerPanelChange = (date: DateType, newMode: CalendarMode) => { const triggerPanelChange = (date: DateType, newMode: CalendarMode) => {
if (onPanelChange) { onPanelChange?.(date, newMode);
onPanelChange(date, newMode);
}
}; };
const triggerChange = (date: DateType) => { const triggerChange = (date: DateType) => {
@ -152,9 +150,7 @@ function generateCalendar<DateType>(generateConfig: GenerateConfig<DateType>) {
triggerPanelChange(date, mergedMode); triggerPanelChange(date, mergedMode);
} }
if (onChange) { onChange?.(date);
onChange(date);
}
} }
}; };
@ -166,9 +162,7 @@ function generateCalendar<DateType>(generateConfig: GenerateConfig<DateType>) {
const onInternalSelect = (date: DateType) => { const onInternalSelect = (date: DateType) => {
triggerChange(date); triggerChange(date);
if (onSelect) { onSelect?.(date);
onSelect(date);
}
}; };
// ====================== Locale ====================== // ====================== Locale ======================

4
components/card/index.tsx
View File

@ -67,9 +67,7 @@ const Card: CardInterface = props => {
const size = React.useContext(SizeContext); const size = React.useContext(SizeContext);
const onTabChange = (key: string) => { const onTabChange = (key: string) => {
if (props.onTabChange) { props.onTabChange?.(key);
props.onTabChange(key);
}
}; };
const isContainGrid = () => { const isContainGrid = () => {

8
components/cascader/index.tsx
View File

@ -312,9 +312,7 @@ class Cascader extends React.Component<CascaderProps, CascaderState> {
this.setState({ value }); this.setState({ value });
} }
const { onChange } = this.props; const { onChange } = this.props;
if (onChange) { onChange?.(value, selectedOptions);
onChange(value, selectedOptions);
}
}; };
getLabel() { getLabel() {
@ -359,9 +357,7 @@ class Cascader extends React.Component<CascaderProps, CascaderState> {
} }
const { onPopupVisibleChange } = this.props; const { onPopupVisibleChange } = this.props;
if (onPopupVisibleChange) { onPopupVisibleChange?.(popupVisible);
onPopupVisibleChange(popupVisible);
}
}; };
handleInputBlur = () => { handleInputBlur = () => {

22
components/checkbox/Group.tsx
View File

@ -94,18 +94,16 @@ const CheckboxGroup: React.FC<CheckboxGroupProps> = ({
if (!('value' in restProps)) { if (!('value' in restProps)) {
setValue(newValue); setValue(newValue);
} }
if (onChange) { const opts = getOptions();
const opts = getOptions(); onChange?.(
onChange( newValue
newValue .filter(val => registeredValues.indexOf(val) !== -1)
.filter(val => registeredValues.indexOf(val) !== -1) .sort((a, b) => {
.sort((a, b) => { const indexA = opts.findIndex(opt => opt.value === a);
const indexA = opts.findIndex(opt => opt.value === a); const indexB = opts.findIndex(opt => opt.value === b);
const indexB = opts.findIndex(opt => opt.value === b); return indexA - indexB;
return indexA - indexB; }),
}), );
);
}
}; };
const prefixCls = getPrefixCls('checkbox', customizePrefixCls); const prefixCls = getPrefixCls('checkbox', customizePrefixCls);

4
components/form/Form.tsx
View File

@ -103,9 +103,7 @@ const InternalForm: React.ForwardRefRenderFunction<unknown, FormProps> = (props,
React.useImperativeHandle(ref, () => wrapForm); React.useImperativeHandle(ref, () => wrapForm);
const onInternalFinishFailed = (errorInfo: ValidateErrorEntity) => { const onInternalFinishFailed = (errorInfo: ValidateErrorEntity) => {
if (onFinishFailed) { onFinishFailed?.(errorInfo);
onFinishFailed(errorInfo);
}
let defaultScrollToFirstError: Options = { block: 'nearest' }; let defaultScrollToFirstError: Options = { block: 'nearest' };

4
components/form/demo/customized-form-controls.md
View File

@ -42,9 +42,7 @@ const PriceInput: React.FC<PriceInputProps> = ({ value = {}, onChange }) => {
const [currency, setCurrency] = useState<Currency>('rmb'); const [currency, setCurrency] = useState<Currency>('rmb');
const triggerChange = (changedValue: { number?: number; currency?: Currency }) => { const triggerChange = (changedValue: { number?: number; currency?: Currency }) => {
if (onChange) { onChange?.({ number, currency, ...value, ...changedValue });
onChange({ number, currency, ...value, ...changedValue });
}
}; };
const onNumberChange = (e: React.ChangeEvent<HTMLInputElement>) => { const onNumberChange = (e: React.ChangeEvent<HTMLInputElement>) => {

47
components/input/Input.tsx
View File

@ -68,23 +68,24 @@ export function resolveOnChange(
| React.MouseEvent<HTMLElement, MouseEvent>, | React.MouseEvent<HTMLElement, MouseEvent>,
onChange?: (event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void, onChange?: (event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void,
) { ) {
if (onChange) { if (!onChange) {
let event = e; return;
if (e.type === 'click') {
// click clear icon
event = Object.create(e);
event.target = target;
event.currentTarget = target;
const originalInputValue = target.value;
// change target ref value cause e.target.value should be '' when clear input
target.value = '';
onChange(event as React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>);
// reset target ref value
target.value = originalInputValue;
return;
}
onChange(event as React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>);
} }
let event = e;
if (e.type === 'click') {
// click clear icon
event = Object.create(e);
event.target = target;
event.currentTarget = target;
const originalInputValue = target.value;
// change target ref value cause e.target.value should be '' when clear input
target.value = '';
onChange(event as React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>);
// reset target ref value
target.value = originalInputValue;
return;
}
onChange(event as React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>);
} }
export function getInputClassName( export function getInputClassName(
@ -230,17 +231,13 @@ class Input extends React.Component<InputProps, InputState> {
onFocus: React.FocusEventHandler<HTMLInputElement> = e => { onFocus: React.FocusEventHandler<HTMLInputElement> = e => {
const { onFocus } = this.props; const { onFocus } = this.props;
this.setState({ focused: true }, this.clearPasswordValueAttribute); this.setState({ focused: true }, this.clearPasswordValueAttribute);
if (onFocus) { onFocus?.(e);
onFocus(e);
}
}; };
onBlur: React.FocusEventHandler<HTMLInputElement> = e => { onBlur: React.FocusEventHandler<HTMLInputElement> = e => {
const { onBlur } = this.props; const { onBlur } = this.props;
this.setState({ focused: false }, this.clearPasswordValueAttribute); this.setState({ focused: false }, this.clearPasswordValueAttribute);
if (onBlur) { onBlur?.(e);
onBlur(e);
}
}; };
setValue(value: string, callback?: () => void) { setValue(value: string, callback?: () => void) {
@ -320,12 +317,10 @@ class Input extends React.Component<InputProps, InputState> {
handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => { handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
const { onPressEnter, onKeyDown } = this.props; const { onPressEnter, onKeyDown } = this.props;
if (e.keyCode === 13 && onPressEnter) { if (onPressEnter && e.keyCode === 13) {
onPressEnter(e); onPressEnter(e);
} }
if (onKeyDown) { onKeyDown?.(e);
onKeyDown(e);
}
}; };
renderComponent = ({ getPrefixCls, direction, input }: ConfigConsumerProps) => { renderComponent = ({ getPrefixCls, direction, input }: ConfigConsumerProps) => {

8
components/layout/Sider.tsx
View File

@ -98,18 +98,14 @@ const Sider = React.forwardRef<HTMLDivElement, SiderProps>(
if (!('collapsed' in props)) { if (!('collapsed' in props)) {
setCollapsed(value); setCollapsed(value);
} }
if (onCollapse) { onCollapse?.(value, type);
onCollapse(value, type);
}
}; };
// ========================= Responsive ========================= // ========================= Responsive =========================
const responsiveHandlerRef = useRef<(mql: MediaQueryListEvent | MediaQueryList) => void>(); const responsiveHandlerRef = useRef<(mql: MediaQueryListEvent | MediaQueryList) => void>();
responsiveHandlerRef.current = (mql: MediaQueryListEvent | MediaQueryList) => { responsiveHandlerRef.current = (mql: MediaQueryListEvent | MediaQueryList) => {
setBelow(mql.matches); setBelow(mql.matches);
if (onBreakpoint) { onBreakpoint?.(mql.matches);
onBreakpoint(mql.matches);
}
if (collapsed !== mql.matches) { if (collapsed !== mql.matches) {
handleSetCollapsed(mql.matches, 'responsive'); handleSetCollapsed(mql.matches, 'responsive');

8
components/modal/Modal.tsx
View File

@ -142,16 +142,12 @@ const Modal: ModalInterface = props => {
const handleCancel = (e: React.MouseEvent<HTMLButtonElement>) => { const handleCancel = (e: React.MouseEvent<HTMLButtonElement>) => {
const { onCancel } = props; const { onCancel } = props;
if (onCancel) { onCancel?.(e);
onCancel(e);
}
}; };
const handleOk = (e: React.MouseEvent<HTMLButtonElement>) => { const handleOk = (e: React.MouseEvent<HTMLButtonElement>) => {
const { onOk } = props; const { onOk } = props;
if (onOk) { onOk?.(e);
onOk(e);
}
}; };
const renderFooter = (locale: ModalLocale) => { const renderFooter = (locale: ModalLocale) => {

4
components/page-header/index.tsx
View File

@ -41,9 +41,7 @@ const renderBack = (
<div className={`${prefixCls}-back`}> <div className={`${prefixCls}-back`}>
<TransButton <TransButton
onClick={(e: React.MouseEvent<HTMLDivElement>) => { onClick={(e: React.MouseEvent<HTMLDivElement>) => {
if (onBack) { onBack?.(e);
onBack(e);
}
}} }}
className={`${prefixCls}-back-button`} className={`${prefixCls}-back-button`}
aria-label={back} aria-label={back}

14
components/popconfirm/index.tsx
View File

@ -61,25 +61,17 @@ const Popconfirm = React.forwardRef<unknown, PopconfirmProps>((props, ref) => {
setVisible(value); setVisible(value);
} }
if (props.onVisibleChange) { props.onVisibleChange?.(value, e);
props.onVisibleChange(value, e);
}
}; };
const onConfirm = (e: React.MouseEvent<HTMLButtonElement>) => { const onConfirm = (e: React.MouseEvent<HTMLButtonElement>) => {
settingVisible(false, e); settingVisible(false, e);
props.onConfirm?.call(this, e);
if (props.onConfirm) {
props.onConfirm.call(this, e);
}
}; };
const onCancel = (e: React.MouseEvent<HTMLButtonElement>) => { const onCancel = (e: React.MouseEvent<HTMLButtonElement>) => {
settingVisible(false, e); settingVisible(false, e);
props.onCancel?.call(this, e);
if (props.onCancel) {
props.onCancel.call(this, e);
}
}; };
const onKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => { const onKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {

9
components/radio/radio.tsx
View File

@ -18,13 +18,8 @@ const InternalRadio: React.ForwardRefRenderFunction<HTMLElement, RadioProps> = (
}, []); }, []);
const onChange = (e: RadioChangeEvent) => { const onChange = (e: RadioChangeEvent) => {
if (props.onChange) { props.onChange?.(e);
props.onChange(e); context?.onChange?.(e);
}
if (context?.onChange) {
context.onChange(e);
}
}; };
const { prefixCls: customizePrefixCls, className, children, style, ...restProps } = props; const { prefixCls: customizePrefixCls, className, children, style, ...restProps } = props;

23
components/table/Table.tsx
View File

@ -226,22 +226,19 @@ function Table<RecordType extends object = any>(props: TableProps<RecordType>) {
}); });
} }
if (onChange) { onChange?.(changeInfo.pagination!, changeInfo.filters!, changeInfo.sorter!, {
onChange(changeInfo.pagination!, changeInfo.filters!, changeInfo.sorter!, { currentDataSource: getFilterData(
currentDataSource: getFilterData( getSortData(rawData, changeInfo.sorterStates!, childrenColumnName),
getSortData(rawData, changeInfo.sorterStates!, childrenColumnName), changeInfo.filterStates!,
changeInfo.filterStates!, ),
), action,
action, });
});
}
}; };
/** /**
* Controlled state in `columns` is not a good idea that makes too many code (1000+ line?) to * Controlled state in `columns` is not a good idea that makes too many code (1000+ line?) to read
* read state out and then put it back to title render. Move these code into `hooks` but still * state out and then put it back to title render. Move these code into `hooks` but still too
* too complex. We should provides Table props like `sorter` & `filter` to handle control in next * complex. We should provides Table props like `sorter` & `filter` to handle control in next big version.
* big version.
*/ */
// ============================ Sorter ============================= // ============================ Sorter =============================

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

@ -127,9 +127,7 @@ function FilterDropdown<RecordType>(props: FilterDropdownProps<RecordType>) {
); );
const triggerVisible = (newVisible: boolean) => { const triggerVisible = (newVisible: boolean) => {
setVisible(newVisible); setVisible(newVisible);
if (onFilterDropdownVisibleChange) { onFilterDropdownVisibleChange?.(newVisible);
onFilterDropdownVisibleChange(newVisible);
}
}; };
const mergedVisible = const mergedVisible =

37
components/table/hooks/useSelection.tsx
View File

@ -231,9 +231,7 @@ export default function useSelection<RecordType>(
setMergedSelectedKeys(availableKeys); setMergedSelectedKeys(availableKeys);
if (onSelectionChange) { onSelectionChange?.(availableKeys, records);
onSelectionChange(availableKeys, records);
}
}, },
[setMergedSelectedKeys, getRecordByKey, onSelectionChange, preserveSelectedRowKeys], [setMergedSelectedKeys, getRecordByKey, onSelectionChange, preserveSelectedRowKeys],
); );
@ -305,10 +303,7 @@ export default function useSelection<RecordType>(
key: 'none', key: 'none',
text: tableLocale.selectNone, text: tableLocale.selectNone,
onSelect() { onSelect() {
if (onSelectNone) { onSelectNone?.();
onSelectNone();
}
setSelectedKeys([]); setSelectedKeys([]);
}, },
}; };
@ -353,13 +348,11 @@ export default function useSelection<RecordType>(
const keys = Array.from(keySet); const keys = Array.from(keySet);
if (onSelectAll) { onSelectAll?.(
onSelectAll( !checkedCurrentAll,
!checkedCurrentAll, keys.map(k => getRecordByKey(k)),
keys.map(k => getRecordByKey(k)), changeKeys.map(k => getRecordByKey(k)),
changeKeys.map(k => getRecordByKey(k)), );
);
}
setSelectedKeys(keys); setSelectedKeys(keys);
}; };
@ -378,9 +371,7 @@ export default function useSelection<RecordType>(
<Menu.Item <Menu.Item
key={key || index} key={key || index}
onClick={() => { onClick={() => {
if (onSelectionClick) { onSelectionClick?.(recordKeys);
onSelectionClick(recordKeys);
}
}} }}
> >
{text} {text}
@ -519,13 +510,11 @@ export default function useSelection<RecordType>(
} }
const keys = Array.from(keySet); const keys = Array.from(keySet);
if (onSelectMultiple) { onSelectMultiple?.(
onSelectMultiple( !checked,
!checked, keys.map(recordKey => getRecordByKey(recordKey)),
keys.map(recordKey => getRecordByKey(recordKey)), changedKeys.map(recordKey => getRecordByKey(recordKey)),
changedKeys.map(recordKey => getRecordByKey(recordKey)), );
);
}
setSelectedKeys(keys); setSelectedKeys(keys);
} else { } else {

8
components/tag/CheckableTag.tsx
View File

@ -27,12 +27,8 @@ const CheckableTag: React.FC<CheckableTagProps> = ({
const { getPrefixCls } = React.useContext(ConfigContext); const { getPrefixCls } = React.useContext(ConfigContext);
const handleClick = (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => { const handleClick = (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
if (onChange) { onChange?.(!checked);
onChange(!checked); onClick?.(e);
}
if (onClick) {
onClick(e);
}
}; };
const prefixCls = getPrefixCls('tag', customizePrefixCls); const prefixCls = getPrefixCls('tag', customizePrefixCls);

4
components/tag/index.tsx
View File

@ -87,9 +87,7 @@ const InternalTag: React.ForwardRefRenderFunction<HTMLSpanElement, TagProps> = (
const handleCloseClick = (e: React.MouseEvent<HTMLElement>) => { const handleCloseClick = (e: React.MouseEvent<HTMLElement>) => {
e.stopPropagation(); e.stopPropagation();
if (onClose) { onClose?.(e);
onClose(e);
}
if (e.defaultPrevented) { if (e.defaultPrevented) {
return; return;

4
components/tooltip/index.tsx
View File

@ -150,8 +150,8 @@ const Tooltip = React.forwardRef<unknown, TooltipProps>((props, ref) => {
if (!('visible' in props)) { if (!('visible' in props)) {
setVisible(isNoTitle() ? false : vis); setVisible(isNoTitle() ? false : vis);
} }
if (props.onVisibleChange && !isNoTitle()) { if (!isNoTitle()) {
props.onVisibleChange(vis); props.onVisibleChange?.(vis);
} }
}; };

28
components/transfer/index.tsx
View File

@ -197,9 +197,7 @@ class Transfer<RecordType extends TransferItem = TransferItem> extends React.Com
this.setStateKeys(oppositeDirection, []); this.setStateKeys(oppositeDirection, []);
this.handleSelectChange(oppositeDirection, []); this.handleSelectChange(oppositeDirection, []);
if (onChange) { onChange?.(newTargetKeys, direction, newMoveKeys);
onChange(newTargetKeys, direction, newMoveKeys);
}
}; };
moveToLeft = () => this.moveTo('left'); moveToLeft = () => this.moveTo('left');
@ -232,9 +230,7 @@ class Transfer<RecordType extends TransferItem = TransferItem> extends React.Com
handleFilter = (direction: TransferDirection, e: React.ChangeEvent<HTMLInputElement>) => { handleFilter = (direction: TransferDirection, e: React.ChangeEvent<HTMLInputElement>) => {
const { onSearch } = this.props; const { onSearch } = this.props;
const { value } = e.target; const { value } = e.target;
if (onSearch) { onSearch?.(direction, value);
onSearch(direction, value);
}
}; };
handleLeftFilter = (e: React.ChangeEvent<HTMLInputElement>) => this.handleFilter('left', e); handleLeftFilter = (e: React.ChangeEvent<HTMLInputElement>) => this.handleFilter('left', e);
@ -243,9 +239,7 @@ class Transfer<RecordType extends TransferItem = TransferItem> extends React.Com
handleClear = (direction: TransferDirection) => { handleClear = (direction: TransferDirection) => {
const { onSearch } = this.props; const { onSearch } = this.props;
if (onSearch) { onSearch?.(direction, '');
onSearch(direction, '');
}
}; };
handleLeftClear = () => this.handleClear('left'); handleLeftClear = () => this.handleClear('left');
@ -280,20 +274,16 @@ class Transfer<RecordType extends TransferItem = TransferItem> extends React.Com
this.setStateKeys('right', []); this.setStateKeys('right', []);
if (onChange) { onChange?.(
onChange( targetKeys.filter(key => !selectedKeys.includes(key)),
targetKeys.filter(key => !selectedKeys.includes(key)), 'left',
'left', [...selectedKeys],
[...selectedKeys], );
);
}
}; };
handleScroll = (direction: TransferDirection, e: React.SyntheticEvent<HTMLUListElement>) => { handleScroll = (direction: TransferDirection, e: React.SyntheticEvent<HTMLUListElement>) => {
const { onScroll } = this.props; const { onScroll } = this.props;
if (onScroll) { onScroll?.(direction, e);
onScroll(direction, e);
}
}; };
handleLeftScroll = (e: React.SyntheticEvent<HTMLUListElement>) => this.handleScroll('left', e); handleLeftScroll = (e: React.SyntheticEvent<HTMLUListElement>) => this.handleScroll('left', e);

18
components/tree/DirectoryTree.tsx
View File

@ -112,11 +112,7 @@ const DirectoryTree: React.ForwardRefRenderFunction<RcTree, DirectoryTreeProps>
setExpandedKeys(keys); setExpandedKeys(keys);
} }
// Call origin function // Call origin function
if (props.onExpand) { return props.onExpand?.(keys, info);
return props.onExpand(keys, info);
}
return undefined;
}; };
const onClick = (event: React.MouseEvent<HTMLElement>, node: EventDataNode) => { const onClick = (event: React.MouseEvent<HTMLElement>, node: EventDataNode) => {
@ -127,9 +123,7 @@ const DirectoryTree: React.ForwardRefRenderFunction<RcTree, DirectoryTreeProps>
onDebounceExpand(event, node); onDebounceExpand(event, node);
} }
if (props.onClick) { props.onClick?.(event, node);
props.onClick(event, node);
}
}; };
const onDoubleClick = (event: React.MouseEvent<HTMLElement>, node: EventDataNode) => { const onDoubleClick = (event: React.MouseEvent<HTMLElement>, node: EventDataNode) => {
@ -140,9 +134,7 @@ const DirectoryTree: React.ForwardRefRenderFunction<RcTree, DirectoryTreeProps>
onDebounceExpand(event, node); onDebounceExpand(event, node);
} }
if (props.onDoubleClick) { props.onDoubleClick?.(event, node);
props.onDoubleClick(event, node);
}
}; };
const onSelect = ( const onSelect = (
@ -202,9 +194,7 @@ const DirectoryTree: React.ForwardRefRenderFunction<RcTree, DirectoryTreeProps>
newEvent.selectedNodes = convertDirectoryKeysToNodes(treeData, newSelectedKeys); newEvent.selectedNodes = convertDirectoryKeysToNodes(treeData, newSelectedKeys);
} }
if (props.onSelect) { props.onSelect?.(newSelectedKeys, newEvent);
props.onSelect(newSelectedKeys, newEvent);
}
if (!('selectedKeys' in props)) { if (!('selectedKeys' in props)) {
setSelectedKeys(newSelectedKeys); setSelectedKeys(newSelectedKeys);
} }

10
components/typography/Base.tsx
View File

@ -189,10 +189,7 @@ class Base extends React.Component<InternalBlockProps, BaseState> {
onExpandClick: React.MouseEventHandler<HTMLElement> = e => { onExpandClick: React.MouseEventHandler<HTMLElement> = e => {
const { onExpand } = this.getEllipsis(); const { onExpand } = this.getEllipsis();
this.setState({ expanded: true }); this.setState({ expanded: true });
(onExpand as React.MouseEventHandler<HTMLElement>)?.(e);
if (onExpand) {
(onExpand as React.MouseEventHandler<HTMLElement>)(e);
}
}; };
// ================ Edit ================ // ================ Edit ================
@ -202,10 +199,7 @@ class Base extends React.Component<InternalBlockProps, BaseState> {
onEditChange = (value: string) => { onEditChange = (value: string) => {
const { onChange } = this.getEditable(); const { onChange } = this.getEditable();
if (onChange) { onChange?.(value);
onChange(value);
}
this.triggerEdit(false); this.triggerEdit(false);
}; };

4
components/upload/UploadList/index.tsx
View File

@ -97,9 +97,7 @@ const InternalUploadList: React.ForwardRefRenderFunction<unknown, UploadListProp
}; };
const onInternalClose = (file: UploadFile) => { const onInternalClose = (file: UploadFile) => {
if (onRemove) { onRemove?.(file);
onRemove(file);
}
}; };
const internalIconRender = (file: UploadFile) => { const internalIconRender = (file: UploadFile) => {