expo-modules-core 2.2.1 → 2.2.2

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 2.2.2 — 2025-02-14
+
+### 🎉 New features
+
+- [iOS] Support async functions by SwiftUI views ([#34853](https://github.com/expo/expo/pull/34853) by [@jakex7](https://github.com/jakex7))
+
 ## 2.2.1 — 2025-02-06
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '2.2.1'
+version = '2.2.2'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -86,7 +86,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.2.1"
+    versionName "2.2.2"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/ios/Api/Factories/ViewFactories.swift

@@ -19,6 +19,13 @@ public func View<Props: ExpoSwiftUI.ViewProps, ViewType: ExpoSwiftUI.View<Props>
   return ExpoSwiftUI.ViewDefinition(ViewType.self)
 }
 
+public func View<Props: ExpoSwiftUI.ViewProps, ViewType: ExpoSwiftUI.View<Props>>(
+  _ viewType: ViewType.Type,
+  @ExpoSwiftUI.ViewDefinitionBuilder<ViewType> _ elements: @escaping () -> [AnyViewDefinitionElement]
+) -> ExpoSwiftUI.ViewDefinition<Props, ViewType> {
+  return ExpoSwiftUI.ViewDefinition(ViewType.self, elements: elements())
+}
+
 // MARK: Props
 
 /**

package/ios/Core/DynamicTypes/DynamicSwiftUIViewType.swift

@@ -0,0 +1,59 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+internal struct DynamicSwiftUIViewType<ViewType: ExpoSwiftUIView>: AnyDynamicType {
+  let innerType: ViewType.Type
+
+  func wraps<InnerType>(_ type: InnerType.Type) -> Bool {
+    return innerType == InnerType.self
+  }
+
+  func equals(_ type: AnyDynamicType) -> Bool {
+    if let viewType = type as? Self {
+      return viewType.innerType == innerType
+    }
+    return false
+  }
+
+  /**
+   Casts from the React component instance to the view tag (`Int`).
+   */
+  func cast(jsValue: JavaScriptValue, appContext: AppContext) throws -> Any {
+    guard let viewTag = findViewTag(jsValue) else {
+      throw InvalidViewTagException()
+    }
+    return viewTag
+  }
+
+  /**
+   Converts a value of type `Int` to a native view with that tag in the given app context.
+   */
+  func cast<ValueType>(_ value: ValueType, appContext: AppContext) throws -> Any {
+    guard let viewTag = value as? Int else {
+      throw InvalidViewTagException()
+    }
+    guard Thread.isMainThread else {
+      throw NonMainThreadException()
+    }
+    guard let view = appContext.findView(withTag: viewTag, ofType: AnyExpoSwiftUIHostingView.self) else {
+      throw Exceptions.SwiftUIViewNotFound((tag: viewTag, type: innerType.self))
+    }
+    return view.getContentView()
+  }
+
+  var description: String {
+    return "View<\(innerType)>"
+  }
+}
+
+private func findViewTag(_ value: JavaScriptValue) -> Int? {
+  if value.isNumber() {
+    return value.getInt()
+  }
+  if value.isObject() {
+    let nativeTag = value.getObject().getProperty("nativeTag")
+    if nativeTag.isNumber() {
+      return nativeTag.getInt()
+    }
+  }
+  return nil
+}

package/ios/Core/Exceptions/CommonExceptions.swift

@@ -39,6 +39,11 @@ public struct Exceptions {
       "Unable to find the '\(param.type)' view with tag '\(param.tag)'"
     }
   }
