expo-modules-core 57.0.12 → 57.0.14

package/CHANGELOG.md

@@ -10,6 +10,23 @@
 
 ### 💡 Others
 
+## 57.0.14 — 2026-08-26
+
+### 🎉 New features
+
+- Added `getNativeRef()` to views created with `requireNativeViewManager`, which returns the underlying host component. ([#48788](https://github.com/expo/expo/pull/48788) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+
+### 🐛 Bug fixes
+
+- [iOS] Measure hosted React Native views where SwiftUI placed them, instead of at their Yoga box. ([#48969](https://github.com/expo/expo/pull/48969) by [@nishan](https://github.com/intergalacticspacehighway))
+- [Android] Measure hosted React Native views where Jetpack Compose placed them, instead of at their Yoga box. ([#48970](https://github.com/expo/expo/pull/48970) by [@nishan](https://github.com/intergalacticspacehighway))
+
+## 57.0.13 — 2026-08-24
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed `matchContents` hosts sometimes being laid out at a stale size. Regression from [#48059](https://github.com/expo/expo/pull/48059). ([#49211](https://github.com/expo/expo/pull/49211) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+
 ## 57.0.12 — 2026-08-20
 
 ### 🐛 Bug fixes

package/android/build.gradle

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

package/android/src/main/cpp/fabric/NativeStatePropsGetter.cpp

@@ -1,5 +1,6 @@
 #include "NativeStatePropsGetter.h"
 #include "AndroidExpoViewState.h"
+#include "ContentOriginRegistry.h"
 #include <react/fabric/StateWrapperImpl.h>
 
 #include <react/renderer/core/ConcreteState.h>
@@ -11,6 +12,9 @@ void NativeStatePropsGetter::registerNatives() {
                                       makeNativeMethod("getStateProps", NativeStatePropsGetter::getStateProps),
                                       makeNativeMethod("updateStyleSizeImmediateImpl", NativeStatePropsGetter::updateStyleSizeImmediate),
                                       makeNativeMethod("updateViewSizeImmediateImpl", NativeStatePropsGetter::updateViewSizeImmediate),
+                                      makeNativeMethod("setContentOriginImpl", NativeStatePropsGetter::setContentOrigin),
+                                      makeNativeMethod("clearContentOriginImpl", NativeStatePropsGetter::clearContentOrigin),
+                                      makeNativeMethod("clearAllContentOriginsImpl", NativeStatePropsGetter::clearAllContentOrigins),
                                     });
 }
 
@@ -57,6 +61,31 @@ void NativeStatePropsGetter::updateViewSizeImmediate(
   state->updateState(std::move(newState), react::EventQueue::UpdateMode::unstable_Immediate);
 }
 
+void NativeStatePropsGetter::setContentOrigin(
+  jni::alias_ref<NativeStatePropsGetter::javaobject> self,
+  jint tag,
+  jdouble x,
+  jdouble y
+) {
+  ContentOriginRegistry::set(
+    static_cast<react::Tag>(tag),
+    react::Point{.x = static_cast<react::Float>(x), .y = static_cast<react::Float>(y)}
+  );
+}
+
+void NativeStatePropsGetter::clearContentOrigin(
+  jni::alias_ref<NativeStatePropsGetter::javaobject> self,
+  jint tag
+) {
+  ContentOriginRegistry::clear(static_cast<react::Tag>(tag));
+}
+
+void NativeStatePropsGetter::clearAllContentOrigins(
+  jni::alias_ref<NativeStatePropsGetter::javaobject> self
+) {
+  ContentOriginRegistry::clearAll();
+}
+
 jni::local_ref<jni::JMap<jstring, jobject>> NativeStatePropsGetter::getStateProps(
   jni::alias_ref<NativeStatePropsGetter::javaobject> self,
   jni::alias_ref<jobject> stateWrapper

package/android/src/main/cpp/fabric/NativeStatePropsGetter.h

@@ -35,6 +35,23 @@ public:
     jdouble width,
     jdouble height
   );
+
+  // Publishes where Compose actually placed a hosted view inside its `Host`, which Yoga cannot see.
+  static void setContentOrigin(
+    jni::alias_ref<NativeStatePropsGetter::javaobject> self,
+    jint tag,
+    jdouble x,
+    jdouble y
+  );
+
+  static void clearContentOrigin(
+    jni::alias_ref<NativeStatePropsGetter::javaobject> self,
+    jint tag
+  );
+
+  static void clearAllContentOrigins(
+    jni::alias_ref<NativeStatePropsGetter::javaobject> self
+  );
 };
 
 } // namespace expo

package/android/src/main/java/expo/modules/kotlin/jni/fabric/NativeStatePropsGetter.kt

@@ -24,6 +24,29 @@ class NativeStatePropsGetter {
     updateViewSizeImmediateImpl(stateWrapper, width, height)
   }
 
+  /**
+   * Publishes where the native layout system placed a hosted view inside its `Host`, keyed by the
+   * view's tag. Read while measuring, so `measure()` reports the position the content occupies
+   * rather than its Yoga box.
+   */
+  fun setContentOrigin(tag: Int, x: Double, y: Double) {
+    setContentOriginImpl(tag, x, y)
+  }
+
+  fun clearContentOrigin(tag: Int) {
+    clearContentOriginImpl(tag)
+  }
+
+  fun clearAllContentOrigins() {
+    clearAllContentOriginsImpl()
+  }
+
+  private external fun setContentOriginImpl(tag: Int, x: Double, y: Double)
+
+  private external fun clearContentOriginImpl(tag: Int)
+
+  private external fun clearAllContentOriginsImpl()
+
   private external fun updateStyleSizeImmediateImpl(
     stateWrapper: Any,
     styleWidth: Double,

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

@@ -28,6 +28,20 @@ class ShadowNodeProxy(expoView: ExpoView) {
     }
   }
 
+  /**
+   * Reports where the native layout system drew this view inside its `Host`, in dp relative to the
+   * `Host`'s origin.
+   */
+  fun setContentOrigin(x: Double, y: Double) {
+    val view = weakExpoView.get() ?: return
+    stateUpdater.setContentOrigin(view.id, x, y)
+  }
+
+  fun clearContentOrigin() {
+    val view = weakExpoView.get() ?: return
+    stateUpdater.clearContentOrigin(view.id)
+  }
+
   private fun scheduleFlush(flush: (stateWrapper: Any) -> Unit) {
     pendingFlush = flush
     val view = weakExpoView.get() ?: return

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

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

package/common/cpp/fabric/ContentOriginRegistry.h

@@ -0,0 +1,63 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include <mutex>
+#include <optional>
+#include <unordered_map>
+
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/graphics/Point.h>
+
+namespace expo {
+
+/**
+ Where the native layout system drew a view's contents, keyed by React tag.
+
+ This sits outside the shadow tree on purpose. `ExpoViewState` would be the idiomatic home, but a
+ state update enqueues a commit, and the origin changes on every native layout pass — a commit per
+ pass can re-run layout, move the origin, and commit again. Writing here schedules no work.
+ */
+class ContentOriginRegistry {
+public:
+  static void set(facebook::react::Tag tag, facebook::react::Point origin) {
+    std::lock_guard<std::mutex> lock(mutex());
+    storage()[tag] = origin;
+  }
+
+  static void clear(facebook::react::Tag tag) {
+    std::lock_guard<std::mutex> lock(mutex());
+    storage().erase(tag);
+  }
+
+  static void clearAll() {
+    std::lock_guard<std::mutex> lock(mutex());
+    storage().clear();
+  }
+
+  static std::optional<facebook::react::Point> find(facebook::react::Tag tag) {
+    std::lock_guard<std::mutex> lock(mutex());
+    auto it = storage().find(tag);
+    if (it == storage().end()) {
+      return std::nullopt;
+    }
+    return it->second;
+  }
+
+private:
+  static std::mutex &mutex() {
+    static std::mutex instance;
+    return instance;
+  }
+
+  static std::unordered_map<facebook::react::Tag, facebook::react::Point> &storage() {
+    static std::unordered_map<facebook::react::Tag, facebook::react::Point> instance;
+    return instance;
+  }
+};
+
+} // namespace expo
+
+#endif // __cplusplus

package/common/cpp/fabric/ExpoViewComponentDescriptor.h

@@ -67,29 +67,19 @@ public:
         snode->getProps());
 
       auto &style = const_cast<facebook::yoga::Style &>(props.yogaStyle);
-      bool changedStyle = false;
 
       if (!isnan(styleWidth)) {
-        auto expectedWidth = facebook::yoga::StyleSizeLength::points(styleWidth);
-        if (style.dimension(facebook::yoga::Dimension::Width) != expectedWidth) {
-          style.setDimension(facebook::yoga::Dimension::Width, expectedWidth);
-          changedStyle = true;
-        }
+        style.setDimension(facebook::yoga::Dimension::Width,
+                           facebook::yoga::StyleSizeLength::points(styleWidth));
       }
 
       if (!isnan(styleHeight)) {
-        auto expectedHeight = facebook::yoga::StyleSizeLength::points(styleHeight);
-        if (style.dimension(facebook::yoga::Dimension::Height) != expectedHeight) {
-          style.setDimension(facebook::yoga::Dimension::Height, expectedHeight);
-          changedStyle = true;
-        }
+        style.setDimension(facebook::yoga::Dimension::Height,
+                           facebook::yoga::StyleSizeLength::points(styleHeight));
       }
 
-      // Update yoga props and dirty layout if we changed the style
-      if (changedStyle) {
-        snode->updateYogaProps();
-        snode->dirtyLayout();
-      }
+      // Updates yoga style from props and sets the node dirty
+      snode->updateYogaProps();
     }
     facebook::react::ConcreteComponentDescriptor<ShadowNodeType>::adopt(shadowNode);
   }

package/common/cpp/fabric/ExpoViewShadowNode.h

@@ -6,6 +6,7 @@
 
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
+#include "ContentOriginRegistry.h"
 #include "ExpoViewEventEmitter.h"
 #include "ExpoViewProps.h"
 #include "ExpoViewState.h"
@@ -51,6 +52,31 @@ public:
     return traits;
   }
 
