Skip to content

fix: Support Map-based listeners in AnimatedPoint (RN 0.83+ compatibility) #4113

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

Open
sleda wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Support Map-based listeners in AnimatedPoint (RN 0.83+ compatibility) #4113

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
33 changes: 28 additions & 5 deletions src/classes/AnimatedPoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ export class AnimatedPoint extends AnimatedWithChildren {
this.latitude = new Animated.Value(this.latitude);
}

this._listeners = {};
// React Native < 0.83 uses object, >= 0.83 uses Map
// We only initialize to object if super didn't initialize it (or initiated it to empty object/null)
// and we want to preserve the type if it is a Map.
if (!this._listeners) {
this._listeners = {};
}
}

setValue(point = DEFAULT_POINT) {
Expand Down Expand Up @@ -61,18 +66,36 @@ export class AnimatedPoint extends AnimatedWithChildren {
}
};

this._listeners[id] = {
const listener = {
longitude: this.longitude.addListener(completeCB),
latitude: this.latitude.addListener(completeCB),
};

if (this._listeners instanceof Map) {
this._listeners.set(id, listener);
} else {
this._listeners[id] = listener;
}

return id;
}

removeListener(id) {
this.longitude.removeListener(this._listeners[id].longitude);
this.latitude.removeListener(this._listeners[id].latitude);
delete this._listeners[id];
if (this._listeners instanceof Map) {
const listener = this._listeners.get(id);
if (listener) {
this.longitude.removeListener(listener.longitude);
this.latitude.removeListener(listener.latitude);
this._listeners.delete(id);
}
} else {
const listener = this._listeners[id];
if (listener) {
this.longitude.removeListener(listener.longitude);
this.latitude.removeListener(listener.latitude);
delete this._listeners[id];
}
}
}

spring(config = { coordinates: DEFAULT_COORD }) {
Expand Down
Loading