+  public final class SwiftUIViewNotFound<ViewType: ExpoSwiftUIView>: GenericException<(tag: Int, type: ViewType.Type)> {
+    override public var reason: String {
+      "Unable to find the '\(param.type)' view with tag '\(param.tag)'"
+    }
+  }
 
   /**
    An exception to throw when there is no module implementing the `EXFileSystemInterface` interface.

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

@@ -7,6 +7,7 @@ import SwiftUI
  */
 internal protocol AnyExpoSwiftUIHostingView {
   func updateProps(_ rawProps: [String: Any])
+  func getContentView() -> any ExpoSwiftUI.View
 }
 
 extension ExpoSwiftUI {
@@ -21,6 +22,7 @@ extension ExpoSwiftUI {
      It's an environment object that is observed by the content view.
      */
     private let props: Props
+    private let contentView: any ExpoSwiftUI.View
 
     /**
      View controller that embeds the content view into the UIKit view hierarchy.
@@ -31,8 +33,8 @@ extension ExpoSwiftUI {
      Initializes a SwiftUI hosting view with the given SwiftUI view type.
      */
     init(viewType: ContentView.Type, props: Props, appContext: AppContext) {
-      let rootView = ContentView().environmentObject(props)
-
+      self.contentView = ContentView()
+      let rootView = AnyView(contentView.environmentObject(props))
       self.props = props
       self.hostingController = UIHostingController(rootView: rootView)
 
@@ -67,6 +69,13 @@ extension ExpoSwiftUI {
       }
     }
 
+    /**
+     Returns inner SwiftUI view.
+     */
+    public func getContentView() -> any ExpoSwiftUI.View {
+      return contentView
+    }
+
     /**
      Returns a bool value whether the view supports prop with the given name.
      */

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

@@ -6,10 +6,11 @@ import Combine
 /**
  A protocol for SwiftUI views that need to access props.
  */
-public protocol ExpoSwiftUIView<Props>: SwiftUI.View {
+public protocol ExpoSwiftUIView<Props>: SwiftUI.View, AnyArgument {
   associatedtype Props: ExpoSwiftUI.ViewProps
 
   var props: Props { get }
+  static func getDynamicType() -> AnyDynamicType
 
   init()
 }
@@ -23,6 +24,10 @@ public extension ExpoSwiftUIView {
       ForEach(props.children ?? []) { $0 }
     }
   }
+
+  static func getDynamicType() -> AnyDynamicType {
+    return DynamicSwiftUIViewType(innerType: Self.self)
+  }
 }
 
 extension ExpoSwiftUI {
@@ -36,6 +41,10 @@ extension ExpoSwiftUI {
       super.init(HostingView<Props, ViewType>.self, elements: [])
     }
 
+    init(_ viewType: ViewType.Type, elements: [AnyViewDefinitionElement]) {
+      super.init(HostingView<Props, ViewType>.self, elements: elements)
+    }
+
     public override func createView(appContext: AppContext) -> UIView? {
       let props = Props()
       return HostingView(viewType: ViewType.self, props: props, appContext: appContext)

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

@@ -0,0 +1,36 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+extension ExpoSwiftUI {
+  /**
+   A result builder for the view elements such as prop setters or view events.
+   */
+  @resultBuilder
+  public struct ViewDefinitionBuilder<ViewType: ExpoSwiftUI.View> {
+    public static func buildBlock(_ elements: AnyViewDefinitionElement...) -> [AnyViewDefinitionElement] {
+      return elements
+    }
+
+    /**
+     Accepts functions as a view definition elements.
+     */
+    public static func buildExpression<ElementType: ViewDefinitionFunctionElement>(
+      _ element: ElementType
+    ) -> AnyViewDefinitionElement {
+      return element
+    }
+
+    /**
+     Accepts functions that take the owner as a view definition elements.
+     */
+    public static func buildExpression<ElementType: ViewDefinitionFunctionElement>(
+      _ element: ElementType
+    ) -> AnyViewDefinitionElement where ElementType.ViewType == ViewType {
+      // Enforce async functions to run on the main queue
+      if var function = element as? AnyAsyncFunctionDefinition {
+        function.runOnQueue(.main)
+        function.takesOwner = true
+      }
+      return element
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@testing-library/react-native": "^12.5.2",
-    "expo-module-scripts": "^4.0.3"
+    "expo-module-scripts": "^4.0.4"
   },
-  "gitHead": "9442f00874e0cd738030abae80e5bdef184a2581"
+  "gitHead": "7080126694798ca950d5dc3ef33483a17fa401bb"
 }