Skip to content

Commit a13cfff

Browse files
authored
feat: port tabsheet Lumo styles to CSS files (#9599)
1 parent ca3b6bf commit a13cfff

5 files changed

Lines changed: 86 additions & 2 deletions

File tree

‎packages/tabsheet/src/vaadin-tabsheet.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { html, LitElement } from 'lit';
99
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';
12+
import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
1213
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1314
import { tabSheetStyles } from './styles/vaadin-tabsheet-core-styles.js';
1415
import { TabSheetMixin } from './vaadin-tabsheet-mixin.js';
@@ -61,7 +62,7 @@ import { TabSheetMixin } from './vaadin-tabsheet-mixin.js';
6162
* @mixes ElementMixin
6263
* @mixes ThemableMixin
6364
*/
64-
class TabSheet extends TabSheetMixin(ThemableMixin(ElementMixin(PolylitMixin(LitElement)))) {
65+
class TabSheet extends TabSheetMixin(ThemableMixin(ElementMixin(LumoInjectionMixin(PolylitMixin(LitElement))))) {
6566
static get is() {
6667
return 'vaadin-tabsheet';
6768
}

‎packages/tabsheet/test/visual/lumo/tabsheet.test.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { sendKeys } from '@vaadin/test-runner-commands';
22
import { fixtureSync } from '@vaadin/testing-helpers';
33
import { visualDiff } from '@web/test-runner-visual-regression';
4+
import '@vaadin/vaadin-lumo-styles/props.css';
5+
import '@vaadin/vaadin-lumo-styles/components/tabsheet.css';
46
import '@vaadin/tabs/test/visual/not-animated-styles.js';
5-
import '../../../theme/lumo/vaadin-tabsheet.js';
7+
import '../../../vaadin-tabsheet.js';
68

79
describe('tabsheet', () => {
810
let div, element;

‎packages/vaadin-lumo-styles/components.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
@import './components/side-nav.css';
6262
@import './components/split-layout.css';
6363
@import './components/tabs.css';
64+
@import './components/tabsheet.css';
6465
@import './components/text-area.css';
6566
@import './components/text-field.css';
6667
@import './components/time-picker.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) 2000 - 2025 Vaadin Ltd.
4+
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
5+
*/
6+
@import '../src/mixins/base-layer-reset.css';
7+
@import '../src/mixins/loader.css';
8+
@import '../src/components/tabsheet.css';
9+
@import './scroller.css';
10+
@import './tabs.css';
11+
12+
html {
13+
--vaadin-tabsheet-lumo-inject: 1;
14+
--vaadin-tabsheet-lumo-inject-modules:
15+
lumo_mixins_base-layer-reset,
16+
lumo_mixins_loader,
17+
lumo_components_tabsheet;
18+
19+
--vaadin-tabsheet-scroller-lumo-inject: 1;
20+
--vaadin-tabsheet-scroller-lumo-inject-modules: lumo_components_scroller;
21+
}
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/**
2+
* @license
3+
* Copyright (c) 2000 - 2025 Vaadin Ltd.
4+
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
5+
*/
6+
@media lumo_components_tabsheet {
7+
:host {
8+
display: flex;
9+
flex-direction: column;
10+
font-size: var(--lumo-font-size-m);
11+
line-height: var(--lumo-line-height-m);
12+
font-family: var(--lumo-font-family);
13+
}
14+
15+
:host([hidden]) {
16+
display: none !important;
17+
}
18+
19+
[part='tabs-container'] {
20+
position: relative;
21+
display: flex;
22+
align-items: center;
23+
box-shadow: inset 0 -1px 0 0 var(--lumo-contrast-10pct);
24+
padding: var(--lumo-space-xs) var(--lumo-space-s);
25+
gap: var(--lumo-space-s);
26+
}
27+
28+
::slotted([slot='tabs']) {
29+
flex: 1;
30+
align-self: stretch;
31+
min-width: 8em;
32+
box-shadow: initial;
33+
margin: calc(var(--lumo-space-xs) * -1) calc(var(--lumo-space-s) * -1);
34+
}
35+
36+
[part='content'] {
37+
position: relative;
38+
flex: 1;
39+
box-sizing: border-box;
40+
padding: var(--lumo-space-s) var(--lumo-space-m);
41+
border-bottom-left-radius: inherit;
42+
border-bottom-right-radius: inherit;
43+
}
44+
45+
:host([theme~='bordered']) {
46+
border: 1px solid var(--lumo-contrast-20pct);
47+
border-radius: var(--lumo-border-radius-l);
48+
}
49+
50+
:host([loading]) [part='content'] {
51+
display: flex;
52+
align-items: center;
53+
justify-content: center;
54+
}
55+
56+
:host([theme~='no-padding']) [part='content'] {
57+
padding: 0;
58+
}
59+
}

0 commit comments

Comments
 (0)