From c960a1d4ae3babdcdef330fe950cf82fe6eac0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 20 Mar 2023 14:37:17 +0100
Subject: [PATCH] fix type

---
 .../registry/extension.registry.ts             | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/registry/extension.registry.ts b/src/Umbraco.Web.UI.Client/libs/extensions-api/registry/extension.registry.ts
index 6c30f58631..7376ca0652 100644
--- a/src/Umbraco.Web.UI.Client/libs/extensions-api/registry/extension.registry.ts
+++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/registry/extension.registry.ts
@@ -170,20 +170,24 @@ export class UmbExtensionRegistry {
 		) as Observable<Array<T>>;
 	}
 
-	extensionsOfTypes<ExtensionTypes = ManifestBase>(types: string[]): Observable<Array<ExtensionTypes>> {
+	extensionsOfTypes<ExtensionTypes extends ManifestBase = ManifestBase>(
+		types: string[]
+	): Observable<Array<ExtensionTypes>> {
 		return this._extensionsOfTypes(types).pipe(
 			withLatestFrom(this._kindsOfTypes(types)),
 			map(([exts, kinds]) =>
 				exts
 					.map((ext) => {
 						// Specific Extension Meta merge (does not merge conditions)
-						const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
-						if (baseManifest) {
-							const merged = { ...baseManifest, ...ext } as any;
-							if ((baseManifest as any).meta) {
-								merged.meta = { ...(baseManifest as any).meta, ...(ext as any).meta };
+						if (ext) {
+							const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
+							if (baseManifest) {
+								const merged = { ...baseManifest, ...ext } as any;
+								if ((baseManifest as any).meta) {
+									merged.meta = { ...(baseManifest as any).meta, ...(ext as any).meta };
+								}
+								return merged;
 							}
-							return merged;
 						}
 						return ext;
 					})