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

fix: diabled Input abbdon should not have status style (#40744)

Browse Source 
Co-authored-by: zhouling <zhouling@kezaihui.com>
This commit is contained in:
carla-cn 2023-02-17 15:45:29 +08:00 committed by GitHub
parent 40abef340a
commit fd2db7614f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/config-provider/__tests__/__snapshots__/components.test.tsx.snap
View File

@ -16015,7 +16015,7 @@ exports[`ConfigProvider components Input configProvider componentDisabled 1`] =
value="" value=""
/> />
<span <span
class="config-input-group-wrapper config-input-search" class="config-input-group-wrapper config-input-search config-input-group-wrapper-disabled"
> >
<span <span
class="config-input-wrapper config-input-group" class="config-input-wrapper config-input-group"

2
components/form/__tests__/__snapshots__/demo-extend.test.ts.snap
View File

@ -5526,7 +5526,7 @@ exports[`renders ./components/form/demo/disabled-input-debug.tsx extend context
class="ant-form-item-control-input-content" class="ant-form-item-control-input-content"
> >
<span <span
class="ant-input-group-wrapper ant-input-group-wrapper-status-error" class="ant-input-group-wrapper ant-input-group-wrapper-disabled ant-input-group-wrapper-status-error"
> >
<span <span
class="ant-input-wrapper ant-input-group" class="ant-input-wrapper ant-input-group"

2
components/form/__tests__/__snapshots__/demo.test.tsx.snap
View File

@ -2999,7 +2999,7 @@ exports[`renders ./components/form/demo/disabled-input-debug.tsx correctly 1`] =
class="ant-form-item-control-input-content" class="ant-form-item-control-input-content"
> >
<span <span
class="ant-input-group-wrapper ant-input-group-wrapper-status-error" class="ant-input-group-wrapper ant-input-group-wrapper-disabled ant-input-group-wrapper-status-error"
> >
<span <span
class="ant-input-wrapper ant-input-group" class="ant-input-wrapper ant-input-group"

1
components/input/Input.tsx
View File

@ -219,6 +219,7 @@ const Input = forwardRef<InputRef, InputProps>((props, ref) => {
[`${prefixCls}-group-wrapper-sm`]: mergedSize === 'small', [`${prefixCls}-group-wrapper-sm`]: mergedSize === 'small',
[`${prefixCls}-group-wrapper-lg`]: mergedSize === 'large', [`${prefixCls}-group-wrapper-lg`]: mergedSize === 'large',
[`${prefixCls}-group-wrapper-rtl`]: direction === 'rtl', [`${prefixCls}-group-wrapper-rtl`]: direction === 'rtl',
[`${prefixCls}-group-wrapper-disabled`]: mergedDisabled,
}, },
getStatusClassNames(`${prefixCls}-group-wrapper`, mergedStatus, hasFeedback), getStatusClassNames(`${prefixCls}-group-wrapper`, mergedStatus, hasFeedback),
hashId, hashId,

20
components/input/style/index.ts
View File

@ -1,9 +1,9 @@
import type { CSSObject } from '@ant-design/cssinjs'; import type { CSSObject } from '@ant-design/cssinjs';
import type { FullToken, GenerateStyle } from '../../theme/internal';
import { genComponentStyleHook, mergeToken } from '../../theme/internal';
import type { GlobalToken } from '../../theme/interface';
import { clearFix, resetComponent } from '../../style'; import { clearFix, resetComponent } from '../../style';
import { genCompactItemStyle } from '../../style/compact-item'; import { genCompactItemStyle } from '../../style/compact-item';
import type { GlobalToken } from '../../theme/interface';
import type { FullToken, GenerateStyle } from '../../theme/internal';
import { genComponentStyleHook, mergeToken } from '../../theme/internal';
export type InputToken<T extends GlobalToken = FullToken<'Input'>> = T & { export type InputToken<T extends GlobalToken = FullToken<'Input'>> = T & {
inputAffixPadding: number; inputAffixPadding: number;
@ -669,7 +669,7 @@ const genAffixStyle: GenerateStyle<InputToken> = (token: InputToken) => {
}; };
const genGroupStyle: GenerateStyle<InputToken> = (token: InputToken) => { const genGroupStyle: GenerateStyle<InputToken> = (token: InputToken) => {
const { componentCls, colorError, colorSuccess, borderRadiusLG, borderRadiusSM } = token; const { componentCls, colorError, colorWarning, borderRadiusLG, borderRadiusSM } = token;
return { return {
[`${componentCls}-group`]: { [`${componentCls}-group`]: {
@ -711,9 +711,15 @@ const genGroupStyle: GenerateStyle<InputToken> = (token: InputToken) => {
}, },
}, },
'&-status-warning': { '&-status-warning': {
[`${componentCls}-group-addon:last-child`]: { [`${componentCls}-group-addon`]: {
color: colorSuccess, color: colorWarning,
borderColor: colorSuccess, borderColor: colorWarning,
},
},
'&-disabled': {
[`${componentCls}-group-addon`]: {
...genDisabledStyle(token),
}, },
}, },
}, },