fix(core): avoid firing removed event listeners (#11263)

CatchABus · web-flow · commit 31690c8a8ddd · 2026-06-08T07:31:37.000-07:00
diff --git a/packages/core/data/observable/index.ts b/packages/core/data/observable/index.ts
@@ -40,6 +40,7 @@ interface ListenerEntry {
 	callback: (data: EventData) => void;
 	thisArg?: any;
 	once?: true;
+	_isRemoved?: true;
 }
 
 interface ListEntryMap {
@@ -301,7 +302,7 @@ export class Observable {
 
 			// If we have neither `thisArg` nor `callback`, just remove all events
 			// of this type regardless.
-
+			entry._isRemoved = true;
 			entries.splice(i, 1);
 			i--;
 		}
@@ -443,7 +444,7 @@ export class Observable {
 	}
 
 	private static _handleListenerEntry<T extends EventData>(entry: ListenerEntry, index: number, observers: Array<ListenerEntry>, data: T): void {
-		if (!entry) {
+		if (!entry || entry._isRemoved) {
 			return;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ interface ListenerEntry {`
`40`	`40`	`callback: (data: EventData) => void;`
`41`	`41`	`thisArg?: any;`
`42`	`42`	`once?: true;`
	`43`	`+ _isRemoved?: true;`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`interface ListEntryMap {`
`@@ -301,7 +302,7 @@ export class Observable {`
`301`	`302`
`302`	`303`	// If we have neither `thisArg` nor `callback`, just remove all events
`303`	`304`	`// of this type regardless.`
`304`		`-`
	`305`	`+ entry._isRemoved = true;`
`305`	`306`	`entries.splice(i, 1);`
`306`	`307`	`i--;`
`307`	`308`	`}`
`@@ -443,7 +444,7 @@ export class Observable {`
`443`	`444`	`}`
`444`	`445`
`445`	`446`	`private static _handleListenerEntry<T extends EventData>(entry: ListenerEntry, index: number, observers: Array<ListenerEntry>, data: T): void {`
`446`		`- if (!entry) {`
	`447`	`+ if (!entry \|\| entry._isRemoved) {`
`447`	`448`	`return;`
`448`	`449`	`}`
`449`	`450`