Skip to content

Commit 6c75910

Browse files
authored
feat: add tooltip support to vaadin-date-picker (#4485)
1 parent d4fb8e3 commit 6c75910

5 files changed

Lines changed: 24 additions & 1 deletion

File tree

‎dev/date-picker.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
<script type="module" src="./common.js"></script>
99
<script type="module">
1010
import '@vaadin/date-picker';
11+
import '@vaadin/tooltip';
1112
</script>
1213
</head>
1314
<body>
14-
<vaadin-date-picker label="Start date"></vaadin-date-picker>
15+
<vaadin-date-picker label="Start date">
16+
<vaadin-tooltip slot="tooltip" text="Counted as first day"></vaadin-tooltip>
17+
</vaadin-date-picker>
1518
</body>
1619
</html>

‎integration/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"@vaadin/button": "23.3.0-alpha0",
1212
"@vaadin/checkbox": "23.3.0-alpha0",
1313
"@vaadin/combo-box": "23.3.0-alpha0",
14+
"@vaadin/date-picker": "23.3.0-alpha0",
1415
"@vaadin/details": "23.3.0-alpha0",
1516
"@vaadin/dialog": "23.3.0-alpha0",
1617
"@vaadin/email-field": "23.3.0-alpha0",

‎integration/tests/component-tooltip.test.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import '@vaadin/tooltip';
44
import { Button } from '@vaadin/button';
55
import { Checkbox } from '@vaadin/checkbox';
66
import { ComboBox } from '@vaadin/combo-box';
7+
import { DatePicker } from '@vaadin/date-picker';
78
import { Details } from '@vaadin/details';
89
import { EmailField } from '@vaadin/email-field';
910
import { IntegerField } from '@vaadin/integer-field';
@@ -20,6 +21,7 @@ import { mouseenter, mouseleave } from '@vaadin/tooltip/test/helpers.js';
2021
{ tagName: Button.is },
2122
{ tagName: Checkbox.is },
2223
{ tagName: ComboBox.is, applyShouldNotShowCondition: (comboBox) => comboBox.click() },
24+
{ tagName: DatePicker.is, applyShouldNotShowCondition: (datePicker) => datePicker.click() },
2325
{ tagName: Details.is, targetSelector: '[part="summary"]', position: 'bottom-start' },
2426
{ tagName: EmailField.is },
2527
{ tagName: IntegerField.is },

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import './vaadin-date-picker-overlay.js';
88
import './vaadin-date-picker-overlay-content.js';
99
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
1010
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
11+
import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
1112
import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js';
1213
import { InputController } from '@vaadin/field-base/src/input-controller.js';
1314
import { LabelledInputController } from '@vaadin/field-base/src/labelled-input-controller.js';
@@ -183,6 +184,8 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
183184
></vaadin-date-picker-overlay-content>
184185
</template>
185186
</vaadin-date-picker-overlay>
187+
188+
<slot name="tooltip"></slot>
186189
`;
187190
}
188191

@@ -209,6 +212,10 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
209212
);
210213
this.addController(new LabelledInputController(this.inputElement, this._labelController));
211214

215+
this._tooltipController = new TooltipController(this);
216+
this.addController(this._tooltipController);
217+
this._tooltipController.setShouldShow((target) => !target.opened);
218+
212219
const toggleButton = this.shadowRoot.querySelector('[part="toggle-button"]');
213220
toggleButton.addEventListener('mousedown', (e) => e.preventDefault());
214221
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ snapshots["vaadin-date-picker shadow default"] =
336336
<template>
337337
</template>
338338
</vaadin-date-picker-overlay>
339+
<slot name="tooltip">
340+
</slot>
339341
`;
340342
/* end snapshot vaadin-date-picker shadow default */
341343

@@ -392,6 +394,8 @@ snapshots["vaadin-date-picker shadow disabled"] =
392394
<template>
393395
</template>
394396
</vaadin-date-picker-overlay>
397+
<slot name="tooltip">
398+
</slot>
395399
`;
396400
/* end snapshot vaadin-date-picker shadow disabled */
397401

@@ -448,6 +452,8 @@ snapshots["vaadin-date-picker shadow readonly"] =
448452
<template>
449453
</template>
450454
</vaadin-date-picker-overlay>
455+
<slot name="tooltip">
456+
</slot>
451457
`;
452458
/* end snapshot vaadin-date-picker shadow readonly */
453459

@@ -504,6 +510,8 @@ snapshots["vaadin-date-picker shadow invalid"] =
504510
<template>
505511
</template>
506512
</vaadin-date-picker-overlay>
513+
<slot name="tooltip">
514+
</slot>
507515
`;
508516
/* end snapshot vaadin-date-picker shadow invalid */
509517

@@ -560,6 +568,8 @@ snapshots["vaadin-date-picker shadow theme"] =
560568
<template>
561569
</template>
562570
</vaadin-date-picker-overlay>
571+
<slot name="tooltip">
572+
</slot>
563573
`;
564574
/* end snapshot vaadin-date-picker shadow theme */
565575

0 commit comments

Comments
 (0)