Commit 4bd3a94
fix(animations): check if target is present before removing its animation (#4586)
In Angular, if the NativeScriptAnimationModule is imported in another
NgModule more than once (which shouldn't be done), the renderer is instantiated twice. This
causes animation with empty targets to be created. If such animation is
removed, the app will crash. Additional check if the target is present
will prevent this.1 parent 1f9a64e commit 4bd3a94
1 file changed
Lines changed: 9 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -192,14 +192,20 @@ export class Animation extends AnimationBase { | |||
| 192 | 192 | this._propertyUpdateCallbacks.forEach(v => v()); | |
| 193 | 193 | this._disableHardwareAcceleration(); | |
| 194 | 194 | this._resolveAnimationFinishedPromise(); | |
| 195 | - this._target._removeAnimation(this); | ||
| 195 | + | ||
| 196 | + if (this._target) { | ||
| 197 | + this._target._removeAnimation(this); | ||
| 198 | + } | ||
| 196 | 199 | } | |
| 197 | 200 | ||
| 198 | 201 | private _onAndroidAnimationCancel() { // tslint:disable-line | |
| 199 | 202 | this._propertyResetCallbacks.forEach(v => v()); | |
| 200 | 203 | this._disableHardwareAcceleration(); | |
| 201 | 204 | this._rejectAnimationFinishedPromise(); | |
| 202 | - this._target._removeAnimation(this); | ||
| 205 | + | ||
| 206 | + if (this._target) { | ||
| 207 | + this._target._removeAnimation(this); | ||
| 208 | + } | ||
| 203 | 209 | } | |
| 204 | 210 | ||
| 205 | 211 | private _createAnimators(propertyAnimation: PropertyAnimation): void { | |
@@ -482,4 +488,4 @@ export class Animation extends AnimationBase { | |||
| 482 | 488 | } | |
| 483 | 489 | } | |
| 484 | 490 | } | |
| 485 | - } | ||
| 491 | + } | ||
0 commit comments