+  /**
+   Used by `RNHostView`. Reports where this view's contents were actually drawn, for views laid
+   out by SwiftUI or Compose instead of Yoga. Without it `measure()` returns this node's Yoga box,
+   which is not where the hosted content ended up.
+   */
+  facebook::react::Point getContentOriginOffset(bool includeTransform) const override {
+    // A `false` caller is asking for a scroll offset, which this view never has. Only the layout
+    // path passes `true`, and that is the one this override is for.
+    if (!includeTransform) {
+      return ConcreteViewShadowNode::getContentOriginOffset(includeTransform);
+    }
+
+    auto contentOrigin = ContentOriginRegistry::find(this->getTag());
+    if (!contentOrigin) {
+      return ConcreteViewShadowNode::getContentOriginOffset(includeTransform);
+    }
+
+    // `computeRelativeLayoutMetrics` adds this node's own Yoga origin before consulting us, 
+    // so subtract them as we only want content origin to be considered. 
+    // Publish only the part Yoga cannot see: where
+    // the native layout system placed the content inside its host.
+    auto ownOrigin = this->getLayoutMetrics().frame.origin;
+    return {.x = contentOrigin->x - ownOrigin.x, .y = contentOrigin->y - ownOrigin.y};
+  }
+
 private:
   void initialize() noexcept {
     auto &viewProps = static_cast<const ExpoViewProps &>(*this->props_);

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

@@ -12,5 +12,8 @@ extension ExpoSwiftUI {
 
     public var setViewSize: ((CGSize) -> Void)?
     public var setStyleSize: ((NSNumber?, NSNumber?) -> Void)?
+    // Where the native layout system drew this view's contents, relative to its host.
+    public var setContentOrigin: ((CGPoint) -> Void)?
+    public var clearContentOrigin: (() -> Void)?
   }
 }

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

