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

make sure callback can be undefined

Browse Source
This commit is contained in:
Niels Lyngsø
2025-01-09 20:23:28 +01:00
parent 75e7bb48ea
commit f862736163
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,21 +53,25 @@ 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 {
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;
}

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

@@ -29,21 +29,25 @@ 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 {
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;
}