Skip to content

Commit ebf040c

Browse files
DiegoCardosoDiegoCardoso
authored
fix: move tooltip slot to field container (#10410) (#10421)
1 parent 5318382 commit ebf040c

File tree

17 files changed

+116
-114
lines changed

17 files changed

+116
-114
lines changed

‎packages/combo-box/src/vaadin-combo-box.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ class ComboBox extends ComboBoxDataProviderMixin(
210210
<div part="error-message">
211211
<slot name="error-message"></slot>
212212
</div>
213+
214+
<slot name="tooltip"></slot>
213215
</div>
214216
215217
<vaadin-combo-box-overlay
@@ -220,8 +222,6 @@ class ComboBox extends ComboBoxDataProviderMixin(
220222
position-target="[[_positionTarget]]"
221223
no-vertical-overlap
222224
></vaadin-combo-box-overlay>
223-
224-
<slot name="tooltip"></slot>
225225
`;
226226
}
227227

‎packages/combo-box/test/dom/__snapshots__/combo-box.test.snap.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,8 @@ snapshots["vaadin-combo-box shadow default"] =
527527
<slot name="error-message">
528528
</slot>
529529
</div>
530+
<slot name="tooltip">
531+
</slot>
530532
</div>
531533
<vaadin-combo-box-overlay
532534
id="overlay"
@@ -538,8 +540,6 @@ snapshots["vaadin-combo-box shadow default"] =
538540
>
539541
</vaadin-combo-box-scroller>
540542
</vaadin-combo-box-overlay>
541-
<slot name="tooltip">
542-
</slot>
543543
`;
544544
/* end snapshot vaadin-combo-box shadow default */
545545

@@ -588,6 +588,8 @@ snapshots["vaadin-combo-box shadow disabled"] =
588588
<slot name="error-message">
589589
</slot>
590590
</div>
591+
<slot name="tooltip">
592+
</slot>
591593
</div>
592594
<vaadin-combo-box-overlay
593595
id="overlay"
@@ -599,8 +601,6 @@ snapshots["vaadin-combo-box shadow disabled"] =
599601
>
600602
</vaadin-combo-box-scroller>
601603
</vaadin-combo-box-overlay>
602-
<slot name="tooltip">
603-
</slot>
604604
`;
605605
/* end snapshot vaadin-combo-box shadow disabled */
606606

@@ -649,6 +649,8 @@ snapshots["vaadin-combo-box shadow readonly"] =
649649
<slot name="error-message">
650650
</slot>
651651
</div>
652+
<slot name="tooltip">
653+
</slot>
652654
</div>
653655
<vaadin-combo-box-overlay
654656
id="overlay"
@@ -660,8 +662,6 @@ snapshots["vaadin-combo-box shadow readonly"] =
660662
>
661663
</vaadin-combo-box-scroller>
662664
</vaadin-combo-box-overlay>
663-
<slot name="tooltip">
664-
</slot>
665665
`;
666666
/* end snapshot vaadin-combo-box shadow readonly */
667667

@@ -710,6 +710,8 @@ snapshots["vaadin-combo-box shadow invalid"] =
710710
<slot name="error-message">
711711
</slot>
712712
</div>
713+
<slot name="tooltip">
714+
</slot>
713715
</div>
714716
<vaadin-combo-box-overlay
715717
id="overlay"
@@ -721,8 +723,6 @@ snapshots["vaadin-combo-box shadow invalid"] =
721723
>
722724
</vaadin-combo-box-scroller>
723725
</vaadin-combo-box-overlay>
724-
<slot name="tooltip">
725-
</slot>
726726
`;
727727
/* end snapshot vaadin-combo-box shadow invalid */
728728

@@ -771,6 +771,8 @@ snapshots["vaadin-combo-box shadow theme"] =
771771
<slot name="error-message">
772772
</slot>
773773
</div>
774+
<slot name="tooltip">
775+
</slot>
774776
</div>
775777
<vaadin-combo-box-overlay
776778
id="overlay"
@@ -783,8 +785,6 @@ snapshots["vaadin-combo-box shadow theme"] =
783785
>
784786
</vaadin-combo-box-scroller>
785787
</vaadin-combo-box-overlay>
786-
<slot name="tooltip">
787-
</slot>
788788
`;
789789
/* end snapshot vaadin-combo-box shadow theme */
790790

‎packages/date-picker/src/vaadin-date-picker.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
192192
<div part="error-message">
193193
<slot name="error-message"></slot>
194194
</div>
195+
196+
<slot name="tooltip"></slot>
195197
</div>
196198
197199
<vaadin-date-picker-overlay
@@ -205,8 +207,6 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
205207
restore-focus-on-close
206208
restore-focus-node="[[inputElement]]"
207209
></vaadin-date-picker-overlay>
208-
209-
<slot name="tooltip"></slot>
210210
`;
211211
}
212212

‎packages/date-picker/test/dom/__snapshots__/date-picker.test.snap.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -830,14 +830,14 @@ snapshots["vaadin-date-picker shadow default"] =
830830
<slot name="error-message">
831831
</slot>
832832
</div>
833+
<slot name="tooltip">
834+
</slot>
833835
</div>
834836
<vaadin-date-picker-overlay
835837
id="overlay"
836838
restore-focus-on-close=""
837839
>
838840
</vaadin-date-picker-overlay>
839-
<slot name="tooltip">
840-
</slot>
841841
`;
842842
/* end snapshot vaadin-date-picker shadow default */
843843

@@ -885,14 +885,14 @@ snapshots["vaadin-date-picker shadow disabled"] =
885885
<slot name="error-message">
886886
</slot>
887887
</div>
888+
<slot name="tooltip">
889+
</slot>
888890
</div>
889891
<vaadin-date-picker-overlay
890892
id="overlay"
891893
restore-focus-on-close=""
892894
>
893895
</vaadin-date-picker-overlay>
894-
<slot name="tooltip">
895-
</slot>
896896
`;
897897
/* end snapshot vaadin-date-picker shadow disabled */
898898

@@ -940,14 +940,14 @@ snapshots["vaadin-date-picker shadow readonly"] =
940940
<slot name="error-message">
941941
</slot>
942942
</div>
943+
<slot name="tooltip">
944+
</slot>
943945
</div>
944946
<vaadin-date-picker-overlay
945947
id="overlay"
946948
restore-focus-on-close=""
947949
>
948950
</vaadin-date-picker-overlay>
949-
<slot name="tooltip">
950-
</slot>
951951
`;
952952
/* end snapshot vaadin-date-picker shadow readonly */
953953

@@ -995,14 +995,14 @@ snapshots["vaadin-date-picker shadow invalid"] =
995995
<slot name="error-message">
996996
</slot>
997997
</div>
998+
<slot name="tooltip">
999+
</slot>
9981000
</div>
9991001
<vaadin-date-picker-overlay
10001002
id="overlay"
10011003
restore-focus-on-close=""
10021004
>
10031005
</vaadin-date-picker-overlay>
1004-
<slot name="tooltip">
1005-
</slot>
10061006
`;
10071007
/* end snapshot vaadin-date-picker shadow invalid */
10081008

@@ -1050,15 +1050,15 @@ snapshots["vaadin-date-picker shadow theme"] =
10501050
<slot name="error-message">
10511051
</slot>
10521052
</div>
1053+
<slot name="tooltip">
1054+
</slot>
10531055
</div>
10541056
<vaadin-date-picker-overlay
10551057
id="overlay"
10561058
restore-focus-on-close=""
10571059
theme="align-right"
10581060
>
10591061
</vaadin-date-picker-overlay>
1060-
<slot name="tooltip">
1061-
</slot>
10621062
`;
10631063
/* end snapshot vaadin-date-picker shadow theme */
10641064

‎packages/email-field/test/dom/__snapshots__/email-field.test.snap.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ snapshots["vaadin-email-field shadow default"] =
125125
<slot name="error-message">
126126
</slot>
127127
</div>
128+
<slot name="tooltip">
129+
</slot>
128130
</div>
129-
<slot name="tooltip">
130-
</slot>
131131
`;
132132
/* end snapshot vaadin-email-field shadow default */
133133

@@ -174,9 +174,9 @@ snapshots["vaadin-email-field shadow disabled"] =
174174
<slot name="error-message">
175175
</slot>
176176
</div>
177+
<slot name="tooltip">
178+
</slot>
177179
</div>
178-
<slot name="tooltip">
179-
</slot>
180180
`;
181181
/* end snapshot vaadin-email-field shadow disabled */
182182

@@ -223,9 +223,9 @@ snapshots["vaadin-email-field shadow readonly"] =
223223
<slot name="error-message">
224224
</slot>
225225
</div>
226+
<slot name="tooltip">
227+
</slot>
226228
</div>
227-
<slot name="tooltip">
228-
</slot>
229229
`;
230230
/* end snapshot vaadin-email-field shadow readonly */
231231

@@ -272,9 +272,9 @@ snapshots["vaadin-email-field shadow invalid"] =
272272
<slot name="error-message">
273273
</slot>
274274
</div>
275+
<slot name="tooltip">
276+
</slot>
275277
</div>
276-
<slot name="tooltip">
277-
</slot>
278278
`;
279279
/* end snapshot vaadin-email-field shadow invalid */
280280

@@ -321,9 +321,9 @@ snapshots["vaadin-email-field shadow theme"] =
321321
<slot name="error-message">
322322
</slot>
323323
</div>
324+
<slot name="tooltip">
325+
</slot>
324326
</div>
325-
<slot name="tooltip">
326-
</slot>
327327
`;
328328
/* end snapshot vaadin-email-field shadow theme */
329329

‎packages/integer-field/test/dom/__snapshots__/integer-field.test.snap.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ snapshots["vaadin-integer-field shadow default"] =
146146
<slot name="error-message">
147147
</slot>
148148
</div>
149+
<slot name="tooltip">
150+
</slot>
149151
</div>
150-
<slot name="tooltip">
151-
</slot>
152152
`;
153153
/* end snapshot vaadin-integer-field shadow default */
154154

@@ -204,9 +204,9 @@ snapshots["vaadin-integer-field shadow step-buttons-visible"] =
204204
<slot name="error-message">
205205
</slot>
206206
</div>
207+
<slot name="tooltip">
208+
</slot>
207209
</div>
208-
<slot name="tooltip">
209-
</slot>
210210
`;
211211
/* end snapshot vaadin-integer-field shadow step-buttons-visible */
212212

@@ -267,9 +267,9 @@ snapshots["vaadin-integer-field shadow disabled"] =
267267
<slot name="error-message">
268268
</slot>
269269
</div>
270+
<slot name="tooltip">
271+
</slot>
270272
</div>
271-
<slot name="tooltip">
272-
</slot>
273273
`;
274274
/* end snapshot vaadin-integer-field shadow disabled */
275275

@@ -330,9 +330,9 @@ snapshots["vaadin-integer-field shadow readonly"] =
330330
<slot name="error-message">
331331
</slot>
332332
</div>
333+
<slot name="tooltip">
334+
</slot>
333335
</div>
334-
<slot name="tooltip">
335-
</slot>
336336
`;
337337
/* end snapshot vaadin-integer-field shadow readonly */
338338

@@ -393,9 +393,9 @@ snapshots["vaadin-integer-field shadow invalid"] =
393393
<slot name="error-message">
394394
</slot>
395395
</div>
396+
<slot name="tooltip">
397+
</slot>
396398
</div>
397-
<slot name="tooltip">
398-
</slot>
399399
`;
400400
/* end snapshot vaadin-integer-field shadow invalid */
401401

@@ -456,9 +456,9 @@ snapshots["vaadin-integer-field shadow theme"] =
456456
<slot name="error-message">
457457
</slot>
458458
</div>
459+
<slot name="tooltip">
460+
</slot>
459461
</div>
460-
<slot name="tooltip">
461-
</slot>
462462
`;
463463
/* end snapshot vaadin-integer-field shadow theme */
464464

‎packages/multi-select-combo-box/src/vaadin-multi-select-combo-box.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ class MultiSelectComboBox extends MultiSelectComboBoxMixin(ThemableMixin(Element
176176
<div part="error-message">
177177
<slot name="error-message"></slot>
178178
</div>
179-
</div>
180179
181-
<slot name="tooltip"></slot>
180+
<slot name="tooltip"></slot>
181+
</div>
182182
`;
183183
}
184184
}

0 commit comments

Comments
 (0)