expo-modules-core 2.0.6 → 2.1.1

package/CHANGELOG.md

@@ -10,6 +10,25 @@
 
 ### 💡 Others
 
+## 2.1.1 — 2024-12-02
+
+_This version does not introduce any user-facing changes._
+
+## 2.1.0 — 2024-11-29
+
+### 🎉 New features
+
+- Added support for rendering children components in SwiftUI views. ([#33271](https://github.com/expo/expo/pull/33271) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- Fixed backwards compatibility in the `EventEmitter` constructor. ([#33294](https://github.com/expo/expo/pull/33294) by [@tsapeta](https://github.com/tsapeta))
+
+### 💡 Others
+
+- Fixed compatibility for React Native 0.77. ([#33277](https://github.com/expo/expo/pull/33277) by [@kudo](https://github.com/kudo))
+- [Android] Bump KSP version for Kotlin 2.0.21. ([#33306](https://github.com/expo/expo/pull/33306) by [@kudo](https://github.com/kudo))
+
 ## 2.0.6 — 2024-11-22
 
 ### 🐛 Bug fixes

package/android/ExpoModulesCorePlugin.gradle

@@ -27,7 +27,7 @@ class KotlinExpoModulesCorePlugin implements Plugin<Project> {
           "1.8.22": "1.8.22-1.0.11",
           "1.9.23": "1.9.23-1.0.20",
           "1.9.24": "1.9.24-1.0.20",
-          "2.0.21": "2.0.21-1.0.27"
+          "2.0.21": "2.0.21-1.0.28"
         ]
 
         project.rootProject.ext.has("kspVersion")

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.0.6'
+version = '2.1.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -67,7 +67,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.0.6"
+    versionName "2.1.1"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

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

@@ -15,6 +15,7 @@ import com.facebook.react.uimanager.style.BoxShadow
 import com.facebook.react.uimanager.style.LogicalEdge
 import expo.modules.kotlin.types.enforceType
 import expo.modules.kotlin.views.ViewDefinitionBuilder
+import expo.modules.rncompatibility.parseBoxShadow
 
 inline fun <reified T : View> ViewDefinitionBuilder<T>.UseBorderColorProps(crossinline body: (view: T, edge: LogicalEdge, color: Int?) -> Unit) {
   PropGroup(
@@ -143,7 +144,7 @@ inline fun <reified T : View> ViewDefinitionBuilder<T>.UseBoxShadowProp(crossinl
 
     val shadowStyle = mutableListOf<BoxShadow>()
     for (i in 0..<shadows.size()) {
-      val shadow = BoxShadow.parse(shadows.getMap(i)) ?: continue
+      val shadow = parseBoxShadow(shadows.getMap(i), view.context) ?: continue
       shadowStyle.add((shadow))
     }
     body(view, shadowStyle)

package/android/src/rn74/expo/modules/rncompatibility/RNCompatibleStaticWrapper.kt

@@ -0,0 +1,14 @@
+package expo.modules.rncompatibility
+
+import android.content.Context
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.uimanager.style.BoxShadow
+
+/**
+ * A compatible wrapper of [BoxShadow.parse] for React Native compatibility
+ * TODO(kudo,20241127): Remove this when we drop react-native 0.76 support
+ */
+@Suppress("UNUSED_PARAMETER")
+fun parseBoxShadow(boxShadow: ReadableMap, context: Context): BoxShadow? {
+  return BoxShadow.parse(boxShadow)
+}

package/android/src/rn77/expo/modules/rncompatibility/RNCompatibleStaticWrapper.kt

@@ -0,0 +1,13 @@
+package expo.modules.rncompatibility
+
+import android.content.Context
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.uimanager.style.BoxShadow
+
+/**
+ * A compatible wrapper of [BoxShadow.parse] for React Native compatibility
+ * TODO(kudo,20241127): Remove this when we drop react-native 0.76 support
+ */
+fun parseBoxShadow(boxShadow: ReadableMap?, context: Context): BoxShadow? {
+  return BoxShadow.parse(boxShadow, context)
+}

package/build/ts-declarations/EventEmitter.d.ts

@@ -32,6 +32,12 @@ export declare class EventEmitter<TEventsMap extends EventsMap = Record<never, n
      * Creates a new event emitter instance.
      */
     constructor();
+    /**
+     * @deprecated As of Expo SDK 52 the given object is already an EventEmitter.
+     * Creating a new one is not necessary.
+     * @hidden
+     */
+    constructor(object: EventEmitter);
     /**
      * Adds a listener for the given event name.
      */

package/build/ts-declarations/EventEmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventEmitter.d.ts","sourceRoot":"","sources":["../../src/ts-declarations/EventEmitter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;OAGG;IACH,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,UAAU,SAAS,SAAS,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC;IACnF;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,UAAU,CAAC;IAErC;;OAEG;;IAGH;;OAEG;IACH,WAAW,CAAC,SAAS,SAAS,MAAM,UAAU,EAC5C,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,GAC9B,iBAAiB;IAEpB;;OAEG;IACH,cAAc,CAAC,SAAS,SAAS,MAAM,UAAU,EAC/C,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,GAC9B,IAAI;IAEP;;OAEG;IACH,kBAAkB,CAAC,SAAS,EAAE,MAAM,UAAU,GAAG,IAAI;IAErD;;;OAGG;IACH,IAAI,CAAC,SAAS,SAAS,MAAM,UAAU,EACrC,SAAS,EAAE,SAAS,EACpB,GAAG,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,GACzC,IAAI;IAEP;;OAEG;IACH,aAAa,CAAC,SAAS,SAAS,MAAM,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,MAAM;IAE/E;;;OAGG;IACH,cAAc,CAAC,CAAC,SAAS,SAAS,MAAM,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;IAE/E;;;OAGG;IACH,aAAa,CAAC,CAAC,SAAS,SAAS,MAAM,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;CAC/E"}
+{"version":3,"file":"EventEmitter.d.ts","sourceRoot":"","sources":["../../src/ts-declarations/EventEmitter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;OAGG;IACH,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,UAAU,SAAS,SAAS,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC;IACnF;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,UAAU,CAAC;IAErC;;OAEG;;IAGH;;;;OAIG;gBACS,MAAM,EAAE,YAAY;IAEhC;;OAEG;IACH,WAAW,CAAC,SAAS,SAAS,MAAM,UAAU,EAC5C,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,GAC9B,iBAAiB;IAEpB;;OAEG;IACH,cAAc,CAAC,SAAS,SAAS,MAAM,UAAU,EAC/C,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,GAC9B,IAAI;IAEP;;OAEG;IACH,kBAAkB,CAAC,SAAS,EAAE,MAAM,UAAU,GAAG,IAAI;IAErD;;;OAGG;IACH,IAAI,CAAC,SAAS,SAAS,MAAM,UAAU,EACrC,SAAS,EAAE,SAAS,EACpB,GAAG,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,GACzC,IAAI;IAEP;;OAEG;IACH,aAAa,CAAC,SAAS,SAAS,MAAM,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,MAAM;IAE/E;;;OAGG;IACH,cAAc,CAAC,CAAC,SAAS,SAAS,MAAM,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;IAE/E;;;OAGG;IACH,aAAa,CAAC,CAAC,SAAS,SAAS,MAAM,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;CAC/E"}

package/common/cpp/EventEmitter.cpp

@@ -211,8 +211,13 @@ void installClass(jsi::Runtime &runtime) {
     // To provide backwards compatibility with the old EventEmitter where the native module object was passed as an argument.
     // We're checking if the argument is already an instance of the new emitter and if so, just return it without unnecessarily wrapping it.
     if (count > 0) {
-      jsi::Object firstArg = args[0].asObject(runtime);
-      jsi::Function constructor = thisValue.asObject(runtime).getPropertyAsFunction(runtime, "constructor");
+      // We need the tmp object to correctly unwrap the lazy object.
+      // For some reason, if we inline the retrieval of the first argument, the instanceOf check fails on Android.
+      // This is probably because the object is copied somewhere in the process.
+      const jsi::Object &tmp = args[0].asObject(runtime);
+      const jsi::Object &firstArg = LazyObject::unwrapObjectIfNecessary(runtime, tmp);
+
+      jsi::Function constructor = thisValue.getObject(runtime).getPropertyAsFunction(runtime, "constructor");
 
       if (firstArg.instanceOf(runtime, constructor)) {
         return jsi::Value(runtime, args[0]);

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

@@ -0,0 +1,45 @@
+// Copyright 2024-present 650 Industries. All rights reserved.
+
+import SwiftUI
+
+extension ExpoSwiftUI {
+  /**
+   View that renders an UIKit-based React child view and manages its layout by synchronizing `UIView.frame` with the SwiftUI system.
+
+   React Native sets `center` and `bounds` properties during the layout, but as per Apple docs, this is not recommended and may result
+   in undefined behavior (read more in ``UIViewRepresentable`` docs). To fix it, we're observing for changes in `bounds` and then
+   pass the new frame to SwiftUI so it can update its layout metrics and then set UIView's origin to zero (so it doesn't affect SwiftUI's layout in any way).
+   */
+  public struct Child: SwiftUI.View, Identifiable {
+    public let id: Int
+    public let view: UIView
+
+    @ObservedObject
+    private var layoutMetrics: LayoutMetrics
+
+    private let viewFrameObserver: UIViewFrameObserver
+
+    init(view: UIView) {
+      self.id = ObjectIdentifier(view).hashValue
+      self.view = view
+      self.layoutMetrics = LayoutMetrics(frame: view.frame)
+      self.viewFrameObserver = UIViewFrameObserver(view: view)
+
+      // Observe for layout changes made by React.
+      viewFrameObserver.observe { [weak view, layoutMetrics] frame in
+        // Update layout metrics for the SwiftUI view. This will trigger a re-render as it changes the observed object.
+        layoutMetrics.frame = frame
+
+        // Reset UIKit's origin to zero so it's fully controlled by `.offset(x:y:)` in SwiftUI.
+        // SwiftUI may reset it anyway, but we want this to be explicit.
+        view?.frame = CGRect(origin: .zero, size: frame.size)
+      }
+    }
+
+    public var body: some SwiftUI.View {
+      return UIViewHost(view: view)
+        .frame(width: layoutMetrics.width, height: layoutMetrics.height, alignment: .topLeading)
+        .offset(x: layoutMetrics.x, y: layoutMetrics.y)
+    }
+  }
+}

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

@@ -78,6 +78,32 @@ extension ExpoSwiftUI {
     }
 
 #if os(iOS) || os(tvOS)
+#if RCT_NEW_ARCH_ENABLED
+    /**
+     Fabric calls this function when mounting (attaching) a child component view.
+     */
+    public override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+      var children = props.children ?? []
+      let child = Child(view: childComponentView)
+
+      children.insert(child, at: index)
+
+      props.children = children
+    }
+
+    /**
+     Fabric calls this function when unmounting (detaching) a child component view.
+     */
+    public override func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
+      // Make sure the view has no superview, React Native asserts against this.
+      childComponentView.removeFromSuperview()
+
+      if let children = props.children {
+        props.children = children.filter({ $0.view != childComponentView })
+      }
+    }
+#endif // RCT_NEW_ARCH_ENABLED
+
     /**
      Setups layout constraints of the hosting controller view to match the layout set by React.
      */

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

@@ -0,0 +1,31 @@
+// Copyright 2024-present 650 Industries. All rights reserved.
+
+extension ExpoSwiftUI {
+  /**
+   Represents layout metrics to apply on SwiftUI view, i.e. its size and offset.
+   */
+  class LayoutMetrics: ObservableObject {
+    @Published
+    var frame: CGRect = .zero
+
+    init(frame: CGRect) {
+      self.frame = frame
+    }
+
+    var width: CGFloat {
+      return frame.width
+    }
+
+    var height: CGFloat {
+      return frame.height
+    }
+
+    var x: CGFloat {
+      return frame.minX
+    }
+
+    var y: CGFloat {
+      return frame.minY
+    }
+  }
+}

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

@@ -14,6 +14,17 @@ public protocol ExpoSwiftUIView<Props>: SwiftUI.View {
   init()
 }
 
+public extension ExpoSwiftUIView {
+  /**
+   Returns React's children as SwiftUI views.
+   */
+  func Children() -> some View { // swiftlint:disable:this identifier_name
+    ZStack(alignment: .topLeading) {
+      ForEach(props.children ?? []) { $0 }
+    }
+  }
+}
+
 extension ExpoSwiftUI {
   public typealias View = ExpoSwiftUIView
 

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

@@ -0,0 +1,32 @@
+// Copyright 2024-present 650 Industries. All rights reserved.
+
+extension ExpoSwiftUI {
+  /**
+   Observes for view frame changes, usually applied by React Native.
+   */
+  internal class UIViewFrameObserver {
+    private let view: UIView
+    private var observer: NSKeyValueObservation?
+
+    init(view: UIView) {
+      self.view = view
+    }
+
+    func observe(_ callback: @escaping (CGRect) -> Void) {
+      // When React Native lays out views, it sets `center` and `bounds` properties to control the `frame`.
+      // You can find this implementation in `updateLayoutMetrics:oldLayoutMetrics:` in `UIView+ComponentViewProtocol.mm`.
+      // We observe changes on `bounds` because:
+      // - It's being changed after `center`, so the origin is already up-to-date.
+      // - `frame` changes much more often, it seems that SwiftUI does it as well.
+      observer = view.observe(\.bounds, options: [.old, .new]) { view, change in
+        guard let newValue = change.newValue else {
+          return
+        }
+
+        // Update layout metrics of the `Child` view. The `origin` needs to be frame's origin,
+        // as `bounds` refers to coordinates relative to view's own space (instead of the parent's space).
+        callback(CGRect(origin: view.frame.origin, size: newValue.size))
+      }
+    }
+  }
+}

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

@@ -0,0 +1,20 @@
+// Copyright 2024-present 650 Industries. All rights reserved.
+
+import SwiftUI
+
+extension ExpoSwiftUI {
+  /**
+   SwiftUI view that embeds an UIKit-based view.
+   */
+  struct UIViewHost: UIViewRepresentable {
+    let view: UIView
+
+    func makeUIView(context: Context) -> UIView {
+      return view
+    }
+
+    func updateUIView(_ uiView: UIView, context: Context) {
+      // Nothing to do here
+    }
+  }
+}

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

@@ -10,6 +10,11 @@ extension ExpoSwiftUI {
   open class ViewProps: ObservableObject, Record {
     public required init() {}
 
+    /**
+     An array of views passed by React as children.
+     */
+    @Field public var children: [Child]?
+
     internal func updateRawProps(_ rawProps: [String: Any], appContext: AppContext) throws {
       // Update the props just like the records
       try update(withDict: rawProps, appContext: appContext)

package/ios/Fabric/ExpoFabricViewObjC.h

@@ -1,10 +1,9 @@
 // Copyright 2022-present 650 Industries. All rights reserved.
 
+#import <ExpoModulesCore/Platform.h>
+
 #ifdef RCT_NEW_ARCH_ENABLED
 
-#if !TARGET_OS_OSX
-#import <UIKit/UIKit.h>
-#endif // !TARGET_OS_OSX
 #import <React/React-Core-umbrella.h>
 
 #ifdef __cplusplus
@@ -41,6 +40,18 @@
 
 - (BOOL)supportsPropWithName:(nonnull NSString *)name;
 
+// MARK: - Derived from RCTComponentViewProtocol
+
 - (void)prepareForRecycle;
 
+/*
+ * Called for mounting (attaching) a child component view inside `self` component view.
+ */
+- (void)mountChildComponentView:(nonnull UIView *)childComponentView index:(NSInteger)index;
+
+/*
+ * Called for unmounting (detaching) a child component view from `self` component view.
+ */
+- (void)unmountChildComponentView:(nonnull UIView *)childComponentView index:(NSInteger)index;
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.0.6",
+  "version": "2.1.1",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-native": "^12.5.2",
     "expo-module-scripts": "^4.0.0"
   },
-  "gitHead": "65ae6fda78837f77eea5a2107066fc545a211804"
+  "gitHead": "bc1fea6bcab47889e2922d543920397691b200f3"
 }

package/src/ts-declarations/EventEmitter.ts

@@ -36,6 +36,13 @@ export declare class EventEmitter<TEventsMap extends EventsMap = Record<never, n
    */
   constructor();
 
+  /**
+   * @deprecated As of Expo SDK 52 the given object is already an EventEmitter.
+   * Creating a new one is not necessary.
+   * @hidden
+   */
+  constructor(object: EventEmitter);
+
   /**
    * Adds a listener for the given event name.
    */