Merge pull request #35 from mendix/moo/MOO-2316-upgrade-rn-v084

[MOO-2316] Upgrade RN to v084

Author: YogendraShelke

.github/CI_DOCUMENTATION.md

@@ -20,8 +20,8 @@ All workflows use standardized tooling versions to ensure consistency:
 | ---------------- | --------- | ----------------------------- |
 | **Node.js**      | `24`      | `.nvmrc`                      |
 | **Yarn**         | `4.12.0`  | `package.json#packageManager` |
-| **React Native** | `0.83.4`  | `package.json`                |
-| **React**        | `19.2.14` | `package.json`                |
+| **React Native** | `0.84.1`  | `package.json`                |
+| **React**        | `19.2.3`  | `package.json`                |
 | **TypeScript**   | `5.9.3`   | `package.json`                |
 
 ### Android Tooling
@@ -55,7 +55,7 @@ All workflows use standardized tooling versions to ensure consistency:
 
 | Tool                     | Version               | Defined In              |
 | ------------------------ | --------------------- | ----------------------- |
-| **React Native Harness** | `1.0.0-alpha.21`      | `package.json`          |
+| **React Native Harness** | `1.1.0`               | `package.json`          |
 | **Android Emulator**     | Pixel_API_35 (API 35) | `rn-harness.config.mjs` |
 | **iOS Simulator**        | iPhone 17 (iOS 26.2)  | `rn-harness.config.mjs` |
 

.gitignore

@@ -90,3 +90,6 @@ lib/
 
 # Fastlane.swift runner binary
 **/fastlane/FastlaneRunner
+
+# Harness logs/crash reports
+example/.harness

MendixNative.podspec

@@ -14,11 +14,12 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/mendix/mendix-native.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
-  s.public_header_files = "ios/**/*.h"
-  s.private_header_files = "ios/**/*.h"
+  s.public_header_files = "ios/Modules/Helper/ReactHostHelper.h"
+  s.private_header_files = "ios/TurboModules/**/*.h"
 
   s.dependency "SSZipArchive"
   s.dependency "RNCAsyncStorage"
+  s.dependency "ReactAppDependencyProvider"
 
   install_modules_dependencies(s)
 end

android/build.gradle

@@ -36,8 +36,6 @@ android {
   }
 
   buildFeatures {
-    dataBinding true
-    viewBinding true
     buildConfig true
   }
 
