Skip to content

[pull] master from facebook:master #780

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
May 28, 2021
Merged

[pull] master from facebook:master #780

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
6 changes: 0 additions & 6 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 @@ -44,12 +44,6 @@ public interface FlagProvider {
/** This feature flag enables logs for Fabric */
public static boolean enableFabricLogs = false;

/**
* Temporary feature flat to control a fix in the transition to layoutOnlyViews TODO T61185028:
* remove this when bug is fixed
*/
public static boolean enableTransitionLayoutOnlyViewCleanup = false;

/** Feature flag to configure eager initialization of Fabric */
public static boolean eagerInitializeFabric = false;

Expand Down
23 changes: 10 additions & 13 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMapKeySetIterator;
import com.facebook.react.config.ReactFeatureFlags;

/**
* Class responsible for optimizing the native view hierarchy while still respecting the final UI
Expand Down Expand Up @@ -425,18 +424,16 @@ private void transitionLayoutOnlyViewToNativeView(
// Bit of a hack: we need to update the layout of this node's children now that it's no longer
// layout-only, but we may still receive more layout updates at the end of this batch that we
// don't want to ignore.
if (ReactFeatureFlags.enableTransitionLayoutOnlyViewCleanup) {
FLog.i(
TAG,
"Transitioning LayoutOnlyView - tag: "
+ node.getReactTag()
+ " - rootTag: "
+ node.getRootTag()
+ " - hasProps: "
+ (props != null)
+ " - tagsWithLayout.size: "
+ mTagsWithLayoutVisited.size());
}
FLog.i(
TAG,
"Transitioning LayoutOnlyView - tag: "
+ node.getReactTag()
+ " - rootTag: "
+ node.getRootTag()
+ " - hasProps: "
+ (props != null)
+ " - tagsWithLayout.size: "
+ mTagsWithLayoutVisited.size());
Assertions.assertCondition(mTagsWithLayoutVisited.size() == 0);
applyLayoutBase(node);
for (int i = 0; i < node.getChildCount(); i++) {
Expand Down
5 changes: 1 addition & 4 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.config.ReactFeatureFlags;
import com.facebook.react.modules.i18nmanager.I18nUtil;
import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
import com.facebook.react.uimanager.events.EventDispatcher;
Expand Down Expand Up @@ -965,9 +964,7 @@ protected void applyUpdatesRecursive(ReactShadowNode cssNode, float absoluteX, f
}
}
cssNode.markUpdateSeen();
if (ReactFeatureFlags.enableTransitionLayoutOnlyViewCleanup) {
mNativeViewHierarchyOptimizer.onViewUpdatesCompleted(cssNode);
}
mNativeViewHierarchyOptimizer.onViewUpdatesCompleted(cssNode);
}

public void addUIBlock(UIBlock block) {
Expand Down