Skip to content

Commit 7e02b41

Browse files
Xin Chenfacebook-github-bot
authored andcommitted
Remove useOverflowInset flag as we rolled out 100% to public for over three months
Summary: This was shipped in D36990986 (df80ed4) but backed out last year in D37074879 (59476d0), as we want to wait for some performance comparison results to come out. Remove overflow inset optimization flags as they've been rolled out 100% to public. Changelog: [Android][Internal] - Clean up feature flags for overflowInset Reviewed By: javache Differential Revision: D43070494 fbshipit-source-id: dbf5aed9b2b5d3db1ad351bc208cb2016dc62e40
1 parent bbed15d commit 7e02b41

File tree

4 files changed

+3
-12
lines changed

4 files changed

+3
-12
lines changed

ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ public class ReactFeatureFlags {
6767
/** Enables or disables calculation of Transformed Frames */
6868
public static boolean calculateTransformedFramesEnabled = false;
6969

70-
/** Feature Flag to use overflowInset values provided by Yoga */
71-
public static boolean useOverflowInset = false;
72-
7370
public static boolean dispatchPointerEvents = false;
7471

7572
/** Feature Flag to enable the pending event queue in fabric before mounting views */

ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import androidx.annotation.Nullable;
2020
import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
2121
import com.facebook.react.bridge.UiThreadUtil;
22-
import com.facebook.react.config.ReactFeatureFlags;
2322
import com.facebook.react.touch.ReactHitSlopView;
2423
import com.facebook.react.uimanager.common.ViewUtil;
2524
import java.util.ArrayList;
@@ -192,7 +191,6 @@ private static View findTouchTargetView(
192191
// If the touch point is outside of the overflowinset for the view, we can safely ignore
193192
// it.
194193
if (ViewUtil.getUIManagerType(view.getId()) == FABRIC
195-
&& ReactFeatureFlags.useOverflowInset
196194
&& !isTouchPointInViewWithOverflowInset(eventCoords[0], eventCoords[1], view)) {
197195
return null;
198196
}

ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ FabricMountingManager::FabricMountingManager(
4040
std::shared_ptr<const ReactNativeConfig> &config,
4141
global_ref<jobject> &javaUIManager)
4242
: javaUIManager_(javaUIManager),
43-
useOverflowInset_(getFeatureFlagValue("useOverflowInset")),
4443
reduceDeleteCreateMutation_(
4544
getFeatureFlagValue("reduceDeleteCreateMutation")) {
4645
CoreFeatures::enableMapBuffer = getFeatureFlagValue("useMapBufferProps");
@@ -404,8 +403,7 @@ void FabricMountingManager::executeMount(
404403
// children of the current view. The layout of current view may not
405404
// change, and we separate this part from layout mount items to not
406405
// pack too much data there.
407-
if (useOverflowInset_ &&
408-
(oldChildShadowView.layoutMetrics.overflowInset !=
406+
if ((oldChildShadowView.layoutMetrics.overflowInset !=
409407
newChildShadowView.layoutMetrics.overflowInset)) {
410408
cppUpdateOverflowInsetMountItems.push_back(
411409
CppMountItem::UpdateOverflowInsetMountItem(
@@ -461,9 +459,8 @@ void FabricMountingManager::executeMount(
461459
// children of the current view. The layout of current view may not
462460
// change, and we separate this part from layout mount items to not
463461
// pack too much data there.
464-
if (useOverflowInset_ &&
465-
newChildShadowView.layoutMetrics.overflowInset !=
466-
EdgeInsets::ZERO) {
462+
if (newChildShadowView.layoutMetrics.overflowInset !=
463+
EdgeInsets::ZERO) {
467464
cppUpdateOverflowInsetMountItems.push_back(
468465
CppMountItem::UpdateOverflowInsetMountItem(
469466
newChildShadowView));

ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class FabricMountingManager final {
6969
butter::map<SurfaceId, butter::set<Tag>> allocatedViewRegistry_{};
7070
std::recursive_mutex allocatedViewsMutex_;
7171

72-
bool const useOverflowInset_{false};
7372
bool const reduceDeleteCreateMutation_{false};
7473

7574
jni::local_ref<jobject> getProps(

0 commit comments

Comments
 (0)