expo-modules-core 1.1.1 → 1.2.0

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

@@ -1,6 +1,5 @@
 package expo.modules.kotlin.modules
 
-import expo.modules.kotlin.ConcatIterator
 import expo.modules.kotlin.activityresult.AppContextActivityResultCaller
 import expo.modules.kotlin.events.EventListener
 import expo.modules.kotlin.events.EventName
@@ -20,7 +19,5 @@ class ModuleDefinitionData(
   val asyncFunctions = objectDefinition.asyncFunctions
   val eventsDefinition = objectDefinition.eventsDefinition
   val properties = objectDefinition.properties
-
-  val functions
-    get() = ConcatIterator(syncFunctions.values.iterator(), asyncFunctions.values.iterator())
+  val functions = objectDefinition.functions
 }

package/android/src/main/java/expo/modules/kotlin/objects/ObjectDefinitionBuilder.kt

@@ -14,6 +14,7 @@
 
 package expo.modules.kotlin.objects
 
+import com.facebook.react.bridge.Arguments
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.events.EventsDefinition
 import expo.modules.kotlin.functions.AsyncFunction
@@ -21,6 +22,9 @@ import expo.modules.kotlin.functions.AsyncFunctionBuilder
 import expo.modules.kotlin.functions.AsyncFunctionComponent
 import expo.modules.kotlin.functions.AsyncFunctionWithPromiseComponent
 import expo.modules.kotlin.functions.SyncFunctionComponent
+import expo.modules.kotlin.jni.JavaScriptModuleObject
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinitionBuilder
 import expo.modules.kotlin.types.toAnyType
 import kotlin.reflect.typeOf
 
@@ -350,3 +354,29 @@ open class ObjectDefinitionBuilder {
     }
   }
 }
+
+inline fun ModuleDefinitionBuilder.Object(block: ObjectDefinitionBuilder.() -> Unit): JavaScriptModuleObject {
+  return module!!.Object(block)
+}
+
+inline fun Module.Object(block: ObjectDefinitionBuilder.() -> Unit): JavaScriptModuleObject {
+  val objectData = ObjectDefinitionBuilder().also(block).buildObject()
+  return JavaScriptModuleObject("[Anonymous Object]")
+    .apply {
+      val constants = objectData.constantsProvider()
+      val convertedConstants = Arguments.makeNativeMap(constants)
+      exportConstants(convertedConstants)
+
+      objectData
+        .functions
+        .forEach { function ->
+          function.attachToJSObject(appContext, this)
+        }
+
+      objectData
+        .properties
+        .forEach { (_, prop) ->
+          prop.attachToJSObject(this)
+        }
+    }
+}

package/android/src/main/java/expo/modules/kotlin/objects/ObjectDefinitionData.kt

@@ -1,5 +1,6 @@
 package expo.modules.kotlin.objects
 
+import expo.modules.kotlin.ConcatIterator
 import expo.modules.kotlin.events.EventsDefinition
 import expo.modules.kotlin.functions.BaseAsyncFunctionComponent
 import expo.modules.kotlin.functions.SyncFunctionComponent
@@ -10,4 +11,7 @@ class ObjectDefinitionData(
   val asyncFunctions: Map<String, BaseAsyncFunctionComponent>,
   val eventsDefinition: EventsDefinition?,
   val properties: Map<String, PropertyComponent>
-)
+) {
+  val functions
+    get() = ConcatIterator(syncFunctions.values.iterator(), asyncFunctions.values.iterator())
+}

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

@@ -39,6 +39,7 @@ object JSTypeConverter {
       is Uri -> value.toJSValue()
       is File -> value.toJSValue()
       is Pair<*, *> -> value.toJSValue(containerProvider)
+      is Long -> value.toDouble()
       else -> value
     }
   }

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

