expo-modules-core 58.0.9 → 58.0.10

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 58.0.10
+
+### Patch Changes
+
+- Lay out `RNHostView` hosted content at the size SwiftUI or Compose gives it on an axis that `matchContents` does not match. ([#50674](https://github.com/expo/expo/pull/50674) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- Updated dependencies. ([#50805](https://github.com/expo/expo/pull/50805), [#50844](https://github.com/expo/expo/pull/50844), [#50806](https://github.com/expo/expo/pull/50806))
+  - expo-modules-jsi@58.0.6
+
 ## 58.0.9
 
 ### Patch Changes
@@ -20,7 +28,7 @@
 
 ### 🐛 Bug fixes
 
-- Fixed listeners removed with `subscription.remove()` never being garbage-collected, together with their emitter and everything their closure references, when the closure can reach the subscription (as in `useEvent`, `useEventListener` or a `useEffect` that returns `() => subscription.remove()`).
+- Fixed listeners removed with `subscription.remove()` never being garbage-collected, together with their emitter and everything their closure references, when the closure can reach the subscription (as in `useEvent`, `useEventListener` or a `useEffect` that returns `() => subscription.remove()`). ([#50603](https://github.com/expo/expo/pull/50603) by [@gkueny](https://github.com/gkueny))
 - [iOS] Fixed `Exception` reporting `undefined reason` to JavaScript instead of the description it was created with, which also affected every `promise.reject(code, description)` call. ([#50215](https://github.com/expo/expo/pull/50215) by [@Maher-Reven](https://github.com/Maher-Reven))
 
 ## 58.0.6 — 2026-09-23

package/android/build.gradle

@@ -46,7 +46,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '58.0.9'
+version = '58.0.10'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -175,7 +175,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "58.0.9"
+    versionName "58.0.10"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true"
 

package/android/src/main/java/expo/modules/kotlin/types/worklets/SerializableTypeConverter.kt

@@ -2,6 +2,7 @@ package expo.modules.kotlin.types.worklets
 
 import expo.modules.kotlin.jni.CppType
 import expo.modules.kotlin.jni.ExpectedType
+import expo.modules.kotlin.jni.WorkletsSoLoader
 import expo.modules.kotlin.jni.worklets.Serializable
 import expo.modules.kotlin.types.ConverterContext
 import expo.modules.kotlin.types.NonNullableTypeConverter
@@ -12,6 +13,9 @@ class SerializableTypeConverter : NonNullableTypeConverter<Serializable>() {
   }
 
   override fun getCppRequiredTypes(): ExpectedType {
+    // Register the C++ converter before a function caches its argument converters.
+    // Module functions can be exported before the UI worklet runtime is installed.
+    WorkletsSoLoader.loadIfPresent()
     return ExpectedType(CppType.SERIALIZABLE)
   }
 

package/common/cpp/fabric/ExpoViewComponentDescriptor.h

@@ -61,17 +61,47 @@ public:
 
     const auto snode = dynamic_cast<ShadowNodeType *>(&shadowNode);
     const auto state = snode->getStateData();
+    auto const &sharedProps = snode->getProps();
+    auto &style = const_cast<facebook::yoga::Style &>(
+      static_cast<const facebook::react::ViewProps &>(*sharedProps).yogaStyle);
+    bool propsStyleChanged = false;
 
+    if (isRNHostView(sharedProps)) {
+      // If RNHostView has align self set to auto or stretch, we should override it to flex-start so that the node can size itself to its content
+      auto const alignSelf = style.alignSelf();
+
+      if (alignSelf == facebook::yoga::Align::Auto || alignSelf == facebook::yoga::Align::Stretch) {
+        style.setAlignSelf(facebook::yoga::Align::FlexStart);
+        propsStyleChanged = true;
+      }
+    }
+
+    // handle layout style prop update
+    if (!isnan(state._styleWidth)) {
+      style.setDimension(facebook::yoga::Dimension::Width,
+                         facebook::yoga::StyleSizeLength::points(state._styleWidth));
+      propsStyleChanged = true;
+    }
+
+    if (!isnan(state._styleHeight)) {
+      style.setDimension(facebook::yoga::Dimension::Height,
+                         facebook::yoga::StyleSizeLength::points(state._styleHeight));
+      propsStyleChanged = true;
+    }
+
+    if (propsStyleChanged) {
+      // Updates yoga style from props and sets the node dirty
+      snode->updateYogaProps();
+    }
+
+    // Writes the node style directly, so it runs last.
     auto width = state._width;
     auto height = state._height;
 
     if (!isnan(width) || !isnan(height)) {
-      auto const &props = *std::static_pointer_cast<const facebook::react::ViewProps>(
-        snode->getProps());
-
       // The node has width and/or height set as style props, so we should not override it
-      auto widthProp = props.yogaStyle.dimension(facebook::yoga::Dimension::Width);
-      auto heightProp = props.yogaStyle.dimension(facebook::yoga::Dimension::Height);
+      auto widthProp = style.dimension(facebook::yoga::Dimension::Width);
+      auto heightProp = style.dimension(facebook::yoga::Dimension::Height);
 
       if (widthProp.value().isDefined()) {
         // view has fixed dimension size set in props, so we should not autosize it in that axis
@@ -84,44 +114,6 @@ public:
       snode->setSize({width, height});
     }
 
-    // handle layout style prop update
-    auto styleWidth = state._styleWidth;
-    auto styleHeight = state._styleHeight;
-
-    if (!isnan(styleWidth) || !isnan(styleHeight)) {
-      auto const &props = *std::static_pointer_cast<const facebook::react::ViewProps>(
-        snode->getProps());
-
-      auto &style = const_cast<facebook::yoga::Style &>(props.yogaStyle);
-
-      if (!isnan(styleWidth)) {
-        style.setDimension(facebook::yoga::Dimension::Width,
-                           facebook::yoga::StyleSizeLength::points(styleWidth));
-      }
-
-      if (!isnan(styleHeight)) {
-        style.setDimension(facebook::yoga::Dimension::Height,
-                           facebook::yoga::StyleSizeLength::points(styleHeight));
-      }
-
-      // Updates yoga style from props and sets the node dirty
-      snode->updateYogaProps();
-    }
-
-    if (isRNHostView(snode->getProps())) {
-      auto const &props = *std::static_pointer_cast<const facebook::react::ViewProps>(
-        snode->getProps());
-      auto &style = const_cast<facebook::yoga::Style &>(props.yogaStyle);
-
-      // If RNHostView has align self set to auto or stretch, we should override it to flex-start so that the node can size itself to its content
-      auto const alignSelf = style.alignSelf();
-
-      if (alignSelf == facebook::yoga::Align::Auto || alignSelf == facebook::yoga::Align::Stretch) {
-        style.setAlignSelf(facebook::yoga::Align::FlexStart);
-        snode->updateYogaProps();
-      }
-    }
-
     facebook::react::ConcreteComponentDescriptor<ShadowNodeType>::adopt(shadowNode);
   }
 };

package/common/cpp/fabric/ExpoViewShadowNode.h

@@ -163,6 +163,20 @@ private:
   }
 
   react::LayoutConstraints hostedContentConstraints(const react::ShadowNode &content) const {
+    auto constraints = contentStyleConstraints(content);
+
+    // An unmatched axis has the size SwiftUI or Compose gave the host (from `setViewSize`), so lay
+    // the content out at exactly that size. This overrides the content's own min/max on that axis.
+    auto const &ownStyle = this->yogaNode_.style();
+    constrainExactlyToPoints(ownStyle.dimension(facebook::yoga::Dimension::Width),
+                             constraints.minimumSize.width, constraints.maximumSize.width);
+    constrainExactlyToPoints(ownStyle.dimension(facebook::yoga::Dimension::Height),
+                             constraints.minimumSize.height, constraints.maximumSize.height);
+
+    return constraints;
+  }
+
+  react::LayoutConstraints contentStyleConstraints(const react::ShadowNode &content) const {
     react::LayoutConstraints constraints{};
     constraints.layoutDirection = resolvedLayoutDirection();
 
@@ -186,6 +200,14 @@ private:
     return constraints;
   }
 
+  static void constrainExactlyToPoints(facebook::yoga::StyleSizeLength length,
+                                       react::Float &minimum,
+                                       react::Float &maximum) {
+    if (length.isPoints() && length.value().isDefined()) {
+      minimum = maximum = std::max<react::Float>(0, length.value().unwrap());
+    }
+  }
+
   static void constrainToPoints(facebook::yoga::StyleSizeLength length, react::Float &constraint) {
     if (length.isPoints() && length.value().isDefined()) {
       constraint = std::max<react::Float>(0, length.value().unwrap());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "58.0.9",
+  "version": "58.0.10",
   "description": "The core of Expo Modules architecture",
   "keywords": [
     "expo",
@@ -64,7 +64,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "expo-modules-jsi": "~58.0.5",
+    "expo-modules-jsi": "~58.0.6",
     "expo-modules-macros": "0.14.0",
     "invariant": "^2.2.4"
   },