Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing check causing layout some animation code to be executed when it shouldn't

Browse Source 
Reviewed By: dmmiller

Differential Revision: D3404149

fbshipit-source-id: 8663325fd3a4b9257d84075e22bd9cc59d6414ac
This commit is contained in:
Olivier Notteghem
2016-06-20 23:15:53 +02:00
committed by Mike Grabowski
parent 3716ce741a
commit a7a34a14db
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
+4 -2
View File
@@ -348,7 +348,8 @@ public class NativeViewHierarchyManager {
View viewToRemove = viewToManage.getChildAt(indexToRemove);
if (mLayoutAnimator.shouldAnimateLayout(viewToRemove) &&
if (mLayoutAnimationEnabled &&
mLayoutAnimator.shouldAnimateLayout(viewToRemove) &&
arrayContains(tagsToDelete, viewToRemove.getId())) {
// The view will be removed and dropped by the 'delete' layout animation
// instead, so do nothing
@@ -395,7 +396,8 @@ public class NativeViewHierarchyManager {
tagsToDelete));
}
if (mLayoutAnimator.shouldAnimateLayout(viewToDestroy)) {
if (mLayoutAnimationEnabled &&
mLayoutAnimator.shouldAnimateLayout(viewToDestroy)) {
mLayoutAnimator.deleteView(viewToDestroy, new LayoutAnimationListener() {
@Override
public void onAnimationEnd() {