mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-24 19:19:57 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

Remove Form Item help transition, fix #8831 (#9675)

Browse Source 
* fix #8831

* remove help transition
This commit is contained in:
jiang 2018-03-14 17:43:02 +08:00 committed by Wei Zhu
parent 37506b238f
commit 76994bd772
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/form/FormItem.tsx
View File

@ -56,6 +56,8 @@ export default class FormItem extends React.Component<FormItemProps, any> {
context: FormItemContext;
state = { helpShow: false };
componentDidMount() {
warning(
this.getControls(this.props.children, true).length <= 1,
@ -89,7 +91,7 @@ export default class FormItem extends React.Component<FormItemProps, any> {
const child = childrenArray[i] as React.ReactElement<any>;
if (child.type &&
(child.type as any === FormItem || (child.type as any).displayName === 'FormItem')) {
(child.type as any === FormItem || (child.type as any).displayName === 'FormItem')) {
continue;
}
if (!child.props) {
@ -126,6 +128,10 @@ export default class FormItem extends React.Component<FormItemProps, any> {
return this.getChildProp(FIELD_DATA_PROP);
}
onHelpAnimEnd = (_key: string, helpShow: boolean) => {
this.setState({ helpShow });
}
renderHelp() {
const prefixCls = this.props.prefixCls;
const help = this.getHelpMsg();
@ -135,7 +141,13 @@ export default class FormItem extends React.Component<FormItemProps, any> {
</div>
) : null;
return (
<Animate transitionName="show-help" component="" transitionAppear key="help">
<Animate
transitionName="show-help"
component=""
transitionAppear
key="help"
onEnd={this.onHelpAnimEnd}
>
{children}
</Animate>
);
@ -298,7 +310,7 @@ export default class FormItem extends React.Component<FormItemProps, any> {
const style = props.style;
const itemClassName = {
[`${prefixCls}-item`]: true,
[`${prefixCls}-item-with-help`]: !!this.getHelpMsg(),
[`${prefixCls}-item-with-help`]: !!this.getHelpMsg() || this.state.helpShow,
[`${prefixCls}-item-no-colon`]: !props.colon,
[`${props.className}`]: !!props.className,
};

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

@ -73,7 +73,6 @@ input[type="checkbox"] {
.reset-component;
margin-bottom: @form-item-margin-bottom;
vertical-align: top;
transition: margin .15s steps(1);
// nested FormItem
&-control > &:last-child,
@ -93,7 +92,6 @@ input[type="checkbox"] {
&-with-help {
margin-bottom: @form-item-margin-bottom - @font-size-base * @line-height-base - @form-help-margin-top;
transition: none;
}
&-label {