mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-29 05:29:37 +08:00
Code Issues Actions 22 Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Tom Xu 2020-10-21 14:42:10 +08:00
parent 1f1956ccd9
commit 605bb2ffdf
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/input/TextArea.tsx
View File

@ -116,7 +116,7 @@ class TextArea extends React.Component<TextAreaProps, TextAreaState> {
value = hasMaxLength ? value.slice(0, maxLength) : value;
// TextArea
let textareaNode = (size?: SizeType) => (
const textareaNode = (size?: SizeType) => (
<ClearableLabeledInput
{...this.props}
prefixCls={prefixCls}
@ -136,21 +136,25 @@ class TextArea extends React.Component<TextAreaProps, TextAreaState> {
const valueLength = [...value].length;
const dataCount = `${valueLength}${hasMaxLength ? ` / ${maxLength}` : ''}`;
textareaNode = (size?: SizeType) => (
<div
className={classNames(
`${prefixCls}-textarea`,
{
[`${prefixCls}-textarea-rtl`]: direction === 'rtl',
},
`${prefixCls}-textarea-show-count`,
className,
return (
<SizeContext.Consumer>
{(size?: SizeType) => (
<div
className={classNames(
`${prefixCls}-textarea`,
{
[`${prefixCls}-textarea-rtl`]: direction === 'rtl',
},
`${prefixCls}-textarea-show-count`,
className,
)}
style={style}
data-count={dataCount}
>
{textareaNode(size)}
</div>
)}
style={style}
data-count={dataCount}
>
{textareaNode(size)}
</div>
</SizeContext.Consumer>
);
}