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

fix custom views for block list and block rte (#18565)

Browse Source
This commit is contained in:
Mads Rasmussen
2025-03-05 08:38:11 +01:00
committed by GitHub
parent b9cbce561c
commit bf7efbc268
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
View File

@@ -395,7 +395,7 @@ export class UmbBlockListEntryElement extends UmbLitElement implements UmbProper
}
#renderBlock() {
return this.contentKey
return this.contentKey && (this._contentTypeAlias || this._unsupported)
? html`
<div class="umb-block-list__block">
<umb-extension-slot

42
src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts
View File

@@ -66,7 +66,7 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
_workspaceEditSettingsPath?: string;
@state()
_contentElementTypeAlias?: string;
_contentTypeAlias?: string;
@state()
_contentTypeName?: string;
@@ -115,7 +115,7 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
this.observe(
this.#context.contentElementTypeAlias,
(alias) => {
this._contentElementTypeAlias = alias;
this._contentTypeAlias = alias;
},
null,
);
@@ -230,7 +230,7 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
}
readonly #filterBlockCustomViews = (manifest: ManifestBlockEditorCustomView) => {
const elementTypeAlias = this._contentElementTypeAlias ?? '';
const elementTypeAlias = this._contentTypeAlias ?? '';
const isForBlockEditor =
!manifest.forBlockEditor || stringOrStringArrayContains(manifest.forBlockEditor, UMB_BLOCK_RTE);
const isForContentTypeAlias =
@@ -256,23 +256,25 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
};
#renderBlock() {
return html`
<div class="uui-text uui-font">
<umb-extension-slot
type="blockEditorCustomView"
default-element="umb-ref-rte-block"
.renderMethod=${this.#extensionSlotRenderMethod}
.props=${this._blockViewProps}
.filter=${this.#filterBlockCustomViews}
single>
${this.#renderRefBlock()}
</umb-extension-slot>
<uui-action-bar> ${this.#renderEditAction()} ${this.#renderEditSettingsAction()} </uui-action-bar>
${!this._showContentEdit && this._contentInvalid
? html`<uui-badge attention color="danger" label="Invalid content">!</uui-badge>`
: nothing}
</div>
`;
return this.contentKey && this._contentTypeAlias
? html`
<div class="uui-text uui-font">
<umb-extension-slot
type="blockEditorCustomView"
default-element="umb-ref-rte-block"
.renderMethod=${this.#extensionSlotRenderMethod}
.props=${this._blockViewProps}
.filter=${this.#filterBlockCustomViews}
single>
${this.#renderRefBlock()}
</umb-extension-slot>
<uui-action-bar> ${this.#renderEditAction()} ${this.#renderEditSettingsAction()} </uui-action-bar>
${!this._showContentEdit && this._contentInvalid
? html`<uui-badge attention color="danger" label="Invalid content">!</uui-badge>`
: nothing}
</div>
`
: nothing;
}
#renderRefBlock() {