Back out "Remove useOverflowInset flag as we rolled out 100% to publi…

…c for over three months" Summary: Original commit changeset: 77da78a29270 Original Phabricator Diff: D36990986 (df80ed4) Reviewed By: mdvacca Differential Revision: D37074879 fbshipit-source-id: 82668c90d50b4cc6c53986aa9450eea7934402b3
facebook · Jun 10, 2022 · 59476d0 · 59476d0
1 parent 114d31f
commit 59476d0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -83,6 +83,9 @@ public class ReactFeatureFlags {
   /** Enables or disables MapBuffer Serialization */
   public static boolean mapBufferSerializationEnabled = false;
 
+  /** Feature Flag to use overflowInset values provided by Yoga */
+  public static boolean useOverflowInset = false;
+
   public static boolean enableLockFreeEventDispatcher = false;
 
   public static boolean enableAggressiveEventEmitterCleanup = false;

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp
@@ -46,6 +46,7 @@ FabricMountingManager::FabricMountingManager(
           config->getBool("react_fabric:disabled_view_preallocation_android")),
       disableRevisionCheckForPreallocation_(config->getBool(
           "react_fabric:disable_revision_check_for_preallocation")),
+      useOverflowInset_(getFeatureFlagValue("useOverflowInset")),
       shouldRememberAllocatedViews_(
           getFeatureFlagValue("shouldRememberAllocatedViews")),
       useMapBufferForViewProps_(config->getBool(
@@ -375,8 +376,9 @@ void FabricMountingManager::executeMount(
             // children of the current view. The layout of current view may not
             // change, and we separate this part from layout mount items to not
             // pack too much data there.
-            if (oldChildShadowView.layoutMetrics.overflowInset !=
-                newChildShadowView.layoutMetrics.overflowInset) {
+            if (useOverflowInset_ &&
+                (oldChildShadowView.layoutMetrics.overflowInset !=
+                 newChildShadowView.layoutMetrics.overflowInset)) {
               cppUpdateOverflowInsetMountItems.push_back(
                   CppMountItem::UpdateOverflowInsetMountItem(
                       newChildShadowView));
@@ -433,8 +435,9 @@ void FabricMountingManager::executeMount(
             // children of the current view. The layout of current view may not
             // change, and we separate this part from layout mount items to not
             // pack too much data there.
-            if (newChildShadowView.layoutMetrics.overflowInset !=
-                EdgeInsets::ZERO) {
+            if (useOverflowInset_ &&
+                newChildShadowView.layoutMetrics.overflowInset !=
+                    EdgeInsets::ZERO) {
               cppUpdateOverflowInsetMountItems.push_back(
                   CppMountItem::UpdateOverflowInsetMountItem(
                       newChildShadowView));

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.h
@@ -72,6 +72,7 @@ class FabricMountingManager final {
   bool const enableEarlyEventEmitterUpdate_{false};
   bool const disablePreallocateViews_{false};
   bool const disableRevisionCheckForPreallocation_{false};
+  bool const useOverflowInset_{false};
   bool const shouldRememberAllocatedViews_{false};
   bool const useMapBufferForViewProps_{false};
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
@@ -19,6 +19,7 @@
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.touch.ReactHitSlopView;
 import com.facebook.react.uimanager.common.ViewUtil;
 import java.util.ArrayList;
@@ -191,6 +192,7 @@ private static View findTouchTargetView(
           // If the touch point is outside of the overflowinset for the view, we can safely ignore
           // it.
           if (ViewUtil.getUIManagerType(view.getId()) == FABRIC
+              && ReactFeatureFlags.useOverflowInset
               && !isTouchPointInViewWithOverflowInset(eventCoords[0], eventCoords[1], view)) {
             return null;
           }