From bf7efbc268a9623bc1b3405af9f9dd03392afa84 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 5 Mar 2025 08:38:11 +0100
Subject: [PATCH] fix custom views for block list and block rte (#18565)

---
 .../block-list-entry.element.ts               |  2 +-
 .../block-rte-entry.element.ts                | 42 ++++++++++---------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
index 48624dad3f..af584330ef 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
@@ -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
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts
index 6155247cf9..4708b444a3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts
@@ -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() {