From 7dd6e258611bc698c9f3934047e661f5db35cc21 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Thu, 20 Mar 2025 13:08:29 -0700 Subject: [PATCH] Compile-out UIManagerModule from ReactSafeAreaView (#50161) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/50161 Compile-out UIManagerModule from ReactSafeAreaView changelog: [internal] internal Reviewed By: cortinico Differential Revision: D71050640 fbshipit-source-id: e6675064a0e34bb581b495b3a6412f42372d223d --- .../views/safeareaview/ReactSafeAreaView.kt | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaView.kt index 10ce2e124d0..5ebcca8d66f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaView.kt @@ -15,6 +15,7 @@ import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.CONSUMED import com.facebook.react.bridge.GuardedRunnable import com.facebook.react.bridge.WritableNativeMap +import com.facebook.react.common.build.ReactBuildConfig import com.facebook.react.uimanager.PixelUtil.pxToDp import com.facebook.react.uimanager.StateWrapper import com.facebook.react.uimanager.ThemedReactContext @@ -40,25 +41,26 @@ internal class ReactSafeAreaView(val reactContext: ThemedReactContext) : ViewGro @UiThread private fun updateState(insets: Insets) { - stateWrapper?.let { stateWrapper -> - // fabric + val sw = stateWrapper + if (sw != null) { WritableNativeMap().apply { putDouble("left", insets.left.toFloat().pxToDp().toDouble()) putDouble("top", insets.top.toFloat().pxToDp().toDouble()) putDouble("bottom", insets.bottom.toFloat().pxToDp().toDouble()) putDouble("right", insets.right.toFloat().pxToDp().toDouble()) - stateWrapper.updateState(this) + sw.updateState(this) } + } else if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { + // paper + reactContext.runOnNativeModulesQueueThread( + object : GuardedRunnable(reactContext) { + override fun runGuarded() { + this@ReactSafeAreaView.reactContext.reactApplicationContext + .getNativeModule(UIManagerModule::class.java) + ?.updateInsetsPadding(id, insets.top, insets.left, insets.bottom, insets.right) + } + }) } - // paper - ?: reactContext.runOnNativeModulesQueueThread( - object : GuardedRunnable(reactContext) { - override fun runGuarded() { - this@ReactSafeAreaView.reactContext.reactApplicationContext - .getNativeModule(UIManagerModule::class.java) - ?.updateInsetsPadding(id, insets.top, insets.left, insets.bottom, insets.right) - } - }) } }