Skip to content

Commit a8d5dad

Browse files
tangjinzhoutangjinzhou
committed
revert: formItem errorlist animate
1 parent 2b8bdf3 commit a8d5dad

File tree

7 files changed

+117
-121
lines changed

7 files changed

+117
-121
lines changed

‎components/comment/__tests__/__snapshots__/demo.test.js.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ exports[`renders ./components/comment/demo/editor.vue correctly 1`] = `
3838
<div class="ant-form-item-control-input-content"><textarea rows="4" class="ant-input"></textarea></div>
3939
<!---->
4040
</div>
41-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
41+
<!---->
4242
<!---->
4343
</div>
4444
</div>
@@ -51,7 +51,7 @@ exports[`renders ./components/comment/demo/editor.vue correctly 1`] = `
5151
</button></div>
5252
<!---->
5353
</div>
54-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
54+
<!---->
5555
<!---->
5656
</div>
5757
</div>

‎components/comment/__tests__/__snapshots__/index.test.js.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ exports[`Comment Comment can be used as editor, user can customize the editor co
4949
<div class="ant-form-item-control-input-content"><textarea rows="4" class="ant-input"></textarea></div>
5050
<!---->
5151
</div>
52-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
52+
<!---->
5353
<!---->
5454
</div>
5555
</div>
@@ -62,7 +62,7 @@ exports[`Comment Comment can be used as editor, user can customize the editor co
6262
</button></div>
6363
<!---->
6464
</div>
65-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
65+
<!---->
6666
<!---->
6767
</div>
6868
</div>

‎components/form/ErrorList.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default defineComponent({
3737
colMItem,
3838
);
3939
(transitionGroupProps as any).class = baseClassName.value;
40-
return (
40+
return props.errors?.length ? (
4141
<TransitionGroup {...transitionGroupProps} tag="div">
4242
{props.errors?.map((error: any, index: number) => (
4343
<div
@@ -49,7 +49,7 @@ export default defineComponent({
4949
</div>
5050
))}
5151
</TransitionGroup>
52-
);
52+
) : null;
5353
};
5454
},
5555
});

‎components/form/__tests__/__snapshots__/demo.test.js.snap‎

Lines changed: 101 additions & 101 deletions
Large diffs are not rendered by default.

‎components/form/style/index.less‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,9 @@
6262

6363
margin-bottom: @form-item-margin-bottom;
6464
vertical-align: top;
65-
// We delay one frame (0.017s) here to let CSSMotion goes
66-
transition: margin-bottom @animation-duration-slow 0.017s linear;
6765

6866
&-with-help {
69-
// margin-bottom: 0;
67+
margin-bottom: 0;
7068
transition: none;
7169
}
7270

@@ -204,10 +202,8 @@
204202

205203
&-explain-connected {
206204
height: 0;
207-
min-height: @form-item-margin-bottom;
205+
min-height: 0;
208206
opacity: 0;
209-
margin-top: -@form-item-margin-bottom;
210-
transform: translateY(@form-item-margin-bottom);
211207
}
212208

213209
&-extra {

‎components/mentions/__tests__/__snapshots__/demo.test.js.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ exports[`renders ./components/mentions/demo/form.vue correctly 1`] = `
2727
</div>
2828
<!---->
2929
</div>
30-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
30+
<!---->
3131
<!---->
3232
</div>
3333
</div>
@@ -44,7 +44,7 @@ exports[`renders ./components/mentions/demo/form.vue correctly 1`] = `
4444
</div>
4545
<!---->
4646
</div>
47-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
47+
<!---->
4848
<!---->
4949
</div>
5050
</div>
@@ -59,7 +59,7 @@ exports[`renders ./components/mentions/demo/form.vue correctly 1`] = `
5959
</button></div>
6060
<!---->
6161
</div>
62-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
62+
<!---->
6363
<!---->
6464
</div>
6565
</div>

‎components/skeleton/__tests__/__snapshots__/demo.test.js.snap‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = `
9292
</button></div>
9393
<!---->
9494
</div>
95-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
95+
<!---->
9696
<!---->
9797
</div>
9898
</div>
@@ -109,7 +109,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = `
109109
</button></div>
110110
<!---->
111111
</div>
112-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
112+
<!---->
113113
<!---->
114114
</div>
115115
</div>
@@ -124,7 +124,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = `
124124
</div>
125125
<!---->
126126
</div>
127-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
127+
<!---->
128128
<!---->
129129
</div>
130130
</div>
@@ -139,7 +139,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = `
139139
</div>
140140
<!---->
141141
</div>
142-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
142+
<!---->
143143
<!---->
144144
</div>
145145
</div>
@@ -154,7 +154,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = `
154154
</div>
155155
<!---->
156156
</div>
157-
<div class="ant-form-item-explain ant-form-item-explain-connected"></div>
157+
<!---->
158158
<!---->
159159
</div>
160160
</div>

0 commit comments

Comments
 (0)