yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Tiptap toolbar, ensure component exists (#2390)

Browse Source 
Tiptap toolbar, checks if component exists
This commit is contained in:
Lee Kelleher
2024-10-01 13:12:01 +01:00
committed by GitHub
parent c7d08d23f3
commit 851d90785b
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Web.UI.Client/src/packages/rte/tiptap/components/input-tiptap/tiptap-fixed-menu.element.ts
View File

@@ -1,5 +1,5 @@
import type { UmbTiptapToolbarValue } from '../../extensions/types.js';
import { css, customElement, html, map, property, state } from '@umbraco-cms/backoffice/external/lit';
import { css, customElement, html, map, nothing, property, state } from '@umbraco-cms/backoffice/external/lit';
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
import { UmbExtensionsElementAndApiInitializer } from '@umbraco-cms/backoffice/extension-api';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -65,14 +65,19 @@ export class UmbTiptapFixedMenuElement extends UmbLitElement {
return html`${map(this.toolbar, (row, rowIndex) =>
map(
row,
(group, groupIndex) =>
html`${map(group, (alias, aliasIndex) => {
const newRow = rowIndex !== 0 && groupIndex === 0 && aliasIndex === 0;
return html`<div class="item" ?data-new-row=${newRow} style="${newRow ? 'grid-column: 1 / span 3' : ''}">
${this._lookup?.get(alias)}
</div>`;
})}
<div class="separator"></div> `,
(group, groupIndex) => html`
${map(group, (alias, aliasIndex) => {
const newRow = rowIndex !== 0 && groupIndex === 0 && aliasIndex === 0;
const component = this._lookup?.get(alias);
if (!component) return nothing;
return html`
<div class="item" ?data-new-row=${newRow} style=${newRow ? 'grid-column: 1 / span 3' : ''}>
${component}
</div>
`;
})}
<div class="separator"></div>
`,
),
)} `;
}