expo-modules-core 2.0.2 → 2.0.4

package/CHANGELOG.md

@@ -10,6 +10,28 @@
 
 ### 💡 Others
 
+## 2.0.4 — 2024-11-19
+
+### 🎉 New features
+
+- [Android] Supported css properties (border, background and shadow) by default. ([#33074](https://github.com/expo/expo/pull/33074) by [@lukmccall](https://github.com/lukmccall))
+
+### 🐛 Bug fixes
+
+- Fixed type errors when using `ts-jest`. ([#32954](https://github.com/expo/expo/pull/32954) by [@kudo](https://github.com/kudo))
+- [Android] Fixed `no non-static method "SharedObject.getSharedObjectId()" when proguard is enabled. ([#33011](https://github.com/expo/expo/pull/33011) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- Use `findNodeHandle` with a native ref instead of a class component instance to avoid expensive calls to `findCurrentFiberUsingSlowPath`. ([#33016](https://github.com/expo/expo/pull/33016) by [@tsapeta](https://github.com/tsapeta))
+
+## 2.0.3 — 2024-11-14
+
+### 🐛 Bug fixes
+
+- Fixed requests from `expo/fetch` being stuck on iOS. ([#32894](https://github.com/expo/expo/pull/32894) by [@kudo](https://github.com/kudo))
+- [Android] Fixed sending event containing `ByteArray` from the Kotlin module results in string ID instead of `Uint8Array`. ([#32945](https://github.com/expo/expo/pull/32945) by [@lukmccall](https://github.com/lukmccall))
+
 ## 2.0.2 — 2024-11-13
 
 ### 💡 Others

package/android/build.gradle

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '2.0.2'
+version = '2.0.4'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -67,7 +67,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.0.2"
+    versionName "2.0.4"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/cpp/JNIUtils.cpp

@@ -144,27 +144,25 @@ void JNIUtils::emitEventOnJavaScriptModule(
   jni::alias_ref<JavaScriptModuleObject::javaobject> jsiThis,
   jni::alias_ref<jni::HybridClass<JSIContext>::javaobject> jsiContextRef,
   jni::alias_ref<jstring> eventName,
-  jni::alias_ref<react::ReadableNativeMap::javaobject> eventBody
+  jni::alias_ref<jni::JMap<jstring, jobject>> eventBody
 ) {
-  folly::dynamic arg;
-  if (eventBody) {
-    arg = eventBody->cthis()->consume();
-  }
+  auto globalEventBody = jni::make_global(eventBody);
 
   JNIUtils::emitEventOnJSIObject(
     jsiThis->cthis()->getCachedJSIObject(),
     jsiContextRef,
     eventName,
-    [arg = std::move(arg)](jsi::Runtime &rt) -> std::vector<jsi::Value> {
-      jsi::Value convertedBody = jsi::valueFromDynamic(rt, arg);
-      std::vector<jsi::Value> args;
-      args.emplace_back(std::move(convertedBody));
-      return args;
+    [args = std::move(globalEventBody)](jsi::Runtime &rt) -> std::vector<jsi::Value> {
+      JNIEnv *env = jni::Environment::current();
+
+      auto localArgs = jni::static_ref_cast<jni::JMap<jstring, jobject>>(args);
+      std::vector<jsi::Value> result;
+      result.push_back(convertToJS(env, rt, localArgs));
+      return result;
     }
   );
 }
 
-
 void JNIUtils::emitEventOnJSIObject(
   std::weak_ptr<jsi::WeakObject> jsiThis,
   jni::alias_ref<jni::HybridClass<JSIContext>::javaobject> jsiContextRef,

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

@@ -57,7 +57,7 @@ public:
     jni::alias_ref<JavaScriptModuleObject::javaobject> jsiThis,
     jni::alias_ref<jni::HybridClass<JSIContext>::javaobject> jsiContextRef,
     jni::alias_ref<jstring> eventName,
-    jni::alias_ref<react::ReadableNativeMap::javaobject> eventBody
+    jni::alias_ref<jni::JMap<jstring, jobject>> eventBody
   );
 
 private:

package/android/src/main/java/expo/modules/kotlin/events/KModuleEventEmitterWrapper.kt

@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.View
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReadableNativeMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 import com.facebook.react.uimanager.UIManagerHelper
@@ -12,7 +11,7 @@ import expo.modules.kotlin.ModuleHolder
 import expo.modules.kotlin.jni.JNIUtils
 import expo.modules.kotlin.records.Record
 import expo.modules.kotlin.types.JSTypeConverter
-import expo.modules.kotlin.types.toJSValue
+import expo.modules.kotlin.types.toJSValueExperimental
 import java.lang.ref.WeakReference
 
 /**
@@ -27,25 +26,25 @@ class KModuleEventEmitterWrapper(
 ) : KEventEmitterWrapper(legacyEventEmitter, reactContextHolder) {
   override fun emit(eventName: String, eventBody: Bundle?) {
     checkIfEventWasExported(eventName)
-    emitNative(eventName, eventBody?.toJSValue(JSTypeConverter.DefaultContainerProvider) as? ReadableNativeMap)
+    emitNative(eventName, eventBody?.toJSValueExperimental())
   }
 
   override fun emit(eventName: String, eventBody: WritableMap?) {
     checkIfEventWasExported(eventName)
-    emitNative(eventName, eventBody as? ReadableNativeMap)
+    emitNative(eventName, eventBody?.toHashMap())
   }
 
   override fun emit(eventName: String, eventBody: Record?) {
     checkIfEventWasExported(eventName)
-    emitNative(eventName, eventBody?.toJSValue(JSTypeConverter.DefaultContainerProvider) as? ReadableNativeMap)
+    emitNative(eventName, eventBody?.toJSValueExperimental())
   }
 
   override fun emit(eventName: String, eventBody: Map<*, *>?) {
     checkIfEventWasExported(eventName)
-    emitNative(eventName, eventBody?.toJSValue(JSTypeConverter.DefaultContainerProvider) as? ReadableNativeMap)
+    emitNative(eventName, eventBody?.toJSValueExperimental())
   }
 
-  private fun emitNative(eventName: String, eventBody: ReadableNativeMap?) {
+  private fun emitNative(eventName: String, eventBody: Map<String, Any?>?) {
     val runtimeContext = moduleHolder.module.runtimeContext
     val jsObject = moduleHolder.safeJSObject ?: return
     try {

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

@@ -1,7 +1,5 @@
 package expo.modules.kotlin.jni
 
-import com.facebook.react.bridge.ReadableNativeMap
-
 @Suppress("KotlinJniMissingFunction")
 class JNIUtils {
   companion object {
@@ -26,7 +24,7 @@ class JNIUtils {
       jsiThis: JavaScriptModuleObject,
       jsiContext: JSIContext,
       eventName: String,
-      eventBody: ReadableNativeMap?
+      eventBody: Map<String, Any?>?
     )
   }
 }

package/android/src/main/java/expo/modules/kotlin/modules/ModuleDefinitionBuilder.kt

@@ -20,6 +20,7 @@ import expo.modules.kotlin.types.LazyKType
 import expo.modules.kotlin.types.toAnyType
 import expo.modules.kotlin.views.ViewDefinitionBuilder
 import expo.modules.kotlin.views.ViewManagerDefinition
+import expo.modules.kotlin.views.decorators.UseCSSProps
 import kotlin.reflect.KClass
 import kotlin.reflect.typeOf
 
@@ -65,6 +66,9 @@ class ModuleDefinitionBuilder(@PublishedApi internal val module: Module? = null)
   inline fun <reified T : View> View(viewClass: KClass<T>, body: ViewDefinitionBuilder<T>.() -> Unit) {
     require(viewManagerDefinition == null) { "The module definition may have exported only one view manager." }
     val viewDefinitionBuilder = ViewDefinitionBuilder(viewClass, LazyKType(classifier = T::class, kTypeProvider = { typeOf<T>() }))
+
+    viewDefinitionBuilder.UseCSSProps()
+
     body.invoke(viewDefinitionBuilder)
     viewManagerDefinition = viewDefinitionBuilder.build()
   }

package/android/src/main/java/expo/modules/kotlin/sharedobjects/SharedObject.kt

@@ -20,6 +20,7 @@ open class SharedObject(runtimeContext: RuntimeContext? = null) {
   internal var sharedObjectId: SharedObjectId = SharedObjectId(0)
 
   // Used by JNI
+  @DoNotStrip
   private fun getSharedObjectId(): Int {
     return sharedObjectId.value
   }

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

@@ -18,6 +18,25 @@ import kotlin.reflect.full.memberProperties
 import kotlin.reflect.full.primaryConstructor
 import kotlin.reflect.jvm.isAccessible
 
+fun Record.toJSValueExperimental(): Map<String, Any?> {
+  val result = mutableMapOf<String, Any?>()
+
+  javaClass
+    .kotlin
+    .memberProperties.map { property ->
+      val fieldInformation = property.findAnnotation<Field>() ?: return@map
+      val jsKey = fieldInformation.key.takeUnless { it == "" } ?: property.name
+
+      property.isAccessible = true
+
+      val value = property.get(this)
+      val convertedValue = JSTypeConverter.convertToJSValue(value, useExperimentalConverter = true)
+      result[jsKey] = convertedValue
+    }
+
+  return result
+}
+
 fun Record.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableMap {
   val result = containerProvider.createMap()
 
@@ -37,6 +56,19 @@ fun Record.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): Writ
   return result
 }
 
+fun Bundle.toJSValueExperimental(): Map<String, Any?> {
+  val result = mutableMapOf<String, Any?>()
+
+  for (key in keySet()) {
+    @Suppress("DEPRECATION")
+    val value = get(key)
+    val convertedValue = JSTypeConverter.convertToJSValue(value, useExperimentalConverter = true)
+    result[key] = convertedValue
+  }
+
+  return result
+}
+
 fun Bundle.toJSValue(containerProvider: JSTypeConverter.ContainerProvider): WritableMap {
   val result = containerProvider.createMap()
 

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

@@ -1,8 +1,10 @@
 package expo.modules.kotlin.views
 
 import android.content.Context
+import android.graphics.Canvas
 import android.widget.LinearLayout
 import androidx.annotation.UiThread
+import com.facebook.react.uimanager.BackgroundStyleApplicator
 import expo.modules.kotlin.AppContext
 
 /**
@@ -46,4 +48,12 @@ abstract class ExpoView(
       post(Runnable { measureAndLayout() })
     }
   }
+
+  override fun dispatchDraw(canvas: Canvas) {
+    // When the border radius is set, we need to clip the content to the padding box.
+    // This is because the border radius is applied to the background drawable, not the view itself.
+    // It is the same behavior as in React Native.
+    BackgroundStyleApplicator.clipToPaddingBox(this, canvas)
+    super.dispatchDraw(canvas)
+  }
 }

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

@@ -8,6 +8,9 @@ import android.view.View
 import android.view.ViewGroup
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.Promise
+import expo.modules.kotlin.component6
+import expo.modules.kotlin.component7
+import expo.modules.kotlin.component8
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.UnexpectedException
 import expo.modules.kotlin.functions.AsyncFunction
@@ -16,14 +19,11 @@ import expo.modules.kotlin.functions.AsyncFunctionWithPromiseComponent
 import expo.modules.kotlin.functions.Queues
 import expo.modules.kotlin.functions.createAsyncFunctionComponent
 import expo.modules.kotlin.modules.DefinitionMarker
+import expo.modules.kotlin.types.enforceType
 import expo.modules.kotlin.types.toAnyType
+import expo.modules.kotlin.types.toArgsArray
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
-import expo.modules.kotlin.component6
-import expo.modules.kotlin.component7
-import expo.modules.kotlin.component8
-import expo.modules.kotlin.types.enforceType
-import expo.modules.kotlin.types.toArgsArray
 
 @DefinitionMarker
 class ViewDefinitionBuilder<T : View>(
@@ -142,6 +142,15 @@ class ViewDefinitionBuilder<T : View>(
     }
   }
 
+  inline fun <reified ViewType : View, reified PropType> PropGroup(
+    vararg props: String,
+    noinline body: (view: ViewType, value: Int, prop: PropType) -> Unit
+  ) {
+    props.forEachIndexed { index, name ->
+      Prop<ViewType, PropType>(name) { view, prop -> body(view, index, prop) }
+    }
+  }
+
   /**
    * Defines prop names that should be treated as callbacks.
    */
@@ -384,39 +393,40 @@ class ViewDefinitionBuilder<T : View>(
     name: String
   ) = AsyncFunctionBuilder(name).also { functionBuilders[name] = it }
 
-  private fun createViewFactory(): (Context, AppContext) -> View = viewFactory@{ context: Context, appContext: AppContext ->
-    val fullConstructor = try {
-      // Try to use constructor with two arguments
-      viewClass.java.getConstructor(Context::class.java, AppContext::class.java)
-    } catch (e: NoSuchMethodException) {
-      null
-    }
+  private fun createViewFactory(): (Context, AppContext) -> View =
+    viewFactory@{ context: Context, appContext: AppContext ->
+      val fullConstructor = try {
+        // Try to use constructor with two arguments
+        viewClass.java.getConstructor(Context::class.java, AppContext::class.java)
+      } catch (e: NoSuchMethodException) {
+        null
+      }
 
-    fullConstructor?.let {
-      return@viewFactory try {
-        it.newInstance(context, appContext)
-      } catch (e: Throwable) {
-        handleFailureDuringViewCreation(context, appContext, e)
+      fullConstructor?.let {
+        return@viewFactory try {
+          it.newInstance(context, appContext)
+        } catch (e: Throwable) {
+          handleFailureDuringViewCreation(context, appContext, e)
+        }
       }
-    }
 
-    val contextConstructor = try {
-      // Try to use constructor that use Android's context
-      viewClass.java.getConstructor(Context::class.java)
-    } catch (e: NoSuchMethodException) {
-      null
-    }
+      val contextConstructor = try {
+        // Try to use constructor that use Android's context
+        viewClass.java.getConstructor(Context::class.java)
+      } catch (e: NoSuchMethodException) {
+        null
+      }
 
-    contextConstructor?.let {
-      return@viewFactory try {
-        it.newInstance(context)
-      } catch (e: Throwable) {
-        handleFailureDuringViewCreation(context, appContext, e)
+      contextConstructor?.let {
+        return@viewFactory try {
+          it.newInstance(context)
+        } catch (e: Throwable) {
+          handleFailureDuringViewCreation(context, appContext, e)
+        }
       }
-    }
 
-    throw IllegalStateException("Didn't find a correct constructor for $viewClass")
-  }
+      throw IllegalStateException("Didn't find a correct constructor for $viewClass")
+    }
 
   private fun handleFailureDuringViewCreation(context: Context, appContext: AppContext, e: Throwable): View {
     Log.e("ExpoModulesCore", "Couldn't create view of type $viewClass", e)

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

@@ -0,0 +1,174 @@
+@file:Suppress("FunctionName")
+
+package expo.modules.kotlin.views.decorators
+
+import android.view.View
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.uimanager.BackgroundStyleApplicator
+import com.facebook.react.uimanager.LengthPercentage
+import com.facebook.react.uimanager.LengthPercentageType
+import com.facebook.react.uimanager.Spacing
+import com.facebook.react.uimanager.ViewProps
+import com.facebook.react.uimanager.style.BorderRadiusProp
+import com.facebook.react.uimanager.style.BorderStyle
+import com.facebook.react.uimanager.style.BoxShadow
+import com.facebook.react.uimanager.style.LogicalEdge
+import expo.modules.kotlin.types.enforceType
+import expo.modules.kotlin.views.ViewDefinitionBuilder
+
+inline fun <reified T : View> ViewDefinitionBuilder<T>.UseBorderColorProps(crossinline body: (view: T, edge: LogicalEdge, color: Int?) -> Unit) {
+  PropGroup(
+    ViewProps.BORDER_COLOR to Spacing.ALL,
+    ViewProps.BORDER_LEFT_COLOR to Spacing.LEFT,
+    ViewProps.BORDER_RIGHT_COLOR to Spacing.RIGHT,
+    ViewProps.BORDER_TOP_COLOR to Spacing.TOP,
+    ViewProps.BORDER_BOTTOM_COLOR to Spacing.BOTTOM,
+    ViewProps.BORDER_START_COLOR to Spacing.START,
+    ViewProps.BORDER_END_COLOR to Spacing.END,
+    ViewProps.BORDER_BLOCK_COLOR to Spacing.BLOCK,
+    ViewProps.BORDER_BLOCK_END_COLOR to Spacing.BLOCK_END,
+    ViewProps.BORDER_BLOCK_START_COLOR to Spacing.BLOCK_START
+  ) { view: T, spacing: Int, color: Int? ->
+    body(view, LogicalEdge.fromSpacingType(spacing), color)
+  }
+}
+
+private fun <T : View> ViewDefinitionBuilder<T>.UseBorderColorProps() {
+  enforceType<ViewDefinitionBuilder<View>>(this)
+  UseBorderColorProps { view: View, edge: LogicalEdge, color: Int? ->
+    BackgroundStyleApplicator.setBorderColor(
+      view,
+      edge,
+      color
+    )
+  }
+}
+
+inline fun <reified T : View> ViewDefinitionBuilder<T>.UseBorderWidthProps(crossinline body: (view: T, edge: LogicalEdge, width: Float?) -> Unit) {
+  PropGroup(
+    ViewProps.BORDER_WIDTH,
+    ViewProps.BORDER_LEFT_WIDTH,
+    ViewProps.BORDER_RIGHT_WIDTH,
+    ViewProps.BORDER_TOP_WIDTH,
+    ViewProps.BORDER_BOTTOM_WIDTH,
+    ViewProps.BORDER_START_WIDTH,
+    ViewProps.BORDER_END_WIDTH
+  ) { view: T, index: Int, width: Float? ->
+    body(view, LogicalEdge.entries[index], width)
+  }
+}
+
+private fun <T : View> ViewDefinitionBuilder<T>.UseBorderWidthProps() {
+  enforceType<ViewDefinitionBuilder<View>>(this)
+  UseBorderWidthProps { view, edge, width ->
+    BackgroundStyleApplicator.setBorderWidth(
+      view,
+      edge,
+      width ?: Float.NaN
+    )
+  }
+}
+
+inline fun <reified T : View> ViewDefinitionBuilder<T>.UseBorderRadiusProps(crossinline body: (view: T, border: BorderRadiusProp, radius: LengthPercentage?) -> Unit) {
+  PropGroup(
+    ViewProps.BORDER_RADIUS,
+    ViewProps.BORDER_TOP_LEFT_RADIUS,
+    ViewProps.BORDER_TOP_RIGHT_RADIUS,
+    ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
+    ViewProps.BORDER_BOTTOM_LEFT_RADIUS,
+    ViewProps.BORDER_TOP_START_RADIUS,
+    ViewProps.BORDER_TOP_END_RADIUS,
+    ViewProps.BORDER_BOTTOM_START_RADIUS,
+    ViewProps.BORDER_BOTTOM_END_RADIUS,
+    ViewProps.BORDER_END_END_RADIUS,
+    ViewProps.BORDER_END_START_RADIUS,
+    ViewProps.BORDER_START_END_RADIUS,
+    ViewProps.BORDER_START_START_RADIUS
+  ) { view: T, index: Int, radius: Float? ->
+    body(
+      view,
+      BorderRadiusProp.entries[index],
+      radius?.let { LengthPercentage(it, LengthPercentageType.POINT) }
+    )
+  }
+}
+
+private fun <T : View> ViewDefinitionBuilder<T>.UseBorderRadiusProps() {
+  enforceType<ViewDefinitionBuilder<View>>(this)
+  UseBorderRadiusProps { view, border, radius ->
+    BackgroundStyleApplicator.setBorderRadius(
+      view,
+      border,
+      radius
+    )
+  }
+}
+
+inline fun <reified T : View> ViewDefinitionBuilder<T>.UseBorderStyleProp(crossinline body: (view: T, style: BorderStyle?) -> Unit) {
+  Prop("borderStyle") { view: T, style: String? ->
+    val parsedBorderStyle = style?.let { BorderStyle.fromString(style) }
+    body(view, parsedBorderStyle)
+  }
+}
+
+private fun <T : View> ViewDefinitionBuilder<T>.UseBorderStyleProp() {
+  enforceType<ViewDefinitionBuilder<View>>(this)
+  UseBorderStyleProp { view, style ->
+    BackgroundStyleApplicator.setBorderStyle(
+      view,
+      style
+    )
+  }
+}
+
+inline fun <reified T : View> ViewDefinitionBuilder<T>.UseBackgroundProp(crossinline body: (view: T, color: Int?) -> Unit) {
+  Prop(ViewProps.BACKGROUND_COLOR) { view: T, color: Int? ->
+    body(view, color)
+  }
+}
+
+private fun <T : View> ViewDefinitionBuilder<T>.UseBackgroundProp() {
+  enforceType<ViewDefinitionBuilder<View>>(this)
+  UseBackgroundProp { view, color ->
+    BackgroundStyleApplicator.setBackgroundColor(view, color)
+  }
+}
+
+inline fun <reified T : View> ViewDefinitionBuilder<T>.UseBoxShadowProp(crossinline body: (view: T, shadow: List<BoxShadow>) -> Unit) {
+  Prop(ViewProps.BOX_SHADOW) { view: T, shadows: ReadableArray? ->
+    if (shadows == null) {
+      body(view, emptyList())
+      return@Prop
+    }
+
+    val shadowStyle = mutableListOf<BoxShadow>()
+    for (i in 0..<shadows.size()) {
+      val shadow = BoxShadow.parse(shadows.getMap(i)) ?: continue
+      shadowStyle.add((shadow))
+    }
+    body(view, shadowStyle)
+  }
+}
+
+private fun <T : View> ViewDefinitionBuilder<T>.UseBoxShadowProp() {
+  enforceType<ViewDefinitionBuilder<View>>(this)
+  UseBoxShadowProp { view, shadows ->
+    BackgroundStyleApplicator.setBoxShadow(view, shadows)
+  }
+}
+
+/**
+ * Decorates the view definition builder with CSS props.
+ * This includes border, background, and box shadow properties.
+ */
+@PublishedApi
+internal fun <T : View> ViewDefinitionBuilder<T>.UseCSSProps() {
+  UseBorderColorProps()
+  UseBorderWidthProps()
+  UseBorderRadiusProps()
+  UseBorderStyleProp()
+
+  UseBackgroundProp()
+
+  UseBoxShadowProp()
+}

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,KAAK,MAAM,OAAO,CAAC;AAuD1B;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAmDpF"}
+{"version":3,"file":"NativeViewManagerAdapter.native.d.ts","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAuD1B;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAqDpF"}

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

@@ -70,6 +70,10 @@ declare global {
      */
     var expo: ExpoGlobal;
     var process: ExpoProcess;
+    /**
+     * ExpoDomWebView is defined in `@expo/dom-webview` runtime.
+     */
+    var ExpoDomWebView: Record<string, any> | undefined;
 }
 export {};
 //# sourceMappingURL=global.d.ts.map

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":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAI7B;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAElC;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAElC;;OAEG;IACH,SAAS,EAAE,OAAO,SAAS,CAAC;IAE5B;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAIlC;;OAEG;IACH,MAAM,IAAI,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAEhD;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC;IAEnD;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C;AAED,KAAK,UAAU,GAAG;IAChB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChE,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,qCAAqC;QACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAEhC,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAE9B,gKAAgK;QAChK,aAAa,CAAC,EAAE,MAAM,CAAC;QAEvB,sKAAsK;QACtK,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAID,OAAO,CAAC,MAAM,CAAC;IACb;;;OAGG;IACH,IAAI,IAAI,EAAE,UAAU,CAAC;IAErB,IAAI,OAAO,EAAE,WAAW,CAAC;CAC1B"}
+{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../src/ts-declarations/global.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAI7B;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAElC;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAElC;;OAEG;IACH,SAAS,EAAE,OAAO,SAAS,CAAC;IAE5B;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAIlC;;OAEG;IACH,MAAM,IAAI,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAEhD;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC;IAEnD;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C;AAED,KAAK,UAAU,GAAG;IAChB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChE,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,qCAAqC;QACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAEhC,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAE9B,gKAAgK;QAChK,aAAa,CAAC,EAAE,MAAM,CAAC;QAEvB,sKAAsK;QACtK,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAID,OAAO,CAAC,MAAM,CAAC;IACb;;;OAGG;IACH,IAAI,IAAI,EAAE,UAAU,CAAC;IAErB,IAAI,OAAO,EAAE,WAAW,CAAC;IAEzB;;OAEG;IACH,IAAI,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;CACrD"}

package/build/web/index.web.d.ts

@@ -1,2 +1,3 @@
+export * from '../ts-declarations/global';
 export declare function registerWebGlobals(): void;
 //# sourceMappingURL=index.web.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../src/web/index.web.ts"],"names":[],"mappings":"AAGA,wBAAgB,kBAAkB,SAiBjC"}
+{"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../src/web/index.web.ts"],"names":[],"mappings":"AAKA,cAAc,2BAA2B,CAAC;AAE1C,wBAAgB,kBAAkB,SAiBjC"}

package/ios/DevTools/URLSessionSessionDelegateProxy.swift

@@ -89,12 +89,15 @@ public final class URLSessionSessionDelegateProxy: NSObject, URLSessionDataDeleg
     didReceive challenge: URLAuthenticationChallenge,
     completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
   ) {
-    if let delegate = getDelegate(task: task) {
+    if let delegate = getDelegate(task: task),
+      delegate.responds(to: #selector(URLSessionTaskDelegate.urlSession(_:task:didReceive:completionHandler:))) {
       delegate.urlSession?(
         session,
         task: task,
         didReceive: challenge,
         completionHandler: completionHandler)
+    } else {
+      completionHandler(.performDefaultHandling, nil)
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-native": "^12.5.2",
     "expo-module-scripts": "^4.0.0"
   },
-  "gitHead": "c4999f5aa407155a170830a0fa17e3e3ca1fcbee"
+  "gitHead": "128718d43bac2eaed764b3551469b95400f2363e"
 }

package/src/NativeViewManagerAdapter.native.tsx

@@ -3,7 +3,7 @@
 'use client';
 
 import React from 'react';
-import { findNodeHandle, NativeModules, HostComponent } from 'react-native';
+import { NativeModules, NativeMethods, HostComponent, findNodeHandle } from 'react-native';
 import * as NativeComponentRegistry from 'react-native/Libraries/NativeComponent/NativeComponentRegistry';
 
 import { requireNativeModule } from './requireNativeModule';
@@ -81,16 +81,18 @@ export function requireNativeViewManager<P>(viewName: string): React.ComponentTy
   class NativeComponent extends React.PureComponent<P> {
     static displayName = viewName;
 
+    nativeRef = React.createRef<React.Component & NativeMethods>();
+
     // This will be accessed from native when the prototype functions are called,
     // in order to find the associated native view.
     nativeTag: number | null = null;
 
     componentDidMount(): void {
-      this.nativeTag = findNodeHandle(this);
+      this.nativeTag = findNodeHandle(this.nativeRef.current);
     }
 
     render(): React.ReactNode {
-      return <ReactNativeComponent {...this.props} />;
+      return <ReactNativeComponent {...this.props} ref={this.nativeRef} />;
     }
   }
 

package/src/ts-declarations/global.ts

@@ -91,4 +91,9 @@ declare global {
   var expo: ExpoGlobal;
 
   var process: ExpoProcess;
+
+  /**
+   * ExpoDomWebView is defined in `@expo/dom-webview` runtime.
+   */
+  var ExpoDomWebView: Record<string, any> | undefined;
 }

package/src/web/index.web.ts

@@ -1,6 +1,10 @@
 import { EventEmitter, NativeModule, SharedObject, SharedRef } from './CoreModule';
 import uuid from '../uuid';
 
+// jest-expo imports to this file directly without going through the global types
+// Exporting the types to let jest-expo to know the globalThis types
+export * from '../ts-declarations/global';
+
 export function registerWebGlobals() {
   if (globalThis.expo) return;
   globalThis.expo = {