diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedNode.js b/packages/react-native/Libraries/Animated/nodes/AnimatedNode.js index 933af8fa24e..6f4ba16ce20 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedNode.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedNode.js @@ -32,7 +32,7 @@ let _assertNativeAnimatedModule: ?() => void = () => { // Note(vjeux): this would be better as an interface but flow doesn't // support them yet export default class AnimatedNode { - _listeners: {[key: string]: ValueListenerCallback, ...} = {}; + #listeners: Map = new Map(); _platformConfig: ?PlatformConfig = undefined; __nativeAnimatedValueListener: ?EventSubscription = null; __attach(): void {} @@ -64,7 +64,7 @@ export default class AnimatedNode { } this._platformConfig = platformConfig; - if (this.hasListeners()) { + if (this.#listeners.size > 0) { this._startListeningToNativeValueUpdates(); } } @@ -78,7 +78,7 @@ export default class AnimatedNode { */ addListener(callback: (value: any) => mixed): string { const id = String(_uniqueId++); - this._listeners[id] = callback; + this.#listeners.set(id, callback); if (this.__isNative) { this._startListeningToNativeValueUpdates(); } @@ -92,8 +92,8 @@ export default class AnimatedNode { * See https://reactnative.dev/docs/animatedvalue#removelistener */ removeListener(id: string): void { - delete this._listeners[id]; - if (this.__isNative && !this.hasListeners()) { + this.#listeners.delete(id); + if (this.__isNative && this.#listeners.size === 0) { this._stopListeningForNativeValueUpdates(); } } @@ -104,14 +104,14 @@ export default class AnimatedNode { * See https://reactnative.dev/docs/animatedvalue#removealllisteners */ removeAllListeners(): void { - this._listeners = {}; + this.#listeners.clear(); if (this.__isNative) { this._stopListeningForNativeValueUpdates(); } } hasListeners(): boolean { - return !!Object.keys(this._listeners).length; + return this.#listeners.size > 0; } _startListeningToNativeValueUpdates() { @@ -146,9 +146,9 @@ export default class AnimatedNode { __callListeners(value: number): void { const event = {value}; - for (const key in this._listeners) { - this._listeners[key](event); - } + this.#listeners.forEach(listener => { + listener(event); + }); } _stopListeningForNativeValueUpdates() { diff --git a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap index 9a3acc7b09a..4cdcedd1b6b 100644 --- a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap +++ b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap @@ -903,9 +903,7 @@ exports[`public API should not change unintentionally Libraries/Animated/nodes/A `; exports[`public API should not change unintentionally Libraries/Animated/nodes/AnimatedNode.js 1`] = ` -"type ValueListenerCallback = (state: { value: number, ... }) => mixed; -declare export default class AnimatedNode { - _listeners: { [key: string]: ValueListenerCallback, ... }; +"declare export default class AnimatedNode { _platformConfig: ?PlatformConfig; __nativeAnimatedValueListener: ?EventSubscription; __attach(): void;