diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java index cbf7388d472..a99fe335b1d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -86,15 +86,7 @@ public class ReactFeatureFlags { } /** Feature Flag to use overflowInset values provided by Yoga */ - private static boolean useOverflowInset = false; - - public static void setUseOverflowInset(boolean enabled) { - useOverflowInset = enabled; - } - - public static boolean doesUseOverflowInset() { - return useOverflowInset; - } + public static boolean useOverflowInset = false; public static boolean enableLockFreeEventDispatcher = 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 index 3374fe0db0a..c20eac7e544 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp @@ -31,10 +31,9 @@ namespace react { static bool doesUseOverflowInset() { static const auto reactFeatureFlagsJavaDescriptor = jni::findClassStatic( FabricMountingManager::ReactFeatureFlagsJavaDescriptor); - static const auto doesUseOverflowInset = - reactFeatureFlagsJavaDescriptor->getStaticMethod( - "doesUseOverflowInset"); - return doesUseOverflowInset(reactFeatureFlagsJavaDescriptor); + const auto field = reactFeatureFlagsJavaDescriptor->getStaticField( + "useOverflowInset"); + return reactFeatureFlagsJavaDescriptor->getStaticFieldValue(field); } FabricMountingManager::FabricMountingManager( diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java index 07f97bdcc0d..f0d7c6fd335 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java @@ -192,7 +192,7 @@ public class TouchTargetHelper { // If the touch point is outside of the overflowinset for the view, we can safely ignore // it. if (ViewUtil.getUIManagerType(view.getId()) == FABRIC - && ReactFeatureFlags.doesUseOverflowInset() + && ReactFeatureFlags.useOverflowInset && !isTouchPointInViewWithOverflowInset(eventCoords[0], eventCoords[1], view)) { return null; }