Skip to content

Commit da1bd50

Browse files
DiegoCardosoDiegoCardoso
authored
fix: move tooltip slot to field container (#10410)
1 parent ba125ba commit da1bd50

File tree

17 files changed

+115
-115
lines changed

17 files changed

+115
-115
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ class ComboBox extends ComboBoxDataProviderMixin(
229229
<div part="error-message">
230230
<slot name="error-message"></slot>
231231
</div>
232+
233+
<slot name="tooltip"></slot>
232234
</div>
233235
234236
<vaadin-combo-box-overlay
@@ -244,8 +246,6 @@ class ComboBox extends ComboBoxDataProviderMixin(
244246
>
245247
<slot name="overlay"></slot>
246248
</vaadin-combo-box-overlay>
247-
248-
<slot name="tooltip"></slot>
249249
`;
250250
}
251251

‎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
@@ -540,6 +540,8 @@ snapshots["vaadin-combo-box shadow default"] =
540540
<slot name="error-message">
541541
</slot>
542542
</div>
543+
<slot name="tooltip">
544+
</slot>
543545
</div>
544546
<vaadin-combo-box-overlay
545547
exportparts="overlay, content, loader"
@@ -550,8 +552,6 @@ snapshots["vaadin-combo-box shadow default"] =
550552
<slot name="overlay">
551553
</slot>
552554
</vaadin-combo-box-overlay>
553-
<slot name="tooltip">
554-
</slot>
555555
`;
556556
/* end snapshot vaadin-combo-box shadow default */
557557

@@ -600,6 +600,8 @@ snapshots["vaadin-combo-box shadow disabled"] =
600600
<slot name="error-message">
601601
</slot>
602602
</div>
603+
<slot name="tooltip">
604+
</slot>
603605
</div>
604606
<vaadin-combo-box-overlay
605607
exportparts="overlay, content, loader"
@@ -610,8 +612,6 @@ snapshots["vaadin-combo-box shadow disabled"] =
610612
<slot name="overlay">
611613
</slot>
612614
</vaadin-combo-box-overlay>
613-
<slot name="tooltip">
614-
</slot>
615615
`;
616616
/* end snapshot vaadin-combo-box shadow disabled */
617617

@@ -660,6 +660,8 @@ snapshots["vaadin-combo-box shadow readonly"] =
660660
<slot name="error-message">
661661
</slot>
662662
</div>
663+
<slot name="tooltip">
664+
</slot>
663665
</div>
664666
<vaadin-combo-box-overlay
665667
exportparts="overlay, content, loader"
@@ -670,8 +672,6 @@ snapshots["vaadin-combo-box shadow readonly"] =
670672
<slot name="overlay">
671673
</slot>
672674
</vaadin-combo-box-overlay>
673-
<slot name="tooltip">
674-
</slot>
675675
`;
676676
/* end snapshot vaadin-combo-box shadow readonly */
677677

@@ -720,6 +720,8 @@ snapshots["vaadin-combo-box shadow invalid"] =
720720
<slot name="error-message">
721721
</slot>
722722
</div>
723+
<slot name="tooltip">
724+
</slot>
723725
</div>
724726
<vaadin-combo-box-overlay
725727
exportparts="overlay, content, loader"
@@ -730,8 +732,6 @@ snapshots["vaadin-combo-box shadow invalid"] =
730732
<slot name="overlay">
731733
</slot>
732734
</vaadin-combo-box-overlay>
733-
<slot name="tooltip">
734-
</slot>
735735
`;
736736
/* end snapshot vaadin-combo-box shadow invalid */
737737

@@ -780,6 +780,8 @@ snapshots["vaadin-combo-box shadow theme"] =
780780
<slot name="error-message">
781781
</slot>
782782
</div>
783+
<slot name="tooltip">
784+
</slot>
783785
</div>
784786
<vaadin-combo-box-overlay
785787
exportparts="overlay, content, loader"
@@ -791,8 +793,6 @@ snapshots["vaadin-combo-box shadow theme"] =
791793
<slot name="overlay">
792794
</slot>
793795
</vaadin-combo-box-overlay>
794-
<slot name="tooltip">
795-
</slot>
796796
`;
797797
/* end snapshot vaadin-combo-box shadow theme */
798798

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,8 @@ class DatePicker extends DatePickerMixin(
216216
<div part="error-message">
217217
<slot name="error-message"></slot>
218218
</div>
219+
220+
<slot name="tooltip"></slot>
219221
</div>
220222
221223
<vaadin-date-picker-overlay
@@ -237,8 +239,6 @@ class DatePicker extends DatePickerMixin(
237239
>
238240
<slot name="overlay"></slot>
239241
</vaadin-date-picker-overlay>
240-
241-
<slot name="tooltip"></slot>
242242
`;
243243
}
244244

‎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
@@ -567,6 +567,8 @@ snapshots["vaadin-date-picker shadow default"] =
567567
<slot name="error-message">
568568
</slot>
569569
</div>
570+
<slot name="tooltip">
571+
</slot>
570572
</div>
571573
<vaadin-date-picker-overlay
572574
exportparts="backdrop, overlay, content"
@@ -578,8 +580,6 @@ snapshots["vaadin-date-picker shadow default"] =
578580
<slot name="overlay">
579581
</slot>
580582
</vaadin-date-picker-overlay>
581-
<slot name="tooltip">
582-
</slot>
583583
`;
584584
/* end snapshot vaadin-date-picker shadow default */
585585

@@ -627,6 +627,8 @@ snapshots["vaadin-date-picker shadow disabled"] =
627627
<slot name="error-message">
628628
</slot>
629629
</div>
630+
<slot name="tooltip">
631+
</slot>
630632
</div>
631633
<vaadin-date-picker-overlay
632634
exportparts="backdrop, overlay, content"
@@ -638,8 +640,6 @@ snapshots["vaadin-date-picker shadow disabled"] =
638640
<slot name="overlay">
639641
</slot>
640642
</vaadin-date-picker-overlay>
641-
<slot name="tooltip">
642-
</slot>
643643
`;
644644
/* end snapshot vaadin-date-picker shadow disabled */
645645

@@ -687,6 +687,8 @@ snapshots["vaadin-date-picker shadow readonly"] =
687687
<slot name="error-message">
688688
</slot>
689689
</div>
690+
<slot name="tooltip">
691+
</slot>
690692
</div>
691693
<vaadin-date-picker-overlay
692694
exportparts="backdrop, overlay, content"
@@ -698,8 +700,6 @@ snapshots["vaadin-date-picker shadow readonly"] =
698700
<slot name="overlay">
699701
</slot>
700702
</vaadin-date-picker-overlay>
701-
<slot name="tooltip">
702-
</slot>
703703
`;
704704
/* end snapshot vaadin-date-picker shadow readonly */
705705

@@ -747,6 +747,8 @@ snapshots["vaadin-date-picker shadow invalid"] =
747747
<slot name="error-message">
748748
</slot>
749749
</div>
750+
<slot name="tooltip">
751+
</slot>
750752
</div>
751753
<vaadin-date-picker-overlay
752754
exportparts="backdrop, overlay, content"
@@ -758,8 +760,6 @@ snapshots["vaadin-date-picker shadow invalid"] =
758760
<slot name="overlay">
759761
</slot>
760762
</vaadin-date-picker-overlay>
761-
<slot name="tooltip">
762-
</slot>
763763
`;
764764
/* end snapshot vaadin-date-picker shadow invalid */
765765

@@ -807,6 +807,8 @@ snapshots["vaadin-date-picker shadow theme"] =
807807
<slot name="error-message">
808808
</slot>
809809
</div>
810+
<slot name="tooltip">
811+
</slot>
810812
</div>
811813
<vaadin-date-picker-overlay
812814
exportparts="backdrop, overlay, content"
@@ -819,8 +821,6 @@ snapshots["vaadin-date-picker shadow theme"] =
819821
<slot name="overlay">
820822
</slot>
821823
</vaadin-date-picker-overlay>
822-
<slot name="tooltip">
823-
</slot>
824824
`;
825825
/* end snapshot vaadin-date-picker shadow theme */
826826

‎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
@@ -126,9 +126,9 @@ snapshots["vaadin-email-field shadow default"] =
126126
<slot name="error-message">
127127
</slot>
128128
</div>
129+
<slot name="tooltip">
130+
</slot>
129131
</div>
130-
<slot name="tooltip">
131-
</slot>
132132
`;
133133
/* end snapshot vaadin-email-field shadow default */
134134

@@ -175,9 +175,9 @@ snapshots["vaadin-email-field shadow disabled"] =
175175
<slot name="error-message">
176176
</slot>
177177
</div>
178+
<slot name="tooltip">
179+
</slot>
178180
</div>
179-
<slot name="tooltip">
180-
</slot>
181181
`;
182182
/* end snapshot vaadin-email-field shadow disabled */
183183

@@ -224,9 +224,9 @@ snapshots["vaadin-email-field shadow readonly"] =
224224
<slot name="error-message">
225225
</slot>
226226
</div>
227+
<slot name="tooltip">
228+
</slot>
227229
</div>
228-
<slot name="tooltip">
229-
</slot>
230230
`;
231231
/* end snapshot vaadin-email-field shadow readonly */
232232

@@ -273,9 +273,9 @@ snapshots["vaadin-email-field shadow invalid"] =
273273
<slot name="error-message">
274274
</slot>
275275
</div>
276+
<slot name="tooltip">
277+
</slot>
276278
</div>
277-
<slot name="tooltip">
278-
</slot>
279279
`;
280280
/* end snapshot vaadin-email-field shadow invalid */
281281

@@ -322,9 +322,9 @@ snapshots["vaadin-email-field shadow theme"] =
322322
<slot name="error-message">
323323
</slot>
324324
</div>
325+
<slot name="tooltip">
326+
</slot>
325327
</div>
326-
<slot name="tooltip">
327-
</slot>
328328
`;
329329
/* end snapshot vaadin-email-field shadow theme */
330330

‎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
@@ -146,6 +146,8 @@ class MultiSelectComboBox extends MultiSelectComboBoxMixin(
146146
<div part="error-message">
147147
<slot name="error-message"></slot>
148148
</div>
149+
150+
<slot name="tooltip"></slot>
149151
</div>
150152
151153
<vaadin-multi-select-combo-box-overlay
@@ -161,8 +163,6 @@ class MultiSelectComboBox extends MultiSelectComboBoxMixin(
161163
>
162164
<slot name="overlay"></slot>
163165
</vaadin-multi-select-combo-box-overlay>
164-
165-
<slot name="tooltip"></slot>
166166
`;
167167
}
168168
}

0 commit comments

Comments
 (0)