Skip to content

Commit

Permalink
Revert D9105838: [react-native][PR] Fix view indices with Android Lay…
Browse files Browse the repository at this point in the history 
…outAnimation (attempt 2)

Differential Revision:
D9105838

Original commit changeset: 5ccb0957d1f4

fbshipit-source-id: f679eceac47c95d9138f1a91a77cc20a74e64e04
  • Loading branch information
@mdvacca @facebook-github-bot
mdvacca authored and facebook-github-bot committed Aug 28, 2018
1 parent cfeb60c commit e8c7cb1
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 85 deletions.
13 changes: 5 additions & 8 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
View file
Expand Up @@ -409,13 +409,12 @@ public synchronized void manageChildren(
if (mLayoutAnimationEnabled &&
mLayoutAnimator.shouldAnimateLayout(viewToRemove) &&
arrayContains(tagsToDelete, viewToRemove.getId())) {
// Display the view in the parent after removal for the duration of the layout animation,
// but pretend that it doesn't exist when calling other ViewGroup methods.
viewManager.startViewTransition(viewToManage, viewToRemove);
// 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 Expand Up @@ -460,9 +459,7 @@ public synchronized void manageChildren(
mLayoutAnimator.deleteView(viewToDestroy, new LayoutAnimationListener() {
@Override
public void onAnimationEnd() {
// Already removed from the ViewGroup, we can just end the transition here to
// release the child.
viewManager.endViewTransition(viewToManage, viewToDestroy);
viewManager.removeView(viewToManage, viewToDestroy);
dropView(viewToDestroy);
}
});
Expand Down
8 changes: 0 additions & 8 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
View file
Expand Up @@ -93,14 +93,6 @@ public void removeAllViews(T parent) {
}
}

public void startViewTransition(T parent, View view) {
parent.startViewTransition(view);
}

public void endViewTransition(T parent, View view) {
parent.endViewTransition(view);
}

/**
* Returns whether this View type needs to handle laying out its own children instead of
* deferring to the standard css-layout algorithm.
Expand Down
69 changes: 20 additions & 49 deletions ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
View file
Expand Up @@ -39,8 +39,6 @@
import com.facebook.react.uimanager.ViewGroupDrawingOrderHelper;
import com.facebook.react.uimanager.ViewProps;
import com.facebook.yoga.YogaConstants;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;

/**
Expand Down Expand Up @@ -108,7 +106,6 @@ public void onLayoutChange(
private @Nullable ChildrenLayoutChangeListener mChildrenLayoutChangeListener;
private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable;
private @Nullable OnInterceptTouchEventListener mOnInterceptTouchEventListener;
private @Nullable List<View> mTransitioningViews;
private boolean mNeedsOffscreenAlphaCompositing = false;
private final ViewGroupDrawingOrderHelper mDrawingOrderHelper;
private @Nullable Path mPath;
Expand Down Expand Up @@ -337,16 +334,16 @@ public void updateClippingRect() {

private void updateClippingToRect(Rect clippingRect) {
Assertions.assertNotNull(mAllChildren);
int childIndexOffset = 0;
int clippedSoFar = 0;
for (int i = 0; i < mAllChildrenCount; i++) {
updateSubviewClipStatus(clippingRect, i, childIndexOffset);
if (!isChildInViewGroup(mAllChildren[i])) {
childIndexOffset++;
updateSubviewClipStatus(clippingRect, i, clippedSoFar);
if (mAllChildren[i].getParent() == null) {
clippedSoFar++;
}
}
}

private void updateSubviewClipStatus(Rect clippingRect, int idx, int childIndexOffset) {
private void updateSubviewClipStatus(Rect clippingRect, int idx, int clippedSoFar) {
View child = Assertions.assertNotNull(mAllChildren)[idx];
sHelperRect.set(child.getLeft(), child.getTop(), child.getRight(), child.getBottom());
boolean intersects = clippingRect
Expand All @@ -363,10 +360,10 @@ private void updateSubviewClipStatus(Rect clippingRect, int idx, int childIndexO
if (!intersects && child.getParent() != null && !isAnimating) {
// We can try saving on invalidate call here as the view that we remove is out of visible area
// therefore invalidation is not necessary.
super.removeViewsInLayout(idx - childIndexOffset, 1);
super.removeViewsInLayout(idx - clippedSoFar, 1);
needUpdateClippingRecursive = true;
} else if (intersects && child.getParent() == null) {
super.addViewInLayout(child, idx - childIndexOffset, sDefaultLayoutParam, true);
super.addViewInLayout(child, idx - clippedSoFar, sDefaultLayoutParam, true);
invalidate();
needUpdateClippingRecursive = true;
} else if (intersects) {
Expand Down Expand Up @@ -402,25 +399,19 @@ private void updateSubviewClipStatus(View subview) {
boolean oldIntersects = (subview.getParent() != null);

if (intersects != oldIntersects) {
int childIndexOffset = 0;
int clippedSoFar = 0;
for (int i = 0; i < mAllChildrenCount; i++) {
if (mAllChildren[i] == subview) {
updateSubviewClipStatus(mClippingRect, i, childIndexOffset);
updateSubviewClipStatus(mClippingRect, i, clippedSoFar);
break;
}
if (!isChildInViewGroup(mAllChildren[i])) {
childIndexOffset++;
if (mAllChildren[i].getParent() == null) {
clippedSoFar++;
}
}
}
}

private boolean isChildInViewGroup(View view) {
// A child is in the group if it's not clipped and it's not transitioning.
return view.getParent() != null
&& (mTransitioningViews == null || !mTransitioningViews.contains(view));
}

@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh);
Expand Down Expand Up @@ -518,13 +509,13 @@ protected void dispatchSetPressed(boolean pressed) {
addInArray(child, index);
// we add view as "clipped" and then run {@link #updateSubviewClipStatus} to conditionally
// attach it
int childIndexOffset = 0;
int clippedSoFar = 0;
for (int i = 0; i < index; i++) {
if (!isChildInViewGroup(mAllChildren[i])) {
childIndexOffset++;
if (mAllChildren[i].getParent() == null) {
clippedSoFar++;
}
}
updateSubviewClipStatus(mClippingRect, index, childIndexOffset);
updateSubviewClipStatus(mClippingRect, index, clippedSoFar);
child.addOnLayoutChangeListener(mChildrenLayoutChangeListener);
}

Expand All @@ -534,14 +525,14 @@ protected void dispatchSetPressed(boolean pressed) {
Assertions.assertNotNull(mAllChildren);
view.removeOnLayoutChangeListener(mChildrenLayoutChangeListener);
int index = indexOfChildInAllChildren(view);
if (isChildInViewGroup(mAllChildren[index])) {
int childIndexOffset = 0;
if (mAllChildren[index].getParent() != null) {
int clippedSoFar = 0;
for (int i = 0; i < index; i++) {
if (!isChildInViewGroup(mAllChildren[i])) {
childIndexOffset++;
if (mAllChildren[i].getParent() == null) {
clippedSoFar++;
}
}
super.removeViewsInLayout(index - childIndexOffset, 1);
super.removeViewsInLayout(index - clippedSoFar, 1);
}
removeFromArray(index);
}
Expand All @@ -556,26 +547,6 @@ protected void dispatchSetPressed(boolean pressed) {
mAllChildrenCount = 0;
}

/*package*/ void startViewTransitionWithSubviewClippingEnabled(View view) {
// We're mirroring ViewGroup's mTransitioningViews since when a transitioning child is removed,
// its parent is not set to null unlike a regular child. Normally this wouldn't be an issue as
// ViewGroup pretends the transitioning child doesn't exist when calling any methods that expose
// child views, but we keep track of our children directly when subview clipping is enabled and
// need to be aware of these.
if (mTransitioningViews == null) {
mTransitioningViews = new ArrayList<>();
}
mTransitioningViews.add(view);
startViewTransition(view);
}

/*package*/ void endViewTransitionWithSubviewClippingEnabled(View view) {
if (mTransitioningViews != null) {
mTransitioningViews.remove(view);
}
endViewTransition(view);
}

private int indexOfChildInAllChildren(View child) {
final int count = mAllChildrenCount;
final View[] children = Assertions.assertNotNull(mAllChildren);
Expand Down
20 changes: 0 additions & 20 deletions ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
View file
Expand Up @@ -297,24 +297,4 @@ public void removeAllViews(ReactViewGroup parent) {
parent.removeAllViews();
}
}

@Override
public void startViewTransition(ReactViewGroup parent, View view) {
boolean removeClippedSubviews = parent.getRemoveClippedSubviews();
if (removeClippedSubviews) {
parent.startViewTransitionWithSubviewClippingEnabled(view);
} else {
parent.startViewTransition(view);
}
}

@Override
public void endViewTransition(ReactViewGroup parent, View view) {
boolean removeClippedSubviews = parent.getRemoveClippedSubviews();
if (removeClippedSubviews) {
parent.endViewTransitionWithSubviewClippingEnabled(view);
} else {
parent.endViewTransition(view);
}
}
}

0 comments on commit e8c7cb1

Please sign in to comment.