Skip to content

Commit 9632998

Browse files
authored
refactor: move RTE background and border to the container (#10487)
1 parent 215bcc9 commit 9632998

21 files changed

+16
-9
lines changed

packages/rich-text-editor/src/styles/vaadin-rich-text-editor-base-styles.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ import { icons } from './vaadin-rich-text-editor-base-icons.js';
1313

1414
const base = css`
1515
:host {
16-
background: var(--vaadin-rich-text-editor-background, var(--vaadin-background-color));
17-
border: var(--vaadin-input-field-border-width, 1px) solid
18-
var(--vaadin-input-field-border-color, var(--vaadin-border-color));
19-
border-radius: var(--vaadin-input-field-border-radius, var(--vaadin-radius-m));
2016
box-sizing: border-box;
2117
display: flex;
2218
flex-direction: column;
@@ -41,7 +37,11 @@ const base = css`
4137
flex-direction: column;
4238
max-height: inherit;
4339
min-height: inherit;
44-
border-radius: inherit;
40+
background: var(--vaadin-rich-text-editor-background, var(--vaadin-background-color));
41+
border: var(--vaadin-input-field-border-width, 1px) solid
42+
var(--vaadin-input-field-border-color, var(--vaadin-border-color));
43+
border-radius: var(--vaadin-input-field-border-radius, var(--vaadin-radius-m));
44+
outline-offset: calc(var(--vaadin-input-field-border-width, 1px) * -1);
4545
contain: paint;
4646
}
4747

packages/rich-text-editor/test/auto-grow.test.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ describe('rich text editor', () => {
4242
['height', 'min-height', 'max-height'].forEach((definedValue, key) => {
4343
describe(`defined ${definedValue}`, () => {
4444
beforeEach(async () => {
45-
rte = fixtureSync(`<vaadin-rich-text-editor style="${definedValue}: 500px"></vaadin-rich-text-editor>`);
45+
rte = fixtureSync(`
46+
<vaadin-rich-text-editor
47+
style="${definedValue}: 500px; --vaadin-input-field-border-width: 0px"
48+
></vaadin-rich-text-editor>
49+
`);
4650
await nextRender();
4751
editorContainer = rte.shadowRoot.querySelector('.vaadin-rich-text-editor-container');
4852
editorContentContainer = rte.shadowRoot.querySelector('.ql-container');
-24 Bytes
Loading
-71 Bytes
Loading
-19 Bytes
Loading
-5 Bytes
Loading
-26 Bytes
Loading
-21 Bytes
Loading
-24 Bytes
Loading
-24 Bytes
Loading

0 commit comments

Comments
 (0)