Skip to content

Commit f70d1c0

Browse files
authored
V16-RC Tiptap style fixes (#19473)
* Fixes search filter text alignment * Let `styleMenu` kind display as a menu * Collapse excessive whitespace in RTE * Ensures the RTE Capabilities are in 3 columns * Dimensions UI fixes
1 parent 9ab17e6 commit f70d1c0

File tree

6 files changed

+19
-17
lines changed

6 files changed

+19
-17
lines changed

src/Umbraco.Web.UI.Client/src/packages/property-editors/dimensions/property-editor-ui-dimensions.element.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
2-
import { customElement, html, property } from '@umbraco-cms/backoffice/external/lit';
1+
import { css, customElement, html, property } from '@umbraco-cms/backoffice/external/lit';
32
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
43
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
54
import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
@@ -25,6 +24,9 @@ export class UmbPropertyEditorUIDimensionsElement extends UmbLitElement {
2524
return html`
2625
<uui-input
2726
type="number"
27+
autocomplete="off"
28+
min="0"
29+
step="1"
2830
label=${this.localize.term('general_width')}
2931
placeholder=${this.localize.term('general_width')}
3032
@change=${this.#onChangeWidth}
@@ -33,6 +35,9 @@ export class UmbPropertyEditorUIDimensionsElement extends UmbLitElement {
3335
<span>&times;</span>
3436
<uui-input
3537
type="number"
38+
autocomplete="off"
39+
min="0"
40+
step="1"
3641
label=${this.localize.term('general_height')}
3742
placeholder=${this.localize.term('general_height')}
3843
@change=${this.#onChangeHeight}
@@ -42,7 +47,15 @@ export class UmbPropertyEditorUIDimensionsElement extends UmbLitElement {
4247
`;
4348
}
4449

45-
static override readonly styles = [UmbTextStyles];
50+
static override readonly styles = [
51+
css`
52+
:host {
53+
display: flex;
54+
align-items: center;
55+
gap: var(--uui-size-space-1);
56+
}
57+
`,
58+
];
4659
}
4760

4861
export { UmbPropertyEditorUIDimensionsElement as element };

src/Umbraco.Web.UI.Client/src/packages/tiptap/components/character-map/character-map-modal.element.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,10 +435,6 @@ export class UmbCharacterMapModalElement extends UmbModalBaseElement<
435435
gap: var(--uui-size-space-4);
436436
}
437437
438-
uui-input {
439-
align-items: baseline;
440-
}
441-
442438
uui-scroll-container {
443439
height: 300px;
444440
width: calc(450px + var(--uui-size-layout-1));

src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
286286
height: 100%;
287287
width: 100%;
288288
outline: none;
289-
white-space: pre-wrap;
289+
white-space: wrap;
290290
min-width: 0;
291291
292292
p:first-of-type {

src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-extensions-configuration.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export class UmbPropertyEditorUiTiptapExtensionsConfigurationElement
197197
}
198198
199199
.group {
200-
flex: 1;
200+
width: calc((100% - 2rem) / 3);
201201
202202
ul {
203203
list-style: none;

src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-statusbar-configuration.element.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,6 @@ export class UmbPropertyEditorUiTiptapStatusbarConfigurationElement
265265
[slot='header-actions'] {
266266
margin-bottom: var(--uui-size-2);
267267
268-
uui-input {
269-
align-items: baseline;
270-
}
271-
272268
uui-icon {
273269
color: var(--uui-color-border);
274270
}

src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
278278
const forbidden = !this.#context?.isExtensionEnabled(item.alias);
279279

280280
switch (item.kind) {
281+
case 'styleMenu':
281282
case 'menu':
282283
return html`
283284
<uui-button
@@ -355,10 +356,6 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
355356
[slot='header-actions'] {
356357
margin-bottom: var(--uui-size-2);
357358
358-
uui-input {
359-
align-items: baseline;
360-
}
361-
362359
uui-icon {
363360
color: var(--uui-color-border);
364361
}

0 commit comments

Comments
 (0)