javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: get listeners afresh each time

Browse Source
This commit is contained in:
shirakaba
2022-12-22 11:36:14 +09:00
parent 6cb8a83c82
commit d0e522f8f0
2 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/core/data/observable/index.ts
View File

@@ -376,12 +376,7 @@ export class Observable implements EventTarget {
* @param options Options for the event, in line with DOM Standard.
*/
public notify<T extends EventData>(data: T, options?: CustomEventInit): void {
new DOMEvent(data.eventName, options).dispatchTo(
this,
data,
() => this._getGlobalEventHandlers(data, 'First'),
() => this._getGlobalEventHandlers(data, '')
);
new DOMEvent(data.eventName, options).dispatchTo(this, data, Observable._getGlobalEventHandlers);
}
dispatchEvent(event: DOMEvent): boolean {
@@ -391,19 +386,15 @@ export class Observable implements EventTarget {
detail: event.detail,
};
return event.dispatchTo(
this,
data,
() => this._getGlobalEventHandlers(data, 'First'),
() => this._getGlobalEventHandlers(data, '')
);
return event.dispatchTo(this, data, Observable._getGlobalEventHandlers);
}
private _getGlobalEventHandlers(data: EventData, eventType: 'First' | ''): ListenerEntry[] {
private static _getGlobalEventHandlers(data: EventData, eventType: 'First' | ''): readonly ListenerEntry[] | undefined {
const eventClass = data.object?.constructor?.name;
const globalEventHandlersForOwnClass = _globalEventHandlers[eventClass]?.[`${data.eventName}${eventType}`] ?? [];
const globalEventHandlersForAllClasses = _globalEventHandlers['*']?.[`${data.eventName}${eventType}`] ?? [];
return [...globalEventHandlersForOwnClass, ...globalEventHandlersForAllClasses];
const globalEventHandlersForOwnClass = _globalEventHandlers[eventClass]?.[`${data.eventName}${eventType}`];
const globalEventHandlersForAllClasses = _globalEventHandlers['*']?.[`${data.eventName}${eventType}`];
return globalEventHandlersForOwnClass?.length ? (globalEventHandlersForAllClasses?.length ? [...globalEventHandlersForOwnClass, ...globalEventHandlersForAllClasses] : globalEventHandlersForOwnClass) : globalEventHandlersForAllClasses?.length ? globalEventHandlersForAllClasses : undefined;
}
/**