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

Merge pull request #17928 from umbraco/v15/bugfix/fix-omitted-callback

Browse Source 
Fix omitted callback
This commit is contained in:
Niels Lyngsø
2025-01-10 09:11:44 +01:00
committed by GitHub
parent 75e7bb48ea bd456a1dfa
commit 7932eb9aae
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts
View File

@@ -53,21 +53,26 @@ export const UmbClassMixin = <T extends ClassConstructor<EventTarget>>(superClas
>(
// 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,
callback: ObserverCallback<SpecificT>,
callback?: ObserverCallback<SpecificT>,
controllerAlias?: UmbControllerAlias | null,
): SpecificR {
// Fallback to use a hash of the provided method, but only if the alias is undefined.
controllerAlias ??= controllerAlias === undefined ? simpleHashCode(callback.toString()) : undefined;
// Fallback to use a hash of the provided method, but only if the alias is undefined and there is a callback.
if (controllerAlias === undefined && callback) {
controllerAlias = simpleHashCode(callback.toString());
} else if (controllerAlias === null) {
// if value is null, then reset it to undefined. Null is used to explicitly tell that we do not want a controller alias. [NL]
controllerAlias = undefined;
}
if (source) {
return new UmbObserverController<T>(
this,
source,
callback as unknown as ObserverCallback<T>,
callback as unknown as ObserverCallback<T> | undefined,
controllerAlias,
) as unknown as SpecificR;
} else {
callback(undefined as SpecificT);
callback?.(undefined as SpecificT);
this.removeUmbControllerByAlias(controllerAlias);
return undefined as SpecificR;
}

15
src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts
View File

@@ -29,21 +29,26 @@ export const UmbElementMixin = <T extends HTMLElementConstructor>(superClass: T)
>(
// 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,
callback: ObserverCallback<SpecificT>,
callback?: ObserverCallback<SpecificT>,
controllerAlias?: UmbControllerAlias | null,
): SpecificR {
// Fallback to use a hash of the provided method, but only if the alias is undefined.
controllerAlias ??= controllerAlias === undefined ? simpleHashCode(callback.toString()) : undefined;
// Fallback to use a hash of the provided method, but only if the alias is undefined and there is a callback.
if (controllerAlias === undefined && callback) {
controllerAlias = simpleHashCode(callback.toString());
} else if (controllerAlias === null) {
// if value is null, then reset it to undefined. Null is used to explicitly tell that we do not want a controller alias. [NL]
controllerAlias = undefined;
}
if (source) {
return new UmbObserverController<T>(
this,
source,
callback as unknown as ObserverCallback<T>,
callback as unknown as ObserverCallback<T> | undefined,
controllerAlias,
) as unknown as SpecificR;
} else {
callback(undefined as SpecificT);
callback?.(undefined as SpecificT);
this.removeUmbControllerByAlias(controllerAlias);
return undefined as SpecificR;
}