Skip to content

Commit 81db84c

Browse files
authored
feat: port date-time-picker Lumo styles to CSS files (#9353)
1 parent 43191e5 commit 81db84c

File tree

6 files changed

+64
-2
lines changed

6 files changed

+64
-2
lines changed

dev/date-time-picker.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<script type="module">
1010
import '@vaadin/date-time-picker';
1111
import '@vaadin/tooltip';
12+
import '@vaadin/vaadin-lumo-styles/lumo.css';
1213
</script>
1314
</head>
1415
<body>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { defineCustomElement } from '@vaadin/component-base/src/define.js';
1010
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1111
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
1212
import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js';
13+
import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
1314
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1415
import { DateTimePickerMixin } from './vaadin-date-time-picker-mixin.js';
1516

@@ -97,7 +98,9 @@ import { DateTimePickerMixin } from './vaadin-date-time-picker-mixin.js';
9798
* @mixes ThemableMixin
9899
* @mixes DateTimePickerMixin
99100
*/
100-
class DateTimePicker extends DateTimePickerMixin(ThemableMixin(ElementMixin(PolylitMixin(LitElement)))) {
101+
class DateTimePicker extends DateTimePickerMixin(
102+
ThemableMixin(ElementMixin(CSSInjectionMixin(PolylitMixin(LitElement)))),
103+
) {
101104
static get is() {
102105
return 'vaadin-date-time-picker';
103106
}

packages/date-time-picker/test/visual/lumo/date-time-picker.test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js';
22
import { visualDiff } from '@web/test-runner-visual-regression';
3+
import '@vaadin/vaadin-lumo-styles/props.css';
4+
import '@vaadin/vaadin-lumo-styles/components/date-time-picker.css';
35
import '../common.js';
4-
import '../../../theme/lumo/vaadin-date-time-picker.js';
6+
import '../../../vaadin-date-time-picker.js';
57

68
describe('date-time-picker', () => {
79
let div, element;

packages/vaadin-lumo-styles/components.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
@import './components/combo-box.css';
99
@import './components/custom-field.css';
1010
@import './components/date-picker.css';
11+
@import './components/date-time-picker.css';
1112
@import './components/details-summary.css';
1213
@import './components/details.css';
1314
@import './components/email-field.css';
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* @license
3+
* Copyright (c) 2017 - 2025 Vaadin Ltd.
4+
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
5+
*/
6+
@import './date-picker.css';
7+
@import './time-picker.css';
8+
9+
@import '../src/mixins/base-layer-reset.css' vaadin-date-time-picker;
10+
@import '../src/mixins/field-label.css' vaadin-date-time-picker;
11+
@import '../src/mixins/field-required.css' vaadin-date-time-picker;
12+
@import '../src/mixins/field-error-message.css' vaadin-date-time-picker;
13+
@import '../src/mixins/field-button.css' vaadin-date-time-picker;
14+
@import '../src/mixins/field-helper.css' vaadin-date-time-picker;
15+
@import '../src/mixins/field-base.css' vaadin-date-time-picker;
16+
@import '../src/components/custom-field.css' vaadin-date-time-picker;
17+
@import '../src/components/date-time-picker.css' vaadin-date-time-picker;
18+
19+
html {
20+
--vaadin-date-time-picker-css-inject: 1;
21+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/**
2+
* @license
3+
* Copyright (c) 2017 - 2025 Vaadin Ltd.
4+
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
5+
*/
6+
.vaadin-date-time-picker-container {
7+
--vaadin-field-default-width: auto;
8+
}
9+
10+
.slots {
11+
display: flex;
12+
--vaadin-field-default-width: 12em;
13+
}
14+
15+
.slots ::slotted([slot='date-picker']) {
16+
min-width: 0;
17+
flex: 1 1 auto;
18+
}
19+
20+
.slots ::slotted([slot='time-picker']) {
21+
min-width: 0;
22+
flex: 1 1.65 auto;
23+
}
24+
25+
::slotted([slot='date-picker']) {
26+
margin-inline-end: 2px;
27+
--vaadin-input-field-top-end-radius: 0;
28+
--vaadin-input-field-bottom-end-radius: 0;
29+
}
30+
31+
::slotted([slot='time-picker']) {
32+
--vaadin-input-field-top-start-radius: 0;
33+
--vaadin-input-field-bottom-start-radius: 0;
34+
}

0 commit comments

Comments
 (0)