expo-modules-core 56.0.16 → 56.0.18

package/CHANGELOG.md

@@ -10,6 +10,24 @@
 
 ### 💡 Others
 
+## 56.0.18 — 2026-07-01
+
+### 🐛 Bug fixes
+
+- [Android][compose] Guard `onLayout` against detached window to prevent `LayoutNode should be attached to an owner` crash. ([#47085](https://github.com/expo/expo/pull/47085) by [@roitium](https://github.com/roitium))
+- [Android] Fix Jetpack Compose `Host` content disappearing before a react-native-screens pop animation finishes, by deferring composition disposal to window detach while the view is still on-screen for a transition. ([#45914](https://github.com/expo/expo/issues/45914), [#47086](https://github.com/expo/expo/issues/47086) by [@aubrey-wodonga](https://github.com/aubrey-wodonga)) ([#47099](https://github.com/expo/expo/pull/47099) by [@nishan](https://github.com/intergalacticspacehighway))
+- [iOS] Fix a reload deadlock on the new architecture where reloading (from pressing `r` in the iOS simulator) would freeze the app until the watchdog killed it. `reloadAppAsync` now triggers the reload synchronously when already on the main thread instead of always deferring via `DispatchQueue.main.async`. ([#47392](https://github.com/expo/expo/pull/47392) by [@brentvatne](https://github.com/brentvatne))
+
+### 💡 Others
+
+- [iOS][android] Resolve the worklet UI runtime from its `react-native-worklets` holder instead of the reanimated `_WORKLET_RUNTIME` global; `installOnUIRuntime` now takes the holder from `getUIRuntimeHolder()`. ([#46922](https://github.com/expo/expo/pull/46922), [#46935](https://github.com/expo/expo/pull/46935) by [@nishan](https://github.com/intergalacticspacehighway))
+
+## 56.0.17 — 2026-06-15
+
+### 🐛 Bug fixes
+
+- [Android] Fixed Expo UI re-compose when switching screens in react-native-screens. ([#46650](https://github.com/expo/expo/pull/46650) by [@kudo](https://github.com/kudo))
+
 ## 56.0.16 — 2026-06-10
 
 ### 🎉 New features
@@ -19,6 +37,7 @@
 ### 🐛 Bug fixes
 
 - [android] Add a synchronous shadow node size update path, fixing a layout shift for `Host` `matchContents` views. ([#46604](https://github.com/expo/expo/pull/46604) by [@nishan](https://github.com/intergalacticspacehighway))
+- [Android] Fix `NullPointerException` crash when a `matchContents` view is unmounted while a shadow node size update is pending (e.g. closing a bottom sheet mid-resize). ([#46785](https://github.com/expo/expo/pull/46785) by [@nishan](https://github.com/intergalacticspacehighway))
 - [iOS] Accept JS `Double` timestamps in `Date` Convertible. JS numbers arrive across the JSI bridge as Swift `Double`; the prior `as? Int` branch never matched, throwing `ConvertingException<Date>` whenever a JS caller passed `someDate.getTime()` to a `Date` / `Date?` argument. ([#46340](https://github.com/expo/expo/pull/46340) by [@kyleasaff](https://github.com/kyleasaff))
 - [Android] Fix events being silently dropped for Compose views in custom modules. ([#46623](https://github.com/expo/expo/issues/46623) by [@benjaminkomen](https://github.com/benjaminkomen)) ([#46624](https://github.com/expo/expo/pull/46624) by [@nishan](https://github.com/intergalacticspacehighway))
 

package/android/build.gradle

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

package/android/src/compose/expo/modules/kotlin/views/ExpoComposeView.kt

@@ -17,6 +17,10 @@ import androidx.annotation.UiThread
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.view.size
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.types.enforceType
@@ -52,10 +56,14 @@ abstract class ExpoComposeView<T : ComposeProps>(
   context: Context,
   appContext: AppContext,
   private val withHostingView: Boolean = false
-) : ExpoView(context, appContext) {
+) : ExpoView(context, appContext), ComposeHostingView {
   open val props: T? = null
   protected var recomposeScope: RecomposeScope? = null
 
+  // Retained so the composition can be disposed on unmount: its strategy is
+  // pinned to the Activity lifecycle, so nothing disposes it on window detach.
+  private var hostingComposeView: ComposeView? = null
+
   private val globalEvent = ViewEvent<Pair<String, Map<String, Any?>>>(GLOBAL_EVENT_NAME, this, null)
 
   /**
@@ -80,6 +88,9 @@ abstract class ExpoComposeView<T : ComposeProps>(
   }
 
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+    if (shouldUseAndroidLayout && !isAttachedToWindow) {
+      return
+    }
     super.onLayout(changed, left, top, right, bottom)
 
     // Makes sure the child ComposeView is sticky with the current hosting view
@@ -191,22 +202,62 @@ abstract class ExpoComposeView<T : ComposeProps>(
 
   private fun addComposeView() {
     val composeView = ComposeView(context).also {
+      // Give each Host a unique id so its rememberSaveable state gets its own key.
+      // All Hosts share the Activity's SavedStateRegistry (set below), so without an id
+      // they'd collide on one key and only the first could save/restore state.
+      it.id = generateViewId()
       it.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
-      it.setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+      // Pin the composition to the Activity lifecycle so it survives
+      // react-native-screens detaching inactive screens on every switch.
+      // The strategy alone isn't enough: Compose's WrappedComposition also
+      // observes the view-tree lifecycle owner found at first attach — the
+      // screen fragment's, which RN-screens destroys per switch — and
+      // self-disposes on its ON_DESTROY, leaving a dead composition that
+      // never recreates. Overriding the owners on the ComposeView (nearest
+      // tag wins) points both at the Activity. Unmount disposes explicitly
+      // via disposeHostedComposition().
+      val activity = appContext.currentActivity
+      if (activity is LifecycleOwner && activity is SavedStateRegistryOwner) {
+        it.setViewTreeLifecycleOwner(activity)
+        it.setViewTreeSavedStateRegistryOwner(activity)
+        it.setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnLifecycleDestroyed(activity.lifecycle))
+      } else {
+        // No Activity to pin to: keep the prior behavior, including the
+        // dispose-on-reattach workaround for blank compositions after
+        // navigation (https://github.com/expo/expo/pull/34689).
+        it.setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+        it.addOnAttachStateChangeListener(
+          OnAttachAfterDetachmentListener(onAttachAfterDetachment = {
+            it.disposeComposition()
+          })
+        )
+      }
       it.setContent {
         with(ComposableScope()) {
           Content()
         }
       }
-      it.addOnAttachStateChangeListener(
-        OnAttachAfterDetachmentListener(onAttachAfterDetachment = {
-          it.disposeComposition()
-        })
-      )
     }
+    hostingComposeView = composeView
     addView(composeView)
   }
 
+  override fun disposeHostedComposition() {
+    hostingComposeView?.let {
+      // disposeComposition() alone leaves the composition strategy's lifecycle observer
+      // registered on the Activity, which leaks this view.
+      // Swapping the strategy first detaches that observer, then we dispose.
+      it.setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
+      // If the view is still attached when RN drops it, react-native-screens is keeping it
+      // on-screen for an in-progress navigation transition (e.g. a pop). Disposing now blanks
+      // the Compose content before the animation finishes (https://github.com/expo/expo/issues/47086).
+      // View eventually gets decomposed when RN screen detatches view from window
+      if (!it.isAttachedToWindow) {
+        it.disposeComposition()
+      }
+    }
+  }
+
   override fun addView(child: View, index: Int, params: ViewGroup.LayoutParams) {
     val view = if (child !is ExpoComposeView<*> && child !is ComposeView && this !is RNHostViewInterface) {
       ExpoComposeAndroidView(child, appContext)

package/android/src/main/cpp/JavaScriptObject.cpp

@@ -58,6 +58,12 @@ std::shared_ptr<jsi::Object> JavaScriptObject::get() {
   return jsObject;
 }
 
+jsi::Runtime &JavaScriptObject::getRuntime() {
+  auto runtime = runtimeHolder.lock();
+  assert((runtime != nullptr) && "JS Runtime was used after deallocation");
+  return runtime->get();
+}
+
 bool JavaScriptObject::hasProperty(const std::string &name) {
   auto runtime = runtimeHolder.lock();
   assert((runtime != nullptr) && "JS Runtime was used after deallocation");

package/android/src/main/cpp/JavaScriptObject.h

@@ -44,6 +44,11 @@ public:
 
   std::shared_ptr<jsi::Object> get() override;
 
+  /**
+   * @return the `jsi::Runtime` this object is bound to.
+   */
+  jsi::Runtime &getRuntime();
+
   /**
    * @return a bool whether the object has a property with the given name
    */

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

@@ -9,8 +9,8 @@ namespace expo {
 void NativeStatePropsGetter::registerNatives() {
   javaClassLocal()->registerNatives({
                                       makeNativeMethod("getStateProps", NativeStatePropsGetter::getStateProps),
-                                      makeNativeMethod("updateStyleSizeImmediate", NativeStatePropsGetter::updateStyleSizeImmediate),
-                                      makeNativeMethod("updateViewSizeImmediate", NativeStatePropsGetter::updateViewSizeImmediate),
+                                      makeNativeMethod("updateStyleSizeImmediateImpl", NativeStatePropsGetter::updateStyleSizeImmediate),
+                                      makeNativeMethod("updateViewSizeImmediateImpl", NativeStatePropsGetter::updateViewSizeImmediate),
                                     });
 }
 

package/android/src/main/cpp/installers/WorkletRuntimeInstaller.cpp

@@ -3,6 +3,7 @@
 #if WORKLETS_ENABLED
 
 #include "../worklets/WorkletJSCallInvoker.h"
+#include <worklets/Compat/StableApi.h>
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 
 #endif
@@ -15,7 +16,8 @@ namespace expo {
 
 void WorkletRuntimeInstaller::registerNatives() {
   javaClassLocal()->registerNatives({
-                                      makeNativeMethod("install", WorkletRuntimeInstaller::install)
+                                      makeNativeMethod("install", WorkletRuntimeInstaller::install),
+                                      makeNativeMethod("resolveUIRuntimePointer", WorkletRuntimeInstaller::resolveUIRuntimePointer)
                                     });
 }
 
@@ -44,6 +46,28 @@ jni::local_ref<JSIContext::javaobject> WorkletRuntimeInstaller::install(
 #endif
 }
 
+jlong WorkletRuntimeInstaller::resolveUIRuntimePointer(
+  jni::alias_ref<jni::JClass>,
+  jni::alias_ref<JavaScriptObject::javaobject> uiRuntimeHolder
+) noexcept {
+#if WORKLETS_ENABLED
+  auto *holder = uiRuntimeHolder->cthis();
+  jsi::Runtime &runtime = holder->getRuntime();
+  std::shared_ptr<jsi::Object> holderObject = holder->get();
+
+  std::shared_ptr<worklets::WorkletRuntime> workletRuntime =
+    worklets::getWorkletRuntimeFromHolder(runtime, *holderObject);
+  if (!workletRuntime) {
+    return 0;
+  }
+
+  jsi::Runtime &uiRuntime = worklets::getJSIRuntimeFromWorkletRuntime(workletRuntime);
+  return reinterpret_cast<jlong>(&uiRuntime);
+#else
+  return 0;
+#endif
+}
+
 void WorkletRuntimeInstaller::prepareRuntime(
   jni::local_ref<JSIContext::javaobject> jsiContext
 ) noexcept {

package/android/src/main/cpp/installers/WorkletRuntimeInstaller.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../ExpoHeader.pch"
+#include "../JavaScriptObject.h"
 #include "MainRuntimeInstaller.h"
 
 namespace jni = facebook::jni;
@@ -24,6 +25,14 @@ public:
   static void prepareRuntime(
     jni::local_ref<JSIContext::javaobject> jsiContext
   ) noexcept;
+
+  // Resolves the raw UI `jsi::Runtime *` (as a jlong) from a
+  // `react-native-worklets` UI runtime holder. Returns 0 when worklets isn't
+  // linked or the holder doesn't wrap a worklet runtime.
+  static jlong resolveUIRuntimePointer(
+    jni::alias_ref<jni::JClass> clazz,
+    jni::alias_ref<JavaScriptObject::javaobject> uiRuntimeHolder
+  ) noexcept;
 };
 
 } // namespace expo

package/android/src/main/java/expo/modules/kotlin/defaultmodules/CoreModule.kt

@@ -6,6 +6,8 @@ import com.facebook.react.ReactActivity
 import expo.modules.BuildConfig
 import expo.modules.kotlin.events.normalizeEventName
 import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.jni.JavaScriptObject
+import expo.modules.kotlin.jni.WorkletRuntimeInstaller
 import expo.modules.kotlin.modules.DEFAULT_MODULE_VIEW
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
@@ -95,26 +97,15 @@ class CoreModule : Module() {
       reactDelegate.reload()
     }
 
-    Function("installOnUIRuntime") {
-      val uiRuntimePointerHolder = appContext.runtime.jsiContext.global()["_WORKLET_RUNTIME"]
-        ?: throw IllegalStateException("UI Runtime is not available. Make sure you have Reanimated installed and imported in your project.")
-
-      assert(uiRuntimePointerHolder.isObject()) {
-        "Expected _WORKLET_RUNTIME to be an ArrayBuffer, got: ${uiRuntimePointerHolder.kind()}."
-      }
-
-      val uiRuntimePointerHolderObj = uiRuntimePointerHolder.getObject()
-      assert(uiRuntimePointerHolderObj.isArrayBuffer()) {
-        "Expected _WORKLET_RUNTIME to be an ArrayBuffer, got: ${uiRuntimePointerHolder.kind()}."
+    Function("installOnUIRuntime") { uiRuntimeHolder: JavaScriptObject ->
+      val runtimePointer = WorkletRuntimeInstaller.resolveUIRuntimePointer(uiRuntimeHolder)
+      if (runtimePointer == 0L) {
+        throw IllegalStateException(
+          "Couldn't resolve the worklets UI runtime from the provided holder. " +
+            "Make sure `react-native-worklets` is installed and rebuild the app."
+        )
       }
 
-      val arayBuffer = uiRuntimePointerHolderObj.getArrayBuffer()
-      assert(arayBuffer.size() == 8) {
-        "Expected _WORKLET_RUNTIME to be an ArrayBuffer with a size of 8 bytes (a pointer size), got: ${arayBuffer.size()}."
-      }
-
-      val runtimePointer = arayBuffer.read8Byte(0)
-
       runBlocking {
         withContext(Dispatchers.Main) {
           appContext.uiRuntime.install(runtimePointer)

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

@@ -22,4 +22,15 @@ class WorkletRuntimeInstaller(
     jsRuntimePointer: Long,
     jniDeallocator: JNIDeallocator
   ): JSIContext
+
+  companion object {
+    /**
+     * Resolves the raw UI `jsi::Runtime*` (as a Long) from a `react-native-worklets`
+     * UI runtime holder. Returns 0 when worklets isn't installed or the holder
+     * doesn't wrap a worklet runtime.
+     */
+    @JvmStatic
+    @Suppress("KotlinJniMissingFunction")
+    external fun resolveUIRuntimePointer(uiRuntimeHolder: JavaScriptObject): Long
+  }
 }

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

@@ -1,5 +1,6 @@
 package expo.modules.kotlin.jni.fabric
 
+import com.facebook.jni.HybridData
 import com.facebook.yoga.annotations.DoNotStrip
 
 @DoNotStrip
@@ -8,8 +9,31 @@ class NativeStatePropsGetter {
   external fun getStateProps(stateWrapper: Any): Map<String, Any?>?
 
   // Synchronously flush a style property size update in the current frame (pass NaN for "unset").
-  external fun updateStyleSizeImmediate(stateWrapper: Any, styleWidth: Double, styleHeight: Double)
+  fun updateStyleSizeImmediate(stateWrapper: Any, styleWidth: Double, styleHeight: Double) {
+    if (!isStateValid(stateWrapper)) {
+      return
+    }
+    updateStyleSizeImmediateImpl(stateWrapper, styleWidth, styleHeight)
+  }
 
   // Synchronously flush a size update in the current frame.
-  external fun updateViewSizeImmediate(stateWrapper: Any, width: Double, height: Double)
+  fun updateViewSizeImmediate(stateWrapper: Any, width: Double, height: Double) {
+    if (!isStateValid(stateWrapper)) {
+      return
+    }
+    updateViewSizeImmediateImpl(stateWrapper, width, height)
+  }
+
+  private external fun updateStyleSizeImmediateImpl(
+    stateWrapper: Any,
+    styleWidth: Double,
+    styleHeight: Double
+  )
+
+  private external fun updateViewSizeImmediateImpl(stateWrapper: Any, width: Double, height: Double)
+
+  // The only `StateWrapper` is RN's `StateWrapperImpl`, a fbjni `HybridData`. When the shadow node is
+  // destroyed its native pointer is reset and calling into it throws. Skip the update like RN does
+  // before its own native state accesses.
+  private fun isStateValid(stateWrapper: Any): Boolean = (stateWrapper as? HybridData)?.isValid == true
 }

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

@@ -148,6 +148,7 @@ class ViewManagerWrapperDelegate(
 
   fun onDestroy(view: View) {
     try {
+      (view as? ComposeHostingView)?.disposeHostedComposition()
       definition.onViewDestroys?.invoke(view)
     } catch (exception: Throwable) {
       // The view wasn't constructed correctly, so errors are expected.
@@ -177,3 +178,11 @@ class ViewManagerWrapperDelegate(
       }
   }
 }
+
+/**
+ * Implemented by Compose-based views to dispose their composition when the
+ * view is destroyed.
+ */
+interface ComposeHostingView {
+  fun disposeHostedComposition()
+}

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

@@ -79,10 +79,11 @@ declare namespace ExpoGlobal {
      */
     export function reloadAppAsync(reason: string): Promise<void>;
     /**
-     * Installs Expo Modules inside the Reanimated UI worklet runtime.
-     * @platform android
+     * Installs Expo Modules inside the worklets UI runtime.
+     * @param uiRuntimeHolder The UI runtime holder from `getUIRuntimeHolder()` in
+     * `react-native-worklets`.
      */
-    export function installOnUIRuntime(): void;
+    export function installOnUIRuntime(uiRuntimeHolder: object): void;
 }
 declare global {
     namespace NodeJS {

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

@@ -1 +1 @@
-{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../src/ts-declarations/global.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../src/ts-declarations/global.ts"],"names":[],"mappings":"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"}

package/build/worklets/index.d.ts

@@ -1,2 +1,9 @@
-export declare function installOnUIRuntime(): void;
+/**
+ * Installs Expo Modules on the UI worklet runtime so worklet callbacks and
+ * serializable SharedObjects work there.
+ *
+ * @param uiRuntimeHolder The UI runtime holder from `getUIRuntimeHolder()` in
+ * `react-native-worklets`.
+ */
+export declare function installOnUIRuntime(uiRuntimeHolder: object): void;
 //# sourceMappingURL=index.d.ts.map

package/build/worklets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worklets/index.ts"],"names":[],"mappings":"AAAA,wBAAgB,kBAAkB,SASjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worklets/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,QASzD"}

package/ios/Core/AppContext.swift

@@ -670,8 +670,13 @@ public final class AppContext: NSObject, EXAppContextProtocol, @unchecked Sendab
     if moduleRegistry.has(moduleWithName: "ExpoGo") {
       NotificationCenter.default.post(name: NSNotification.Name(rawValue: "EXReloadActiveAppRequest"), object: nil)
     } else {
-      DispatchQueue.main.async {
-        RCTTriggerReloadCommandListeners(reason)
+      // Must run on the main thread (see #31789), but synchronously when already there — deferring
+      // via `DispatchQueue.main.async` deadlocks the bridgeless reload against TurboModule teardown.
+      let trigger = { RCTTriggerReloadCommandListeners(reason) }
+      if Thread.isMainThread {
+        trigger()
+      } else {
+        DispatchQueue.main.async(execute: trigger)
       }
     }
   }

package/ios/Core/Modules/CoreModule.swift

@@ -4,8 +4,6 @@ internal import React
 import Foundation
 import ExpoModulesJSI
 
-private let WORKLET_RUNTIME_KEY = "_WORKLET_RUNTIME"
-
 // The core module that describes the `global.expo` object.
 internal final class CoreModule: Module {
   internal func definition() -> ModuleDefinition {
@@ -29,7 +27,7 @@ internal final class CoreModule: Module {
       FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.path ?? ""
     }
 
-    Function("installOnUIRuntime") {
+    Function("installOnUIRuntime") { (uiRuntimeHolder: JavaScriptValue) in
       guard let appContext else {
         throw Exceptions.AppContextLost()
       }
@@ -40,12 +38,7 @@ internal final class CoreModule: Module {
       }
 
       let runtime = try appContext.runtime
-      if !runtime.global().hasProperty(WORKLET_RUNTIME_KEY) {
-        throw WorkletUIRuntimeException()
-      }
-
-      let pointerHolder = runtime.global().getProperty(WORKLET_RUNTIME_KEY)
-      if !pointerHolder.isObject() {
+      guard uiRuntimeHolder.isObject() else {
         throw WorkletUIRuntimeException()
       }
 
@@ -61,7 +54,7 @@ internal final class CoreModule: Module {
 
       let block = {
         do {
-          let uiRuntime = try factory(appContext, pointerHolder, runtime)
+          let uiRuntime = try factory(appContext, uiRuntimeHolder, runtime)
           appContext._uiRuntime = uiRuntime
         } catch {
           errorHolder.error = error

package/ios/Worklets/Core/WorkletIntegration.swift

@@ -8,20 +8,13 @@ import ExpoModulesJSI
 @objc(EXWorkletIntegration)
 public final class WorkletIntegration: NSObject {
   @objc public static func register() {
-    AppContext.uiRuntimeFactory = { _, pointerValue, runtime in
-      // The worklet runtime pointer is passed as a JS ArrayBuffer containing the raw address.
-      // This is an internal transport between the worklets package's own install code and this
-      // factory — we trust the ArrayBuffer bytes to be a valid `jsi::Runtime *`. No authentication
-      // is performed; the size check below is only a sanity guard against malformed transport.
-      guard pointerValue.isArrayBuffer() else {
-        throw WorkletRuntimePointerExtractionException()
-      }
-      let arrayBuffer = pointerValue.getArrayBuffer()
-      guard arrayBuffer.size == MemoryLayout<UnsafeMutableRawPointer>.size else {
-        throw WorkletRuntimePointerExtractionException()
+    AppContext.uiRuntimeFactory = { _, holder, runtime in
+      let runtimePointer: UnsafeMutableRawPointer? = runtime.withUnsafePointee { runtimePointee in
+        holder.withUnsafePointee { holderPointee in
+          WorkletRuntimeResolver.uiRuntimePointer(runtimePointer: runtimePointee, holderPointer: holderPointee)
+        }
       }
-      let pointer = UnsafeMutableRawPointer(arrayBuffer.data()).load(as: UnsafeMutableRawPointer.self)
-      guard let workletRuntime = WorkletRuntime(runtimePointer: pointer) else {
+      guard let runtimePointer, let workletRuntime = WorkletRuntime(runtimePointer: runtimePointer) else {
         throw WorkletRuntimePointerExtractionException()
       }
       return workletRuntime
@@ -29,7 +22,7 @@ public final class WorkletIntegration: NSObject {
   }
 }
 
-private final class WorkletRuntimePointerExtractionException: Exception, @unchecked Sendable {
+internal final class WorkletRuntimePointerExtractionException: Exception, @unchecked Sendable {
   override var reason: String {
     "Cannot extract pointer to UI worklet runtime"
   }

package/ios/Worklets/EXWorkletsProvider.h

@@ -25,6 +25,10 @@ NS_SWIFT_NAME(WorkletsProvider)
 - (nullable id)workletRuntimeHandleForRawPointer:(void *)rawPointer
     NS_SWIFT_NAME(workletRuntimeHandle(rawPointer:));
 
+- (void * _Nullable)uiRuntimePointerWithRuntimePointer:(void *)runtimePointer
+                                         holderPointer:(const void *)holderPointer
+    NS_SWIFT_NAME(uiRuntimePointer(runtimePointer:holderPointer:));
+
 - (void)scheduleWorkletWithRuntimeHandle:(id)runtimeHandle
                             serializable:(EXJavaScriptSerializable *)serializable
                                arguments:(NSArray *)arguments

package/ios/Worklets/WorkletRuntimeResolver.h

@@ -0,0 +1,23 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+NS_SWIFT_NAME(WorkletRuntimeResolver)
+@interface EXWorkletRuntimeResolver : NSObject
+
+/**
+ Resolves the raw `jsi::Runtime *` of the UI worklet runtime from a
+ `react-native-worklets` UI runtime holder.
+ @param runtimePointer Raw pointer to the RN `jsi::Runtime`.
+ @param holderPointer Raw pointer to the holder `jsi::Value`.
+ Returns NULL when the runtime can't be resolved.
+ */
++ (void * _Nullable)uiRuntimePointerWithRuntimePointer:(void *)runtimePointer
+                                         holderPointer:(const void *)holderPointer
+    NS_SWIFT_NAME(uiRuntimePointer(runtimePointer:holderPointer:));
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/Worklets/WorkletRuntimeResolver.mm

@@ -0,0 +1,15 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+#import <ExpoModulesWorklets/WorkletRuntimeResolver.h>
+#import <ExpoModulesWorklets/EXWorkletsProvider.h>
+
+@implementation EXWorkletRuntimeResolver
+
++ (void * _Nullable)uiRuntimePointerWithRuntimePointer:(void *)runtimePointer
+                                         holderPointer:(const void *)holderPointer
+{
+  id<EXWorkletsProvider> provider = EXWorkletsProviderRegistry.shared;
+  return [provider uiRuntimePointerWithRuntimePointer:runtimePointer holderPointer:holderPointer];
+}
+
+@end

package/ios/WorkletsAdapter/ExpoWorkletsBridgeProvider.mm

@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <vector>
+#include <worklets/Compat/StableApi.h>
 #include <worklets/SharedItems/Serializable.h>
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 
@@ -163,6 +164,26 @@ static jsi::Value callWorklet(jsi::Runtime &rt, std::shared_ptr<worklets::Serial
   return handle;
 }
 
+- (void * _Nullable)uiRuntimePointerWithRuntimePointer:(void *)runtimePointer
+                                         holderPointer:(const void *)holderPointer
+{
+  jsi::Runtime &rt = *reinterpret_cast<jsi::Runtime *>(runtimePointer);
+  const jsi::Value &holderValue = *reinterpret_cast<const jsi::Value *>(holderPointer);
+
+  if (!holderValue.isObject()) {
+    return nullptr;
+  }
+
+  jsi::Object holder = holderValue.getObject(rt);
+  std::shared_ptr<worklets::WorkletRuntime> workletRuntime = worklets::getWorkletRuntimeFromHolder(rt, holder);
+  if (!workletRuntime) {
+    return nullptr;
+  }
+
+  jsi::Runtime &uiRuntime = worklets::getJSIRuntimeFromWorkletRuntime(workletRuntime);
+  return &uiRuntime;
+}
+
 - (void)scheduleWorkletWithRuntimeHandle:(id)runtimeHandle
                             serializable:(EXJavaScriptSerializable *)serializable
                                arguments:(NSArray *)arguments

package/ios/WorkletsTests/WorkletsNotInstalledTests.swift

@@ -30,4 +30,24 @@ struct WorkletsNotInstalledTests {
       _ = try dynamicType.cast(jsValue: jsValue, appContext: appContext)
     }
   }
+
+  @Test
+  func `UI runtime install fails with an error (not a crash) when the worklets adapter is not linked`() throws {
+    // Only meaningful while the adapter is unlinked (the default in this test harness).
+    try #require(WorkletsProviderRegistry.shared == nil)
+
+    // Installs the core-side hook that turns a UI runtime holder into a runtime.
+    WorkletIntegration.register()
+    let factory = try #require(AppContext.uiRuntimeFactory)
+
+    let appContext = AppContext.create()
+    let runtime = try appContext.runtime
+    // With no adapter linked the resolver returns NULL for any holder, so the
+    // factory must throw rather than dereference a null runtime pointer.
+    let holder = try runtime.eval("({})")
+
+    #expect(throws: WorkletRuntimePointerExtractionException.self) {
+      _ = try factory(appContext, holder, runtime)
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "56.0.16",
+  "version": "56.0.18",
   "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.2.2",
-    "expo-modules-jsi": "~56.0.9",
+    "expo-modules-jsi": "~56.0.10",
     "invariant": "^2.2.4"
   },
   "peerDependencies": {
@@ -66,7 +66,7 @@
     "@types/invariant": "^2.2.33",
     "expo-module-scripts": "56.0.3"
   },
-  "gitHead": "b1e94a5c1c5b19472a42ca25752a3533699bc46a",
+  "gitHead": "b293744c7b199c6cbe910188863e93a174c21250",
   "scripts": {
     "build": "expo-module build",
     "clean": "expo-module clean",

package/src/polyfill/dangerous-internal.ts

@@ -27,7 +27,7 @@ export function installExpoGlobalPolyfill() {
     cacheDir: undefined,
     documentsDir: undefined,
 
-    installOnUIRuntime: () => {
+    installOnUIRuntime: (_uiRuntimeHolder: object) => {
       throw new Error('Method not implemented.');
     },
   };

package/src/ts-declarations/global.ts

@@ -102,10 +102,11 @@ declare namespace ExpoGlobal {
   export function reloadAppAsync(reason: string): Promise<void>;
 
   /**
-   * Installs Expo Modules inside the Reanimated UI worklet runtime.
-   * @platform android
+   * Installs Expo Modules inside the worklets UI runtime.
+   * @param uiRuntimeHolder The UI runtime holder from `getUIRuntimeHolder()` in
+   * `react-native-worklets`.
    */
-  export function installOnUIRuntime(): void;
+  export function installOnUIRuntime(uiRuntimeHolder: object): void;
 }
 
 /* eslint-disable no-var */

package/src/worklets/index.ts

@@ -1,10 +1,17 @@
-export function installOnUIRuntime() {
+/**
+ * Installs Expo Modules on the UI worklet runtime so worklet callbacks and
+ * serializable SharedObjects work there.
+ *
+ * @param uiRuntimeHolder The UI runtime holder from `getUIRuntimeHolder()` in
+ * `react-native-worklets`.
+ */
+export function installOnUIRuntime(uiRuntimeHolder: object) {
   const installOnUIRuntimeNative = globalThis?.expo?.installOnUIRuntime;
   if (!installOnUIRuntimeNative) {
     throw Error(
-      "Native method to install Expo Modules on Reanimated UI worklet runtime wasn't found in `expo-modules-core`."
+      "Native method to install Expo Modules on the worklets UI runtime wasn't found in `expo-modules-core`."
     );
   }
 
-  installOnUIRuntimeNative();
+  installOnUIRuntimeNative(uiRuntimeHolder);
 }