expo-modules-core 2.3.9 → 2.3.10

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 2.3.10 — 2025-04-28
+
+### 🐛 Bug fixes
+
+- [iOS] Fix concurrent functions on views. ([#36431](https://github.com/expo/expo/pull/36431) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 2.3.9 — 2025-04-25
 
 ### 💡 Others

package/android/build.gradle

@@ -25,7 +25,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '2.3.9'
+version = '2.3.10'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -75,7 +75,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.3.9"
+    versionName "2.3.10"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.3.9",
+  "version": "2.3.10",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-native": "^13.1.0",
     "expo-module-scripts": "^4.1.5"
   },
-  "gitHead": "3cd208465df78e385ca9380531bbbfe33ca68e81"
+  "gitHead": "a639a661a5329e58f916cf69b8f1a7718bbdd26e"
 }