Skip to content

Fix issue in removing items with LayoutAnimation on Android. When LayoutAnimation is enabled, indicesToRemove are incorrect, which makes adjacent views disappear. #11962

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

Closed
vinceyuan wants to merge 2 commits into from
Closed

Fix issue in removing items with LayoutAnimation on Android. When LayoutAnimation is enabled, indicesToRemove are incorrect, which makes adjacent views disappear. #11962

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6632bf6
Fix issue in removing items with LayoutAnimation. When LayoutAnimatio…
vinceyuan Jan 18, 2017
49731e9
Remove unnecessary method shouldAnimateLayoutChildrenInView from Layo…
vinceyuan Feb 15, 2017
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
19 changes: 7 additions & 12 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,13 @@ public void manageChildren(
tagsToDelete));
}

// Remove views whose indices are in indicesToRemove only when LayoutAnimation is not enabled.
// When LayoutAnimation is enabled, indicesToRemove are incorrect, and we should depend on
// tagsToDelete. The views with tags in tagsToDelete will be removed and dropped by the 'delete'
// layout animation.
int lastIndexToRemove = viewManager.getChildCount(viewToManage);
if (indicesToRemove != null) {
if (!(mLayoutAnimationEnabled && mLayoutAnimator.shouldAnimateLayout(viewToManage))
&& indicesToRemove != null) {
for (int i = indicesToRemove.length - 1; i >= 0; i--) {
int indexToRemove = indicesToRemove[i];
if (indexToRemove < 0) {
Expand Down Expand Up @@ -361,17 +366,7 @@ public void manageChildren(
tagsToDelete));
}

View viewToRemove = viewManager.getChildAt(viewToManage, indexToRemove);

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
} else {
viewManager.removeViewAt(viewToManage, indexToRemove);
}

viewManager.removeViewAt(viewToManage, indexToRemove);
lastIndexToRemove = indexToRemove;
}
}
Expand Down