mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-07 17:44:35 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

refactor: code optimization (#49431)

Browse Source 
* refactor: refactor InputAddon code

* fix: fix

* fix: fix

* Update components/_util/InputAddon.tsx

Signed-off-by: afc163 <afc163@gmail.com>

* fix: fix lint

---------

Signed-off-by: afc163 <afc163@gmail.com>
Co-authored-by: afc163 <afc163@gmail.com>
This commit is contained in:
lijianan 2024-06-16 15:44:18 +08:00 committed by GitHub
parent 4f3e381797
commit 41fba82b39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/_util/InputAddon.tsx Normal file
View File

@ -0,0 +1,15 @@
import React from 'react';
import { NoFormStyle } from '../form/context';
import { NoCompactStyle } from '../space/Compact';
const getInputAddon = (addon: React.ReactNode): React.ReactNode =>
addon ? (
<NoCompactStyle>
<NoFormStyle override status>
{addon}
</NoFormStyle>
</NoCompactStyle>
) : null;
export default getInputAddon;

22
components/input-number/index.tsx
View File

@ -5,6 +5,7 @@ import classNames from 'classnames';
import type { InputNumberProps as RcInputNumberProps, ValueType } from 'rc-input-number';
import RcInputNumber from 'rc-input-number';
import getInputAddon from '../_util/InputAddon';
import type { InputStatus } from '../_util/statusUtils';
import { getMergedStatus, getStatusClassNames } from '../_util/statusUtils';
import { devUseWarning } from '../_util/warning';
@ -13,10 +14,10 @@ import DisabledContext from '../config-provider/DisabledContext';
import useCSSVarCls from '../config-provider/hooks/useCSSVarCls';
import useSize from '../config-provider/hooks/useSize';
import type { SizeType } from '../config-provider/SizeContext';
import { FormItemInputContext, NoFormStyle } from '../form/context';
import { FormItemInputContext } from '../form/context';
import type { Variant } from '../form/hooks/useVariants';
import useVariant from '../form/hooks/useVariants';
import { NoCompactStyle, useCompactItemContext } from '../space/Compact';
import { useCompactItemContext } from '../space/Compact';
import useStyle from './style';
export interface InputNumberProps<T extends ValueType = ValueType>
@ -124,19 +125,6 @@ const InputNumber = React.forwardRef<HTMLInputElement, InputNumberProps>((props,
);
const wrapperClassName = `${prefixCls}-group`;
const getAddon = (addon: React.ReactNode): React.ReactNode => {
if (!addon) {
return null;
}
return (
<NoCompactStyle>
<NoFormStyle override status>
{addon}
</NoFormStyle>
</NoCompactStyle>
);
};
const element = (
<RcInputNumber
ref={inputRef}
@ -149,8 +137,8 @@ const InputNumber = React.forwardRef<HTMLInputElement, InputNumberProps>((props,
controls={controlsTemp}
prefix={prefix}
suffix={suffixNode}
addonBefore={getAddon(addonBefore)}
addonAfter={getAddon(addonAfter)}
addonBefore={getInputAddon(addonBefore)}
addonAfter={getInputAddon(addonAfter)}
classNames={{
input: inputNumberClass,
variant: classNames(

18
components/input/Input.tsx
View File

@ -5,6 +5,7 @@ import RcInput from 'rc-input';
import { composeRef } from 'rc-util/lib/ref';
import getAllowClear from '../_util/getAllowClear';
import getInputAddon from '../_util/InputAddon';
import type { InputStatus } from '../_util/statusUtils';
import { getMergedStatus, getStatusClassNames } from '../_util/statusUtils';
import { devUseWarning } from '../_util/warning';
@ -13,10 +14,10 @@ import DisabledContext from '../config-provider/DisabledContext';
import useCSSVarCls from '../config-provider/hooks/useCSSVarCls';
import useSize from '../config-provider/hooks/useSize';
import type { SizeType } from '../config-provider/SizeContext';
import { FormItemInputContext, NoFormStyle } from '../form/context';
import { FormItemInputContext } from '../form/context';
import type { Variant } from '../form/hooks/useVariants';
import useVariant from '../form/hooks/useVariants';
import { NoCompactStyle, useCompactItemContext } from '../space/Compact';
import { useCompactItemContext } from '../space/Compact';
import useRemovePasswordTimeout from './hooks/useRemovePasswordTimeout';
import useStyle from './style';
import { hasPrefixSuffix } from './utils';
@ -171,15 +172,6 @@ const Input = forwardRef<InputRef, InputProps>((props, ref) => {
</>
);
const getAddon = (addon: React.ReactNode): React.ReactNode =>
addon && (
<NoCompactStyle>
<NoFormStyle override status>
{addon}
</NoFormStyle>
</NoCompactStyle>
);
const mergedAllowClear = getAllowClear(allowClear ?? input?.allowClear);
const [variant, enableVariantCls] = useVariant(customVariant, bordered);
@ -206,8 +198,8 @@ const Input = forwardRef<InputRef, InputProps>((props, ref) => {
input?.className,
)}
onChange={handleChange}
addonBefore={getAddon(addonBefore)}
addonAfter={getAddon(addonAfter)}
addonBefore={getInputAddon(addonBefore)}
addonAfter={getInputAddon(addonAfter)}
classNames={{
...classes,
...input?.classNames,