@@ -135,6 +135,9 @@ object TypeConverterProviderImpl : TypeConverterProvider {
     val intTypeConverter = createTrivialTypeConverter(
       isOptional, ExpectedType(CppType.INT)
     ) { it.asDouble().toInt() }
+    val longTypeConverter = createTrivialTypeConverter(
+      isOptional, ExpectedType(CppType.LONG)
+    ) { it.asDouble().toLong() }
     val doubleTypeConverter = createTrivialTypeConverter(
       isOptional, ExpectedType(CppType.DOUBLE)
     ) { it.asDouble() }
@@ -149,6 +152,9 @@ object TypeConverterProviderImpl : TypeConverterProvider {
       Int::class.createType(nullable = isOptional) to intTypeConverter,
       java.lang.Integer::class.createType(nullable = isOptional) to intTypeConverter,
 
+      Long::class.createType(nullable = isOptional) to longTypeConverter,
+      java.lang.Long::class.createType(nullable = isOptional) to longTypeConverter,
+
       Double::class.createType(nullable = isOptional) to doubleTypeConverter,
       java.lang.Double::class.createType(nullable = isOptional) to doubleTypeConverter,
 

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

@@ -7,4 +7,6 @@ abstract class AnyViewProp(
   val name: String
 ) {
   abstract fun set(prop: Dynamic, onView: View)
+
+  abstract val isNullable: Boolean
 }

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

@@ -20,4 +20,6 @@ class ConcreteViewProp<ViewType : View, PropType>(
       setter(onView as ViewType, propType.convert(prop) as PropType)
     }
   }
+
+  override val isNullable: Boolean = propType.kType.isMarkedNullable
 }

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

@@ -5,15 +5,17 @@ package expo.modules.kotlin.views
 
 import android.content.Context
 import android.view.View
+import android.view.ViewGroup
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.modules.DefinitionMarker
 import expo.modules.kotlin.types.toAnyType
 import kotlin.reflect.KClass
+import kotlin.reflect.KFunction
 import kotlin.reflect.full.primaryConstructor
 import kotlin.reflect.typeOf
 
 @DefinitionMarker
