Skip to content

Commit 6e9cf4c

Browse files
authored
feat: add tooltip support to date-time-picker (#4494)
1 parent e257119 commit 6e9cf4c

6 files changed

Lines changed: 71 additions & 1 deletion

File tree

‎dev/date-time-picker.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<script type="module" src="./common.js"></script>
99
<script type="module">
1010
import '@vaadin/date-time-picker';
11+
import '@vaadin/tooltip';
1112
</script>
1213
</head>
1314
<body>
@@ -16,6 +17,8 @@
1617
error-message="error-message"
1718
min="2019-09-01T08:00"
1819
max="2019-09-30T22:00"
19-
></vaadin-date-time-picker>
20+
>
21+
<vaadin-tooltip slot="tooltip" text="You will have a personal discount"></vaadin-tooltip>
22+
</vaadin-date-time-picker>
2023
</body>
2124
</html>

‎integration/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"@vaadin/checkbox": "23.3.0-alpha0",
1313
"@vaadin/combo-box": "23.3.0-alpha0",
1414
"@vaadin/date-picker": "23.3.0-alpha0",
15+
"@vaadin/date-time-picker": "23.3.0-alpha0",
1516
"@vaadin/details": "23.3.0-alpha0",
1617
"@vaadin/dialog": "23.3.0-alpha0",
1718
"@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
@@ -5,6 +5,7 @@ import { Button } from '@vaadin/button';
55
import { Checkbox } from '@vaadin/checkbox';
66
import { ComboBox } from '@vaadin/combo-box';
77
import { DatePicker } from '@vaadin/date-picker';
8+
import { DateTimePicker } from '@vaadin/date-time-picker';
89
import { Details } from '@vaadin/details';
910
import { EmailField } from '@vaadin/email-field';
1011
import { IntegerField } from '@vaadin/integer-field';
@@ -23,6 +24,7 @@ import { mouseenter, mouseleave } from '@vaadin/tooltip/test/helpers.js';
2324
{ tagName: Checkbox.is },
2425
{ tagName: ComboBox.is, applyShouldNotShowCondition: (comboBox) => comboBox.click() },
2526
{ tagName: DatePicker.is, applyShouldNotShowCondition: (datePicker) => datePicker.click() },
27+
{ tagName: DateTimePicker.is, applyShouldNotShowCondition: (element) => element.querySelector('input').click() },
2628
{ tagName: Details.is, targetSelector: '[part="summary"]', position: 'bottom-start' },
2729
{ tagName: EmailField.is },
2830
{ tagName: IntegerField.is },

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js';
1111
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1212
import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js';
1313
import { SlotMixin } from '@vaadin/component-base/src/slot-mixin.js';
14+
import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
1415
import { dateEquals } from '@vaadin/date-picker/src/vaadin-date-picker-helper.js';
1516
import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
1617
import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js';
@@ -156,6 +157,8 @@ class DateTimePicker extends FieldMixin(
156157
<slot name="error-message"></slot>
157158
</div>
158159
</div>
160+
161+
<slot name="tooltip"></slot>
159162
`;
160163
}
161164

@@ -423,6 +426,12 @@ class DateTimePicker extends FieldMixin(
423426

424427
this.setAttribute('role', 'group');
425428

429+
this._tooltipController = new TooltipController(this);
430+
this.addController(this._tooltipController);
431+
this._tooltipController.setShouldShow((target) => {
432+
return target.__datePicker && !target.__datePicker.opened && target.__timePicker && !target.__timePicker.opened;
433+
});
434+
426435
this.ariaTarget = this;
427436
}
428437

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/* @web/test-runner snapshot v1 */
2+
export const snapshots = {};
3+
4+
snapshots["vaadin-date-time-picker default"] =
5+
`<div class="vaadin-date-time-picker-container">
6+
<div part="label">
7+
<slot name="label">
8+
</slot>
9+
<span
10+
aria-hidden="true"
11+
part="required-indicator"
12+
>
13+
</span>
14+
</div>
15+
<div class="slots">
16+
<slot
17+
id="dateSlot"
18+
name="date-picker"
19+
>
20+
</slot>
21+
<slot
22+
id="timeSlot"
23+
name="time-picker"
24+
>
25+
</slot>
26+
</div>
27+
<div part="helper-text">
28+
<slot name="helper">
29+
</slot>
30+
</div>
31+
<div part="error-message">
32+
<slot name="error-message">
33+
</slot>
34+
</div>
35+
</div>
36+
<slot name="tooltip">
37+
</slot>
38+
`;
39+
/* end snapshot vaadin-date-time-picker default */
40+
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { expect } from '@esm-bundle/chai';
2+
import { fixtureSync } from '@vaadin/testing-helpers';
3+
import '../../src/vaadin-date-time-picker.js';
4+
5+
describe('vaadin-date-time-picker', () => {
6+
let dateTimePicker;
7+
8+
beforeEach(() => {
9+
dateTimePicker = fixtureSync('<vaadin-date-time-picker></vaadin-date-time-picker>');
10+
});
11+
12+
it('default', async () => {
13+
await expect(dateTimePicker).shadowDom.to.equalSnapshot();
14+
});
15+
});

0 commit comments

Comments
 (0)