@@ -88,7 +86,7 @@ dependencies {
   kapt 'com.github.bumptech.glide:compiler:4.12.0'
 
 
-  api "com.facebook.react:react-android:0.83.4"
+  api "com.facebook.react:react-android:0.84.1"
   api project(':op-engineering_op-sqlite')
   api project(':react-native-async-storage_async-storage')
   api project(':react-native-gesture-handler')

android/src/main/java/com/facebook/react/devsupport/DevInternalSettings.kt

@@ -1,44 +1,25 @@
 package com.mendix.mendixnative
 
 import android.app.Activity
-import android.view.MotionEvent
 import com.facebook.react.ReactHost
-import com.facebook.react.ReactInstanceEventListener
-import com.facebook.react.ReactNativeHost
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.common.ShakeDetector
 import com.facebook.react.devsupport.DevSupportManagerBase
-import com.facebook.react.devsupport.attachMendixSupportManagerShakeDetector
-import com.facebook.react.devsupport.makeShakeDetector
 import com.facebook.react.modules.network.OkHttpClientProvider
 import com.mendix.mendixnative.config.AppPreferences
-import com.mendix.mendixnative.handler.DevMenuTouchEventHandler
 import com.mendix.mendixnative.react.*
 import com.mendix.mendixnative.request.MendixNetworkInterceptor
 import com.mendix.mendixnative.util.CookieEncryption
 import com.mendix.mendixnative.react.MxConfiguration
 import com.mendix.mendixnative.react.clearCachedReactNativeDevBundle
 import com.mendix.mendixnative.react.clearData
 import com.mendix.mendixnative.react.closeSqlDatabaseConnection
-import com.mendix.mendixnative.react.toggleElementInspector
-import com.mendixnative.MendixNativeModule
 
 class MendixInitializer(
   private val context: Activity,
   private val reactHost: ReactHost,
-  private val reactNativeHost: ReactNativeHost,
   private val hasRNDeveloperSupport: Boolean = false,
-) : ReactInstanceEventListener {
-  private var shakeDetector: ShakeDetector? = null
-  private var devMenuTouchEventHandler: DevMenuTouchEventHandler? = null
+) {
 
-  fun onCreate(
-    mendixApp: MendixApp,
-    devAppMenuHandler: DevAppMenuHandler = object : DevAppMenuHandler {
-      override fun showDevAppMenu() {}
-    },
-    clearData: Boolean,
-  ) {
+  fun onCreate(mendixApp: MendixApp, clearData: Boolean) {
     // Assign mendix xas id interceptor to okhttp
     CookieEncryption.init(this.context)
     if (CookieEncryption.isCookieEncryptionEnabled()) {
@@ -53,77 +34,25 @@ class MendixInitializer(
     MxConfiguration.runtimeUrl = runtimeUrl
     MxConfiguration.warningsFilter = mendixApp.warningsFilter
 
-    // This is here to make sure that a clean host instance is initialised.
-    restartReactInstanceManager()
+    // Reload only if there's already a running instance.
+    if (reactHost.currentReactContext != null) {
+      reactHost.reload("Clean start for new Mendix app")
+    }
     if (clearData) clearData(context.application)
     if (hasRNDeveloperSupport) setupDeveloperApp(runtimeUrl, mendixApp)
-    if (mendixApp.attachCustomDeveloperMenu) attachCustomDeveloperMenu(devAppMenuHandler)
-  }
-
-  private fun restartReactInstanceManager() {
-    if (reactNativeHost.hasInstance()) reactNativeHost.clear()
-    // Pre-initialize reactInstanceManager to be available for other methods
-    if (reactNativeHost.hasInstance()) reactNativeHost.reactInstanceManager
-  }
-
-  private fun attachCustomDeveloperMenu(devAppMenuHandler: DevAppMenuHandler) {
-    devMenuTouchEventHandler =
-      DevMenuTouchEventHandler(object : DevMenuTouchEventHandler.DevMenuTouchListener {
-        override fun onTap() {
-          reactNativeHost.typeSafeNativeModule<MendixNativeModule>()?.reloadClientWithState()
-        }
-
-        override fun onLongPress() {
-          devAppMenuHandler.showDevAppMenu()
-        }
-      })
-
-    attachShakeDetector(devAppMenuHandler)
   }
 
   fun onDestroy() {
-    // Stop shaking as early as possible to avoid orphaned dialogs
-    stopShakeDetector()
-
     if (hasRNDeveloperSupport) {
       AppPreferences(context.applicationContext).setElementInspector(false)
-      reactHost.removeReactInstanceEventListener(this)
     }
-
-    // We need to clear the host to allow for reinitialization of the Native Modules
-    // Especially for when switching between apps
-    reactNativeHost.clear()
+    // Destroy the current instance but keep the host reusable — invalidate() is terminal
+    // in bridgeless mode and would prevent the host from ever starting a new instance.
+    reactHost.destroy("MendixInitializer.onDestroy()", null)
 
     // We need to close all databases separately to avoid hitting a read only state exception
     // Databases need to close after we are done closing the react native host to avoid db locks
-    closeSqlDatabaseConnection(reactNativeHost.reactApplicationContext())
-  }
-
-  fun stopShakeDetector() {
-    shakeDetector?.stop()
-  }
-
-  override fun onReactContextInitialized(context: ReactContext) {
-    val preferences = AppPreferences(context)
-    if (preferences.isElementInspectorEnabled) {
-      toggleElementInspector(context)
-    }
-  }
-
-  fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-    return devMenuTouchEventHandler?.handle(ev) ?: false
-  }
-
-  private fun attachShakeDetector(devAppMenuHandler: DevAppMenuHandler) {
-    if (shakeDetector == null) {
-      shakeDetector = makeShakeDetector(context.applicationContext) {
-        devAppMenuHandler.showDevAppMenu()
-      }
-    }
-
-    (reactHost.devSupportManager as? DevSupportManagerBase)?.run {
-        attachMendixSupportManagerShakeDetector(shakeDetector!!, this)
-    }
+    closeSqlDatabaseConnection(reactHost.currentReactContext)
   }
 
   private fun setupDeveloperApp(
@@ -137,7 +66,6 @@ class MendixInitializer(
     preferences.setDevMode((mendixApp.showExtendedDevMenu))
 
     clearCachedReactNativeDevBundle(context.application)
-    reactHost.addReactInstanceEventListener(this)
   }
 }
 

android/src/main/java/com/facebook/react/devsupport/DevSupportManagerHelpers.kt

@@ -10,6 +10,7 @@ import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.defaults.DefaultComponentsRegistry
 import com.facebook.react.defaults.DefaultReactHostDelegate
 import com.facebook.react.defaults.DefaultTurboModuleManagerDelegate
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
 import com.facebook.react.devsupport.interfaces.RedBoxHandler
 import com.facebook.react.fabric.ComponentFactory
 import com.facebook.react.runtime.ReactHostImpl
@@ -20,6 +21,7 @@ import com.mendix.mendixnative.error.ErrorHandler
 import com.mendix.mendixnative.error.ErrorHandlerFactory
 import com.mendix.mendixnative.error.mapErrorHandlerToRedBox
 import com.mendix.mendixnative.handler.DummyErrorHandler
+import com.mendix.mendixnative.devsupport.MendixDevSupportManagerFactory
 import com.mendix.mendixnative.react.ota.OtaJSBundleUrlProvider
 import com.mendix.mendixnative.react.splash.MendixSplashScreenPresenter
 import com.mendixnative.MendixNativePackage
@@ -106,11 +108,12 @@ abstract class MendixReactApplication : Application(), MendixApplication, ErrorH
     val componentFactory = ComponentFactory()
     DefaultComponentsRegistry.register(componentFactory)
     ReactHostImpl(
-      applicationContext,
-      delegate,
-      componentFactory,
-      true /* allowPackagerServerAccess */,
-      useDeveloperSupport,
+      context = applicationContext,
+      reactHostDelegate = delegate,
+      componentFactory = componentFactory,
+      allowPackagerServerAccess = true,
+      useDevSupport = useDeveloperSupport,
+      devSupportManagerFactory = MendixDevSupportManagerFactory(devBundleDownloadListener),
     )
   }
 
@@ -158,4 +161,14 @@ abstract class MendixReactApplication : Application(), MendixApplication, ErrorH
 
   open val jsBundleProvider: JSBundleFileProvider?
     get() = null
+
+  /**
+   * Override this to provide a [DevBundleDownloadListener] that receives bundle download
+   * progress, success, and failure callbacks. This is used to drive custom loading UIs.
+   *
+   * The listener is injected at [ReactHost] creation time via [MendixDevSupportManagerFactory].
+   * Use a delegating holder pattern if the actual listener is created after app initialization.
+   */
+  open val devBundleDownloadListener: DevBundleDownloadListener?
+    get() = null
 }

android/src/main/java/com/mendix/mendixnative/MendixInitializer.kt

@@ -2,7 +2,6 @@ package com.mendix.mendixnative.activity
 
 import android.os.Bundle
 import android.view.KeyEvent
-import android.view.MotionEvent
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.bridge.ReactContext
@@ -31,8 +30,8 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
       ?: throw ClassCastException("Application needs to implement MendixApplication")
 
     mendixInitializer =
-      MendixInitializer(this, reactHost, reactNativeHost, mendixApplication.useDeveloperSupport)
-    mendixInitializer.onCreate(mendixApp!!, this, intent.getBooleanExtra(CLEAR_DATA, false))
+      MendixInitializer(this, reactHost, mendixApplication.useDeveloperSupport)
+    mendixInitializer.onCreate(mendixApp!!, intent.getBooleanExtra(CLEAR_DATA, false))
 
     super.onCreate(null)
   }
@@ -42,12 +41,6 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
     super.onDestroy()
   }
 
