expo-modules-core 2.3.8 → 2.3.10

package/android/src/main/java/expo/modules/kotlin/objects/ObjectDefinitionBuilder.kt

@@ -8,7 +8,7 @@ import expo.modules.kotlin.component6
 import expo.modules.kotlin.component7
 import expo.modules.kotlin.component8
 import expo.modules.kotlin.events.EventsDefinition
-import expo.modules.kotlin.functions.AsyncFunction
+import expo.modules.kotlin.functions.AsyncFunctionComponent
 import expo.modules.kotlin.functions.AsyncFunctionBuilder
 import expo.modules.kotlin.functions.AsyncFunctionWithPromiseComponent
 import expo.modules.kotlin.functions.FunctionBuilder
@@ -47,7 +47,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   internal var syncFunctionBuilder = mutableMapOf<String, FunctionBuilder>()
 
   @PublishedApi
-  internal var asyncFunctions = mutableMapOf<String, AsyncFunction>()
+  internal var asyncFunctions = mutableMapOf<String, AsyncFunctionComponent>()
 
   private var asyncFunctionBuilders = mutableMapOf<String, AsyncFunctionBuilder>()
 
@@ -222,7 +222,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun AsyncFunction(
     name: String,
     crossinline body: () -> Any?
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, emptyArray()) { body() }.also {
       asyncFunctions[name] = it
     }
@@ -231,7 +231,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R> AsyncFunction(
     name: String,
     crossinline body: () -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, emptyArray()) { body() }.also {
       asyncFunctions[name] = it
     }
@@ -240,7 +240,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0> AsyncFunction(
     name: String,
     crossinline body: (p0: P0) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     // We can't split that function, because that introduces a ambiguity when creating DSL component without parameters.
     return if (P0::class.java == Promise::class.java) {
       AsyncFunctionWithPromiseComponent(name, arrayOf()) { _, promise -> body(promise as P0) }
@@ -257,7 +257,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1>()) { (p0, p1) ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1)
@@ -270,7 +270,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0>()) { (p0), promise ->
       enforceType<P0>(p0)
       body(p0, promise)
@@ -282,7 +282,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2>()) { (p0, p1, p2) ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2)
@@ -295,7 +295,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1>()) { (p0, p1), promise ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1, promise)
@@ -307,7 +307,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3) ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3)
@@ -320,7 +320,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2>()) { (p0, p1, p2), promise ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2, promise)
@@ -332,7 +332,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4) ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4)
@@ -345,7 +345,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3), promise ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3, promise)
@@ -357,7 +357,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>()) { (p0, p1, p2, p3, p4, p5) ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       body(p0, p1, p2, p3, p4, p5)
@@ -370,7 +370,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4), promise ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4, promise)
@@ -382,7 +382,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (p0, p1, p2, p3, p4, p5, p6) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       body(p0, p1, p2, p3, p4, p5, p6)
@@ -395,7 +395,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>()) { (p0, p1, p2, p3, p4, p5), promise ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       body(p0, p1, p2, p3, p4, p5, promise)
@@ -407,7 +407,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>()) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6, P7>(p0, p1, p2, p3, p4, p5, p6, p7)
       body(p0, p1, p2, p3, p4, p5, p6, p7)