@@ -51,6 +51,12 @@ extension ExpoSwiftUI {
       props.shadowNodeProxy.setStyleSize = { [weak self] width, height in
         self?.setStyleSize(width, height: height)
       }
+      props.shadowNodeProxy.setContentOrigin = { [weak self] origin in
+        self?.setContentOrigin(origin)
+      }
+      props.shadowNodeProxy.clearContentOrigin = { [weak self] in
+        self?.clearContentOrigin()
+      }
 
       installEventDispatchers()
     }
@@ -213,6 +219,12 @@ extension ExpoSwiftUI {
       props.shadowNodeProxy.setStyleSize = { [weak self] width, height in
         self?.setStyleSize(width, height: height)
       }
+      props.shadowNodeProxy.setContentOrigin = { [weak self] origin in
+        self?.setContentOrigin(origin)
+      }
+      props.shadowNodeProxy.clearContentOrigin = { [weak self] in
+        self?.clearContentOrigin()
+      }
 
       installEventDispatchers()
     }

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

@@ -14,6 +14,15 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) NSInteger tag;
 @property (nonatomic, copy, nullable) NSString *componentName;
 
+/**
+ The tag this view last published a content origin under.
+
+ React Native zeroes `tag` when it recycles a component view, and it does so *before* calling
+ `prepareForRecycle` or `invalidate`, so a teardown hook cannot use `tag` to find its own registry
+ entry. Remembering it here is what lets the entry be removed rather than leaked.
+ */
+@property (nonatomic) NSInteger publishedContentOriginTag;
+
 - (void)dispatchEvent:(nonnull NSString *)eventName payload:(nullable id)payload;
 
 - (void)updateProps:(nonnull NSDictionary<NSString *, id> *)props NS_SWIFT_UI_ACTOR;
@@ -24,6 +33,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setStyleSize:(nullable NSNumber *)width height:(nullable NSNumber *)height;
 