-  override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
-    return if (mendixInitializer.dispatchTouchEvent(ev)) {
-      true
-    } else super.dispatchTouchEvent(ev)
-  }
-
   override fun getMainComponentName(): String? {
     return MAIN_COMPONENT_NAME
   }
@@ -66,7 +59,9 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
     return object : ReactActivityDelegate(this, mainComponentName) {
       override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
         if (keyCode == KeyEvent.KEYCODE_MENU) {
-          showDevAppMenu()
+          if (mendixApp?.showExtendedDevMenu == true) {
+            showDevAppMenu()
+          }
           return true
         }
         return super.onKeyUp(keyCode, event)

android/src/main/java/com/mendix/mendixnative/MendixReactApplication.kt

@@ -0,0 +1,53 @@
+package com.mendix.mendixnative.devsupport
+
+import android.content.Context
+import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.common.SurfaceDelegateFactory
+import com.facebook.react.devsupport.DevSupportManagerBase
+import com.facebook.react.devsupport.ReactInstanceDevHelper
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
+import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
+import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
+import com.facebook.react.devsupport.interfaces.RedBoxHandler
+import com.facebook.react.packagerconnection.RequestHandler
+
+/**
+ * A public DevSupportManager implementation for Mendix apps in bridgeless mode.
+ *
+ * This mirrors the behavior of React Native's internal [BridgelessDevSupportManager]
+ * but is accessible from external modules, allowing us to inject a custom
+ * [DevBundleDownloadListener] at construction time without reflection.
+ */
+class MendixBridgelessDevSupportManager(
+    applicationContext: Context,
+    reactInstanceManagerHelper: ReactInstanceDevHelper,
+    packagerPathForJSBundleName: String?,
+    enableOnCreate: Boolean,
+    redBoxHandler: RedBoxHandler?,
+    devBundleDownloadListener: DevBundleDownloadListener?,
+    minNumShakes: Int,
+    customPackagerCommandHandlers: Map<String, RequestHandler>?,
+    surfaceDelegateFactory: SurfaceDelegateFactory?,
+    devLoadingViewManager: DevLoadingViewManager?,
+    pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?,
+) : DevSupportManagerBase(
+    applicationContext,
+    reactInstanceManagerHelper,
+    packagerPathForJSBundleName,
+    enableOnCreate,
+    redBoxHandler,
+    devBundleDownloadListener,
+    minNumShakes,
+    customPackagerCommandHandlers,
+    surfaceDelegateFactory,
+    devLoadingViewManager,
+    pausedInDebuggerOverlayManager,
+) {
+    override val uniqueTag: String get() = "MendixBridgeless"
+
+    override fun handleReloadJS() {
+        UiThreadUtil.assertOnUiThread()
+        hideRedboxDialog()
+        reactInstanceDevHelper.reload("MendixBridgelessDevSupportManager.handleReloadJS()")
+    }
+}