Skip to content

feat(core): Ensure concurrency when firing events #10946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanWalker merged 1 commit into from
Nov 12, 2025
Merged

feat(core): Ensure concurrency when firing events #10946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 38 additions & 20 deletions packages/core/data/observable/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ interface ListenerEntry {
once?: true;
}

interface ListEntryMap {
[eventName: string]: Array<ListenerEntry>;
}

let _wrappedIndex = 0;

/**
Expand Down Expand Up @@ -107,7 +111,7 @@ export class Observable {
*/
public _isViewBase: boolean;

private readonly _observers: { [eventName: string]: Array<ListenerEntry> } = {};
private readonly _observers: ListEntryMap = {};

/**
* Gets the value of the specified property.
Expand Down Expand Up @@ -379,7 +383,7 @@ export class Observable {
const eventName = data.eventName + eventType;
const entries = _globalEventHandlers[eventClass][eventName];
if (entries) {
Observable._handleEvent(entries, data);
Observable._fireEvent(entries, data);
}
}

Expand All @@ -388,7 +392,7 @@ export class Observable {
const eventName = data.eventName + eventType;
const entries = _globalEventHandlers['*'][eventName];
if (entries) {
Observable._handleEvent(entries, data);
Observable._fireEvent(entries, data);
}
}
}
Expand All @@ -411,35 +415,49 @@ export class Observable {

const observers = this._observers[data.eventName];
if (observers) {
Observable._handleEvent(observers, dataWithObject);
Observable._fireEvent(observers, dataWithObject);
}

this._globalNotify(eventClass, '', dataWithObject);
}

private static _handleEvent<T extends EventData>(observers: Array<ListenerEntry>, data: T): void {
if (!observers.length) {
private static _fireEvent<T extends EventData>(observers: Array<ListenerEntry>, data: T): void {
const length = observers.length;

if (!length) {
return;
}

for (let i = observers.length - 1; i >= 0; i--) {
const entry = observers[i];
if (!entry) {
continue;
}
if (length === 1) {
const index = 0;
this._handleListenerEntry<T>(observers[index], index, observers, data);
} else {
// This keeps a copy of observers list to ensure concurrency
const observersCp = observers.slice();

if (entry.once) {
observers.splice(i, 1);
for (let i = 0; i < length; i++) {
const entry = observersCp[i];
this._handleListenerEntry<T>(entry, i, observers, data);
}
}
}

const returnValue = entry.thisArg ? entry.callback.apply(entry.thisArg, [data]) : entry.callback(data);
private static _handleListenerEntry<T extends EventData>(entry: ListenerEntry, index: number, observers: Array<ListenerEntry>, data: T): void {
if (!entry) {
return;
}

// This ensures errors thrown inside asynchronous functions do not get swallowed
if (returnValue instanceof Promise) {
returnValue.catch((err) => {
console.error(err);
});
}
if (entry.once) {
observers.splice(index, 1);
}

const returnValue = entry.thisArg ? entry.callback.apply(entry.thisArg, [data]) : entry.callback(data);

// This ensures errors thrown inside asynchronous functions do not get swallowed
if (returnValue instanceof Promise) {
returnValue.catch((err) => {
console.error(err);
});
}
}

Expand Down
32 changes: 27 additions & 5 deletions packages/core/ui/core/view/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,12 +694,34 @@ export class View extends ViewCommon {
}

public handleGestureTouch(event: android.view.MotionEvent): any {
for (const type in this._gestureObservers) {
const list = this._gestureObservers[type];
list.forEach((element) => {
element.androidOnTouchEvent(event);
});
// This keeps a copy of gesture observers from the map to ensure concurrency
const allObservers = Object.values(this._gestureObservers);

for (const observers of allObservers) {
const length = observers.length;

if (!length) {
continue;
}

if (length === 1) {
const entry = observers[0];
if (entry) {
entry.androidOnTouchEvent(event);
}
} else {
// This keeps a copy of gesture observers list to ensure concurrency
const observersCp = observers.slice();

for (let i = 0; i < length; i++) {
const entry = observersCp[i];
if (entry) {
entry.androidOnTouchEvent(event);
}
}
}
}

if (this.parent instanceof View) {
this.parent.handleGestureTouch(event);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/ui/gestures/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ function _getPanArgs(deltaX: number, deltaY: number, view: View, state: GestureS

function _executeCallback(observer: GesturesObserver, args: GestureEventData) {
if (observer && observer.callback) {
observer.callback.call((<any>observer)._context, args);
observer.callback.call(observer.context, args);
}
}

Expand Down