From e00309c9afc32c0d7c5580155326bbade90bda0f Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Mon, 25 Mar 2024 17:22:54 -0700 Subject: [PATCH 1/3] Introduce BridgeReactContext < ReactApplicationContext Summary: Eventually, we will move all bridge methods to BridgeReactContext. Long-term, ReactApplicationContext and ReactContext will become abstract. And these two contexts will only contain methods common to both modes. Changelog: [Android][Added] Introduce BridgeReactContext Differential Revision: https://internalfb.com/D55218592 --- .../ReactAndroid/api/ReactAndroid.api | 4 ++++ .../react/bridge/BridgeReactContext.kt | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.kt diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 8512bcd07989..6e2698c4b939 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -532,6 +532,10 @@ public abstract class com/facebook/react/bridge/BaseJavaModule : com/facebook/re public fun invalidate ()V } +public final class com/facebook/react/bridge/BridgeReactContext : com/facebook/react/bridge/ReactApplicationContext { + public fun (Landroid/content/Context;)V +} + public abstract interface class com/facebook/react/bridge/Callback { public abstract fun invoke ([Ljava/lang/Object;)V } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.kt new file mode 100644 index 000000000000..7ca3ef1cd9d3 --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.kt @@ -0,0 +1,20 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.react.bridge + +import android.content.Context +import com.facebook.react.common.annotations.DeprecatedInNewArchitecture + +/** + * This is the bridge-specific concrete subclass of ReactContext. ReactContext has many methods that + * delegate to the react instance. This subclass will implement those methods, by delegating to the + * CatalystInstance. If you need to create a ReactContext within an "bridge context", please create + * BridgeReactContext. + */ +@DeprecatedInNewArchitecture +class BridgeReactContext(base: Context) : ReactApplicationContext(base) {} From 6f3f3ba9b4de15ec36b64f5c4c2d2e33a9321f9a Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Mon, 25 Mar 2024 17:22:54 -0700 Subject: [PATCH 2/3] Manual: Codemod initializeWithInstance() callers to BridgeReactContext Summary: Eventaully, ReactApplicationContext.initailizeWithInstance() will be moved to BridgeReactContext. Doing the migration up-front to remove noise from the eventual diff. Changelog: [Internal] Differential Revision: https://internalfb.com/D55218593 --- .../main/java/com/facebook/react/ReactInstanceManager.java | 3 ++- .../src/test/java/com/facebook/react/RootViewTest.kt | 7 +++---- .../react/modules/deviceinfo/DeviceInfoModuleTest.kt | 6 +++--- .../com/facebook/react/modules/timing/TimingModuleTest.kt | 6 +++--- .../com/facebook/react/uimanager/SimpleViewPropertyTest.kt | 6 +++--- .../facebook/react/views/image/ReactImagePropertyTest.kt | 6 +++--- .../react/views/textinput/ReactTextInputPropertyTest.kt | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 3480c3fae279..749f4749ccef 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -51,6 +51,7 @@ import com.facebook.infer.annotation.ThreadConfined; import com.facebook.infer.annotation.ThreadSafe; import com.facebook.react.bridge.Arguments; +import com.facebook.react.bridge.BridgeReactContext; import com.facebook.react.bridge.CatalystInstance; import com.facebook.react.bridge.CatalystInstanceImpl; import com.facebook.react.bridge.JSBundleLoader; @@ -1346,7 +1347,7 @@ private ReactApplicationContext createReactContext( JavaScriptExecutor jsExecutor, JSBundleLoader jsBundleLoader) { FLog.d(ReactConstants.TAG, "ReactInstanceManager.createReactContext()"); ReactMarker.logMarker(CREATE_REACT_CONTEXT_START, jsExecutor.getName()); - final ReactApplicationContext reactContext = new ReactApplicationContext(mApplicationContext); + final BridgeReactContext reactContext = new BridgeReactContext(mApplicationContext); JSExceptionHandler exceptionHandler = mJSExceptionHandler != null ? mJSExceptionHandler : mDevSupportManager; diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt index 9085150a2015..31855f2dba8f 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt @@ -16,11 +16,10 @@ import android.view.MotionEvent import android.view.WindowInsets import android.view.WindowManager import com.facebook.react.bridge.Arguments +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext -import com.facebook.react.bridge.ReactContext import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.bridge.WritableArray import com.facebook.react.bridge.WritableMap @@ -49,7 +48,7 @@ import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) class RootViewTest { - private lateinit var reactContext: ReactContext + private lateinit var reactContext: BridgeReactContext private lateinit var catalystInstanceMock: CatalystInstance private lateinit var arguments: MockedStatic @@ -66,7 +65,7 @@ class RootViewTest { systemClock.`when` { SystemClock.uptimeMillis() }.thenReturn(ts) catalystInstanceMock = ReactTestHelper.createMockCatalystInstance() - reactContext = spy(ReactApplicationContext(RuntimeEnvironment.getApplication())) + reactContext = spy(BridgeReactContext(RuntimeEnvironment.getApplication())) reactContext.initializeWithInstance(catalystInstanceMock) DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt index 2c0bcb288ef8..dafaf8b1761b 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt @@ -7,8 +7,8 @@ package com.facebook.react.modules.deviceinfo +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactContext import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.bridge.WritableMap @@ -32,7 +32,7 @@ class DeviceInfoModuleTest : TestCase() { private lateinit var deviceInfoModule: DeviceInfoModule private lateinit var fakePortraitDisplayMetrics: WritableMap private lateinit var fakeLandscapeDisplayMetrics: WritableMap - private lateinit var reactContext: ReactApplicationContext + private lateinit var reactContext: BridgeReactContext private lateinit var displayMetricsHolder: MockedStatic @Before @@ -45,7 +45,7 @@ class DeviceInfoModuleTest : TestCase() { fakeLandscapeDisplayMetrics.putInt("height", 100) displayMetricsHolder = mockStatic(DisplayMetricsHolder::class.java) - reactContext = spy(ReactApplicationContext(RuntimeEnvironment.getApplication())) + reactContext = spy(BridgeReactContext(RuntimeEnvironment.getApplication())) val catalystInstanceMock = ReactTestHelper.createMockCatalystInstance() reactContext.initializeWithInstance(catalystInstanceMock) deviceInfoModule = DeviceInfoModule(reactContext) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt index 10cf42fde9b9..96437acf8670 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt @@ -11,10 +11,10 @@ import android.content.Context import android.os.Looper import android.view.Choreographer.FrameCallback import com.facebook.react.bridge.Arguments +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.WritableArray import com.facebook.react.common.SystemClock import com.facebook.react.devsupport.interfaces.DevSupportManager @@ -53,7 +53,7 @@ class TimingModuleTest { const val FRAME_TIME_NS = 17 * 1000 * 1000 } - private lateinit var reactContext: ReactApplicationContext + private lateinit var reactContext: BridgeReactContext private lateinit var headlessContext: HeadlessJsTaskContext private lateinit var timingModule: TimingModule private lateinit var reactChoreographerMock: ReactChoreographer @@ -94,7 +94,7 @@ class TimingModuleTest { .thenAnswer { reactChoreographerMock } val reactInstance = mock(CatalystInstance::class.java) - reactContext = spy(ReactApplicationContext(mock(Context::class.java))) + reactContext = spy(BridgeReactContext(mock(Context::class.java))) doReturn(reactInstance).`when`(reactContext).catalystInstance doReturn(true).`when`(reactContext).hasActiveReactInstance() diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt index 24557e0cd20a..1c1e4025119a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt @@ -9,9 +9,9 @@ package com.facebook.react.uimanager import android.graphics.drawable.ColorDrawable import android.view.View +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance import com.facebook.react.bridge.ReadableMap import com.facebook.react.touch.JSResponderHandler @@ -45,14 +45,14 @@ class SimpleViewPropertyTest { } } - private lateinit var context: ReactApplicationContext + private lateinit var context: BridgeReactContext private lateinit var catalystInstanceMock: CatalystInstance private lateinit var themedContext: ThemedReactContext private lateinit var manager: ConcreteViewManager @Before fun setup() { - context = ReactApplicationContext(RuntimeEnvironment.getApplication()) + context = BridgeReactContext(RuntimeEnvironment.getApplication()) catalystInstanceMock = createMockCatalystInstance() context.initializeWithInstance(catalystInstanceMock) themedContext = ThemedReactContext(context, context, null, surfaceId) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt index 889e38adb266..b6bfc31b8f2a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt @@ -12,10 +12,10 @@ import android.util.DisplayMetrics import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.drawee.drawable.ScalingUtils import com.facebook.react.bridge.Arguments +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance import com.facebook.react.bridge.WritableArray import com.facebook.react.bridge.WritableMap @@ -41,7 +41,7 @@ import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) class ReactImagePropertyTest { - private var context: ReactApplicationContext? = null + private var context: BridgeReactContext? = null private var catalystInstanceMock: CatalystInstance? = null private var themeContext: ThemedReactContext? = null private lateinit var arguments: MockedStatic @@ -57,7 +57,7 @@ class ReactImagePropertyTest { rnLog.`when` { RNLog.w(any(), anyString()) }.thenAnswer {} SoLoader.setInTestMode() - context = ReactApplicationContext(RuntimeEnvironment.getApplication()) + context = BridgeReactContext(RuntimeEnvironment.getApplication()) catalystInstanceMock = createMockCatalystInstance() context!!.initializeWithInstance(catalystInstanceMock) themeContext = ThemedReactContext(context, context, null, -1) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt index 50074941bc64..109bcd6d91fb 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt @@ -17,9 +17,9 @@ import android.util.DisplayMetrics import android.view.Gravity import android.view.inputmethod.EditorInfo import androidx.core.content.res.ResourcesCompat.ID_NULL +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance import com.facebook.react.uimanager.DisplayMetricsHolder import com.facebook.react.uimanager.ReactStylesDiffMap @@ -36,7 +36,7 @@ import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) class ReactTextInputPropertyTest { - private lateinit var context: ReactApplicationContext + private lateinit var context: BridgeReactContext private lateinit var catalystInstanceMock: CatalystInstance private lateinit var themedContext: ThemedReactContext private lateinit var manager: ReactTextInputManager @@ -54,7 +54,7 @@ class ReactTextInputPropertyTest { @Before fun setup() { - context = ReactApplicationContext(RuntimeEnvironment.getApplication()) + context = BridgeReactContext(RuntimeEnvironment.getApplication()) catalystInstanceMock = createMockCatalystInstance() context.initializeWithInstance(catalystInstanceMock) themedContext = ThemedReactContext(context, context.baseContext, null, ID_NULL) From 4cc95ef0fa75a0e3494ea7fc9384db253ef572cb Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Mon, 25 Mar 2024 17:23:13 -0700 Subject: [PATCH 3/3] Scripted: Codemod ReactApplicationContext creators to BridgeReactContext (#43626) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/43626 The things that create ReactApplicationContext should instead create BridgeReactContext. Long-term, ReactApplicationContext will be abstract. This diff pulls noise out from that eventual diff. Changelog: [Internal] Reviewed By: arushikesarwani94 Differential Revision: D55218591 --- .../test/java/com/facebook/react/CompositeReactPackageTest.kt | 3 ++- .../test/java/com/facebook/react/bridge/ReactTestHelper.kt | 2 +- .../java/com/facebook/react/fabric/FabricUIManagerTest.kt | 3 ++- .../react/internal/interop/InteropEventEmitterTest.kt | 4 ++-- .../facebook/react/modules/clipboard/ClipboardModuleTest.kt | 4 ++-- .../com/facebook/react/uimanager/ReactPropConstantsTest.kt | 4 ++-- .../react/uimanager/ReactPropForShadowNodeSetterTest.kt | 4 ++-- .../facebook/react/uimanager/UIManagerModuleConstantsTest.kt | 3 ++- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.kt index c20a7c4d5acf..7305f808f402 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.kt @@ -7,6 +7,7 @@ package com.facebook.react +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.NativeModule import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.uimanager.ViewManager @@ -33,7 +34,7 @@ class CompositeReactPackageTest { packageNo1 = mock(ReactPackage::class.java) packageNo2 = mock(ReactPackage::class.java) packageNo3 = mock(ReactPackage::class.java) - reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) } @Test diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt index ac4353df2c4b..69d96486b6d5 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt @@ -24,7 +24,7 @@ object ReactTestHelper { */ @JvmStatic fun createCatalystContextForTest(): ReactApplicationContext = - ReactApplicationContext(RuntimeEnvironment.getApplication()).apply { + BridgeReactContext(RuntimeEnvironment.getApplication()).apply { initializeWithInstance(createMockCatalystInstance()) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt index f8827eb72255..c80567f4de45 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt @@ -7,6 +7,7 @@ package com.facebook.react.fabric +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.uimanager.ViewManagerRegistry import com.facebook.react.uimanager.events.BatchEventDispatchedListener @@ -31,7 +32,7 @@ class FabricUIManagerTest { @Before fun setup() { - reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) viewManagerRegistry = ViewManagerRegistry(emptyList()) batchEventDispatchedListener = FakeBatchEventDispatchedListener() underTest = FabricUIManager(reactContext, viewManagerRegistry, batchEventDispatchedListener) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/internal/interop/InteropEventEmitterTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/internal/interop/InteropEventEmitterTest.kt index 10a71829e6f2..265cb3031b10 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/internal/interop/InteropEventEmitterTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/internal/interop/InteropEventEmitterTest.kt @@ -9,9 +9,9 @@ package com.facebook.react.internal.interop +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactContext import com.facebook.testutils.fakes.FakeEventDispatcher import org.junit.Assert.assertEquals @@ -29,7 +29,7 @@ class InteropEventEmitterTest { @Before fun setup() { - reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) eventDispatcher = FakeEventDispatcher() } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt index 3f58b66aff08..95fa44245e5f 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt @@ -10,7 +10,7 @@ package com.facebook.react.modules.clipboard import android.annotation.SuppressLint import android.content.ClipboardManager import android.content.Context -import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.BridgeReactContext import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Before @@ -28,7 +28,7 @@ class ClipboardModuleTest { @Before fun setUp() { - clipboardModule = ClipboardModule(ReactApplicationContext(RuntimeEnvironment.getApplication())) + clipboardModule = ClipboardModule(BridgeReactContext(RuntimeEnvironment.getApplication())) clipboardManager = RuntimeEnvironment.getApplication().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt index 61bf145ca5c0..37a700aa3bbf 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt @@ -8,7 +8,7 @@ package com.facebook.react.uimanager import android.view.View -import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.ReadableArray import com.facebook.react.bridge.ReadableMap import com.facebook.react.common.MapBuilder @@ -84,7 +84,7 @@ class ReactPropConstantsTest { @Test fun testNativePropsIncludeCorrectTypes() { val viewManagers = listOf>(ViewManagerUnderTest()) - val reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + val reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) val uiManagerModule = UIManagerModule(reactContext, viewManagers, 0) val constants: Map<*, *> = valueAtPath(uiManagerModule.constants as Map<*, *>, "SomeView", "NativeProps") diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.kt index 4e53fd209ff5..d54462018ff9 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.kt @@ -7,8 +7,8 @@ package com.facebook.react.uimanager +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReadableArray import com.facebook.react.bridge.ReadableMap import com.facebook.react.uimanager.annotations.ReactProp @@ -65,7 +65,7 @@ class ReactPropForShadowNodeSetterTest { init { setViewClassName("ShadowViewUnderTest") - val context = ReactApplicationContext(RuntimeEnvironment.getApplication()) + val context = BridgeReactContext(RuntimeEnvironment.getApplication()) setThemedContext(ThemedReactContext(context, context, null, -1)) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt index 5ae599e77b75..8405ca12ea0e 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt @@ -8,6 +8,7 @@ package com.facebook.react.uimanager import android.view.View +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.common.MapBuilder import org.assertj.core.api.Assertions @@ -49,7 +50,7 @@ class UIManagerModuleConstantsTest { @Before fun setUp() { - reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) } @Suppress("UNCHECKED_CAST")