From da56d57ac7ea4f3d2237f8af21d742524549ca0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Norte?= Date: Wed, 7 May 2025 04:17:26 -0700 Subject: [PATCH] Refactor MutationObserver.disconnect (#51128) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/51128 Changelog: [internal] Just a minor refactor of a method in `MutationObserver` which was doing some redundant work that could be avoided. Reviewed By: javache Differential Revision: D74247437 fbshipit-source-id: 510d26f2a315582df9cddc215bf516d3d4ebd341 --- .../mutationobserver/MutationObserver.js | 38 ++++++------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/packages/react-native/src/private/webapis/mutationobserver/MutationObserver.js b/packages/react-native/src/private/webapis/mutationobserver/MutationObserver.js index 17a5b26dd21..e57be1c7ed3 100644 --- a/packages/react-native/src/private/webapis/mutationobserver/MutationObserver.js +++ b/packages/react-native/src/private/webapis/mutationobserver/MutationObserver.js @@ -132,39 +132,23 @@ export default class MutationObserver { } } - _unobserve(target: ReactNativeElement): void { - if (!(target instanceof ReactNativeElement)) { - throw new TypeError( - "Failed to execute 'observe' on 'MutationObserver': parameter 1 is not of type 'ReactNativeElement'.", - ); - } - - if (!this._observationTargets.has(target)) { - return; - } - - const mutationObserverId = this._mutationObserverId; - if (mutationObserverId == null) { - return; - } - - MutationObserverManager.unobserve(mutationObserverId, target); - this._observationTargets.delete(target); - - if (this._observationTargets.size === 0) { - MutationObserverManager.unregisterObserver(mutationObserverId); - this._mutationObserverId = null; - } - } - /** * Tells the observer to stop watching for mutations. * The observer can be reused by calling its `observe()` method again. */ disconnect(): void { - for (const target of this._observationTargets.keys()) { - this._unobserve(target); + const mutationObserverId = this._mutationObserverId; + if (mutationObserverId == null) { + return; } + + for (const target of this._observationTargets.keys()) { + MutationObserverManager.unobserve(mutationObserverId, target); + this._observationTargets.delete(target); + } + + MutationObserverManager.unregisterObserver(mutationObserverId); + this._mutationObserverId = null; } _getOrCreateMutationObserverId(): MutationObserverId {