From 25ed8775bcb10114c9849b43d06fc3aabecd4fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 6 Mar 2024 11:35:39 +0100
Subject: [PATCH] correct type + test

---
 .../src/libs/class-api/class.interface.ts                    | 5 +++--
 src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts  | 5 +++--
 .../src/libs/element-api/element.mixin.ts                    | 5 +++--
 .../src/libs/element-api/element.test.ts                     | 2 --
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/libs/class-api/class.interface.ts b/src/Umbraco.Web.UI.Client/src/libs/class-api/class.interface.ts
index a80f1a1b0f..7235a74eb9 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/class-api/class.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/class-api/class.interface.ts
@@ -24,8 +24,9 @@ export interface UmbClassInterface extends UmbControllerHost {
 				? U | undefined
 				: U
 			: undefined,
-		R extends UmbObserverController<SpecificT> = UmbObserverController<SpecificT>,
-		SpecificR = ObservableType extends undefined ? R | undefined : R,
+		SpecificR = ObservableType extends undefined
+			? UmbObserverController<SpecificT> | undefined
+			: UmbObserverController<SpecificT>,
 	>(
 		// This type dance checks if the Observable given could be undefined, if it potentially could be undefined it means that this potentially could return undefined and then call the callback with undefined. [NL]
 		source: ObservableType,
diff --git a/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts b/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts
index b04466b39c..ce5c4c6f5a 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts
@@ -47,8 +47,9 @@ export const UmbClassMixin = <T extends ClassConstructor<EventTarget>>(superClas
 					? U | undefined
 					: U
 				: undefined,
-			R extends UmbObserverController<SpecificT> = UmbObserverController<SpecificT>,
-			SpecificR = ObservableType extends undefined ? R | undefined : R,
+			SpecificR = ObservableType extends undefined
+				? UmbObserverController<SpecificT> | undefined
+				: UmbObserverController<SpecificT>,
 		>(
 			// This type dance checks if the Observable given could be undefined, if it potentially could be undefined it means that this potentially could return undefined and then call the callback with undefined. [NL]
 			source: ObservableType,
diff --git a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts
index 2e9c83f4a9..aea4582c81 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts
@@ -20,8 +20,9 @@ export const UmbElementMixin = <T extends HTMLElementConstructor>(superClass: T)
 					? U | undefined
 					: U
 				: undefined,
-			R extends UmbObserverController<SpecificT> = UmbObserverController<SpecificT>,
-			SpecificR = ObservableType extends undefined ? R | undefined : R,
+			SpecificR = ObservableType extends undefined
+				? UmbObserverController<SpecificT> | undefined
+				: UmbObserverController<SpecificT>,
 		>(
 			// This type dance checks if the Observable given could be undefined, if it potentially could be undefined it means that this potentially could return undefined and then call the callback with undefined. [NL]
 			source: ObservableType,
diff --git a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.test.ts b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.test.ts
index 6f731acc5d..4ab0e1d812 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.test.ts
@@ -180,7 +180,6 @@ describe('UmbElement', () => {
 			// The controller is removed from the host, and the new one was NOT added:
 			expect(hostElement.hasController(ctrl)).to.be.false;
 			expect(ctrl2).to.be.undefined;
-			expect(hostElement.hasController(ctrl2)).to.be.false;
 		});
 
 		it('observe is removed when observer is undefined and using the same callback method', () => {
@@ -197,7 +196,6 @@ describe('UmbElement', () => {
 			// The controller is removed from the host, and the new one was NOT added:
 			expect(hostElement.hasController(ctrl)).to.be.false;
 			expect(ctrl2).to.be.undefined;
-			expect(hostElement.hasController(ctrl2)).to.be.false;
 		});
 	});
 });