@@ -420,7 +420,7 @@ open class ObjectDefinitionBuilder(customConverter: TypeConverterProvider? = nul
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (p0, p1, p2, p3, p4, p5, p6), promise ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       body(p0, p1, p2, p3, p4, p5, p6, promise)

package/android/src/main/java/expo/modules/kotlin/views/ViewDefinitionBuilder.kt

@@ -13,7 +13,7 @@ import expo.modules.kotlin.component7
 import expo.modules.kotlin.component8
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.UnexpectedException
-import expo.modules.kotlin.functions.AsyncFunction
+import expo.modules.kotlin.functions.AsyncFunctionComponent
 import expo.modules.kotlin.functions.AsyncFunctionBuilder
 import expo.modules.kotlin.functions.AsyncFunctionWithPromiseComponent
 import expo.modules.kotlin.functions.Queues
@@ -47,7 +47,7 @@ class ViewDefinitionBuilder<T : View>(
   private var callbacksDefinition: CallbacksDefinition? = null
 
   @PublishedApi
-  internal var asyncFunctions = mutableMapOf<String, AsyncFunction>()
+  internal var asyncFunctions = mutableMapOf<String, AsyncFunctionComponent>()
 
   private var functionBuilders = mutableMapOf<String, AsyncFunctionBuilder>()
 
@@ -193,7 +193,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun AsyncFunction(
     name: String,
     crossinline body: () -> Any?
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, emptyArray()) { body() }.also {
       asyncFunctions[name] = it
     }
@@ -202,7 +202,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R> AsyncFunction(
     name: String,
     crossinline body: () -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, emptyArray()) { body() }.also {
       asyncFunctions[name] = it
     }
@@ -211,7 +211,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0> AsyncFunction(
     name: String,
     crossinline body: (p0: P0) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     // We can't split that function, because that introduces a ambiguity when creating DSL component without parameters.
     return if (P0::class == Promise::class) {
       AsyncFunctionWithPromiseComponent(name, emptyArray()) { _, promise -> body(promise as P0) }
@@ -228,7 +228,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1>()) { (p0, p1) ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1)
@@ -241,7 +241,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0>()) { (p0), promise ->
       enforceType<P0>(p0)
       body(p0, promise)
@@ -253,7 +253,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2>()) { (p0, p1, p2) ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2)
@@ -266,7 +266,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1>()) { (p0, p1), promise ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1, promise)
@@ -278,7 +278,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3) ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3)
@@ -291,7 +291,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2>()) { (p0, p1, p2), promise ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2, promise)
@@ -303,7 +303,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4) ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4)
@@ -316,7 +316,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3), promise ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3, promise)
@@ -328,7 +328,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>()) { (p0, p1, p2, p3, p4, p5) ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       body(p0, p1, p2, p3, p4, p5)
@@ -341,7 +341,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4), promise ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4, promise)
@@ -353,7 +353,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (p0, p1, p2, p3, p4, p5, p6) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       body(p0, p1, p2, p3, p4, p5, p6)
@@ -366,7 +366,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>()) { (p0, p1, p2, p3, p4, p5), promise ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       body(p0, p1, p2, p3, p4, p5, promise)
@@ -378,7 +378,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>()) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6, P7>(p0, p1, p2, p3, p4, p5, p6, p7)
       body(p0, p1, p2, p3, p4, p5, p6, p7)
@@ -391,7 +391,7 @@ class ViewDefinitionBuilder<T : View>(
   inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncFunction(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: Promise) -> R
-  ): AsyncFunction {
+  ): AsyncFunctionComponent {
     return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (p0, p1, p2, p3, p4, p5, p6), promise ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       body(p0, p1, p2, p3, p4, p5, p6, promise)

package/android/src/withoutCompose/expo/modules/kotlin/views/ModuleDefinitionBuilderComposeExtension.kt

@@ -0,0 +1,10 @@
+@file:Suppress("FunctionName")
+
+package expo.modules.kotlin.views
+
+import expo.modules.kotlin.modules.InternalModuleDefinitionBuilder
+import expo.modules.kotlin.modules.Module
+
+open class ModuleDefinitionBuilderWithCompose(
+  module: Module? = null
+) : InternalModuleDefinitionBuilder(module)

package/common/cpp/TestingSyncJSCallInvoker.h

@@ -21,7 +21,6 @@ class TestingSyncJSCallInvoker : public react::CallInvoker {
 public:
   explicit TestingSyncJSCallInvoker(const std::shared_ptr<jsi::Runtime>& runtime) : runtime(runtime) {}
 
-#if REACT_NATIVE_TARGET_VERSION >= 75
   void invokeAsync(react::CallFunc &&func) noexcept override {
     func(*runtime.lock());
   }
@@ -29,15 +28,6 @@ public:
   void invokeSync(react::CallFunc &&func) override {
     func(*runtime.lock());
   }
-#else
-  void invokeAsync(std::function<void()> &&func) noexcept override {
-    func();
-  }
-
-  void invokeSync(std::function<void()> &&func) override {
-    func();
-  }
-#endif
 
   ~TestingSyncJSCallInvoker() override = default;
 

package/ios/Api/Builders/ViewDefinitionBuilder.swift

@@ -55,6 +55,11 @@ public struct ViewDefinitionBuilder<ViewType: UIView> {
       function.runOnQueue(.main)
       function.takesOwner = true
     }
+
+    if var function = element as? AnyConcurrentFunctionDefinition {
+      function.requiresMainActor = true
+      function.takesOwner = true
+    }
     return element
   }
 }

