Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
return html`
${when(loading, () => html`<div id="loader"><uui-loader></uui-loader></div>`)}
${when(!loading, () => html`${this.#renderStyles()}${this.#renderToolbar()}`)}
<div id="editor" data-mark="input:tiptap-rte"></div>
<div id="editor" data-mark="input:tiptap-rte" ?data-loaded=${!loading}></div>
${when(!loading, () => this.#renderStatusbar())}
`;
}
Expand Down Expand Up @@ -272,7 +272,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
display: flex;
overflow: auto;
border-radius: var(--uui-border-radius);
border: 1px solid var(--umb-tiptap-edge-border-color, var(--uui-color-border));
border: 1px solid transparent;
padding: 1rem;
box-sizing: border-box;

Expand All @@ -283,6 +283,10 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
width: 100%;
max-width: 100%;

&[data-loaded] {
border-color: var(--umb-tiptap-edge-border-color, var(--uui-color-border));
}

> .tiptap {
height: 100%;
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export class UmbTiptapStatusbarElement extends UmbLitElement {
border-top-left-radius: 0;
border-top-right-radius: 0;
border-top: 0;
box-sizing: border-box;

min-height: var(--uui-size-layout-1);
max-height: var(--uui-size-layout-2);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/
import '../cascading-menu-popover/cascading-menu-popover.element.js';

/**
* Provides a sticky toolbar for the {@link UmbInputTiptapElement}
* @element umb-tiptap-toolbar
* @cssprop --umb-tiptap-edge-border-color - Defines the edge border color
* @cssprop --umb-tiptap-top - Defines the top value for the sticky toolbar
*/
* Provides a sticky toolbar for the {@link UmbInputTiptapElement}
* @element umb-tiptap-toolbar
* @cssprop --umb-tiptap-edge-border-color - Defines the edge border color
* @cssprop --umb-tiptap-top - Defines the top value for the sticky toolbar
*/
@customElement('umb-tiptap-toolbar')
export class UmbTiptapToolbarElement extends UmbLitElement {
#attached = false;
Expand Down Expand Up @@ -105,6 +105,7 @@ export class UmbTiptapToolbarElement extends UmbLitElement {
border-top-color: var(--umb-tiptap-edge-border-color, var(--uui-color-border));
border-left-color: var(--umb-tiptap-edge-border-color, var(--uui-color-border));
border-right-color: var(--umb-tiptap-edge-border-color, var(--uui-color-border));
box-sizing: border-box;

background-color: var(--uui-color-surface);
color: var(--color-text);
Expand All @@ -114,7 +115,7 @@ export class UmbTiptapToolbarElement extends UmbLitElement {
flex-direction: column;

position: sticky;
top: var(--umb-tiptap-top,-25px);
top: var(--umb-tiptap-top, -25px);
left: 0;
right: 0;
padding: var(--uui-size-3);
Expand All @@ -130,17 +131,21 @@ export class UmbTiptapToolbarElement extends UmbLitElement {
flex-direction: row;
flex-wrap: wrap;

min-height: var(--uui-size-12, 36px);

.group {
display: inline-flex;
flex-wrap: wrap;
align-items: stretch;

min-height: var(--uui-size-12, 36px);

&:not(:last-child)::after {
content: '';
background-color: var(--uui-color-border);
width: 1px;
place-self: center;
height: 22px;
height: var(--uui-size-7, 21px);
margin: 0 var(--uui-size-3);
}
}
Expand Down
Loading