expo-modules-core 2.3.4 → 2.3.5

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 2.3.5 — 2025-04-14
+
+### 🐛 Bug fixes
+
+- Fixed `UnwrappedChildren` not get the unwrapped content view for SwiftUI integration. ([#36112](https://github.com/expo/expo/pull/36112) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Removed the limitation to use `collapsable={false}` when hosting a UIView in SwiftUI views. ([#36153](https://github.com/expo/expo/pull/36153) by [@kudo](https://github.com/kudo))
+
 ## 2.3.4 — 2025-04-11
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -23,7 +23,7 @@ if (KOTLIN_MAJOR_VERSION >= 2) {
 }
 
 group = 'host.exp.exponent'
-version = '2.3.4'
+version = '2.3.5'
 
 // List of features that are required by linked modules
 def coreFeatures = project.findProperty("coreFeatures") ?: []
@@ -76,7 +76,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.3.4"
+    versionName "2.3.5"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 

package/build/EventEmitter.d.ts

@@ -1,5 +1,14 @@
 import type { EventEmitter } from './ts-declarations/EventEmitter';
-export type { EventSubscription } from './ts-declarations/EventEmitter';
+/**
+ * A subscription object that allows to conveniently remove an event listener from the emitter.
+ */
+export interface EventSubscription {
+    /**
+     * Removes an event listener for which the subscription has been created.
+     * After calling this function, the listener will no longer receive any events from the emitter.
+     */
+    remove(): void;
+}
 declare const _default: typeof EventEmitter;
 export default _default;
 //# sourceMappingURL=EventEmitter.d.ts.map

package/build/EventEmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventEmitter.d.ts","sourceRoot":"","sources":["../src/EventEmitter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAInE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;wBACzB,OAAO,YAAY;AAAlE,wBAAmE"}
+{"version":3,"file":"EventEmitter.d.ts","sourceRoot":"","sources":["../src/EventEmitter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAInE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,MAAM,IAAI,IAAI,CAAC;CAChB;wBAE8C,OAAO,YAAY;AAAlE,wBAAmE"}

package/build/LegacyEventEmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LegacyEventEmitter.d.ts","sourceRoot":"","sources":["../src/LegacyEventEmitter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAY,MAAM,cAAc,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAInD,KAAK,YAAY,GAAG;IAClB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAI3B,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,eAAe,CAAC,EAAE,GAAG,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,cAAc,SAAK;IAGnB,aAAa,EAAE,YAAY,CAAC;IAG5B,aAAa,EAAE,kBAAkB,CAAC;gBAEtB,YAAY,EAAE,YAAY;IAWtC,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,iBAAiB;IAgBlF,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAmB3C,kBAAkB,CAAC,YAAY,EAAE,iBAAiB,GAAG,IAAI;IAuBzD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;CAGhD"}
+{"version":3,"file":"LegacyEventEmitter.d.ts","sourceRoot":"","sources":["../src/LegacyEventEmitter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAY,MAAM,cAAc,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAWnD,KAAK,YAAY,GAAG;IAClB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAI3B,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,eAAe,CAAC,EAAE,GAAG,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,cAAc,SAAK;IAGnB,aAAa,EAAE,YAAY,CAAC;IAG5B,aAAa,EAAE,kBAAkB,CAAC;gBAEtB,YAAY,EAAE,YAAY;IAWtC,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,iBAAiB;IAgBlF,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAmB3C,kBAAkB,CAAC,YAAY,EAAE,iBAAiB,GAAG,IAAI;IAwBzD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;CAGhD"}

package/build/NativeModulesProxy.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeModulesProxy.native.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAUpE;;;GAGG;AACH,QAAA,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAM,CAAC;AA+DjE,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"NativeModulesProxy.native.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAUpE;;;GAGG;AACH,QAAA,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAM,CAAC;AAgEjE,eAAe,kBAAkB,CAAC"}

package/build/NativeViewManagerAdapter.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeViewManagerAdapter.native.d.ts","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAkB,KAAK,aAAa,EAA4B,MAAM,OAAO,CAAC;AA6ErF;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,aAAa,CAAC,CAAC,CAAC,CAiDlB"}
+{"version":3,"file":"NativeViewManagerAdapter.native.d.ts","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAkB,KAAK,aAAa,EAA4B,MAAM,OAAO,CAAC;AA6FrF;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,aAAa,CAAC,CAAC,CAAC,CAiDlB"}

package/build/sweet/setUpErrorManager.fx.web.d.ts

@@ -1 +1,2 @@
+export {};
 //# sourceMappingURL=setUpErrorManager.fx.web.d.ts.map

package/common/cpp/fabric/ExpoViewProps.h

@@ -10,7 +10,7 @@
 
 namespace expo {
 
-class ExpoViewProps final : public facebook::react::ViewProps {
+class ExpoViewProps : public facebook::react::ViewProps {
 public:
   ExpoViewProps() = default;
   ExpoViewProps(const facebook::react::PropsParserContext &context,

package/common/cpp/fabric/ExpoViewShadowNode.cpp

@@ -2,8 +2,35 @@
 
 #include "ExpoViewShadowNode.h"
 
+namespace react = facebook::react;
+
 namespace expo {
 
-  extern const char ExpoViewComponentName[] = "ExpoFabricView";
+extern const char ExpoViewComponentName[] = "ExpoFabricView";
+
+ExpoViewShadowNode::ExpoViewShadowNode(
+    const react::ShadowNodeFragment &fragment,
+    const react::ShadowNodeFamily::Shared &family,
+    react::ShadowNodeTraits traits)
+    : ConcreteViewShadowNode(fragment, family, traits) {
+  initialize();
+}
+
+ExpoViewShadowNode::ExpoViewShadowNode(
+    const react::ShadowNode &sourceShadowNode,
+    const react::ShadowNodeFragment &fragment)
+    : ConcreteViewShadowNode(sourceShadowNode, fragment) {
+  initialize();
+}
+
+void ExpoViewShadowNode::initialize() noexcept {
+  auto &viewProps = static_cast<const ExpoViewProps &>(*props_);
+
+  if (viewProps.collapsableChildren) {
+    traits_.set(react::ShadowNodeTraits::Trait::ChildrenFormStackingContext);
+  } else {
+    traits_.unset(react::ShadowNodeTraits::Trait::ChildrenFormStackingContext);
+  }
+}
 
 } // namespace expo

package/common/cpp/fabric/ExpoViewShadowNode.h

@@ -6,17 +6,35 @@
 
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
-#include "ExpoViewProps.h"
 #include "ExpoViewEventEmitter.h"
+#include "ExpoViewProps.h"
 #include "ExpoViewState.h"
 
 namespace expo {
 
 extern const char ExpoViewComponentName[];
 
-class ExpoViewShadowNode final : public facebook::react::ConcreteViewShadowNode<ExpoViewComponentName, ExpoViewProps, ExpoViewEventEmitter, ExpoViewState> {
+class ExpoViewShadowNode final : public facebook::react::ConcreteViewShadowNode<
+                                     ExpoViewComponentName, ExpoViewProps,
+                                     ExpoViewEventEmitter, ExpoViewState> {
 public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+  ExpoViewShadowNode(const facebook::react::ShadowNodeFragment &fragment,
+                     const facebook::react::ShadowNodeFamily::Shared &family,
+                     facebook::react::ShadowNodeTraits traits);
+
+  ExpoViewShadowNode(const facebook::react::ShadowNode &sourceShadowNode,
+                     const facebook::react::ShadowNodeFragment &fragment);
+
+public:
+  static facebook::react::ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    return traits;
+  }
+
+private:
+  void initialize() noexcept;
 };
 
 } // namespace expo

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

@@ -45,8 +45,9 @@ public extension ExpoSwiftUIView {
       }
       return AnyView(
         Group {
-          if let hostingView = child as? ExpoSwiftUI.UIViewHost {
-            let content = hostingView.childView
+          if let hostingView = child as? ExpoSwiftUI.UIViewHost,
+            let hostingUIView = hostingView.view as? (any ExpoSwiftUI.AnyHostingView) {
+            let content = hostingUIView.getContentView()
             transform(
               AnyView(
                 content

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

@@ -0,0 +1,30 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include <ExpoModulesCore/ExpoViewProps.h>
+
+namespace expo {
+
+/**
+ An `ExpoViewProps` derived class specific for SwiftUI that disables `collapsableChildren` by default
+ */
+class SwiftUIViewProps final : public ExpoViewProps {
+public:
+  SwiftUIViewProps() : ExpoViewProps() {
+    this->collapsableChildren = false;
+  }
+
+  SwiftUIViewProps(const facebook::react::PropsParserContext &context,
+                       const ExpoViewProps &sourceProps,
+                       const facebook::react::RawProps &rawProps)
+      : ExpoViewProps(context, sourceProps, rawProps) {
+    this->collapsableChildren = false;
+  }
+};
+
+} // namespace expo
+
+#endif // __cplusplus

package/ios/Core/Views/SwiftUI/SwiftUIVirtualViewObjC.mm

@@ -11,6 +11,7 @@
 
 #import <ExpoModulesCore/ExpoViewComponentDescriptor.h>
 #import <ExpoModulesCore/EXJSIConversions.h>
+#import <ExpoModulesCore/SwiftUIViewProps.h>
 #import <React/RCTAssert.h>
 #import <React/RCTComponentViewProtocol.h>
 
@@ -89,7 +90,7 @@ static std::unordered_map<std::string, expo::ExpoViewComponentDescriptor::Flavor
 - (instancetype)init
 {
   if (self = [super init]) {
-    static const auto defaultProps = std::make_shared<const expo::ExpoViewProps>();
+    static const auto defaultProps = std::make_shared<const expo::SwiftUIViewProps>();
     _props = defaultProps;
   }
   return self;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "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": "^13.1.0",
-    "expo-module-scripts": "^4.1.1"
+    "expo-module-scripts": "^4.1.2"
   },
-  "gitHead": "dd2c7150fd75c56505aa6d3f805c14e255649c5d"
+  "gitHead": "335e9312f5caf634097354a230f0d4bbbfb9b0ba"
 }

package/src/EventEmitter.ts

@@ -5,5 +5,15 @@ import type { EventEmitter } from './ts-declarations/EventEmitter';
 
 ensureNativeModulesAreInstalled();
 
-export type { EventSubscription } from './ts-declarations/EventEmitter';
+/**
+ * A subscription object that allows to conveniently remove an event listener from the emitter.
+ */
+export interface EventSubscription {
+  /**
+   * Removes an event listener for which the subscription has been created.
+   * After calling this function, the listener will no longer receive any events from the emitter.
+   */
+  remove(): void;
+}
+
 export default globalThis.expo.EventEmitter as typeof EventEmitter;

package/src/LegacyEventEmitter.ts

@@ -3,7 +3,14 @@ import { NativeEventEmitter, Platform } from 'react-native';
 
 import { EventSubscription } from './EventEmitter';
 
-const nativeEmitterSubscriptionKey = '@@nativeEmitterSubscription@@';
+const nativeEmitterSubscriptionKey = '@@nativeEmitterSubscription@@' as const;
+
+type SubscriptionState = {
+  // NOTE(@kitten): Since this is legacy/deprecated, we don't need to be exact about types here
+  [Key in typeof nativeEmitterSubscriptionKey]?: {
+    remove?(): void;
+  };
+} & EventSubscription;
 
 type NativeModule = {
   __expo_module_name__?: string;
@@ -46,7 +53,7 @@ export class LegacyEventEmitter {
 
     this._listenerCount++;
     const nativeEmitterSubscription = this._eventEmitter.addListener(eventName, listener);
-    const subscription = {
+    const subscription: SubscriptionState = {
       [nativeEmitterSubscriptionKey]: nativeEmitterSubscription,
       remove: () => {
         this.removeSubscription(subscription);
@@ -75,19 +82,20 @@ export class LegacyEventEmitter {
   }
 
   removeSubscription(subscription: EventSubscription): void {
-    const nativeEmitterSubscription = subscription[nativeEmitterSubscriptionKey];
+    const state = subscription as SubscriptionState;
+    const nativeEmitterSubscription = state[nativeEmitterSubscriptionKey];
     if (!nativeEmitterSubscription) {
       return;
     }
 
     if ('remove' in nativeEmitterSubscription) {
-      nativeEmitterSubscription.remove();
+      nativeEmitterSubscription.remove?.();
     }
     this._listenerCount--;
 
     // Ensure that the emitter's internal state remains correct even if `removeSubscription` is
     // called again with the same subscription
-    delete subscription[nativeEmitterSubscriptionKey];
+    delete state[nativeEmitterSubscriptionKey];
 
     // Release closed-over references to the emitter
     subscription.remove = () => {};

package/src/NativeModulesProxy.native.ts

@@ -30,7 +30,8 @@ if (LegacyNativeProxy) {
     NativeModulesProxy[moduleName] = NativeProxy[modulesConstantsKey][moduleName] || {};
 
     // copy methods
-    NativeProxy[exportedMethodsKey][moduleName].forEach((methodInfo) => {
+    // TODO(@kitten): Annotate `NativeProxy` with abstract types to avoid implicit `any`
+    NativeProxy[exportedMethodsKey][moduleName].forEach((methodInfo: any) => {
       NativeModulesProxy[moduleName][methodInfo.name] = (...args: unknown[]): Promise<any> => {
         // Use the new proxy to call methods on legacy modules, if possible.
         if (ExpoNativeProxy?.callMethod) {

package/src/NativeViewManagerAdapter.native.tsx

@@ -1,5 +1,7 @@
 // Copyright © 2024 650 Industries.
 
+/// <reference path="ts-declarations/NativeComponentRegistry.d.ts" />
+
 'use client';
 
 import { type Component, type ComponentType, createRef, PureComponent } from 'react';
@@ -27,6 +29,22 @@ import { requireNativeModule } from './requireNativeModule';
  */
 const nativeComponentsCache = new Map<string, HostComponent<any>>();
 
+// TODO(@kitten): Optimally, this is defined on ExpoGlobal, but we treat `__expo_app_identifier__` as internal
+declare namespace globalThis {
+  const expo:
+    | undefined
+    | {
+        __expo_app_identifier__?: string;
+        getViewConfig(
+          moduleName: string,
+          viewName?: string
+        ): {
+          validAttributes: Record<string, any>;
+          directEventTypes: Record<string, { registrationName: string }>;
+        } | null;
+      };
+}
+
 /**
  * Requires a React Native component using the static view config from an Expo module.
  */

package/src/Platform.ts

@@ -25,7 +25,7 @@ const nativeSelect =
       function select<T>(specifics: { [platform in PlatformSelectOSType]?: T }): T | undefined {
         if (!process.env.EXPO_OS) return undefined;
         if (specifics.hasOwnProperty(process.env.EXPO_OS)) {
-          return specifics[process.env.EXPO_OS]!;
+          return specifics[process.env.EXPO_OS as PlatformSelectOSType]!;
         } else if (process.env.EXPO_OS !== 'web' && specifics.hasOwnProperty('native')) {
           return specifics.native!;
         } else if (specifics.hasOwnProperty('default')) {

package/src/sweet/setUpErrorManager.fx.ts

@@ -15,5 +15,9 @@ if (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {
   });
 }
 
+declare namespace globalThis {
+  let ExpoModulesCore_CodedError: undefined | typeof CodedError;
+}
+
 // We have to export `CodedError` via global object to use in later in the C++ code.
 globalThis.ExpoModulesCore_CodedError = CodedError;

package/src/ts-declarations/NativeComponentRegistry.d.ts

@@ -0,0 +1,12 @@
+declare module 'react-native/Libraries/NativeComponent/NativeComponentRegistry' {
+  import type { HostComponent } from 'react-native';
+
+  export function get<Props>(
+    name: string,
+    register: () => {
+      uiViewClassName: string;
+      validAttributes?: Record<string, any>;
+      directEventTypes?: Record<string, { registrationName: string }>;
+    }
+  ): HostComponent<Props>;
+}