-
Notifications
You must be signed in to change notification settings - Fork 24.6k
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.
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
Fix Memory Leak in AnimatedWithChildren #49217
Open
c-miles
wants to merge
1
commit into
facebook:main
Choose a base branch
from
c-miles:animated-api-fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
74 changes: 74 additions & 0 deletions
74
packages/react-native/Libraries/Animated/__tests__/AnimatedWithChildren-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/** | ||
* Copyright (c) Meta Platforms, Inc. and affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
* | ||
* @format | ||
* @oncall react_native | ||
*/ | ||
|
||
describe('AnimatedWithChildren', () => { | ||
let AnimatedWithChildren; | ||
let AnimatedValue; | ||
|
||
beforeEach(() => { | ||
jest.resetModules(); | ||
AnimatedWithChildren = require('../nodes/AnimatedWithChildren').default; | ||
AnimatedValue = require('../nodes/AnimatedValue').default; | ||
}); | ||
|
||
it('adds a child to the children array when it is not already present', () => { | ||
const parent = new AnimatedWithChildren(); | ||
const child = new AnimatedValue(0); | ||
|
||
expect(parent.__getChildren().length).toBe(0); | ||
|
||
parent.__addChild(child); | ||
expect(parent.__getChildren().length).toBe(1); | ||
expect(parent.__getChildren()).toContain(child); | ||
}); | ||
|
||
it('prevents adding the same child more than once to the children array', () => { | ||
const parent = new AnimatedWithChildren(); | ||
const child = new AnimatedValue(0); | ||
|
||
parent.__addChild(child); | ||
expect(parent.__getChildren().length).toBe(1); | ||
|
||
parent.__addChild(child); | ||
expect(parent.__getChildren().length).toBe(1); | ||
}); | ||
|
||
it('removes a child correctly from the children array when it exists', () => { | ||
const parent = new AnimatedWithChildren(); | ||
const child1 = new AnimatedValue(0); | ||
const child2 = new AnimatedValue(10); | ||
|
||
parent.__addChild(child1); | ||
parent.__addChild(child2); | ||
expect(parent.__getChildren().length).toBe(2); | ||
|
||
parent.__removeChild(child1); | ||
expect(parent.__getChildren().length).toBe(1); | ||
expect(parent.__getChildren()).not.toContain(child1); | ||
expect(parent.__getChildren()).toContain(child2); | ||
|
||
parent.__removeChild(child2); | ||
expect(parent.__getChildren().length).toBe(0); | ||
}); | ||
|
||
it('safely ignores removal calls for non-existent children in the children array', () => { | ||
const parent = new AnimatedWithChildren(); | ||
const child = new AnimatedValue(0); | ||
|
||
parent.__addChild(child); | ||
expect(parent.__getChildren().length).toBe(1); | ||
|
||
parent.__removeChild(child); | ||
expect(parent.__getChildren().length).toBe(0); | ||
|
||
expect(() => parent.__removeChild(child)).not.toThrow(); | ||
expect(parent.__getChildren().length).toBe(0); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,6 +39,10 @@ export default class AnimatedWithChildren extends AnimatedNode { | |
} | ||
|
||
__addChild(child: AnimatedNode): void { | ||
// Prevent adding duplicate animated nodes. | ||
if (this._children.includes(child)) { | ||
return; | ||
} | ||
if (this._children.length === 0) { | ||
this.__attach(); | ||
} | ||
|
@@ -53,7 +57,6 @@ export default class AnimatedWithChildren extends AnimatedNode { | |
__removeChild(child: AnimatedNode): void { | ||
const index = this._children.indexOf(child); | ||
if (index === -1) { | ||
console.warn("Trying to remove a child that doesn't exist"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Assumed duplicate removals are expected during cleanup; with |
||
return; | ||
} | ||
if (this.__isNative && child.__isNative) { | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This check prevents duplicate animated nodes from being added, which fixes the memory leak we observed.
The fact that
_addChild
is being called repeatedly with the same node may suggest an opportunity for further architectural review, though this fix addresses the immediate issue.