expo-modules-core 55.0.5 → 55.0.7

package/CHANGELOG.md

@@ -10,6 +10,26 @@
 
 ### 💡 Others
 
+## 55.0.7 — 2026-02-03
+
+### 🐛 Bug fixes
+
+- Fix global type declaration chain to point to `expo -> expo-modules-core/types -> ./build/global` rather than `types="node"` ([#42751](https://github.com/expo/expo/pull/42751) by [@kitten](https://github.com/kitten))
+
+## 55.0.6 — 2026-02-03
+
+### 🛠 Breaking changes
+
+- [iOS] Renamed `ignoreSafeAreaKeyboardInsets` to `ignoreSafeArea` on `Host` component. It now accepts `'all'` or `'keyboard'` instead of a boolean. ([#42598](https://github.com/expo/expo/pull/42598) by [@nishan](https://github.com/intergalacticspacehighway))
+
+### 🎉 New features
+
+- [macOS] Added `NSEdgeInsets.zero` extension to better match `UIEdgeInsets`. ([#42675](https://github.com/expo/expo/pull/42675) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed a crash in Fabric when unmounting a view while a geometry change event is being dispatched. ([#42628](https://github.com/expo/expo/issues/42628) by [@danishshaik](https://github.com/danishshaik)) ([#42634](https://github.com/expo/expo/pull/42634) by [@danishshaik](https://github.com/danishshaik))
+
 ## 55.0.5 — 2026-01-27
 
 _This version does not introduce any user-facing changes._
@@ -31,6 +51,7 @@ _This version does not introduce any user-facing changes._
 ### 💡 Others
 
 - [macos] Remove react-native-macos@0.79.0 workarounds ([#42409](https://github.com/expo/expo/pull/42409) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- Improved Jetpack Compose integration for Expo UI. ([#42450](https://github.com/expo/expo/pull/42450) by [@kudo](https://github.com/kudo))
 
 ## 55.0.1 — 2026-01-22
 

package/android/build.gradle

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

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

@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.RowScope
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.view.size
@@ -142,7 +141,18 @@ abstract class ExpoComposeView<T : ComposeProps>(
   }
 }
 
-class ExpoViewComposableScope(val view: ComposeFunctionHolder<*>) {
+/**
+ * A composable DSL scope that wraps an [ExpoComposeView] to provide syntax sugar.
+ *
+ * This scope allows defining view content using a functional, DSL-style API
+ * without creating a dedicated subclass of [ExpoComposeView].
+ */
+class FunctionalComposableScope(
+  val view: ComposeFunctionHolder<*>,
+  val composableScope: ComposableScope
+) {
+  val appContext = view.appContext
+
   @Composable
   fun Child(composableScope: ComposableScope, index: Int) {
     view.Child(composableScope, index)
@@ -167,16 +177,15 @@ class ComposeFunctionHolder<Props : ComposeProps>(
   context: Context,
   appContext: AppContext,
   override val name: String,
-  private val composableContent: @Composable ExpoViewComposableScope.(props: Props) -> Unit,
+  private val composableContent: @Composable FunctionalComposableScope.(props: Props) -> Unit,
   override val props: Props
 ) : ExpoComposeView<Props>(context, appContext), ViewFunctionHolder {
   val propsMutableState = mutableStateOf(props)
-  val scope = ExpoViewComposableScope(this)
 
   @Composable
   override fun ComposableScope.Content() {
     val props by propsMutableState
-    with(scope) {
+    with(FunctionalComposableScope(this@ComposeFunctionHolder, this@Content)) {
       composableContent(props)
     }
   }

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

@@ -40,7 +40,7 @@ open class ModuleDefinitionBuilderWithCompose(
   inline fun <reified Props : ComposeProps> View(
     name: String,
     events: ComposeViewFunctionDefinitionBuilder<Props>.() -> Unit = {},
-    noinline viewFunction: @Composable ExpoViewComposableScope.(props: Props) -> Unit
+    noinline viewFunction: @Composable FunctionalComposableScope.(props: Props) -> Unit
   ) {
     val definitionBuilder = ComposeViewFunctionDefinitionBuilder(name, Props::class, viewFunction)
     events.invoke(definitionBuilder)
@@ -52,7 +52,7 @@ open class ModuleDefinitionBuilderWithCompose(
 class ComposeViewFunctionDefinitionBuilder<Props : ComposeProps>(
   val name: String,
   val propsClass: KClass<Props>,
-  val viewFunction: @Composable ExpoViewComposableScope.(props: Props) -> Unit
+  val viewFunction: @Composable FunctionalComposableScope.(props: Props) -> Unit
 ) {
   private var callbacksDefinition: CallbacksDefinition? = null
 

package/android/src/main/cpp/MethodMetadata.cpp

@@ -194,7 +194,7 @@ jsi::Value MethodMetadata::callSync(
   jni::JniLocalScope scope(env, (int) count);
 
   auto result = this->callJNISync(env, rt, thisValue, args, count);
-  return convert(env, rt, result);
+  return convert(env, rt, this->info.returnType, result);
 }
 
 jsi::Function MethodMetadata::toAsyncFunction(

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

@@ -5,6 +5,7 @@
 #include "types/CppType.h"
 #include "types/ExpectedType.h"
 #include "types/AnyType.h"
+#include "types/ReturnType.h"
 
 #include <jsi/jsi.h>
 #include <fbjni/fbjni.h>
@@ -48,6 +49,10 @@ public:
      * Representation of expected argument types.
      */
     std::vector<std::unique_ptr<AnyType>> argTypes;
+    /**
+     * Representation of expected return type.
+     */
+    ReturnType returnType = ReturnType::UNKNOWN;
   };
 
   Info info;

package/android/src/main/cpp/concepts/jni.h

@@ -0,0 +1,43 @@
+// Copyright © 2026-present 650 Industries, Inc. (aka Expo)
+
+#pragma once
+
+#include <concepts>
+#include <fbjni/fbjni.h>
+#include "jni_deref.h"
+
+namespace jni = facebook::jni;
+
+namespace expo {
+
+template<typename T>
+concept HasCthis = requires(T &t) { t->cthis(); };
+
+template<typename T>
+concept HasToStdString = requires(T &t) { t->toStdString(); };
+
+template<typename T>
+concept HasValue = requires(T &t) { t->value(); };
+
+template<typename T>
+concept HasGetRegion = requires(T &t, jsize s) { t->getRegion(s, s); };
+
+template<typename T>
+concept IsJBoolean = std::is_same_v<jni_deref_t<T>, jni::JBoolean>;
+
+template<typename T>
+concept JniRef =
+  std::is_same_v<T, jni::local_ref<jni_deref_t<T>>> ||
+  std::is_same_v<T, jni::global_ref<jni_deref_t<T>>> ||
+  std::is_same_v<T, jni::alias_ref<jni_deref_t<T>>>;
+
+template<typename T, typename Inner>
+concept JniRefTo = JniRef<T> && std::is_same_v<jni_deref_t<T>, Inner>;
+
+template<typename T, typename Inner>
+concept JCollectionRef = JniRefTo<T, jni::JCollection<Inner>>;
+
+template<typename T, typename Key, typename Value>
+concept JMapRef = JniRefTo<T, jni::JMap<Key, Value>>;
+
+} // namespace expo

package/android/src/main/cpp/concepts/jni_deref.h

@@ -0,0 +1,39 @@
+// Copyright © 2026-present 650 Industries, Inc. (aka Expo)
+
+#pragma once
+
+#include <concepts>
+#include <fbjni/fbjni.h>
+
+namespace jni = facebook::jni;
+
+namespace expo::jni_deref_impl {
+
+template<typename T>
+struct deref {
+  using type = T;
+};
+
+template<typename T>
+struct deref<jni::local_ref<T>> {
+  using type = T;
+};
+
+template<typename T>
+struct deref<jni::global_ref<T>> {
+  using type = T;
+};
+
+template<typename T>
+struct deref<jni::alias_ref<T>> {
+  using type = T;
+};
+
+} // namespace expo::jni_deref_impl
+
+namespace expo {
+
+template<typename T>
+using jni_deref_t = typename jni_deref_impl::deref<std::remove_cvref_t<T>>::type;
+
+} // namespace expo

package/android/src/main/cpp/concepts/jsi.h

@@ -0,0 +1,20 @@
+// Copyright © 2026-present 650 Industries, Inc. (aka Expo)
+
+#pragma once
+
+#include <concepts>
+#include <jsi/jsi.h>
+
+namespace jsi = facebook::jsi;
+
+namespace expo {
+
+template<typename T>
+concept TriviallyConvertibleToJSI = std::is_constructible_v<jsi::Value, T>;
+
+template<typename T>
+concept ConvertibleToJSI =
+  std::is_constructible_v<jsi::Value, jsi::Runtime &, T> &&
+  !std::is_constructible_v<jsi::Value, T>;
+
+} // namespace expo

package/android/src/main/cpp/decorators/JSDecoratorsBridgingObject.cpp

@@ -3,6 +3,7 @@
 #include "JSDecoratorsBridgingObject.h"
 
 #include "JSClassesDecorator.h"
+#include "../types/ReturnType.h"
 
 namespace expo {
 
@@ -36,13 +37,21 @@ void JSDecoratorsBridgingObject::registerSyncFunction(
   jboolean takesOwner,
   jboolean enumerable,
   jni::alias_ref<jni::JArrayClass<ExpectedType>> expectedArgTypes,
+  jint cppReturnType,
   jni::alias_ref<JNIFunctionBody::javaobject> body
 ) {
   if (!functionDecorator) {
     functionDecorator = std::make_unique<JSFunctionsDecorator>();
   }
 
-  functionDecorator->registerSyncFunction(name, takesOwner, enumerable, expectedArgTypes, body);
+  functionDecorator->registerSyncFunction(
+    name,
+    takesOwner,
+    enumerable,
+    expectedArgTypes,
+    (ReturnType)cppReturnType,
+    body
+  );
 }
 
 void JSDecoratorsBridgingObject::registerAsyncFunction(
@@ -94,7 +103,8 @@ void JSDecoratorsBridgingObject::registerConstant(
   constantsDecorator->registerConstant(name, getter);
 }
 
-void JSDecoratorsBridgingObject::registerConstants(jni::alias_ref<react::NativeMap::javaobject> constants) {
+void JSDecoratorsBridgingObject::registerConstants(
+  jni::alias_ref<react::NativeMap::javaobject> constants) {
   if (!constantsDecorator) {
     constantsDecorator = std::make_unique<JSConstantsDecorator>();
   }

package/android/src/main/cpp/decorators/JSDecoratorsBridgingObject.h

@@ -51,6 +51,7 @@ public:
     jboolean takesOwner,
     jboolean enumerable,
     jni::alias_ref<jni::JArrayClass<ExpectedType>> expectedArgTypes,
+    jint cppReturnType,
     jni::alias_ref<JNIFunctionBody::javaobject> body
   );
 

package/android/src/main/cpp/decorators/JSFunctionsDecorator.cpp

@@ -30,6 +30,7 @@ void JSFunctionsDecorator::registerFunction(
   bool enumerable,
   bool isAsync,
   std::vector<std::unique_ptr<AnyType>> &&argTypes,
+  ReturnType returnType,
   jni::global_ref<jobject> body
 ) {
   MethodMetadata::Info info{
@@ -51,6 +52,7 @@ void JSFunctionsDecorator::registerSyncFunction(
   jboolean takesOwner,
   jboolean enumerable,
   jni::alias_ref<jni::JArrayClass<ExpectedType>> expectedArgTypes,
+  ReturnType returnType,
   jni::alias_ref<JNIFunctionBody::javaobject> body
 ) {
   registerFunction(
@@ -61,6 +63,7 @@ void JSFunctionsDecorator::registerSyncFunction(
     enumerable,
     /*isAsync=*/false,
     mapConverters(expectedArgTypes),
+    returnType,
     jni::make_global(body)
   );
 }
@@ -80,6 +83,7 @@ void JSFunctionsDecorator::registerAsyncFunction(
     enumerable,
     /*isAsync=*/true,
     mapConverters(expectedArgTypes),
+    ReturnType::UNKNOWN,
     jni::make_global(body)
   );
 }

package/android/src/main/cpp/decorators/JSFunctionsDecorator.h

@@ -12,6 +12,7 @@
 #include "../MethodMetadata.h"
 #include "../JNIFunctionBody.h"
 #include "../types/ExpectedType.h"
+#include "../types/ReturnType.h"
 
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
@@ -26,6 +27,7 @@ public:
     jboolean takesOwner,
     jboolean enumerable,
     jni::alias_ref<jni::JArrayClass<ExpectedType>> expectedArgTypes,
+    ReturnType returnType,
     jni::alias_ref<JNIFunctionBody::javaobject> body
   );
 
@@ -56,6 +58,7 @@ private:
     bool enumerable,
     bool isAsync,
     std::vector<std::unique_ptr<AnyType>> &&argTypes,
+    ReturnType returnType,
     jni::global_ref<jobject> body
   );
 };

package/android/src/main/cpp/types/CppType.h

@@ -7,7 +7,7 @@ namespace expo {
  * A cpp version of the `expo.modules.kotlin.jni.CppType` enum.
  * Used to determine which representation of the js value should be sent to the Kotlin.
  */
-enum CppType {
+enum class CppType {
   NONE = 0,
   DOUBLE = 1 << 0,
   INT = 1 << 1,
@@ -35,4 +35,5 @@ enum CppType {
   NATIVE_ARRAY_BUFFER = 1 << 23,
   SERIALIZABLE = 1 << 24,
 };
+
 } // namespace expo

package/android/src/main/cpp/types/JNIToJSIConverter.cpp

@@ -90,6 +90,67 @@ jsi::Value convert(
   return jsi::Value::undefined();
 }
 
+jsi::Value convert(
+  JNIEnv *env,
+  jsi::Runtime &rt,
+  ReturnType returnType,
+  const jni::local_ref<jobject> &value
+) {
+#define CAST_AND_RETURN(type) \
+    return convertToJS(env, rt, *((jni::local_ref<type>*)((void*)&value)));
+#define COMMA ,
+
+  switch (returnType) {
+    case ReturnType::UNKNOWN:
+      return convert(env, rt, value);
+    case ReturnType::DOUBLE:
+      CAST_AND_RETURN(jni::JDouble)
+    case ReturnType::INT:
+      CAST_AND_RETURN(jni::JInteger)
+    case ReturnType::LONG:
+      CAST_AND_RETURN(jni::JLong)
+    case ReturnType::STRING:
+      CAST_AND_RETURN(jni::JString)
+    case ReturnType::BOOLEAN:
+      CAST_AND_RETURN(jni::JBoolean)
+    case ReturnType::FLOAT:
+      CAST_AND_RETURN(jni::JFloat)
+    case ReturnType::WRITEABLE_ARRAY:
+      CAST_AND_RETURN(react::WritableNativeArray::javaobject)
+    case ReturnType::WRITEABLE_MAP:
+      CAST_AND_RETURN(react::WritableNativeMap::javaobject)
+    case ReturnType::JS_MODULE:
+      CAST_AND_RETURN(JavaScriptModuleObject::javaobject)
+    case ReturnType::SHARED_OBJECT:
+      CAST_AND_RETURN(JSharedObject::javaobject)
+    case ReturnType::JS_TYPED_ARRAY:
+      CAST_AND_RETURN(JavaScriptTypedArray::javaobject)
+    case ReturnType::JS_ARRAY_BUFFER:
+      CAST_AND_RETURN(JavaScriptArrayBuffer::javaobject)
+    case ReturnType::NATIVE_ARRAY_BUFFER:
+      CAST_AND_RETURN(NativeArrayBuffer::javaobject)
+    case ReturnType::MAP:
+      CAST_AND_RETURN(jni::JMap<jstring COMMA jobject>)
+    case ReturnType::COLLECTION:
+      CAST_AND_RETURN(jni::JCollection<jobject>)
+    case ReturnType::DOUBLE_ARRAY:
+      CAST_AND_RETURN(jni::JArrayDouble)
+    case ReturnType::INT_ARRAY:
+      CAST_AND_RETURN(jni::JArrayInt)
+    case ReturnType::LONG_ARRAY:
+      CAST_AND_RETURN(jni::JArrayLong)
+    case ReturnType::FLOAT_ARRAY:
+      CAST_AND_RETURN(jni::JArrayFloat)
+    case ReturnType::BOOLEAN_ARRAY:
+      CAST_AND_RETURN(jni::JArrayBoolean )
+  }
+
+#undef COMMA
+#undef CAST_AND_RETURN
+
+  assert("Unhandled ReturnType in JNIToJSIConverter::convert" && false);
+}
+
 std::optional<jsi::Value> decorateValueForDynamicExtension(jsi::Runtime &rt, const jsi::Value &value) {
   if (value.isString()) {
     std::string string = value.getString(rt).utf8(rt);