package/ios/Core/Functions/AsyncFunctionDefinition.swift

@@ -9,6 +9,7 @@ internal protocol AnyAsyncFunctionDefinition: AnyFunctionDefinition {
   /**
    Specifies on which queue the function should run.
    */
+  @discardableResult
   func runOnQueue(_ queue: DispatchQueue?) -> Self
 }
 

package/ios/Core/Functions/ConcurrentFunctionDefinition.swift

@@ -1,10 +1,20 @@
 // Copyright 2022-present 650 Industries. All rights reserved.
 
+/**
+ Type-erased protocol for asynchronous functions using Swift concurrency
+ */
+internal protocol AnyConcurrentFunctionDefinition: AnyFunctionDefinition {
+  /**
+   Specifies if the main actor should be used. Necessary when attached to a view
+   */
+  var requiresMainActor: Bool { get set }
+}
+
 /**
  Represents a concurrent function that can only be called asynchronously, thus its JavaScript equivalent returns a Promise.
  As opposed to `AsyncFunctionDefinition`, it can leverage the new Swift's concurrency model and take the async/await closure.
  */
-public final class ConcurrentFunctionDefinition<Args, FirstArgType, ReturnType>: AnyFunctionDefinition {
+public final class ConcurrentFunctionDefinition<Args, FirstArgType, ReturnType>: AnyConcurrentFunctionDefinition {
   typealias ClosureType = (Args) async throws -> ReturnType
 
   let body: ClosureType
@@ -31,6 +41,7 @@ public final class ConcurrentFunctionDefinition<Args, FirstArgType, ReturnType>:
   }
 
   var takesOwner: Bool = false
+  var requiresMainActor: Bool = false
 
   func call(by owner: AnyObject?, withArguments args: [Any], appContext: AppContext, callback: @escaping (FunctionCallResult) -> Void) {
     var arguments: [Any]
@@ -62,7 +73,14 @@ public final class ConcurrentFunctionDefinition<Args, FirstArgType, ReturnType>:
 
       do {
         // Convert arguments to the types desired by the function.
-        let finalArguments = try cast(arguments: arguments, forFunction: self, appContext: appContext)
+        var finalArguments: [Any]
+        if requiresMainActor {
+          finalArguments = try await MainActor.run {
+            try cast(arguments: arguments, forFunction: self, appContext: appContext)
+          }
+        } else {
+          finalArguments = try cast(arguments: arguments, forFunction: self, appContext: appContext)
+        }
 
         // TODO: Right now we force cast the tuple in all types of functions, but we should throw another exception here.
         // swiftlint:disable force_cast

package/ios/Core/Promise.swift

@@ -20,12 +20,14 @@ public struct Promise: AnyArgument {
 
   public func resolve(_ value: Any? = nil) {
     if let value = value as? AnySharedObject {
-      let result = Conversions.convertFunctionResult(
-        value,
-        appContext: appContext,
-        dynamicType: type(of: value).getDynamicType()
-      )
-      resolver(result)
+      resolver(JavaScriptSharedObjectBinding.init {
+        return Conversions.convertFunctionResult(
+          value,
+          appContext: appContext,
+          dynamicType: type(of: value).getDynamicType()
+          // swiftlint:disable:next force_cast
+        ) as! JavaScriptObject
+      })
       return
     }
     resolver(value)

package/ios/Core/Views/SwiftUI/SwiftUIViewDefinition.swift

@@ -19,7 +19,8 @@ public extension ExpoSwiftUIView {
   /**
    Returns React's children as SwiftUI views.
    */
-  func Children() -> some View { // swiftlint:disable:this identifier_name
+  // swiftlint:disable:next identifier_name
+  func Children() -> ForEach<[any ExpoSwiftUI.AnyChild], ObjectIdentifier, AnyView> {
     ForEach(props.children ?? [], id: \.id) { child in
       let view: any View = child.childView
       AnyView(view)

package/ios/Core/Views/SwiftUI/SwiftUIViewDefinitionBuilder.swift

@@ -30,6 +30,11 @@ extension ExpoSwiftUI {
         function.runOnQueue(.main)
         function.takesOwner = true
       }
+
+      if var function = element as? AnyConcurrentFunctionDefinition {
+        function.requiresMainActor = true
+        function.takesOwner = true
+      }
       return element
     }
   }

package/ios/JSI/EXJSIConversions.mm

@@ -7,6 +7,7 @@
 #import <ExpoModulesCore/EXJSIConversions.h>
 #import <ExpoModulesCore/EXJavaScriptValue.h>
 #import <ExpoModulesCore/EXJavaScriptRuntime.h>
+#import <ExpoModulesCore/EXJavaScriptSharedObjectBinding.h>
 
 namespace expo {
 
@@ -78,6 +79,9 @@ jsi::Value convertObjCObjectToJSIValue(jsi::Runtime &runtime, id value)
   if ([value isKindOfClass:[EXJavaScriptWeakObject class]]) {
     return jsi::Value(runtime, *[[(EXJavaScriptWeakObject *)value lock] get]);
   }
+  if ([value isKindOfClass:[EXJavaScriptSharedObjectBinding class]]) {
+    return jsi::Value(runtime, *[[(EXJavaScriptSharedObjectBinding *)value get] get]);
+  }
   if ([value isKindOfClass:[NSString class]]) {
     return convertNSStringToJSIString(runtime, (NSString *)value);
   } else if ([value isKindOfClass:[NSNumber class]]) {

package/ios/JSI/EXJavaScriptRuntime.mm

@@ -14,7 +14,7 @@
 #import <ExpoModulesCore/EXJSIConversions.h>
 #import <ExpoModulesCore/SharedObject.h>
 #import <ExpoModulesCore/Swift.h>
-#import <ExpoModulesCore/TestingSyncJSCallInvoker.h>
+#import <ExpoModulesCore/TestingJSCallInvoker.h>
 
 @implementation EXJavaScriptRuntime {
   std::shared_ptr<jsi::Runtime> _runtime;
@@ -45,7 +45,7 @@
 #else
     _runtime = jsc::makeJSCRuntime();
 #endif
-    _jsCallInvoker = std::make_shared<expo::TestingSyncJSCallInvoker>(_runtime);
+    _jsCallInvoker = std::make_shared<expo::TestingJSCallInvoker>(_runtime);
   }
   return self;
 }

package/ios/JSI/EXJavaScriptSharedObjectBinding.h

@@ -0,0 +1,25 @@
+// Copyright 2023-present 650 Industries. All rights reserved.
+
+#import <Foundation/Foundation.h>
+#import <ExpoModulesCore/EXJavaScriptRuntime.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef EXJavaScriptObject * _Nonnull (^EXJavaScriptObjectBindingGetter)(void);
+
+NS_SWIFT_NAME(JavaScriptSharedObjectBinding)
+@interface EXJavaScriptSharedObjectBinding : NSObject
+
+@property (nonatomic, copy) EXJavaScriptObjectBindingGetter getter;
+
+- (instancetype)initWithGetter:(EXJavaScriptObjectBindingGetter)getter
+      NS_DESIGNATED_INITIALIZER
+      NS_SWIFT_NAME(init(getter:));
+
+- (instancetype)init NS_UNAVAILABLE;
+
+- (EXJavaScriptObject *)get;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/JSI/EXJavaScriptSharedObjectBinding.mm

@@ -0,0 +1,24 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+#import <ExpoModulesCore/EXJSIConversions.h>
+#import <ExpoModulesCore/EXJavaScriptSharedObjectBinding.h>
+
+/**
+  A wrapper around a SharedObject getter – The getter is a Swift lambda that creates the JS object and registers the pair in registry.
+  Needed to make sure the registration happens on the correct thread when called from inside EXJSIConversions.
+ */
+@implementation EXJavaScriptSharedObjectBinding
+
+- (nonnull instancetype)initWithGetter:(EXJavaScriptObjectBindingGetter)getter
+{
+  self.getter = getter;
+  return self;
+}
+
+- (EXJavaScriptObject *)get
+{
+  auto obj = self.getter();
+  return obj;
+}
+
+@end

package/ios/TestUtils/MainThreadInvoker.h

@@ -0,0 +1,14 @@
+// Copyright 2023-present 650 Industries. All rights reserved.
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include <functional>
+
+class MainThreadInvoker {
+public:
+  static void invokeOnMainThread(const std::function<void()> task);
+};
+
+#endif // __cplusplus

package/ios/TestUtils/MainThreadInvoker.mm

@@ -0,0 +1,19 @@
+// Copyright 2023-present 650 Industries. All rights reserved.
+
+#ifdef __cplusplus
+
+#import <ExpoModulesCore/MainThreadInvoker.h>
+#import <Foundation/Foundation.h>
+
+void MainThreadInvoker::invokeOnMainThread(const std::function<void()> task) {
+  dispatch_block_t block = [task]() {
+    task();
+  };
+  if ([NSThread isMainThread]) {
+      block();
+  } else {
+      dispatch_async(dispatch_get_main_queue(), block);
+  }
+}
+
+#endif // __cplusplus

package/ios/TestUtils/TestingJSCallInvoker.h

@@ -0,0 +1,46 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include <ReactCommon/CallInvoker.h>
+#include <ExpoModulesCore/MainThreadInvoker.h>
+
+#include <jsi/jsi.h>
+
+namespace jsi = facebook::jsi;
+namespace react = facebook::react;
+
+namespace expo {
+
+/**
+ * Dummy CallInvoker.
+ * Async functions are invoked on the main thread on iOS.
+ * Used in the test environment to check the async flow.
+ */
+class TestingJSCallInvoker : public react::CallInvoker {
+public:
+  explicit TestingJSCallInvoker(const std::shared_ptr<jsi::Runtime>& runtime) : runtime(runtime) {}
+
+  void invokeAsync(react::CallFunc &&func) noexcept override {
+    auto weakRuntime = runtime;
+    std::function<void()> mainThreadFunc = [weakRuntime, func]() {
+      auto strongRuntime = weakRuntime.lock();
+      func(*strongRuntime);
+    };
+    MainThreadInvoker::invokeOnMainThread(mainThreadFunc);
+  }
+
+  void invokeSync(react::CallFunc &&func) override {
+    func(*runtime.lock());
+  }
+
+  ~TestingJSCallInvoker() override = default;
+
+  std::weak_ptr<jsi::Runtime> runtime;
+};
+
+} // namespace expo
+
+#endif // __cplusplus