Skip to content

[pull] master from facebook:master #328

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

Merged
pull merged 1 commit into from
Oct 24, 2020
Merged

[pull] master from facebook:master #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,7 @@ public class ReactFeatureFlags {

/** Enable caching of Spannable objects using equality of ReadableNativeMaps */
public static boolean enableSpannableCacheByReadableNativeMapEquality = true;

/** Disable customDrawOrder in ReactViewGroup under Fabric only. */
public static boolean disableCustomDrawOrderFabric = false;
}
42 changes: 36 additions & 6 deletions ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
import com.facebook.react.uimanager.RootViewUtil;
import com.facebook.react.uimanager.ViewGroupDrawingOrderHelper;
import com.facebook.react.uimanager.ViewProps;
import com.facebook.react.uimanager.common.UIManagerType;
import com.facebook.react.uimanager.common.ViewUtil;
import com.facebook.yoga.YogaConstants;

/**
Expand Down Expand Up @@ -433,12 +435,28 @@ protected void onAttachedToWindow() {
}
}

private boolean customDrawOrderDisabled() {
if (getId() == NO_ID) {
return false;
}
if (ViewUtil.getUIManagerType(getId()) != UIManagerType.FABRIC) {
return false;
}

return ReactFeatureFlags.disableCustomDrawOrderFabric;
}

@Override
public void addView(View child, int index, ViewGroup.LayoutParams params) {
// This will get called for every overload of addView so there is not need to override every
// method.
mDrawingOrderHelper.handleAddView(child);
setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());

if (!customDrawOrderDisabled()) {
mDrawingOrderHelper.handleAddView(child);
setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
} else {
setChildrenDrawingOrderEnabled(false);
}

super.addView(child, index, params);
}
Expand All @@ -447,8 +465,12 @@ public void addView(View child, int index, ViewGroup.LayoutParams params) {
public void removeView(View view) {
UiThreadUtil.assertOnUiThread();

mDrawingOrderHelper.handleRemoveView(view);
setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
if (!customDrawOrderDisabled()) {
mDrawingOrderHelper.handleRemoveView(view);
setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
} else {
setChildrenDrawingOrderEnabled(false);
}

super.removeView(view);
}
Expand All @@ -457,8 +479,12 @@ public void removeView(View view) {
public void removeViewAt(int index) {
UiThreadUtil.assertOnUiThread();

mDrawingOrderHelper.handleRemoveView(getChildAt(index));
setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
if (!customDrawOrderDisabled()) {
mDrawingOrderHelper.handleRemoveView(getChildAt(index));
setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
} else {
setChildrenDrawingOrderEnabled(false);
}

super.removeViewAt(index);
}
Expand All @@ -479,6 +505,10 @@ public int getZIndexMappedChildIndex(int index) {

@Override
public void updateDrawingOrder() {
if (customDrawOrderDisabled()) {
return;
}

mDrawingOrderHelper.update();
setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
invalidate();
Expand Down