Merge branch 'main' into feat/android

CAMOBAP · web-flow · commit 10924500a017 · 2026-03-15T23:15:01.000+01:00
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Callstack Incubator
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@
 [![check](https://img.shields.io/github/actions/workflow/status/callstackincubator/react-native-sandbox/check.yml?style=for-the-badge)](https://github.com/callstackincubator/react-native-sandbox/actions/workflows/check.yml)
 [![platform: iOS](https://img.shields.io/badge/platform-iOS-blue.svg?style=for-the-badge)](https://img.shields.io/badge/platform-iOS-blue.svg)
 [![platform: Android](https://img.shields.io/badge/platform-android-green.svg?style=for-the-badge)](https://img.shields.io/badge/platform-android-green.svg)
+[![react-native >= 0.78](https://img.shields.io/badge/react--native-%3E%3D%200.78-61dafb.svg?style=for-the-badge&logo=react)](https://reactnative.dev/)
 
 </div>
 
diff --git a/apps/demo/android/app/src/main/java/com/demo/MainApplication.kt b/apps/demo/android/app/src/main/java/com/demo/MainApplication.kt
@@ -4,11 +4,13 @@ import android.app.Application
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
-import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
+import com.facebook.soloader.SoLoader
 
 class MainApplication : Application(), ReactApplication {
 
@@ -33,6 +35,9 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    loadReactNative(this)
+    SoLoader.init(this, OpenSourceMergedSoMapping)
+    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+      load()
+    }
   }
 }
diff --git a/apps/demo/android/build.gradle b/apps/demo/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         compileSdkVersion = 35
         targetSdkVersion = 35
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.1.20"
+        kotlinVersion = "2.0.21"
     }
     repositories {
         google()
diff --git a/apps/demo/android/gradle/wrapper/gradle-wrapper.properties b/apps/demo/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/apps/demo/ios/Demo/AppDelegate.swift b/apps/demo/ios/Demo/AppDelegate.swift
@@ -4,36 +4,15 @@ import React_RCTAppDelegate
 import ReactAppDependencyProvider
 
 @main
-class AppDelegate: UIResponder, UIApplicationDelegate {
-  var window: UIWindow?
+class AppDelegate: RCTAppDelegate {
+  override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+    self.moduleName = "Demo"
+    self.dependencyProvider = RCTAppDependencyProvider()
+    self.initialProps = [:]
 
-  var reactNativeDelegate: ReactNativeDelegate?
-  var reactNativeFactory: RCTReactNativeFactory?
-
-  func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
-  ) -> Bool {
-    let delegate = ReactNativeDelegate()
-    let factory = RCTReactNativeFactory(delegate: delegate)
-    delegate.dependencyProvider = RCTAppDependencyProvider()
-
-    reactNativeDelegate = delegate
-    reactNativeFactory = factory
-
-    window = UIWindow(frame: UIScreen.main.bounds)
-
-    factory.startReactNative(
-      withModuleName: "Demo",
-      in: window,
-      launchOptions: launchOptions
-    )
-
-    return true
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
-}
 
-class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
   override func sourceURL(for bridge: RCTBridge) -> URL? {
     self.bundleURL()
   }
diff --git a/apps/demo/ios/Podfile.lock b/apps/demo/ios/Podfile.lock
@@ -2019,7 +2019,7 @@ PODS:
     - React-timing
     - React-utils
     - SocketRocket
-  - React-Sandbox (0.4.0):
+  - React-Sandbox (0.4.1):
     - boost
     - DoubleConversion
     - fast_float
@@ -2451,7 +2451,7 @@ SPEC CHECKSUMS:
   React-runtimeexecutor: 17c70842d5e611130cb66f91e247bc4a609c3508
   React-RuntimeHermes: 3c88e6e1ea7ea0899dcffc77c10d61ea46688cfd
   React-runtimescheduler: 024500621c7c93d65371498abb4ee26d34f5d47d
-  React-Sandbox: e3cf3c955559ed9f0bf014b29dce1e94600cd790
+  React-Sandbox: 9c091813e335735668c62b2d3dbeb1456f93d8a5
   React-timing: c3c923df2b86194e1682e01167717481232f1dc7
   React-utils: 9154a037543147e1c24098f1a48fc8472602c092
   ReactAppDependencyProvider: afd905e84ee36e1678016ae04d7370c75ed539be
diff --git a/bun.lock b/bun.lock
diff --git a/package.json b/package.json
@@ -77,5 +77,5 @@
     "node": ">=18"
   },
   "packageManager": "bun@1.1.0",
-  "version": "0.4.0"
+  "version": "0.4.1"
 }
diff --git a/packages/react-native-sandbox/README.md b/packages/react-native-sandbox/README.md
@@ -7,6 +7,13 @@
 
 This is the **developer documentation** for installing and using `@callstack/react-native-sandbox` in your React Native application.
 
+## Requirements
+
+- **React Native >= 0.78**
+- **New Architecture** (Fabric) enabled
+
+This library uses `RCTReactNativeFactory`, C++ TurboModules, and Fabric component APIs that are only available starting from React Native 0.78. It does not include an Old Architecture / Bridge fallback.
+
 ## 📦 Installation
 
 ### npm/yarn
diff --git a/packages/react-native-sandbox/ios/SandboxReactNativeViewComponentView.mm b/packages/react-native-sandbox/ios/SandboxReactNativeViewComponentView.mm
@@ -9,6 +9,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTFollyConvert.h>
+#import <ReactCommon/RCTHost+Internal.h>
 #import <ReactCommon/RCTHost.h>
 
 #import "SandboxReactNativeDelegate.h"
@@ -74,6 +75,10 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
 
     if (oldViewProps.jsBundleSource != newViewProps.jsBundleSource) {
       [self.reactNativeDelegate setJsBundleSource:newViewProps.jsBundleSource];
+      RCTHost *host = self.reactNativeFactory.rootViewFactory.reactHost;
+      if (host) {
+        [host reload];
+      }
     }
 
     if (oldViewProps.allowedTurboModules != newViewProps.allowedTurboModules) {
diff --git a/packages/react-native-sandbox/package.json b/packages/react-native-sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@callstack/react-native-sandbox",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A component to run multiple React Native instances side-by-side.",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -49,8 +49,8 @@
     ]
   },
   "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
+    "react": ">=19.0.0",
+    "react-native": ">=0.78.0"
   },
   "devDependencies": {
     "react": "19.1.0",

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`compileSdkVersion = 35`
`6`	`6`	`targetSdkVersion = 35`
`7`	`7`	`ndkVersion = "27.1.12297006"`
`8`		`- kotlinVersion = "2.1.20"`
	`8`	`+ kotlinVersion = "2.0.21"`
`9`	`9`	`}`
`10`	`10`	`repositories {`
`11`	`11`	`google()`
Original file line number	Diff line number	Diff line change
`@@ -77,5 +77,5 @@`
`77`	`77`	`"node": ">=18"`
`78`	`78`	`},`
`79`	`79`	`"packageManager": "bun@1.1.0",`
`80`		`- "version": "0.4.0"`
	`80`	`+ "version": "0.4.1"`
`81`	`81`	`}`