+/**
+ Publishes where SwiftUI drew this view's contents, relative to its host, so `measure()` matches
+ what is on screen. Pass `CGPointZero`-equivalent by calling `clearContentOrigin`.
+ */
+- (void)setContentOrigin:(CGPoint)contentOrigin;
+
+- (void)clearContentOrigin;
+
 - (BOOL)supportsPropWithName:(nonnull NSString *)name;
 
 /*

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

@@ -17,6 +17,15 @@ NS_ASSUME_NONNULL_BEGIN
 // `tag` is inherited from UIView
 @property (nonatomic, copy, nullable) NSString *componentName;
 
+/**
+ The tag this view last published a content origin under.
+
+ React Native zeroes `tag` when it recycles a component view, and it does so *before* calling
+ `prepareForRecycle` or `invalidate`, so a teardown hook cannot use `tag` to find its own registry
+ entry. Remembering it here is what lets the entry be removed rather than leaked.
+ */
+@property (nonatomic) NSInteger publishedContentOriginTag;
+
 - (void)dispatchEvent:(nonnull NSString *)eventName payload:(nullable id)payload;
 
 - (void)updateProps:(nonnull NSDictionary<NSString *, id> *)props NS_SWIFT_UI_ACTOR;
@@ -27,6 +36,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setStyleSize:(nullable NSNumber *)width height:(nullable NSNumber *)height;
 
+- (void)setContentOrigin:(CGPoint)contentOrigin;
+
+- (void)clearContentOrigin;
+
 - (BOOL)supportsPropWithName:(nonnull NSString *)name;
 
 /*

package/ios/Core/Views/SwiftUI/SwiftUIVirtualViewSharedImpl+Private.h

@@ -98,6 +98,7 @@ namespace react = facebook::react;
 - (void)prepareForRecycle
 {
   // Default implementation does nothing.
+  [self clearContentOrigin];
   _eventEmitter.reset();
 }
 
@@ -186,6 +187,23 @@ namespace react = facebook::react;
   }
 }
 
+- (void)setContentOrigin:(CGPoint)contentOrigin
+{
+  self.publishedContentOriginTag = self.tag;
+  expo::ContentOriginRegistry::set(
+    (react::Tag)self.tag,
+    react::Point{.x = (react::Float)contentOrigin.x, .y = (react::Float)contentOrigin.y});
+}
+
+- (void)clearContentOrigin
+{
+  // Not `self.tag`: by the time a teardown hook runs, React Native has already zeroed it.
+  if (self.publishedContentOriginTag != 0) {
+    expo::ContentOriginRegistry::clear((react::Tag)self.publishedContentOriginTag);
+    self.publishedContentOriginTag = 0;
+  }
+}
+
 - (BOOL)supportsPropWithName:(nonnull NSString *)name
 {
   // Implemented in `SwiftUIVirtualView.swift`

package/ios/Fabric/EXContentOriginRegistry.h

@@ -0,0 +1,17 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+NS_SWIFT_NAME(ContentOriginRegistry)
+@interface EXContentOriginRegistry : NSObject
+
+/**
+ Drops every published content origin
+ */
++ (void)clearAll;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/Fabric/EXContentOriginRegistry.mm

@@ -0,0 +1,13 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+#import <ExpoModulesCore/EXContentOriginRegistry.h>
+#import <ExpoModulesCore/ContentOriginRegistry.h>
+
+@implementation EXContentOriginRegistry
+
++ (void)clearAll
+{
+  expo::ContentOriginRegistry::clearAll();
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "57.0.12",
+  "version": "57.0.14",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@expo/expo-modules-macros-plugin": "0.6.1",
-    "expo-modules-jsi": "~57.0.5",
+    "expo-modules-jsi": "~57.0.6",
     "invariant": "^2.2.4"
   },
   "peerDependencies": {
@@ -66,7 +66,7 @@
     "@types/invariant": "^2.2.33",
     "expo-module-scripts": "56.0.3"
   },
-  "gitHead": "499024a441d67293aa60afcbe02051999a54f1bb",
+  "gitHead": "c300d2cc60c9e684e64f48d9bc90ea18a571d01d",
   "scripts": {
     "build": "expo-module build",
     "clean": "expo-module clean",

package/src/NativeViewManagerAdapter.native.tsx

@@ -150,6 +150,13 @@ export function requireNativeViewManager<P>(
       this.nativeTag = findNodeHandle(this.nativeRef.current);
     }
 
+    /**
+     * The underlying host component
+     */
+    getNativeRef(): (Component & ReactNativeElement) | null {
+      return this.nativeRef.current;
+    }
+
     render() {
       return <ReactNativeComponent {...this.props} ref={this.nativeRef} />;
     }