detox 20.32.0 → 20.33.0-prerelease.0

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/factory/DetoxIdlingResourceFactory.kt

@@ -1,32 +1,21 @@
 package com.wix.detox.reactnative.idlingresources.factory
 
-import com.facebook.react.bridge.ReactContext
+import com.facebook.react.ReactApplication
 import com.wix.detox.reactnative.idlingresources.DetoxIdlingResource
-import com.wix.detox.reactnative.idlingresources.animations.AnimatedModuleIdlingResource
-import com.wix.detox.reactnative.idlingresources.bridge.BridgeIdlingResource
-import com.wix.detox.reactnative.idlingresources.network.NetworkIdlingResource
-import com.wix.detox.reactnative.idlingresources.storage.AsyncStorageIdlingResource
-import com.wix.detox.reactnative.idlingresources.timers.TimersIdlingResource
-import com.wix.detox.reactnative.idlingresources.uimodule.UIModuleIdlingResource
+import com.wix.detox.reactnative.isFabricEnabled
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
-class DetoxIdlingResourceFactory(private val reactContext: ReactContext) {
-    suspend fun create(): Map<IdlingResourcesName, DetoxIdlingResource> = withContext(Dispatchers.Main) {
-        val result = mutableMapOf(
-            IdlingResourcesName.Timers to TimersIdlingResource(reactContext),
-            IdlingResourcesName.RNBridge to BridgeIdlingResource(reactContext),
-            IdlingResourcesName.UIModule to UIModuleIdlingResource(reactContext),
-            IdlingResourcesName.Animations to AnimatedModuleIdlingResource(reactContext),
-            IdlingResourcesName.Network to NetworkIdlingResource(reactContext)
-        )
 
-        val asyncStorageIdlingResource = AsyncStorageIdlingResource.createIfNeeded(reactContext)
-        if (asyncStorageIdlingResource != null) {
-            result[IdlingResourcesName.AsyncStorage] = asyncStorageIdlingResource
+class DetoxIdlingResourceFactory(private val reactApplication: ReactApplication) {
+    suspend fun create(): Map<IdlingResourcesName, DetoxIdlingResource> = withContext(Dispatchers.Main) {
+        val strategy = if (isFabricEnabled()) {
+            FabricDetoxIdlingResourceFactoryStrategy(reactApplication)
+        } else {
+            OldArchitectureDetoxIdlingResourceFactoryStrategy(reactApplication)
         }
 
-        return@withContext result
+        return@withContext strategy.create()
     }
 }
 

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/factory/DetoxIdlingResourceFactoryStrategy.kt

@@ -0,0 +1,7 @@
+package com.wix.detox.reactnative.idlingresources.factory
+
+import com.wix.detox.reactnative.idlingresources.DetoxIdlingResource
+
+interface DetoxIdlingResourceFactoryStrategy {
+    suspend fun create(): Map<IdlingResourcesName, DetoxIdlingResource>
+}

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/factory/FabricDetoxIdlingResourceFactoryStrategy.kt

@@ -0,0 +1,31 @@
+package com.wix.detox.reactnative.idlingresources.factory
+
+import com.facebook.react.ReactApplication
+import com.wix.detox.reactnative.getCurrentReactContext
+import com.wix.detox.reactnative.getCurrentReactContextSafe
+import com.wix.detox.reactnative.idlingresources.DetoxIdlingResource
+import com.wix.detox.reactnative.idlingresources.animations.AnimatedModuleIdlingResource
+import com.wix.detox.reactnative.idlingresources.network.NetworkIdlingResource
+import com.wix.detox.reactnative.idlingresources.storage.AsyncStorageIdlingResource
+import com.wix.detox.reactnative.idlingresources.timers.FabricTimersIdlingResource
+import com.wix.detox.reactnative.idlingresources.uimodule.fabric.FabricUIManagerIdlingResources
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class FabricDetoxIdlingResourceFactoryStrategy(private val reactApplication: ReactApplication) :
+    DetoxIdlingResourceFactoryStrategy {
+    override suspend fun create(): Map<IdlingResourcesName, DetoxIdlingResource> =
+        withContext(Dispatchers.Main) {
+            val reactContext = reactApplication.getCurrentReactContextSafe()
+
+            val result = mutableMapOf(
+                IdlingResourcesName.UI to FabricUIManagerIdlingResources(reactContext),
+                IdlingResourcesName.Animations to AnimatedModuleIdlingResource(reactContext),
+                IdlingResourcesName.Timers to FabricTimersIdlingResource(reactContext),
+                IdlingResourcesName.Network to NetworkIdlingResource(reactContext),
+                IdlingResourcesName.AsyncStorage to AsyncStorageIdlingResource(reactContext)
+            )
+
+            return@withContext result
+        }
+}

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/factory/IdlingResourcesName.kt

@@ -4,7 +4,7 @@ enum class IdlingResourcesName {
     Timers,
     AsyncStorage,
     RNBridge,
-    UIModule,
+    UI,
     Animations,
     Network
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/factory/OldArchitectureDetoxIdlingResourceFactoryStrategy.kt

@@ -0,0 +1,33 @@
+package com.wix.detox.reactnative.idlingresources.factory
+
+import com.facebook.react.ReactApplication
+import com.wix.detox.reactnative.getCurrentReactContext
+import com.wix.detox.reactnative.getCurrentReactContextSafe
+import com.wix.detox.reactnative.idlingresources.DetoxIdlingResource
+import com.wix.detox.reactnative.idlingresources.animations.AnimatedModuleIdlingResource
+import com.wix.detox.reactnative.idlingresources.bridge.BridgeIdlingResource
+import com.wix.detox.reactnative.idlingresources.network.NetworkIdlingResource
+import com.wix.detox.reactnative.idlingresources.storage.AsyncStorageIdlingResource
+import com.wix.detox.reactnative.idlingresources.timers.TimersIdlingResource
+import com.wix.detox.reactnative.idlingresources.uimodule.paper.UIModuleIdlingResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class OldArchitectureDetoxIdlingResourceFactoryStrategy(private val reactApplication: ReactApplication) :
+    DetoxIdlingResourceFactoryStrategy {
+    override suspend fun create(): Map<IdlingResourcesName, DetoxIdlingResource> =
+        withContext(Dispatchers.Main) {
+            val reactContext = reactApplication.getCurrentReactContextSafe()
+
+            val result = mutableMapOf(
+                IdlingResourcesName.Timers to TimersIdlingResource(reactContext),
+                IdlingResourcesName.RNBridge to BridgeIdlingResource(reactContext),
+                IdlingResourcesName.UI to UIModuleIdlingResource(reactContext),
+                IdlingResourcesName.Animations to AnimatedModuleIdlingResource(reactContext),
+                IdlingResourcesName.Network to NetworkIdlingResource(reactContext),
+                IdlingResourcesName.AsyncStorage to AsyncStorageIdlingResource(reactContext)
+            )
+
+            return@withContext result
+        }
+}

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/network/NetworkIdlingResource.kt

@@ -39,6 +39,11 @@ class NetworkIdlingResource(private val dispatcher: Dispatcher) : DetoxIdlingRes
         Choreographer.getInstance().postFrameCallback(this)
     }
 
+    override fun onUnregistered() {
+        super.onUnregistered()
+        Choreographer.getInstance().removeFrameCallback(this)
+    }
+
     override fun doFrame(frameTimeNanos: Long) {
         isIdleNow
     }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/network/NetworkingModuleReflected.kt

@@ -7,22 +7,19 @@ import okhttp3.OkHttpClient
 import org.joor.Reflect
 import org.joor.ReflectException
 
+
+private const val LOG_TAG = "RNNetworkingModuleRefl"
+
+private const val FIELD_OKHTTP_CLIENT = "mClient"
+
 internal class NetworkingModuleReflected(private val reactContext: ReactContext) {
     fun getHttpClient(): OkHttpClient? {
-        if (reactContext.hasNativeModule(NetworkingModule::class.java)) {
-            val networkNativeModule = reactContext.getNativeModule(NetworkingModule::class.java)
-            try {
-                return Reflect.on(networkNativeModule).field(FIELD_OKHTTP_CLIENT).get()
-            } catch (e: ReflectException) {
-                Log.e(LOG_TAG, "Can't set up Networking Module listener", e)
-            }
+        val networkNativeModule = reactContext.getNativeModule(NetworkingModule::class.java)
+        try {
+            return Reflect.on(networkNativeModule).field(FIELD_OKHTTP_CLIENT).get()
+        } catch (e: ReflectException) {
+            Log.e(LOG_TAG, "Can't set up Networking Module listener", e)
+            return null
         }
-        return null
-    }
-
-    companion object {
-        private const val LOG_TAG = "RNNetworkingModuleRefl"
-
-        private const val FIELD_OKHTTP_CLIENT = "mClient"
     }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/storage/AsyncStorageIdlingResource.kt

@@ -9,6 +9,8 @@ import com.wix.detox.reactnative.idlingresources.DetoxIdlingResource
 import org.joor.Reflect
 import java.util.concurrent.Executor
 
+private const val LOG_TAG = "AsyncStorageIR"
+
 private typealias SExecutorReflectedGenFnType = (executor: Executor) -> SerialExecutorReflected
 
 private val defaultSExecutorReflectedGenFn: SExecutorReflectedGenFnType =
@@ -29,17 +31,19 @@ private class ModuleReflected(module: NativeModule, sexecutorReflectedGen: SExec
 
 class AsyncStorageIdlingResource
 @JvmOverloads constructor(
-    module: NativeModule,
-    sexecutorReflectedGenFn: SExecutorReflectedGenFnType = defaultSExecutorReflectedGenFn
+    private val reactContext: ReactContext,
+    private val sexecutorReflectedGenFn: SExecutorReflectedGenFnType = defaultSExecutorReflectedGenFn,
+    private val rnHelpers: RNHelpers = RNHelpers()
 ) : DetoxIdlingResource() {
 
     val logTag: String
         get() = LOG_TAG
 
-    private val moduleReflected = ModuleReflected(module, sexecutorReflectedGenFn)
+    private val moduleReflected: ModuleReflected? = null
     private var idleCheckTask: Runnable? = null
     private val idleCheckTaskImpl = Runnable {
-        with(moduleReflected.sexecutor) {
+        val module = getModuleReflected() ?: return@Runnable
+        with(module.sexecutor) {
             synchronized(executor()) {
                 if (hasPendingTasks()) {
                     executeTask(idleCheckTask!!)
@@ -49,19 +53,36 @@ class AsyncStorageIdlingResource
                 }
             }
         }
+
     }
 
     override fun getName(): String = javaClass.name
     override fun getDebugName() = "io"
     override fun getBusyHint(): Map<String, Any>? = null
 
+    private fun getModuleReflected(): ModuleReflected? {
+
+        fun className(): String {
+            val packageName = "com.reactnativecommunity.asyncstorage"
+            return "$packageName.AsyncStorageModule"
+        }
+
+        if (moduleReflected != null) {
+            return moduleReflected
+        }
+
+        val nativeModule = rnHelpers.getNativeModule(reactContext, className()) ?: return null
+        return ModuleReflected(nativeModule, sexecutorReflectedGenFn)
+    }
 
-    private fun checkIdleInternal(): Boolean =
-        with(moduleReflected.sexecutor) {
+    private fun checkIdleInternal(): Boolean {
+        val module = getModuleReflected() ?: return true
+        return with(module.sexecutor) {
             synchronized(executor()) {
                 !hasActiveTask() && !hasPendingTasks()
             }
         }
+    }
 
     override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
         super.registerIdleTransitionCallback(callback)
@@ -76,8 +97,9 @@ class AsyncStorageIdlingResource
             }
         }
 
-    private fun enqueueIdleCheckTask() =
-        with(moduleReflected.sexecutor) {
+    private fun enqueueIdleCheckTask() {
+        val module = getModuleReflected() ?: return
+        with(module.sexecutor) {
             synchronized(executor()) {
                 if (idleCheckTask == null) {
                     initIdleCheckTask()
@@ -85,6 +107,7 @@ class AsyncStorageIdlingResource
                 }
             }
         }
+    }
 
     private fun initIdleCheckTask() {
         idleCheckTask = idleCheckTaskImpl
@@ -93,25 +116,4 @@ class AsyncStorageIdlingResource
     private fun clearIdleCheckTask() {
         idleCheckTask = null
     }
-
-    companion object {
-        private const val LOG_TAG = "AsyncStorageIR"
-
-        fun createIfNeeded(reactContext: ReactContext): AsyncStorageIdlingResource? {
-            Log.d(LOG_TAG, "Checking whether a custom IR for Async-Storage is required...")
-
-            return RNHelpers.getNativeModule(reactContext, className())?.let { module ->
-                Log.d(LOG_TAG, "IR for Async-Storage is required!")
-                createInstance(module)
-            }
-        }
-
-        private fun className(): String {
-            val packageName = "com.reactnativecommunity.asyncstorage"
-            return "$packageName.AsyncStorageModule"
-        }
-
-        private fun createInstance(module: NativeModule) =
-            AsyncStorageIdlingResource(module)
-    }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/FabricTimersIdlingResource.kt

@@ -0,0 +1,50 @@
+package com.wix.detox.reactnative.idlingresources.timers
+
+import android.view.Choreographer
+import androidx.test.espresso.IdlingResource
+import com.facebook.react.bridge.ReactContext
+import com.wix.detox.reactnative.idlingresources.DetoxIdlingResource
+
+class FabricTimersIdlingResource(
+    private val reactContext: ReactContext,
+    private val getChoreographer: () -> Choreographer = { Choreographer.getInstance() }
+) : DetoxIdlingResource(), Choreographer.FrameCallback {
+
+    override fun checkIdle(): Boolean {
+        val hasActiveTimers = JavaTimersReflected.hasActiveTimers(reactContext)
+
+        if (hasActiveTimers) {
+            getChoreographer().postFrameCallback(this@FabricTimersIdlingResource)
+        } else {
+            notifyIdle()
+        }
+
+        return !hasActiveTimers
+    }
+
+    override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
+        super.registerIdleTransitionCallback(callback)
+        getChoreographer().postFrameCallback(this)
+    }
+
+    override fun onUnregistered() {
+        super.onUnregistered()
+        getChoreographer().removeFrameCallback(this)
+    }
+
+    override fun getDebugName(): String {
+        return "timers"
+    }
+
+    override fun getBusyHint(): Map<String, Any>? = null
+
+    override fun getName(): String {
+        return FabricTimersIdlingResource::class.java.name
+    }
+
+
+
+    override fun doFrame(frameTimeNanos: Long) {
+        isIdleNow()
+    }
+}

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/JavaTimersReflected.kt

@@ -0,0 +1,26 @@
+package com.wix.detox.reactnative.idlingresources.timers
+
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.modules.core.JavaTimerManager
+import org.joor.Reflect
+import kotlin.reflect.full.declaredFunctions
+import kotlin.reflect.jvm.isAccessible
+
+object JavaTimersReflected {
+
+    fun hasActiveTimers(reactContext: ReactContext): Boolean {
+        val timersManager = getTimersManager(reactContext)
+        val hasActiveTimersInRangeInstanceClass = timersManager::class
+        val method =
+            hasActiveTimersInRangeInstanceClass.declaredFunctions.first { it.name.contains("hasActiveTimersInRange") }
+        method.isAccessible = true
+        val hasActiveTimers: Boolean = method.call(timersManager, BUSY_WINDOW_THRESHOLD) as? Boolean ?: false
+        return hasActiveTimers
+    }
+
+    private fun getTimersManager(reactContext: ReactContext): JavaTimerManager {
+        val reactHost = Reflect.on(reactContext).field("mReactHost").get<Any>()
+        val reactInstance = Reflect.on(reactHost).field("mReactInstance").get<Any>()
+        return Reflect.on(reactInstance).field("mJavaTimerManager").get() as JavaTimerManager
+    }
+}

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/TimersIdlingResource.kt

@@ -7,7 +7,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.modules.core.TimingModule
 import com.wix.detox.reactnative.idlingresources.DetoxIdlingResource
 
-private const val BUSY_WINDOW_THRESHOLD = 1500L
+const val BUSY_WINDOW_THRESHOLD: Long = 1500L
 
 class TimersIdlingResource @JvmOverloads constructor(
     reactContext: ReactContext,
@@ -25,6 +25,11 @@ class TimersIdlingResource @JvmOverloads constructor(
         getChoreographer().postFrameCallback(this)
     }
 
+    override fun onUnregistered() {
+        super.onUnregistered()
+        getChoreographer().removeFrameCallback(this)
+    }
+
     @SuppressLint("VisibleForTests")
     override fun checkIdle(): Boolean {
         val isIdle = !timingModule.hasActiveTimersInRange(BUSY_WINDOW_THRESHOLD)
@@ -41,8 +46,4 @@ class TimersIdlingResource @JvmOverloads constructor(
     override fun doFrame(frameTimeNanos: Long) {
         isIdleNow
     }
-
-    companion object {
-        internal const val LOG_TAG = "TimersIdlingResource"
-    }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/fabric/FabricUIManagerIdlingResources.kt

@@ -0,0 +1,70 @@
+package com.wix.detox.reactnative.idlingresources.uimodule.fabric
+
+import android.view.Choreographer
+import androidx.test.espresso.IdlingResource
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.common.UIManagerType
+import com.wix.detox.reactnative.idlingresources.DetoxIdlingResource
+import org.joor.Reflect
+import java.util.concurrent.ConcurrentLinkedQueue
+
+
+class FabricUIManagerIdlingResources(
+    private val reactContext: ReactContext
+) : DetoxIdlingResource(), Choreographer.FrameCallback  {
+
+    override fun checkIdle(): Boolean {
+        return if (getViewCommandMountItemsSize() == 0 && getMountItemsSize() == 0) {
+            notifyIdle()
+            true
+        } else {
+            Choreographer.getInstance().postFrameCallback(this)
+            false
+        }
+    }
+
+    override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
+        super.registerIdleTransitionCallback(callback)
+        Choreographer.getInstance().postFrameCallback(this)
+    }
+
+    override fun onUnregistered() {
+        super.onUnregistered()
+        Choreographer.getInstance().removeFrameCallback(this)
+    }
+
+    override fun getDebugName(): String {
+        return "Fabric UI"
+    }
+
+    override fun getBusyHint(): Map<String, Any> {
+        return mapOf("mountItems" to getMountItemsSize(), "viewCommandMountItems" to getViewCommandMountItemsSize())
+    }
+
+    override fun getName() = FabricUIManagerIdlingResources::class.java.name
+
+    override fun doFrame(frameTimeNanos: Long) {
+        isIdleNow()
+    }
+
+    private fun getMountItemsSize(): Int {
+        val mountItemDispatcher = getMountItemDispatcher()
+        val mountItems = Reflect.on(mountItemDispatcher).field("mMountItems").get<ConcurrentLinkedQueue<*>>()
+        return mountItems.size
+    }
+
+    private fun getMountItemDispatcher(): Any {
+        val fabricUIManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC)
+        val mountItemDispatcher = Reflect.on(fabricUIManager).field("mMountItemDispatcher").get<Any>()
+        return mountItemDispatcher
+    }
+
+    private fun getViewCommandMountItemsSize(): Int {
+        val mountItemDispatcher = getMountItemDispatcher()
+        val viewCommandMountItems =
+            Reflect.on(mountItemDispatcher).field("mViewCommandMountItems").get<ConcurrentLinkedQueue<*>>()
+        return viewCommandMountItems.size
+    }
+
+}

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/{DispatchCommandOperationReflected.kt → paper/DispatchCommandOperationReflected.kt}

@@ -1,4 +1,4 @@
-package com.wix.detox.reactnative.idlingresources.uimodule
+package com.wix.detox.reactnative.idlingresources.uimodule.paper
 
 import android.util.Log
 import com.wix.detox.common.DetoxLog

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/{NativeHierarchyManagerReflected.kt → paper/NativeHierarchyManagerReflected.kt}

@@ -1,15 +1,17 @@
-package com.wix.detox.reactnative.idlingresources.uimodule
+package com.wix.detox.reactnative.idlingresources.uimodule.paper
 
 import android.util.Log
 import android.view.View
 import com.facebook.react.uimanager.NativeViewHierarchyManager
 import com.facebook.react.uimanager.UIViewOperationQueue
-import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
+import com.wix.detox.common.DetoxLog
 import org.joor.Reflect
 import org.joor.ReflectException
 
 private const val FIELD_NATIVE_HIERARCHY_MANAGER = "mNativeViewHierarchyManager"
 
+
+
 class NativeHierarchyManagerReflected(uIViewOperationQueueInstance: UIViewOperationQueue) {
     private val reflected = Reflect.on(uIViewOperationQueueInstance)
 
@@ -21,7 +23,7 @@ class NativeHierarchyManagerReflected(uIViewOperationQueueInstance: UIViewOperat
         return try {
             reflected.field(FIELD_NATIVE_HIERARCHY_MANAGER).get<NativeViewHierarchyManager>()
         } catch(e: ReflectException) {
-            Log.e(LOG_TAG, "failed to get $FIELD_NATIVE_HIERARCHY_MANAGER ", e.cause)
+            Log.e(DetoxLog.LOG_TAG, "failed to get $FIELD_NATIVE_HIERARCHY_MANAGER ", e.cause)
             null
         }
     }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/{UIManagerModuleReflected.kt → paper/UIManagerModuleReflected.kt}

@@ -1,9 +1,9 @@
-package com.wix.detox.reactnative.idlingresources.uimodule
+package com.wix.detox.reactnative.idlingresources.uimodule.paper
 
 import android.util.Log
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIViewOperationQueue
-import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
+import com.wix.detox.common.DetoxLog
 import org.joor.Reflect
 
 private const val CLASS_UI_MANAGER_MODULE = "com.facebook.react.uimanager.UIManagerModule"
@@ -16,6 +16,8 @@ private const val FIELD_DISPATCH_RUNNABLES_LOCK = "mDispatchRunnablesLock"
 private const val FIELD_NON_BATCHED_OPS = "mNonBatchedOperations"
 private const val FIELD_NON_BATCHED_OPS_LOCK = "mNonBatchedOperationsLock"
 
+
+
 class UIManagerModuleReflected(private val reactContext: ReactContext) {
 
     fun isRunnablesListEmpty(): Boolean =
@@ -56,7 +58,7 @@ class UIManagerModuleReflected(private val reactContext: ReactContext) {
                 .field(FIELD_UI_OPERATION_QUEUE)
                 .get()
         } catch (e: Exception) {
-            Log.e(LOG_TAG, "failed to get $CLASS_UI_MANAGER_MODULE instance ", e)
+            Log.e(DetoxLog.LOG_TAG, "failed to get $CLASS_UI_MANAGER_MODULE instance ", e)
             null
         }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/{UIModuleIdlingResource.kt → paper/UIModuleIdlingResource.kt}

@@ -1,8 +1,8 @@
-package com.wix.detox.reactnative.idlingresources.uimodule
+package com.wix.detox.reactnative.idlingresources.uimodule.paper
 
 import android.util.Log
 import android.view.Choreographer
-import androidx.test.espresso.IdlingResource.ResourceCallback
+import androidx.test.espresso.IdlingResource
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.reactnative.helpers.RNHelpers
 import com.wix.detox.reactnative.idlingresources.DetoxIdlingResource
@@ -30,7 +30,10 @@ class UIModuleIdlingResource(private val reactContext: ReactContext)
                 return false
             }
 
-            if (RNHelpers.getNativeModule(reactContext, "com.facebook.react.uimanager.UIManagerModule") == null) {
+            if (RNHelpers().getNativeModule(
+                    reactContext,
+                    "com.facebook.react.uimanager.UIManagerModule"
+                ) == null) {
                 notifyIdle()
                 return true
             }
@@ -54,11 +57,16 @@ class UIModuleIdlingResource(private val reactContext: ReactContext)
         return true
     }
 
-    override fun registerIdleTransitionCallback(callback: ResourceCallback?) {
+    override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
         super.registerIdleTransitionCallback(callback)
         Choreographer.getInstance().postFrameCallback(this)
     }
 
+    override fun onUnregistered() {
+        super.onUnregistered()
+        Choreographer.getInstance().removeFrameCallback(this)
+    }
+
     override fun doFrame(frameTimeNanos: Long) {
         isIdleNow
     }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/{ViewCommandOpsQueueReflected.kt → paper/ViewCommandOpsQueueReflected.kt}

@@ -1,8 +1,8 @@
-package com.wix.detox.reactnative.idlingresources.uimodule
+package com.wix.detox.reactnative.idlingresources.uimodule.paper
 
 import android.util.Log
 import com.facebook.react.uimanager.UIViewOperationQueue
-import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
+import com.wix.detox.common.DetoxLog
 import org.joor.Reflect
 import org.joor.ReflectException
 
@@ -21,7 +21,7 @@ class ViewCommandOpsQueueReflected(uiViewOperationQueueInstance: UIViewOperation
         try {
             instance.field(FIELD_VIEW_COMMAND_OPERATIONS).get<Collection<Any>>()
         } catch(e: ReflectException) {
-            Log.e(LOG_TAG, "could not get reflected field mViewCommandOperations ", e)
+            Log.e(DetoxLog.LOG_TAG, "could not get reflected field mViewCommandOperations ", e)
             null
         }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/reloader/ReactNativeReloader.kt

@@ -0,0 +1,34 @@
+package com.wix.detox.reactnative.reloader
+
+import android.app.Instrumentation
+import com.facebook.react.ReactApplication
+
+interface ReactNativeReLoader {
+    fun reloadInBackground()
+}
+
+class OldArchReactNativeReLoader(
+        private val instrumentation: Instrumentation,
+        private val rnApplication: ReactApplication
+) : ReactNativeReLoader {
+
+    override fun reloadInBackground() {
+        val rnInstanceManager = rnApplication.reactNativeHost.reactInstanceManager
+        instrumentation.runOnMainSync {
+            rnInstanceManager.recreateReactContextInBackground()
+        }
+    }
+}
+
+class NewArchitectureNativeReLoader(
+    private val instrumentation: Instrumentation,
+    private val rnApplication: ReactApplication
+) : ReactNativeReLoader {
+    override fun reloadInBackground() {
+        val reactHost = rnApplication.reactHost ?: throw IllegalStateException("ReactHost is null. Check implementation of you Application class")
+
+        instrumentation.runOnMainSync {
+            reactHost.reload("Detox")
+        }
+    }
+}

package/android/detox/src/full/java/com/wix/detox/reactnative/reloader/ReactNativeReloaderFactory.kt

@@ -0,0 +1,18 @@
+package com.wix.detox.reactnative.reloader
+
+import android.app.Instrumentation
+import com.facebook.react.ReactApplication
+import com.wix.detox.reactnative.isFabricEnabled
+
+class ReactNativeReloaderFactory(
+    private val instrumentation: Instrumentation,
+    private val rnApplication: ReactApplication
+) {
+
+    fun create(): ReactNativeReLoader {
+        return when {
+            isFabricEnabled() -> NewArchitectureNativeReLoader(instrumentation, rnApplication)
+            else -> OldArchReactNativeReLoader(instrumentation, rnApplication)
+        }
+    }
+}