-class ViewDefinitionBuilder<T : View>(private val viewType: KClass<T>) {
+class ViewDefinitionBuilder<T : View>(@PublishedApi internal val viewType: KClass<T>) {
   @PublishedApi
   internal var props = mutableMapOf<String, AnyViewProp>()
 
@@ -41,20 +43,57 @@ class ViewDefinitionBuilder<T : View>(private val viewType: KClass<T>) {
   /**
    * Creates view's lifecycle listener that is called right after the view isn't longer used by React Native.
    */
-  inline fun <reified ViewType : View> OnViewDestroys(noinline body: (view: ViewType) -> Unit) {
+  @Suppress("UNCHECKED_CAST")
+  inline fun OnViewDestroys(crossinline body: (view: T) -> Unit) {
+    onViewDestroys = {
+      body(it as T)
+    }
+  }
+
+  /**
+   * Creates view's lifecycle listener that is called right after the view isn't longer used by React Native.
+   */
+  @JvmName("OnViewDestroysGeneric")
+  inline fun <reified ViewType : T> OnViewDestroys(noinline body: (view: ViewType) -> Unit) {
     onViewDestroys = { body(it as ViewType) }
   }
 
   /**
    * Defines the view lifecycle method that is called when the view finished updating all props.
    */
-  inline fun <reified ViewType : View> OnViewDidUpdateProps(noinline body: (view: ViewType) -> Unit) {
+  @Suppress("UNCHECKED_CAST")
+  inline fun OnViewDidUpdateProps(crossinline body: (view: T) -> Unit) {
+    onViewDidUpdateProps = {
+      body(it as T)
+    }
+  }
+
+  /**
+   * Defines the view lifecycle method that is called when the view finished updating all props.
+   */
+  @JvmName("OnViewDidUpdatePropsGeneric")
+  inline fun <reified ViewType : T> OnViewDidUpdateProps(noinline body: (view: ViewType) -> Unit) {
     onViewDidUpdateProps = { body(it as ViewType) }
   }
 
   /**
    * Creates a view prop that defines its name and setter.
    */
+  inline fun <reified PropType> Prop(
+    name: String,
+    noinline body: (view: T, prop: PropType) -> Unit
+  ) {
+    props[name] = ConcreteViewProp(
+      name,
+      typeOf<PropType>().toAnyType(),
+      body
+    )
+  }
+
+  /**
+   * Creates a view prop that defines its name and setter.
+   */
+  @JvmName("PropGeneric")
   inline fun <reified ViewType : View, reified PropType> Prop(
     name: String,
     noinline body: (view: ViewType, prop: PropType) -> Unit
@@ -84,16 +123,17 @@ class ViewDefinitionBuilder<T : View>(private val viewType: KClass<T>) {
   /**
    * Creates the group view definition that scopes group view-related definitions.
    */
-  inline fun GroupView(body: ViewGroupDefinitionBuilder.() -> Unit) {
+  inline fun <reified ParentType : ViewGroup> GroupView(body: ViewGroupDefinitionBuilder<ParentType>.() -> Unit) {
+    assert(viewType == ParentType::class) { "Provided type and view type have to be the same." }
     require(viewGroupDefinition == null) { "The viewManager definition may have exported only one groupView definition." }
 
-    val groupViewDefinitionBuilder = ViewGroupDefinitionBuilder()
+    val groupViewDefinitionBuilder = ViewGroupDefinitionBuilder<ParentType>()
     body.invoke(groupViewDefinitionBuilder)
     viewGroupDefinition = groupViewDefinitionBuilder.build()
   }
 
   private fun createViewFactory(): (Context, AppContext) -> View = viewFactory@{ context: Context, appContext: AppContext ->
-    val primaryConstructor = requireNotNull(viewType.primaryConstructor) { "$viewType doesn't have a primary constructor" }
+    val primaryConstructor = requireNotNull(getPrimaryConstructor()) { "$viewType doesn't have a primary constructor" }
     val args = primaryConstructor.parameters
 
     if (args.isEmpty()) {
@@ -121,4 +161,14 @@ class ViewDefinitionBuilder<T : View>(private val viewType: KClass<T>) {
 
     return@viewFactory primaryConstructor.call(context, appContext)
   }
+
+  private fun getPrimaryConstructor(): KFunction<T>? {
+    val kotlinContractor = viewType.primaryConstructor
+    if (kotlinContractor != null) {
+      return kotlinContractor
+    }
+
+    // Add compatibility with Java
+    return viewType.constructors.firstOrNull()
+  }
 }

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

@@ -7,7 +7,79 @@ import android.view.ViewGroup
 import expo.modules.kotlin.modules.DefinitionMarker
 
 @DefinitionMarker
-class ViewGroupDefinitionBuilder {
+class ViewGroupDefinitionBuilder<ParentType : ViewGroup> {
+  @PublishedApi
+  internal var addViewAction: AddViewAction? = null
+
+  @PublishedApi
+  internal var getChildAtAction: GetChildAtAction? = null
+
+  @PublishedApi
+  internal var getChildCountAction: GetChildCountAction? = null
+
+  @PublishedApi
+  internal var removeViewAction: RemoveViewAction? = null
+
+  @PublishedApi
+  internal var removeViewAtAction: RemoveViewAtAction? = null
+
+  fun build() = ViewGroupDefinition(
+    addViewAction,
+    getChildAtAction,
+    getChildCountAction,
+    removeViewAction,
+    removeViewAtAction
+  )
+
+  @Suppress("UNCHECKED_CAST")
+  inline fun <reified ChildViewType : View> AddChildView(
+    crossinline body: (parent: ParentType, child: ChildViewType, index: Int) -> Unit
+  ) {
+    addViewAction = { parent, child, index ->
+      body(parent as ParentType, child as ChildViewType, index)
+    }
+  }
+
+  @Suppress("UNCHECKED_CAST")
+  inline fun GetChildCount(
+    crossinline body: (view: ParentType) -> Int
+  ) {
+    getChildCountAction = { view ->
+      body(view as ParentType)
+    }
+  }
+
+  @Suppress("UNCHECKED_CAST")
+  inline fun <reified ChildViewType : View> GetChildViewAt(
+    crossinline body: (view: ParentType, index: Int) -> ChildViewType?
+  ) {
+    getChildAtAction = { view, index ->
+      body(view as ParentType, index)
+    }
+  }
+
+  @Suppress("UNCHECKED_CAST")
+  inline fun RemoveChildViewAt(
+    crossinline body: (view: ParentType, index: Int) -> Unit
+  ) {
+    removeViewAtAction = { view, index ->
+      body(view as ParentType, index)
+    }
+  }
+
+  @Suppress("UNCHECKED_CAST")
+  inline fun <reified ChildViewType : View> RemoveChildView(
+    noinline body: (parent: ParentType, child: ChildViewType) -> Unit
+  ) {
+    removeViewAction = { view, child ->
+      body(view as ParentType, child as ChildViewType)
+    }
+  }
+}
+
+@Deprecated("Use `ViewGroupDefinitionBuilder` instead.")
+@DefinitionMarker
+class ViewGroupDefinitionLegacyBuilder {
   @PublishedApi
   internal var addViewAction: AddViewAction? = null
 

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

@@ -8,6 +8,7 @@ import com.facebook.react.bridge.ReadableMap
 import expo.modules.adapters.react.NativeModulesProxy
 import expo.modules.core.ViewManager
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.DynamicNull
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.UnexpectedException
 import expo.modules.kotlin.logger
@@ -36,24 +37,27 @@ class ViewManagerDefinition(
   }
 
   fun setProps(propsToSet: ReadableMap, onView: View) {
-    val iterator = propsToSet.keySetIterator()
-    while (iterator.hasNextKey()) {
-      val key = iterator.nextKey()
-      val propDelegate = props[key] ?: continue
-      propsToSet.getDynamic(key).recycle {
-        try {
-          propDelegate.set(this, onView)
-        } catch (exception: Throwable) {
-          logger.error("❌ Cannot set the '$key' prop on the '${viewType.simpleName}'", exception)
-
-          handleException(
-            onView,
-            when (exception) {
-              is CodedException -> exception
-              else -> UnexpectedException(exception)
+    props.forEach { (name, propDelegate) ->
+      try {
+        if (propsToSet.hasKey(name)) {
+          propsToSet
+            .getDynamic(name)
+            .recycle {
+              propDelegate.set(this, onView)
             }
-          )
+        } else if (propDelegate.isNullable) {
+          propDelegate.set(DynamicNull, onView)
         }
+      } catch (exception: Throwable) {
+        logger.error("❌ Cannot set the '$name' prop on the '${viewType.simpleName}'", exception)
+
+        handleException(
+          onView,
+          when (exception) {
+            is CodedException -> exception
+            else -> UnexpectedException(exception)
+          }
+        )
       }
     }
   }

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

@@ -122,10 +122,10 @@ class ViewManagerDefinitionBuilder {
   /**
    * Creates the group view definition that scopes group view-related definitions.
    */
-  inline fun GroupView(body: ViewGroupDefinitionBuilder.() -> Unit) {
+  inline fun GroupView(body: ViewGroupDefinitionLegacyBuilder.() -> Unit) {
     require(viewGroupDefinition == null) { "The viewManager definition may have exported only one groupView definition." }
 
-    val groupViewDefinitionBuilder = ViewGroupDefinitionBuilder()
+    val groupViewDefinitionBuilder = ViewGroupDefinitionLegacyBuilder()
     body.invoke(groupViewDefinitionBuilder)
     viewGroupDefinition = groupViewDefinitionBuilder.build()
   }

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

@@ -1 +1 @@
-{"version":3,"file":"NativeViewManagerAdapter.native.d.ts","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAgB1B;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CA0BpF"}
+{"version":3,"file":"NativeViewManagerAdapter.native.d.ts","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAqC1B;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CA0BpF"}

package/build/NativeViewManagerAdapter.native.js

@@ -1,5 +1,23 @@
 import React from 'react';
 import { NativeModules, requireNativeComponent } from 'react-native';
+/**
+ * A map that caches registered native components.
+ */
+const nativeComponentsCache = new Map();
+/**
+ * Requires a React Native component from cache if possible. This prevents
+ * "Tried to register two views with the same name" errors on fast refresh, but
+ * also when there are multiple versions of the same package with native component.
+ */
+function requireCachedNativeComponent(viewName) {
+    const cachedNativeComponent = nativeComponentsCache.get(viewName);
+    if (!cachedNativeComponent) {
+        const nativeComponent = requireNativeComponent(viewName);
+        nativeComponentsCache.set(viewName, nativeComponent);
+        return nativeComponent;
+    }
+    return cachedNativeComponent;
+}
 /**
  * A drop-in replacement for `requireNativeComponent`.
  */
@@ -13,7 +31,7 @@ export function requireNativeViewManager(viewName) {
     // Set up the React Native native component, which is an adapter to the universal module's view
     // manager
     const reactNativeViewName = `ViewManagerAdapter_${viewName}`;
-    const ReactNativeComponent = requireNativeComponent(reactNativeViewName);
+    const ReactNativeComponent = requireCachedNativeComponent(reactNativeViewName);
     const proxiedPropsNames = viewManagerConfig?.propsNames ?? [];
     // Define a component for universal-module authors to access their native view manager
     const NativeComponentAdapter = React.forwardRef((props, ref) => {

package/build/NativeViewManagerAdapter.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"NativeViewManagerAdapter.native.js","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAerE;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAI,QAAgB;IAC1D,MAAM,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAAC,oBAAoB,CAAC;IACpE,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC,QAAQ,CAAC,CAAC;IAE3D,IAAI,OAAO,IAAI,CAAC,iBAAiB,EAAE;QACjC,MAAM,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9E,OAAO,CAAC,IAAI,CACV,6CAA6C,QAAQ,8IAA8I,wBAAwB,IAAI,CAChO,CAAC;KACH;IAED,+FAA+F;IAC/F,UAAU;IACV,MAAM,mBAAmB,GAAG,sBAAsB,QAAQ,EAAE,CAAC;IAC7D,MAAM,oBAAoB,GACxB,sBAAsB,CAA2B,mBAAmB,CAAC,CAAC;IACxE,MAAM,iBAAiB,GAAG,iBAAiB,EAAE,UAAU,IAAI,EAAE,CAAC;IAE9D,sFAAsF;IACtF,MAAM,sBAAsB,GAAG,KAAK,CAAC,UAAU,CAAM,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAClE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACpD,OAAO,oBAAC,oBAAoB,OAAK,WAAW,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,GAAI,CAAC;IAC9F,CAAC,CAA2B,CAAC;IAC7B,sBAAsB,CAAC,WAAW,GAAG,WAAW,QAAQ,GAAG,CAAC;IAC5D,OAAO,sBAAsB,CAAC;AAChC,CAAC;AAED,SAAS,IAAI,CAAC,KAA0B,EAAE,SAAmB;IAC3D,MAAM,MAAM,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;IAC5B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;KACzB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,IAAI,CAAC,KAA0B,EAAE,SAAmB;IAC3D,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QACrC,IAAI,IAAI,IAAI,KAAK,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC","sourcesContent":["import React from 'react';\nimport { NativeModules, requireNativeComponent } from 'react-native';\n\n// To make the transition from React Native's `requireNativeComponent` to Expo's\n// `requireNativeViewManager` as easy as possible, `requireNativeViewManager` is a drop-in\n// replacement for `requireNativeComponent`.\n//\n// For each view manager, we create a wrapper component that accepts all of the props available to\n// the author of the universal module. This wrapper component splits the props into two sets: props\n// passed to React Native's View (ex: style, testID) and custom view props, which are passed to the\n// adapter view component in a prop called `proxiedProperties`.\n\ntype NativeExpoComponentProps = {\n  proxiedProperties: object;\n};\n\n/**\n * A drop-in replacement for `requireNativeComponent`.\n */\nexport function requireNativeViewManager<P>(viewName: string): React.ComponentType<P> {\n  const { viewManagersMetadata } = NativeModules.NativeUnimoduleProxy;\n  const viewManagerConfig = viewManagersMetadata?.[viewName];\n\n  if (__DEV__ && !viewManagerConfig) {\n    const exportedViewManagerNames = Object.keys(viewManagersMetadata).join(', ');\n    console.warn(\n      `The native view manager required by name (${viewName}) from NativeViewManagerAdapter isn't exported by expo-modules-core. Views of this type may not render correctly. Exported view managers: [${exportedViewManagerNames}].`\n    );\n  }\n\n  // Set up the React Native native component, which is an adapter to the universal module's view\n  // manager\n  const reactNativeViewName = `ViewManagerAdapter_${viewName}`;\n  const ReactNativeComponent =\n    requireNativeComponent<NativeExpoComponentProps>(reactNativeViewName);\n  const proxiedPropsNames = viewManagerConfig?.propsNames ?? [];\n\n  // Define a component for universal-module authors to access their native view manager\n  const NativeComponentAdapter = React.forwardRef<any>((props, ref) => {\n    const nativeProps = omit(props, proxiedPropsNames);\n    const proxiedProps = pick(props, proxiedPropsNames);\n    return <ReactNativeComponent {...nativeProps} proxiedProperties={proxiedProps} ref={ref} />;\n  }) as React.ComponentType<P>;\n  NativeComponentAdapter.displayName = `Adapter<${viewName}>`;\n  return NativeComponentAdapter;\n}\n\nfunction omit(props: Record<string, any>, propNames: string[]) {\n  const copied = { ...props };\n  for (const propName of propNames) {\n    delete copied[propName];\n  }\n  return copied;\n}\n\nfunction pick(props: Record<string, any>, propNames: string[]) {\n  return propNames.reduce((prev, curr) => {\n    if (curr in props) {\n      prev[curr] = props[curr];\n    }\n    return prev;\n  }, {});\n}\n"]}
+{"version":3,"file":"NativeViewManagerAdapter.native.js","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAiB,MAAM,cAAc,CAAC;AAepF;;GAEG;AACH,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA8B,CAAC;AAEpE;;;;GAIG;AACH,SAAS,4BAA4B,CAAQ,QAAgB;IAC3D,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAElE,IAAI,CAAC,qBAAqB,EAAE;QAC1B,MAAM,eAAe,GAAG,sBAAsB,CAAQ,QAAQ,CAAC,CAAC;QAChE,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QACrD,OAAO,eAAe,CAAC;KACxB;IACD,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAI,QAAgB;IAC1D,MAAM,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAAC,oBAAoB,CAAC;IACpE,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC,QAAQ,CAAC,CAAC;IAE3D,IAAI,OAAO,IAAI,CAAC,iBAAiB,EAAE;QACjC,MAAM,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9E,OAAO,CAAC,IAAI,CACV,6CAA6C,QAAQ,8IAA8I,wBAAwB,IAAI,CAChO,CAAC;KACH;IAED,+FAA+F;IAC/F,UAAU;IACV,MAAM,mBAAmB,GAAG,sBAAsB,QAAQ,EAAE,CAAC;IAC7D,MAAM,oBAAoB,GACxB,4BAA4B,CAA2B,mBAAmB,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,iBAAiB,EAAE,UAAU,IAAI,EAAE,CAAC;IAE9D,sFAAsF;IACtF,MAAM,sBAAsB,GAAG,KAAK,CAAC,UAAU,CAAM,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAClE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACpD,OAAO,oBAAC,oBAAoB,OAAK,WAAW,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,GAAI,CAAC;IAC9F,CAAC,CAA2B,CAAC;IAC7B,sBAAsB,CAAC,WAAW,GAAG,WAAW,QAAQ,GAAG,CAAC;IAC5D,OAAO,sBAAsB,CAAC;AAChC,CAAC;AAED,SAAS,IAAI,CAAC,KAA0B,EAAE,SAAmB;IAC3D,MAAM,MAAM,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;IAC5B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;KACzB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,IAAI,CAAC,KAA0B,EAAE,SAAmB;IAC3D,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QACrC,IAAI,IAAI,IAAI,KAAK,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC","sourcesContent":["import React from 'react';\nimport { NativeModules, requireNativeComponent, HostComponent } from 'react-native';\n\n// To make the transition from React Native's `requireNativeComponent` to Expo's\n// `requireNativeViewManager` as easy as possible, `requireNativeViewManager` is a drop-in\n// replacement for `requireNativeComponent`.\n//\n// For each view manager, we create a wrapper component that accepts all of the props available to\n// the author of the universal module. This wrapper component splits the props into two sets: props\n// passed to React Native's View (ex: style, testID) and custom view props, which are passed to the\n// adapter view component in a prop called `proxiedProperties`.\n\ntype NativeExpoComponentProps = {\n  proxiedProperties: object;\n};\n\n/**\n * A map that caches registered native components.\n */\nconst nativeComponentsCache = new Map<string, HostComponent<any>>();\n\n/**\n * Requires a React Native component from cache if possible. This prevents\n * \"Tried to register two views with the same name\" errors on fast refresh, but\n * also when there are multiple versions of the same package with native component.\n */\nfunction requireCachedNativeComponent<Props>(viewName: string): HostComponent<Props> {\n  const cachedNativeComponent = nativeComponentsCache.get(viewName);\n\n  if (!cachedNativeComponent) {\n    const nativeComponent = requireNativeComponent<Props>(viewName);\n    nativeComponentsCache.set(viewName, nativeComponent);\n    return nativeComponent;\n  }\n  return cachedNativeComponent;\n}\n\n/**\n * A drop-in replacement for `requireNativeComponent`.\n */\nexport function requireNativeViewManager<P>(viewName: string): React.ComponentType<P> {\n  const { viewManagersMetadata } = NativeModules.NativeUnimoduleProxy;\n  const viewManagerConfig = viewManagersMetadata?.[viewName];\n\n  if (__DEV__ && !viewManagerConfig) {\n    const exportedViewManagerNames = Object.keys(viewManagersMetadata).join(', ');\n    console.warn(\n      `The native view manager required by name (${viewName}) from NativeViewManagerAdapter isn't exported by expo-modules-core. Views of this type may not render correctly. Exported view managers: [${exportedViewManagerNames}].`\n    );\n  }\n\n  // Set up the React Native native component, which is an adapter to the universal module's view\n  // manager\n  const reactNativeViewName = `ViewManagerAdapter_${viewName}`;\n  const ReactNativeComponent =\n    requireCachedNativeComponent<NativeExpoComponentProps>(reactNativeViewName);\n  const proxiedPropsNames = viewManagerConfig?.propsNames ?? [];\n\n  // Define a component for universal-module authors to access their native view manager\n  const NativeComponentAdapter = React.forwardRef<any>((props, ref) => {\n    const nativeProps = omit(props, proxiedPropsNames);\n    const proxiedProps = pick(props, proxiedPropsNames);\n    return <ReactNativeComponent {...nativeProps} proxiedProperties={proxiedProps} ref={ref} />;\n  }) as React.ComponentType<P>;\n  NativeComponentAdapter.displayName = `Adapter<${viewName}>`;\n  return NativeComponentAdapter;\n}\n\nfunction omit(props: Record<string, any>, propNames: string[]) {\n  const copied = { ...props };\n  for (const propName of propNames) {\n    delete copied[propName];\n  }\n  return copied;\n}\n\nfunction pick(props: Record<string, any>, propNames: string[]) {\n  return propNames.reduce((prev, curr) => {\n    if (curr in props) {\n      prev[curr] = props[curr];\n    }\n    return prev;\n  }, {});\n}\n"]}

package/build/SyntheticPlatformEmitter.d.ts

@@ -2,5 +2,5 @@
  * This emitter is used for sending synthetic native events to listeners
  * registered in the API layer with `NativeEventEmitter`.
  */
-export { default } from 'react-native/Libraries/EventEmitter/RCTDeviceEventEmitter';
+export { DeviceEventEmitter as default } from 'react-native';
 //# sourceMappingURL=SyntheticPlatformEmitter.d.ts.map

package/build/SyntheticPlatformEmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SyntheticPlatformEmitter.d.ts","sourceRoot":"","sources":["../src/SyntheticPlatformEmitter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,2DAA2D,CAAC"}
+{"version":3,"file":"SyntheticPlatformEmitter.d.ts","sourceRoot":"","sources":["../src/SyntheticPlatformEmitter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,kBAAkB,IAAI,OAAO,EAAE,MAAM,cAAc,CAAC"}

package/build/SyntheticPlatformEmitter.js

@@ -2,5 +2,5 @@
  * This emitter is used for sending synthetic native events to listeners
  * registered in the API layer with `NativeEventEmitter`.
  */
-export { default } from 'react-native/Libraries/EventEmitter/RCTDeviceEventEmitter';
+export { DeviceEventEmitter as default } from 'react-native';
 //# sourceMappingURL=SyntheticPlatformEmitter.js.map

package/build/SyntheticPlatformEmitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"SyntheticPlatformEmitter.js","sourceRoot":"","sources":["../src/SyntheticPlatformEmitter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,2DAA2D,CAAC","sourcesContent":["/**\n * This emitter is used for sending synthetic native events to listeners\n * registered in the API layer with `NativeEventEmitter`.\n */\nexport { default } from 'react-native/Libraries/EventEmitter/RCTDeviceEventEmitter';\n"]}
+{"version":3,"file":"SyntheticPlatformEmitter.js","sourceRoot":"","sources":["../src/SyntheticPlatformEmitter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,kBAAkB,IAAI,OAAO,EAAE,MAAM,cAAc,CAAC","sourcesContent":["/**\n * This emitter is used for sending synthetic native events to listeners\n * registered in the API layer with `NativeEventEmitter`.\n */\nexport { DeviceEventEmitter as default } from 'react-native';\n"]}

package/ios/Fabric/ExpoFabricView.swift

@@ -51,17 +51,17 @@ public class ExpoFabricView: ExpoFabricViewObjC {
 
   // MARK: - ExpoFabricViewInterface
 
-  public override func updateProp(_ propName: String, withValue value: Any) {
-    guard let view = contentView else {
+  public override func updateProps(_ props: [String: Any]) {
+    guard let view = contentView, let propsDict = viewManagerPropDict else {
       return
     }
-    if let _ = moduleHolder, let prop = viewManagerPropDict?[propName] {
+    for (key, prop) in propsDict {
+      let newValue = props[key] as Any
+
       // TODO: @tsapeta: Figure out better way to rethrow errors from here.
       // Adding `throws` keyword to the function results in different
       // method signature in Objective-C. Maybe just call `RCTLogError`?
-      try? prop.set(value: value, onView: view)
-    } else if let _ = legacyViewManager {
-      legacyViewManager?.updateProp(propName, withValue: value, on: view)
+      try? prop.set(value: Conversions.fromNSObject(newValue), onView: view)
     }
   }
 

package/ios/Fabric/ExpoFabricViewObjC.h

@@ -33,7 +33,7 @@
 
 - (void)dispatchEvent:(nonnull NSString *)eventName payload:(nullable id)payload;
 
-- (void)updateProp:(nonnull NSString *)propName withValue:(nonnull id)value;
+- (void)updateProps:(nonnull NSDictionary<NSString *, id> *)props;
 
 - (void)viewDidUpdateProps;
 

package/ios/Fabric/ExpoFabricViewObjC.mm

@@ -140,15 +140,9 @@ static std::unordered_map<std::string, ExpoViewComponentDescriptor::Flavor> _com
 - (void)updateProps:(const facebook::react::Props::Shared &)props oldProps:(const facebook::react::Props::Shared &)oldProps
 {
   const auto &newViewProps = *std::static_pointer_cast<ExpoViewProps const>(props);
-  auto proxiedProperties = newViewProps.proxiedProperties;
-  if (proxiedProperties.isObject()) {
-    for (auto& item : proxiedProperties.items()) {
-      NSString *name = [NSString stringWithCString:item.first.c_str() encoding:NSUTF8StringEncoding];
-      id value = convertFollyDynamicToId(item.second);
-      [self updateProp:name withValue:value];
-    }
-  }
+  NSDictionary<NSString *, id> *proxiedProperties = convertFollyDynamicToId(newViewProps.proxiedProperties);
 
+  [self updateProps:proxiedProperties];
   [super updateProps:props oldProps:oldProps];
   [self viewDidUpdateProps];
 }
@@ -170,7 +164,7 @@ static std::unordered_map<std::string, ExpoViewComponentDescriptor::Flavor> _com
 
 #pragma mark - Methods to override in Swift
 
-- (void)updateProp:(nonnull NSString *)propName withValue:(nonnull id)value
+- (void)updateProps:(nonnull NSDictionary<NSString *, id> *)props
 {
   // Implemented in `ExpoFabricView.swift`
 }

package/ios/Swift/ExpoBridgeModule.swift

@@ -41,12 +41,33 @@ public final class ExpoBridgeModule: NSObject, RCTBridgeModule {
   public var bridge: RCTBridge! {
     didSet {
       appContext.reactBridge = bridge
-      bridge.dispatchBlock({ [weak self] in
+
+      let attachRuntime = { [weak self] in
         guard let self = self, let bridge = self.appContext.reactBridge else {
           return
         }
         self.appContext.runtime = EXJavaScriptRuntimeManager.runtime(fromBridge: bridge)
-      }, queue: RCTJSThread)
+      }
+
+      if bridge.responds(to: Selector(("runtime"))) {
+        // Getting the `runtime` on a different thread than JS is considered to be dangerous.
+        // However, we just checking if it exists. We don't do anything with it.
+        let result = bridge.perform(Selector(("runtime")))
+        if result == nil {
+          // When exporting expo modules using `extraModulesForBridge` (e.g. in Expo Go),
+          // the runtime won't be initiated before the bridge didSet method is called.
+          // Therefore, we need to wait for the main thread to complete its initialization by dispatching on it first.
+          bridge.dispatchBlock({ [weak self] in
+            guard let self = self, let bridge = self.appContext.reactBridge else {
+              return
+            }
+            bridge.dispatchBlock(attachRuntime, queue: RCTJSThread)
+          }, queue: DispatchQueue.main)
+          return
+        }
+      }
+
+      bridge.dispatchBlock(attachRuntime, queue: RCTJSThread)
     }
   }
   

package/ios/Swift/Views/ViewModuleWrapper.swift

@@ -109,15 +109,13 @@ public final class ViewModuleWrapper: RCTViewManager, DynamicModuleWrapperProtoc
     }
     let props = viewManager.propsDict()
 
-    for (key, value) in json {
-      if let prop = props[key] {
-        let value = Conversions.fromNSObject(value)
-
-        // TODO: @tsapeta: Figure out better way to rethrow errors from here.
-        // Adding `throws` keyword to the function results in different
-        // method signature in Objective-C. Maybe just call `RCTLogError`?
-        try? prop.set(value: value, onView: view)
-      }
+    for (key, prop) in props {
+      let newValue = json[key] as Any
+
+      // TODO: @tsapeta: Figure out better way to rethrow errors from here.
+      // Adding `throws` keyword to the function results in different
+      // method signature in Objective-C. Maybe just call `RCTLogError`?
+      try? prop.set(value: Conversions.fromNSObject(newValue), onView: view)
     }
     viewManager.callLifecycleMethods(withType: .didUpdateProps, forView: view)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "c2bfd01edc16bd6aecb317c67f475e9332459e2a"
+  "gitHead": "1815e2eaad8c753588c7b1eb74420174a28e01f4"
 }