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: adjust TextArea in form (#34714)

Browse Source
This commit is contained in:
MadCcc 2022-03-25 19:31:42 +08:00 committed by GitHub
parent 7c4e12f99e
commit 0d4cc5ed33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5188,7 +5188,7 @@ exports[`renders ./components/form/demo/register.md extend context correctly 1`]
class="ant-form-item-control-input-content" class="ant-form-item-control-input-content"
> >
<div <div
class="ant-input-textarea ant-input-textarea-show-count" class="ant-input-textarea ant-input-textarea-show-count ant-input-textarea-in-form-item"
data-count="0 / 100" data-count="0 / 100"
> >
<textarea <textarea
@ -22272,7 +22272,7 @@ exports[`renders ./components/form/demo/validate-static.md extend context correc
class="ant-form-item-control-input-content" class="ant-form-item-control-input-content"
> >
<div <div
class="ant-input-textarea ant-input-textarea-show-count ant-input-textarea-status-error ant-input-textarea-has-feedback" class="ant-input-textarea ant-input-textarea-show-count ant-input-textarea-in-form-item ant-input-textarea-status-error ant-input-textarea-has-feedback"
data-count="0" data-count="0"
> >
<span <span

4
components/form/__tests__/__snapshots__/demo.test.js.snap
View File

@ -4370,7 +4370,7 @@ exports[`renders ./components/form/demo/register.md correctly 1`] = `
class="ant-form-item-control-input-content" class="ant-form-item-control-input-content"
> >
<div <div
class="ant-input-textarea ant-input-textarea-show-count" class="ant-input-textarea ant-input-textarea-show-count ant-input-textarea-in-form-item"
data-count="0 / 100" data-count="0 / 100"
> >
<textarea <textarea
@ -9002,7 +9002,7 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
class="ant-form-item-control-input-content" class="ant-form-item-control-input-content"
> >
<div <div
class="ant-input-textarea ant-input-textarea-show-count ant-input-textarea-status-error ant-input-textarea-has-feedback" class="ant-input-textarea ant-input-textarea-show-count ant-input-textarea-in-form-item ant-input-textarea-status-error ant-input-textarea-has-feedback"
data-count="0" data-count="0"
> >
<span <span

6
components/form/style/index.less
View File

@ -212,12 +212,6 @@
min-height: @form-item-margin-bottom; min-height: @form-item-margin-bottom;
} }
.@{ant-prefix}-input-textarea-show-count {
&::after {
margin-bottom: -22px;
}
}
&-with-help &-explain { &-with-help &-explain {
height: auto; height: auto;
min-height: @form-item-margin-bottom; min-height: @form-item-margin-bottom;

2
components/input/TextArea.tsx
View File

@ -77,6 +77,7 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
const { const {
status: contextStatus, status: contextStatus,
hasFeedback, hasFeedback,
isFormItemInput,
feedbackIcon, feedbackIcon,
} = React.useContext(FormItemInputContext); } = React.useContext(FormItemInputContext);
const mergedStatus = getMergedStatus(contextStatus, customStatus); const mergedStatus = getMergedStatus(contextStatus, customStatus);
@ -233,6 +234,7 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
{ {
[`${prefixCls}-textarea-rtl`]: direction === 'rtl', [`${prefixCls}-textarea-rtl`]: direction === 'rtl',
[`${prefixCls}-textarea-show-count`]: showCount, [`${prefixCls}-textarea-show-count`]: showCount,
[`${prefixCls}-textarea-in-form-item`]: isFormItemInput,
}, },
getStatusClassNames(`${prefixCls}-textarea`, mergedStatus, hasFeedback), getStatusClassNames(`${prefixCls}-textarea`, mergedStatus, hasFeedback),
className, className,

6
components/input/style/index.less
View File

@ -61,6 +61,12 @@
content: attr(data-count); content: attr(data-count);
pointer-events: none; pointer-events: none;
} }
&.@{input-prefix-cls}-textarea-in-form-item {
&::after {
margin-bottom: -22px;
}
}
} }
&-textarea-suffix { &-textarea-suffix {