Skip to content

Commit c1187cf

Browse files
authored
feat: port rich-text-editor Lumo styles to CSS files (#9502)
1 parent 63bad46 commit c1187cf

8 files changed

Lines changed: 521 additions & 3 deletions

File tree

‎dev/rich-text-editor.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<script type="module">
1111
import '@vaadin/rich-text-editor';
12+
import '@vaadin/vaadin-lumo-styles/lumo.css';
1213
</script>
1314
</head>
1415

‎packages/rich-text-editor/src/vaadin-rich-text-editor-popup.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
1515
import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-core-styles.js';
1616
import { OverlayMixin } from '@vaadin/overlay/src/vaadin-overlay-mixin.js';
1717
import { PositionMixin } from '@vaadin/overlay/src/vaadin-overlay-position-mixin.js';
18+
import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
1819
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1920

2021
/**
@@ -136,7 +137,7 @@ export { RichTextEditorPopup };
136137
* @private
137138
*/
138139
class RichTextEditorPopupOverlay extends PositionMixin(
139-
OverlayMixin(DirMixin(ThemableMixin(PolylitMixin(LitElement)))),
140+
OverlayMixin(DirMixin(ThemableMixin(CSSInjectionMixin(PolylitMixin(LitElement))))),
140141
) {
141142
static get is() {
142143
return 'vaadin-rich-text-editor-popup-overlay';

‎packages/rich-text-editor/src/vaadin-rich-text-editor.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { html, LitElement } from 'lit';
1717
import { defineCustomElement } from '@vaadin/component-base/src/define.js';
1818
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1919
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
20+
import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
2021
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
2122
import { richTextEditorStyles } from './styles/vaadin-rich-text-editor-core-styles.js';
2223
import { RichTextEditorMixin } from './vaadin-rich-text-editor-mixin.js';
@@ -99,7 +100,9 @@ import { RichTextEditorMixin } from './vaadin-rich-text-editor-mixin.js';
99100
* @mixes RichTextEditorMixin
100101
* @mixes ThemableMixin
101102
*/
102-
class RichTextEditor extends RichTextEditorMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
103+
class RichTextEditor extends RichTextEditorMixin(
104+
ElementMixin(ThemableMixin(CSSInjectionMixin(PolylitMixin(LitElement)))),
105+
) {
103106
static get is() {
104107
return 'vaadin-rich-text-editor';
105108
}

‎packages/rich-text-editor/test/visual/lumo/rich-text-editor.test.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js';
22
import { visualDiff } from '@web/test-runner-visual-regression';
3-
import '../../../theme/lumo/vaadin-rich-text-editor.js';
3+
import '@vaadin/vaadin-lumo-styles/props.css';
4+
import '@vaadin/vaadin-lumo-styles/components/rich-text-editor.css';
5+
import '../../../vaadin-rich-text-editor.js';
46

57
describe('rich-text-editor', () => {
68
let div, element;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
@import './components/progress-bar.css';
4242
@import './components/radio-button.css';
4343
@import './components/radio-group.css';
44+
@import './components/rich-text-editor.css';
4445
@import './components/scroller.css';
4546
@import './components/select.css';
4647
@import './components/side-nav.css';
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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 './button.css';
7+
@import './confirm-dialog.css';
8+
@import './text-field.css';
9+
@import './tooltip.css';
10+
11+
@import '../src/mixins/base-layer-reset.css' vaadin-rich-text-editor;
12+
@import '../src/global/color.css' vaadin-rich-text-editor;
13+
@import '../src/global/typography.css' vaadin-rich-text-editor;
14+
@import '../src/components/rich-text-editor.css' vaadin-rich-text-editor;
15+
16+
@import '../src/mixins/base-layer-reset.css' vaadin-rich-text-editor-popup-overlay;
17+
@import '../src/mixins/overlay.css' vaadin-rich-text-editor-popup-overlay;
18+
@import '../src/components/rich-text-editor-popup-overlay.css' vaadin-rich-text-editor-popup-overlay;
19+
20+
html {
21+
--vaadin-rich-text-editor-css-inject: 1;
22+
--vaadin-rich-text-editor-popup-overlay-css-inject: 1;
23+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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+
[part='overlay'] {
7+
margin: var(--lumo-space-xs) 0;
8+
}
9+
10+
[part='content'] {
11+
padding: var(--lumo-space-xs);
12+
max-width: calc(7 * (var(--_button-size) + var(--_button-margin) * 2));
13+
display: flex;
14+
flex-wrap: wrap;
15+
justify-content: center;
16+
--_button-size: 1.25rem;
17+
--_button-margin: 3px;
18+
}
19+
20+
[part='content'] ::slotted(button) {
21+
border: none;
22+
width: var(--_button-size);
23+
height: var(--_button-size);
24+
margin: var(--_button-margin);
25+
}

0 commit comments

Comments
 (0)