expo-modules-core 0.7.0 → 0.9.1

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

@@ -7,6 +7,7 @@ import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
+import expo.modules.core.utilities.ifNull
 
 class GroupViewManagerWrapper(
   override val viewWrapperDelegate: ViewManagerWrapperDelegate
@@ -41,4 +42,52 @@ class GroupViewManagerWrapper(
 
     return super.getExportedCustomDirectEventTypeConstants()
   }
+
+  override fun addView(parent: ViewGroup, child: View, index: Int) {
+    viewWrapperDelegate
+      .viewGroupDefinition
+      ?.addViewAction
+      ?.invoke(parent, child, index)
+      .ifNull {
+        super.addView(parent, child, index)
+      }
+  }
+
+  override fun getChildCount(parent: ViewGroup): Int {
+    return viewWrapperDelegate.viewGroupDefinition
+      ?.getChildCountAction
+      ?.invoke(parent)
+      .ifNull {
+        super.getChildCount(parent)
+      }
+  }
+
+  override fun getChildAt(parent: ViewGroup, index: Int): View? {
+    viewWrapperDelegate.viewGroupDefinition
+      ?.getChildAtAction
+      ?.let {
+        return it.invoke(parent, index)
+      }
+      .ifNull {
+        return super.getChildAt(parent, index)
+      }
+  }
+
+  override fun removeViewAt(parent: ViewGroup, index: Int) {
+    viewWrapperDelegate.viewGroupDefinition
+      ?.removeViewAtAction
+      ?.invoke(parent, index)
+      .ifNull {
+        super.removeViewAt(parent, index)
+      }
+  }
+
+  override fun removeView(parent: ViewGroup, view: View) {
+    viewWrapperDelegate.viewGroupDefinition
+      ?.removeViewAction
+      ?.invoke(parent, view)
+      .ifNull {
+        super.removeView(parent, view)
+      }
+  }
 }

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

@@ -0,0 +1,18 @@
+package expo.modules.kotlin.views
+
+import android.view.View
+import android.view.ViewGroup
+
+class ViewGroupDefinition(
+  val addViewAction: AddViewAction?,
+  val getChildAtAction: GetChildAtAction?,
+  val getChildCountAction: GetChildCountAction?,
+  val removeViewAction: RemoveViewAction?,
+  val removeViewAtAction: RemoveViewAtAction?
+)
+
+internal typealias AddViewAction = (parent: ViewGroup, child: View, index: Int) -> Unit
+internal typealias GetChildAtAction = (parent: ViewGroup, index: Int) -> View?
+internal typealias GetChildCountAction = (parent: ViewGroup) -> Int
+internal typealias RemoveViewAction = (parent: ViewGroup, childToRemove: View) -> Unit
+internal typealias RemoveViewAtAction = (parent: ViewGroup, index: Int) -> Unit

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

@@ -0,0 +1,114 @@
+@file:OptIn(ExperimentalStdlibApi::class)
+@file:Suppress("FunctionName")
+
+package expo.modules.kotlin.views
+
+import android.view.View
+import android.view.ViewGroup
+import expo.modules.kotlin.modules.DefinitionMarker
+
+@DefinitionMarker
+class ViewGroupDefinitionBuilder {
+  @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
+  )
+
+  @Deprecated(
+    message = "The 'addChildView' component was renamed to 'AddChildView'.",
+    replaceWith = ReplaceWith("AddChildView(body)")
+  )
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> addChildView(
+    noinline body: (parent: ParentViewType, child: ChildViewType, index: Int) -> Unit
+  ) = AddChildView(body)
+
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> AddChildView(
+    noinline body: (parent: ParentViewType, child: ChildViewType, index: Int) -> Unit
+  ) {
+    addViewAction = { parent, child, index ->
+      body(parent as ParentViewType, child as ChildViewType, index)
+    }
+  }
+
+  @Deprecated(
+    message = "The 'getChildCount' component was renamed to 'GetChildCount'.",
+    replaceWith = ReplaceWith("GetChildCount(body)")
+  )
+  inline fun <reified ParentViewType : ViewGroup> getChildCount(
+    noinline body: (view: ParentViewType) -> Int
+  ) = GetChildCount(body)
+
+  inline fun <reified ParentViewType : ViewGroup> GetChildCount(
+    noinline body: (view: ParentViewType) -> Int
+  ) {
+    getChildCountAction = { view ->
+      body(view as ParentViewType)
+    }
+  }
+
+  @Deprecated(
+    message = "The 'getChildViewAt' component was renamed to 'GetChildViewAt'.",
+    replaceWith = ReplaceWith("GetChildViewAt(body)")
+  )
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> getChildViewAt(
+    noinline body: (view: ParentViewType, index: Int) -> ChildViewType?
+  ) = GetChildViewAt(body)
+
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> GetChildViewAt(
+    noinline body: (view: ParentViewType, index: Int) -> ChildViewType?
+  ) {
+    getChildAtAction = { view, index ->
+      body(view as ParentViewType, index)
+    }
+  }
+
+  @Deprecated(
+    message = "The 'removeChildViewAt' component was renamed to 'RemoveChildViewAt'.",
+    replaceWith = ReplaceWith("RemoveChildViewAt(body)")
+  )
+  inline fun <reified ParentViewType : ViewGroup> removeChildViewAt(
+    noinline body: (view: ParentViewType, index: Int) -> Unit
+  ) = RemoveChildViewAt(body)
+
+  inline fun <reified ParentViewType : ViewGroup> RemoveChildViewAt(
+    noinline body: (view: ParentViewType, index: Int) -> Unit
+  ) {
+    removeViewAtAction = { view, index ->
+      body(view as ParentViewType, index)
+    }
+  }
+
+  @Deprecated(
+    message = "The 'removeChildView' component was renamed to 'RemoveChildView'.",
+    replaceWith = ReplaceWith("RemoveChildView(body)")
+  )
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> removeChildView(
+    noinline body: (parent: ParentViewType, child: ChildViewType) -> Unit
+  ) = RemoveChildView(body)
+
+  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> RemoveChildView(
+    noinline body: (parent: ParentViewType, child: ChildViewType) -> Unit
+  ) {
+    removeViewAction = { view, child ->
+      body(view as ParentViewType, child as ChildViewType)
+    }
+  }
+}

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

@@ -17,11 +17,14 @@ class ViewManagerDefinition(
   private val viewType: Class<out View>,
   private val props: Map<String, AnyViewProp>,
   val onViewDestroys: ((View) -> Unit)? = null,
-  val callbacksDefinition: CallbacksDefinition? = null
+  val callbacksDefinition: CallbacksDefinition? = null,
+  val viewGroupDefinition: ViewGroupDefinition? = null
 ) {
 
   fun createView(context: Context): View = viewFactory(context)
 
+  val propsNames: List<String> = props.keys.toList()
+
   fun getViewManagerType(): ViewManager.ViewManagerType {
     return if (ViewGroup::class.java.isAssignableFrom(viewType)) {
       ViewManager.ViewManagerType.GROUP

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

@@ -1,4 +1,5 @@
 @file:OptIn(ExperimentalStdlibApi::class)
+@file:Suppress("FunctionName")
 
 package expo.modules.kotlin.views
 
@@ -12,13 +13,18 @@ import kotlin.reflect.typeOf
 class ViewManagerDefinitionBuilder {
   @PublishedApi
   internal var viewFactory: ((Context) -> View)? = null
+
   @PublishedApi
   internal var viewType: Class<out View>? = null
+
   @PublishedApi
   internal var props = mutableMapOf<String, AnyViewProp>()
+
   @PublishedApi
   internal var onViewDestroys: ((View) -> Unit)? = null
 
+  @PublishedApi
+  internal var viewGroupDefinition: ViewGroupDefinition? = null
   private var callbacksDefinition: CallbacksDefinition? = null
 
   fun build(): ViewManagerDefinition =
@@ -27,28 +33,50 @@ class ViewManagerDefinitionBuilder {
       requireNotNull(viewType),
       props,
       onViewDestroys,
-      callbacksDefinition
+      callbacksDefinition,
+      viewGroupDefinition
     )
 
+  @Deprecated(
+    message = "The 'view' component was renamed to 'View'.",
+    replaceWith = ReplaceWith("View(body)")
+  )
+  inline fun <reified ViewType : View> view(noinline body: (Context) -> ViewType) = View(body)
+
   /**
    * Defines the factory creating a native view when the module is used as a view.
    */
-  inline fun <reified ViewType : View> view(noinline body: (Context) -> ViewType) {
+  inline fun <reified ViewType : View> View(noinline body: (Context) -> ViewType) {
     viewType = ViewType::class.java
     viewFactory = body
   }
 
+  @Deprecated(
+    message = "The 'onViewDestroys' component was renamed to 'OnViewDestroys'.",
+    replaceWith = ReplaceWith("OnViewDestroys(body)")
+  )
+  inline fun <reified ViewType : View> onViewDestroys(noinline body: (view: ViewType) -> Unit) = OnViewDestroys(body)
+
   /**
    * 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) {
+  inline fun <reified ViewType : View> OnViewDestroys(noinline body: (view: ViewType) -> Unit) {
     onViewDestroys = { body(it as ViewType) }
   }
 
+  @Deprecated(
+    message = "The 'prop' component was renamed to 'Prop'.",
+    replaceWith = ReplaceWith("Prop(body)")
+  )
+  inline fun <reified ViewType : View, reified PropType> prop(
+    name: String,
+    noinline body: (view: ViewType, prop: PropType) -> Unit
+  ) = Prop(name, body)
+
   /**
    * Creates a view prop that defines its name and setter.
    */
-  inline fun <reified ViewType : View, reified PropType> prop(
+  inline fun <reified ViewType : View, reified PropType> Prop(
     name: String,
     noinline body: (view: ViewType, prop: PropType) -> Unit
   ) {
@@ -59,10 +87,33 @@ class ViewManagerDefinitionBuilder {
     )
   }
 
+  @Deprecated(
+    message = "The 'events' component was renamed to 'Events'.",
+    replaceWith = ReplaceWith("Events(callbacks)")
+  )
+  fun events(vararg callbacks: String) = Events(*callbacks)
+
   /**
    * Defines prop names that should be treated as callbacks.
    */
-  fun events(vararg callbacks: String) {
+  fun Events(vararg callbacks: String) {
     callbacksDefinition = CallbacksDefinition(callbacks)
   }
+
+  @Deprecated(
+    message = "The 'groupView' component was renamed to 'GroupView'.",
+    replaceWith = ReplaceWith("GroupView(callbacks)")
+  )
+  inline fun groupView(body: ViewGroupDefinitionBuilder.() -> Unit) = GroupView(body)
+
+  /**
+   * Creates the group view definition that scopes group view-related definitions.
+   */
+  inline fun GroupView(body: ViewGroupDefinitionBuilder.() -> Unit) {
+    require(viewGroupDefinition == null) { "The viewManager definition may have exported only one groupView definition." }
+
+    val groupViewDefinitionBuilder = ViewGroupDefinitionBuilder()
+    body.invoke(groupViewDefinitionBuilder)
+    viewGroupDefinition = groupViewDefinitionBuilder.build()
+  }
 }

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

@@ -15,6 +15,9 @@ class ViewManagerWrapperDelegate(internal var moduleHolder: ModuleHolder) {
   private val definition: ViewManagerDefinition
     get() = requireNotNull(moduleHolder.definition.viewManagerDefinition)
 
+  internal val viewGroupDefinition: ViewGroupDefinition?
+    get() = definition.viewGroupDefinition
+
   val name: String
     get() = moduleHolder.name
 

package/build/NativeModulesProxy.native.d.ts

@@ -2,9 +2,5 @@ import { ProxyNativeModule } from './NativeModulesProxy.types';
 declare const NativeModulesProxy: {
     [moduleName: string]: ProxyNativeModule;
 };
-/**
- * Sets whether to use a TurboModule version of the proxy.
- */
-export declare function useExpoTurboModules(state?: boolean): void;
 export default NativeModulesProxy;
 //# sourceMappingURL=NativeModulesProxy.native.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"NativeModulesProxy.native.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA0B,MAAM,4BAA4B,CAAC;AAWvF,QAAA,MAAM,kBAAkB,EAAE;IAAE,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAO,CAAC;AAK3E;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,GAAE,OAAc,QAExD;AAuDD,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"NativeModulesProxy.native.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAM/D,QAAA,MAAM,kBAAkB,EAAE;IAAE,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAO,CAAC;AAkD3E,eAAe,kBAAkB,CAAC"}

package/build/NativeModulesProxy.native.js

@@ -3,14 +3,6 @@ const NativeProxy = NativeModules.NativeUnimoduleProxy;
 const modulesConstantsKey = 'modulesConstants';
 const exportedMethodsKey = 'exportedMethods';
 const NativeModulesProxy = {};
-// Keep it opt-in for now. It's too risky without proper and thorough testing.
-let canUseExpoTurboModules = false;
-/**
- * Sets whether to use a TurboModule version of the proxy.
- */
-export function useExpoTurboModules(state = true) {
-    canUseExpoTurboModules = state;
-}
 if (NativeProxy) {
     Object.keys(NativeProxy[exportedMethodsKey]).forEach((moduleName) => {
         NativeModulesProxy[moduleName] = NativeProxy[modulesConstantsKey][moduleName] || {};
@@ -20,12 +12,7 @@ if (NativeProxy) {
                 if (argumentsCount !== args.length) {
                     return Promise.reject(new Error(`Native method ${moduleName}.${methodInfo.name} expects ${argumentsCount} ${argumentsCount === 1 ? 'argument' : 'arguments'} but received ${args.length}`));
                 }
-                if (canUseExpoTurboModules && global.ExpoModulesProxy) {
-                    return global.ExpoModulesProxy.callMethodAsync(moduleName, methodInfo.name, args);
-                }
-                else {
-                    return NativeProxy.callMethod(moduleName, key, args);
-                }
+                return NativeProxy.callMethod(moduleName, key, args);
             };
         });
         // These are called by EventEmitter (which is a wrapper for NativeEventEmitter)

package/build/NativeModulesProxy.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"NativeModulesProxy.native.js","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAS7C,MAAM,WAAW,GAAG,aAAa,CAAC,oBAAoB,CAAC;AACvD,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAC/C,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;AAE7C,MAAM,kBAAkB,GAAgD,EAAE,CAAC;AAE3E,8EAA8E;AAC9E,IAAI,sBAAsB,GAAG,KAAK,CAAC;AAEnC;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAiB,IAAI;IACvD,sBAAsB,GAAG,KAAK,CAAC;AACjC,CAAC;AAED,IAAI,WAAW,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAClE,kBAAkB,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACpF,WAAW,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjE,kBAAkB,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAe,EAAgB,EAAE;gBACrF,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;gBAC3C,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,EAAE;oBAClC,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CACP,iBAAiB,UAAU,IAAI,UAAU,CAAC,IAAI,YAAY,cAAc,IACtE,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WACtC,iBAAiB,IAAI,CAAC,MAAM,EAAE,CAC/B,CACF,CAAC;iBACH;gBAED,IAAI,sBAAsB,IAAI,MAAM,CAAC,gBAAgB,EAAE;oBACrD,OAAO,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACnF;qBAAM;oBACL,OAAO,WAAW,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;iBACtD;YACH,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,+EAA+E;QAC/E,kFAAkF;QAClF,EAAE;QACF,wEAAwE;QACxE,gDAAgD;QAChD,EAAE;QACF,6GAA6G;QAC7G,gGAAgG;QAChG,4HAA4H;QAC5H,qCAAqC;QACrC,IAAI,aAAa,CAAC,yBAAyB,EAAE;YAC3C,kBAAkB,CAAC,UAAU,CAAC,CAAC,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CACvD,aAAa,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;YAClF,kBAAkB,CAAC,UAAU,CAAC,CAAC,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CAC3D,aAAa,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;SACvF;aAAM;YACL,oBAAoB;YACpB,kHAAkH;YAClH,sHAAsH;YACtH,kBAAkB,CAAC,UAAU,CAAC,CAAC,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;YACtD,kBAAkB,CAAC,UAAU,CAAC,CAAC,eAAe,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;SAC3D;IACH,CAAC,CAAC,CAAC;CACJ;KAAM;IACL,OAAO,CAAC,IAAI,CACV,gJAAgJ,CACjJ,CAAC;CACH;AAED,eAAe,kBAAkB,CAAC","sourcesContent":["import { NativeModules } from 'react-native';\n\nimport { ProxyNativeModule, TurboNativeModuleProxy } from './NativeModulesProxy.types';\n\n// `ExpoModulesProxy` is not declared in TypeScript yet. It's installed via JSI.\ndeclare namespace global {\n  const ExpoModulesProxy: TurboNativeModuleProxy;\n}\n\nconst NativeProxy = NativeModules.NativeUnimoduleProxy;\nconst modulesConstantsKey = 'modulesConstants';\nconst exportedMethodsKey = 'exportedMethods';\n\nconst NativeModulesProxy: { [moduleName: string]: ProxyNativeModule } = {};\n\n// Keep it opt-in for now. It's too risky without proper and thorough testing.\nlet canUseExpoTurboModules = false;\n\n/**\n * Sets whether to use a TurboModule version of the proxy.\n */\nexport function useExpoTurboModules(state: boolean = true) {\n  canUseExpoTurboModules = state;\n}\n\nif (NativeProxy) {\n  Object.keys(NativeProxy[exportedMethodsKey]).forEach((moduleName) => {\n    NativeModulesProxy[moduleName] = NativeProxy[modulesConstantsKey][moduleName] || {};\n    NativeProxy[exportedMethodsKey][moduleName].forEach((methodInfo) => {\n      NativeModulesProxy[moduleName][methodInfo.name] = (...args: unknown[]): Promise<any> => {\n        const { key, argumentsCount } = methodInfo;\n        if (argumentsCount !== args.length) {\n          return Promise.reject(\n            new Error(\n              `Native method ${moduleName}.${methodInfo.name} expects ${argumentsCount} ${\n                argumentsCount === 1 ? 'argument' : 'arguments'\n              } but received ${args.length}`\n            )\n          );\n        }\n\n        if (canUseExpoTurboModules && global.ExpoModulesProxy) {\n          return global.ExpoModulesProxy.callMethodAsync(moduleName, methodInfo.name, args);\n        } else {\n          return NativeProxy.callMethod(moduleName, key, args);\n        }\n      };\n    });\n\n    // These are called by EventEmitter (which is a wrapper for NativeEventEmitter)\n    // only on iOS and they use iOS-specific native module, EXReactNativeEventEmitter.\n    //\n    // On Android only {start,stop}Observing are called on the native module\n    // and these should be exported as Expo methods.\n    //\n    // Before the RN 65, addListener/removeListeners weren't called on Android. However, it no longer stays true.\n    // See https://github.com/facebook/react-native/commit/f5502fbda9fe271ff6e1d0da773a3a8ee206a453.\n    // That's why, we check if the `EXReactNativeEventEmitter` exists and only if yes, we use it in the listener implementation.\n    // Otherwise, those methods are NOOP.\n    if (NativeModules.EXReactNativeEventEmitter) {\n      NativeModulesProxy[moduleName].addListener = (...args) =>\n        NativeModules.EXReactNativeEventEmitter.addProxiedListener(moduleName, ...args);\n      NativeModulesProxy[moduleName].removeListeners = (...args) =>\n        NativeModules.EXReactNativeEventEmitter.removeProxiedListeners(moduleName, ...args);\n    } else {\n      // Fixes on Android:\n      // WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `addListener` method.\n      // WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `removeListeners` method.\n      NativeModulesProxy[moduleName].addListener = () => {};\n      NativeModulesProxy[moduleName].removeListeners = () => {};\n    }\n  });\n} else {\n  console.warn(\n    `The \"EXNativeModulesProxy\" native module is not exported through NativeModules; verify that expo-modules-core's native code is linked properly`\n  );\n}\n\nexport default NativeModulesProxy;\n"]}
+{"version":3,"file":"NativeModulesProxy.native.js","sourceRoot":"","sources":["../src/NativeModulesProxy.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,MAAM,WAAW,GAAG,aAAa,CAAC,oBAAoB,CAAC;AACvD,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAC/C,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;AAE7C,MAAM,kBAAkB,GAAgD,EAAE,CAAC;AAE3E,IAAI,WAAW,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAClE,kBAAkB,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACpF,WAAW,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjE,kBAAkB,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAe,EAAgB,EAAE;gBACrF,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;gBAC3C,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,EAAE;oBAClC,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CACP,iBAAiB,UAAU,IAAI,UAAU,CAAC,IAAI,YAAY,cAAc,IACtE,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WACtC,iBAAiB,IAAI,CAAC,MAAM,EAAE,CAC/B,CACF,CAAC;iBACH;gBACD,OAAO,WAAW,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YACvD,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,+EAA+E;QAC/E,kFAAkF;QAClF,EAAE;QACF,wEAAwE;QACxE,gDAAgD;QAChD,EAAE;QACF,6GAA6G;QAC7G,gGAAgG;QAChG,4HAA4H;QAC5H,qCAAqC;QACrC,IAAI,aAAa,CAAC,yBAAyB,EAAE;YAC3C,kBAAkB,CAAC,UAAU,CAAC,CAAC,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CACvD,aAAa,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;YAClF,kBAAkB,CAAC,UAAU,CAAC,CAAC,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CAC3D,aAAa,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;SACvF;aAAM;YACL,oBAAoB;YACpB,kHAAkH;YAClH,sHAAsH;YACtH,kBAAkB,CAAC,UAAU,CAAC,CAAC,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;YACtD,kBAAkB,CAAC,UAAU,CAAC,CAAC,eAAe,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;SAC3D;IACH,CAAC,CAAC,CAAC;CACJ;KAAM;IACL,OAAO,CAAC,IAAI,CACV,gJAAgJ,CACjJ,CAAC;CACH;AAED,eAAe,kBAAkB,CAAC","sourcesContent":["import { NativeModules } from 'react-native';\n\nimport { ProxyNativeModule } from './NativeModulesProxy.types';\n\nconst NativeProxy = NativeModules.NativeUnimoduleProxy;\nconst modulesConstantsKey = 'modulesConstants';\nconst exportedMethodsKey = 'exportedMethods';\n\nconst NativeModulesProxy: { [moduleName: string]: ProxyNativeModule } = {};\n\nif (NativeProxy) {\n  Object.keys(NativeProxy[exportedMethodsKey]).forEach((moduleName) => {\n    NativeModulesProxy[moduleName] = NativeProxy[modulesConstantsKey][moduleName] || {};\n    NativeProxy[exportedMethodsKey][moduleName].forEach((methodInfo) => {\n      NativeModulesProxy[moduleName][methodInfo.name] = (...args: unknown[]): Promise<any> => {\n        const { key, argumentsCount } = methodInfo;\n        if (argumentsCount !== args.length) {\n          return Promise.reject(\n            new Error(\n              `Native method ${moduleName}.${methodInfo.name} expects ${argumentsCount} ${\n                argumentsCount === 1 ? 'argument' : 'arguments'\n              } but received ${args.length}`\n            )\n          );\n        }\n        return NativeProxy.callMethod(moduleName, key, args);\n      };\n    });\n\n    // These are called by EventEmitter (which is a wrapper for NativeEventEmitter)\n    // only on iOS and they use iOS-specific native module, EXReactNativeEventEmitter.\n    //\n    // On Android only {start,stop}Observing are called on the native module\n    // and these should be exported as Expo methods.\n    //\n    // Before the RN 65, addListener/removeListeners weren't called on Android. However, it no longer stays true.\n    // See https://github.com/facebook/react-native/commit/f5502fbda9fe271ff6e1d0da773a3a8ee206a453.\n    // That's why, we check if the `EXReactNativeEventEmitter` exists and only if yes, we use it in the listener implementation.\n    // Otherwise, those methods are NOOP.\n    if (NativeModules.EXReactNativeEventEmitter) {\n      NativeModulesProxy[moduleName].addListener = (...args) =>\n        NativeModules.EXReactNativeEventEmitter.addProxiedListener(moduleName, ...args);\n      NativeModulesProxy[moduleName].removeListeners = (...args) =>\n        NativeModules.EXReactNativeEventEmitter.removeProxiedListeners(moduleName, ...args);\n    } else {\n      // Fixes on Android:\n      // WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `addListener` method.\n      // WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `removeListeners` method.\n      NativeModulesProxy[moduleName].addListener = () => {};\n      NativeModulesProxy[moduleName].removeListeners = () => {};\n    }\n  });\n} else {\n  console.warn(\n    `The \"EXNativeModulesProxy\" native module is not exported through NativeModules; verify that expo-modules-core's native code is linked properly`\n  );\n}\n\nexport default NativeModulesProxy;\n"]}

package/build/NativeModulesProxy.types.d.ts

@@ -3,7 +3,4 @@ export declare type ProxyNativeModule = {
     addListener: (eventName: string) => void;
     removeListeners: (count: number) => void;
 };
-export declare type TurboNativeModuleProxy = {
-    callMethodAsync: <ReturnType>(moduleName: string, methodName: string, args: any[]) => Promise<ReturnType>;
-};
 //# sourceMappingURL=NativeModulesProxy.types.d.ts.map

package/build/NativeModulesProxy.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeModulesProxy.types.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.types.ts"],"names":[],"mappings":"AAAA,oBAAY,iBAAiB,GAAG;IAC9B,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG,CAAC;IAC5B,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACnC,eAAe,EAAE,CAAC,UAAU,EAC1B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,GAAG,EAAE,KACR,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1B,CAAC"}
+{"version":3,"file":"NativeModulesProxy.types.d.ts","sourceRoot":"","sources":["../src/NativeModulesProxy.types.ts"],"names":[],"mappings":"AAAA,oBAAY,iBAAiB,GAAG;IAC9B,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG,CAAC;IAC5B,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C,CAAC"}

package/build/NativeModulesProxy.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"NativeModulesProxy.types.js","sourceRoot":"","sources":["../src/NativeModulesProxy.types.ts"],"names":[],"mappings":"","sourcesContent":["export type ProxyNativeModule = {\n  [propertyName: string]: any;\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n};\n\nexport type TurboNativeModuleProxy = {\n  callMethodAsync: <ReturnType>(\n    moduleName: string,\n    methodName: string,\n    args: any[]\n  ) => Promise<ReturnType>;\n};\n"]}
+{"version":3,"file":"NativeModulesProxy.types.js","sourceRoot":"","sources":["../src/NativeModulesProxy.types.ts"],"names":[],"mappings":"","sourcesContent":["export type ProxyNativeModule = {\n  [propertyName: string]: any;\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n};\n"]}

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;AAqB1B;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAqC1F"}
+{"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,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CA0B1F"}

package/build/NativeViewManagerAdapter.native.js

@@ -1,48 +1,24 @@
 import React from 'react';
-import { NativeModules, UIManager, ViewPropTypes, requireNativeComponent } from 'react-native';
-// To make the transition from React Native's `requireNativeComponent` to Expo's
-// `requireNativeViewManager` as easy as possible, `requireNativeViewManager` is a drop-in
-// replacement for `requireNativeComponent`.
-//
-// For each view manager, we create a wrapper component that accepts all of the props available to
-// the author of the universal module. This wrapper component splits the props into two sets: props
-// passed to React Native's View (ex: style, testID) and custom view props, which are passed to the
-// adapter view component in a prop called `proxiedProperties`.
-// NOTE: React Native is moving away from runtime PropTypes and may remove ViewPropTypes, in which
-// case we will need another way to separate standard React Native view props from other props,
-// which we proxy through the adapter
-const ViewPropTypesKeys = Object.keys(ViewPropTypes);
+import { NativeModules, requireNativeComponent } from 'react-native';
 /**
  * A drop-in replacement for `requireNativeComponent`.
  */
 export function requireNativeViewManager(viewName) {
-    if (__DEV__) {
-        const { NativeUnimoduleProxy } = NativeModules;
-        if (!NativeUnimoduleProxy.viewManagersNames.includes(viewName)) {
-            const exportedViewManagerNames = NativeUnimoduleProxy.viewManagersNames.join(', ');
-            console.warn(`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}].`);
-        }
+    const { viewManagersMetadata } = NativeModules.NativeUnimoduleProxy;
+    const viewManagerConfig = viewManagersMetadata?.[viewName];
+    if (__DEV__ && !viewManagerConfig) {
+        const exportedViewManagerNames = Object.keys(viewManagersMetadata).join(', ');
+        console.warn(`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}].`);
     }
     // 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 reactNativeUIConfiguration = (UIManager.getViewManagerConfig
-        ? UIManager.getViewManagerConfig(reactNativeViewName)
-        : UIManager[reactNativeViewName]) || {
-        NativeProps: {},
-        directEventTypes: {},
-    };
-    const reactNativeComponentPropNames = [
-        'children',
-        ...ViewPropTypesKeys,
-        ...Object.keys(reactNativeUIConfiguration.NativeProps),
-        ...Object.keys(reactNativeUIConfiguration.directEventTypes),
-    ];
+    const proxiedPropsNames = viewManagerConfig?.propsNames ?? [];
     // Define a component for universal-module authors to access their native view manager
     function NativeComponentAdapter(props, ref) {
-        const nativeProps = pick(props, reactNativeComponentPropNames);
-        const proxiedProps = omit(props, reactNativeComponentPropNames);
+        const nativeProps = omit(props, proxiedPropsNames);
+        const proxiedProps = pick(props, proxiedPropsNames);
         return React.createElement(ReactNativeComponent, { ...nativeProps, proxiedProperties: proxiedProps, ref: ref });
     }
     NativeComponentAdapter.displayName = `Adapter<${viewName}>`;

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,SAAS,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE/F,gFAAgF;AAChF,0FAA0F;AAC1F,4CAA4C;AAC5C,EAAE;AACF,kGAAkG;AAClG,mGAAmG;AACnG,mGAAmG;AACnG,+DAA+D;AAE/D,kGAAkG;AAClG,+FAA+F;AAC/F,qCAAqC;AACrC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AAMrD;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAU,QAAgB;IAChE,IAAI,OAAO,EAAE;QACX,MAAM,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAAC;QAC/C,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC9D,MAAM,wBAAwB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnF,OAAO,CAAC,IAAI,CACV,6CAA6C,QAAQ,8IAA8I,wBAAwB,IAAI,CAChO,CAAC;SACH;KACF;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,0BAA0B,GAAG,CAAC,SAAS,CAAC,oBAAoB;QAChE,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,mBAAmB,CAAC;QACrD,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,IAAI;QACrC,WAAW,EAAE,EAAE;QACf,gBAAgB,EAAE,EAAE;KACrB,CAAC;IACF,MAAM,6BAA6B,GAAG;QACpC,UAAU;QACV,GAAG,iBAAiB;QACpB,GAAG,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC;QACtD,GAAG,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,gBAAgB,CAAC;KAC5D,CAAC;IAEF,sFAAsF;IACtF,SAAS,sBAAsB,CAAC,KAAK,EAAE,GAAG;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC;QAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC;QAChE,OAAO,oBAAC,oBAAoB,OAAK,WAAW,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,GAAI,CAAC;IAC9F,CAAC;IACD,sBAAsB,CAAC,WAAW,GAAG,WAAW,QAAQ,GAAG,CAAC;IAC5D,OAAO,KAAK,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;AAClD,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, UIManager, ViewPropTypes, 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\n// NOTE: React Native is moving away from runtime PropTypes and may remove ViewPropTypes, in which\n// case we will need another way to separate standard React Native view props from other props,\n// which we proxy through the adapter\nconst ViewPropTypesKeys = Object.keys(ViewPropTypes);\n\ntype NativeExpoComponentProps = {\n  proxiedProperties: object;\n};\n\n/**\n * A drop-in replacement for `requireNativeComponent`.\n */\nexport function requireNativeViewManager<P = any>(viewName: string): React.ComponentType<P> {\n  if (__DEV__) {\n    const { NativeUnimoduleProxy } = NativeModules;\n    if (!NativeUnimoduleProxy.viewManagersNames.includes(viewName)) {\n      const exportedViewManagerNames = NativeUnimoduleProxy.viewManagersNames.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\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 reactNativeUIConfiguration = (UIManager.getViewManagerConfig\n    ? UIManager.getViewManagerConfig(reactNativeViewName)\n    : UIManager[reactNativeViewName]) || {\n    NativeProps: {},\n    directEventTypes: {},\n  };\n  const reactNativeComponentPropNames = [\n    'children',\n    ...ViewPropTypesKeys,\n    ...Object.keys(reactNativeUIConfiguration.NativeProps),\n    ...Object.keys(reactNativeUIConfiguration.directEventTypes),\n  ];\n\n  // Define a component for universal-module authors to access their native view manager\n  function NativeComponentAdapter(props, ref) {\n    const nativeProps = pick(props, reactNativeComponentPropNames);\n    const proxiedProps = omit(props, reactNativeComponentPropNames);\n    return <ReactNativeComponent {...nativeProps} proxiedProperties={proxiedProps} ref={ref} />;\n  }\n  NativeComponentAdapter.displayName = `Adapter<${viewName}>`;\n  return React.forwardRef(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,EAAE,MAAM,cAAc,CAAC;AAerE;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAU,QAAgB;IAChE,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,SAAS,sBAAsB,CAAC,KAAK,EAAE,GAAG;QACxC,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;IACD,sBAAsB,CAAC,WAAW,GAAG,WAAW,QAAQ,GAAG,CAAC;IAC5D,OAAO,KAAK,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;AAClD,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 = any>(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  function NativeComponentAdapter(props, ref) {\n    const nativeProps = omit(props, proxiedPropsNames);\n    const proxiedProps = pick(props, proxiedPropsNames);\n    return <ReactNativeComponent {...nativeProps} proxiedProperties={proxiedProps} ref={ref} />;\n  }\n  NativeComponentAdapter.displayName = `Adapter<${viewName}>`;\n  return React.forwardRef(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/sweet/NativeErrorManager.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from '..';
+import NativeModulesProxy from '../NativeModulesProxy';
 export default NativeModulesProxy.ExpoModulesCoreErrorManager;
 //# sourceMappingURL=NativeErrorManager.js.map

package/build/sweet/NativeErrorManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"NativeErrorManager.js","sourceRoot":"","sources":["../../src/sweet/NativeErrorManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AACxC,eAAe,kBAAkB,CAAC,2BAA2B,CAAC","sourcesContent":["import { NativeModulesProxy } from '..';\nexport default NativeModulesProxy.ExpoModulesCoreErrorManager;\n"]}
+{"version":3,"file":"NativeErrorManager.js","sourceRoot":"","sources":["../../src/sweet/NativeErrorManager.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,eAAe,kBAAkB,CAAC,2BAA2B,CAAC","sourcesContent":["import NativeModulesProxy from '../NativeModulesProxy';\nexport default NativeModulesProxy.ExpoModulesCoreErrorManager;\n"]}

package/ios/AppDelegates/EXAppDelegatesLoader.m

@@ -1,14 +1,10 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
+#import <ExpoModulesCore/EXLegacyAppDelegateWrapper.h>
+
 #import <ExpoModulesCore/EXAppDelegatesLoader.h>
 #import <ExpoModulesCore/EXNativeModulesProxy.h>
-
-#if __has_include(<ExpoModulesCore/ExpoModulesCore-Swift.h>)
-// When `use_frameworks!` is used, the generated Swift header is inside ExpoModulesCore module.
-#import <ExpoModulesCore/ExpoModulesCore-Swift.h>
-#else
-#import "ExpoModulesCore-Swift.h"
-#endif
+#import <ExpoModulesCore/Swift.h>
 
 // Make the legacy wrapper conform to the protocol for subscribers.
 @interface EXLegacyAppDelegateWrapper () <EXAppDelegateSubscriberProtocol>
@@ -21,7 +17,7 @@
 // and before any code is executed, so we switch back to Objective-C just to do this one thing.
 + (void)load
 {
-  id<ModulesProviderObjCProtocol> modulesProvider = [EXNativeModulesProxy getExpoModulesProvider];
+  ModulesProvider *modulesProvider = [EXNativeModulesProxy getExpoModulesProvider];
   [EXExpoAppDelegate registerSubscriber:[[EXLegacyAppDelegateWrapper alloc] init]];
   [EXExpoAppDelegate registerSubscribersFromModulesProvider:modulesProvider];
   [EXExpoAppDelegate registerReactDelegateHandlersFromModulesProvider:modulesProvider];

package/ios/AppDelegates/ExpoAppDelegate.swift

@@ -263,11 +263,8 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
   // MARK: - Statics
 
   @objc
-  public static func registerSubscribersFrom(modulesProvider: ModulesProviderObjCProtocol) {
-    guard let provider = modulesProvider as? ModulesProviderProtocol else {
-      fatalError("Expo modules provider must implement `ModulesProviderProtocol`.")
-    }
-    provider.getAppDelegateSubscribers().forEach { subscriberType in
+  public static func registerSubscribersFrom(modulesProvider: ModulesProvider) {
+    modulesProvider.getAppDelegateSubscribers().forEach { subscriberType in
       registerSubscriber(subscriberType.init())
     }
   }
@@ -286,11 +283,8 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
   }
 
   @objc
-  public static func registerReactDelegateHandlersFrom(modulesProvider: ModulesProviderObjCProtocol) {
-    guard let provider = modulesProvider as? ModulesProviderProtocol else {
-      fatalError("Expo modules provider must implement `ModulesProviderProtocol`.")
-    }
-    provider.getReactDelegateHandlers()
+  public static func registerReactDelegateHandlersFrom(modulesProvider: ModulesProvider) {
+    modulesProvider.getReactDelegateHandlers()
       .sorted { tuple1, tuple2 -> Bool in
         return ModulePriorities.get(tuple1.packageName) > ModulePriorities.get(tuple2.packageName)
       }

package/ios/EXAppDefines.h

@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (class, nonatomic, assign, readonly) BOOL APP_DEBUG NS_SWIFT_NAME(APP_DEBUG);
 @property (class, nonatomic, assign, readonly) BOOL APP_RCT_DEBUG NS_SWIFT_NAME(APP_RCT_DEBUG);
 @property (class, nonatomic, assign, readonly) BOOL APP_RCT_DEV NS_SWIFT_NAME(APP_RCT_DEV);
+@property (class, nonatomic, assign, readonly) BOOL APP_NEW_ARCH_ENABLED NS_SWIFT_NAME(APP_NEW_ARCH_ENABLED);
 
 + (NSDictionary *)getAllDefines;
 

package/ios/EXAppDefines.m

@@ -26,6 +26,12 @@ static BOOL _loaded = NO;
   return [_storage[@"APP_RCT_DEV"] boolValue];
 }
 
++ (BOOL)APP_NEW_ARCH_ENABLED
+{
+  [self throwIfNotLoaded];
+  return [_storage[@"APP_NEW_ARCH_ENABLED"] boolValue];
+}
+
 + (NSDictionary *)getAllDefines
 {
   return _storage;

package/ios/EXUtilities.h

@@ -20,6 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable UIViewController *)currentViewController;
 - (nullable NSDictionary *)launchOptions;
 
++ (BOOL)catchException:(void(^)(void))tryBlock error:(__autoreleasing NSError **)error;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/EXUtilities.m

@@ -206,6 +206,18 @@ EX_REGISTER_MODULE();
   }
 }
 
++ (BOOL)catchException:(void(^)(void))tryBlock error:(__autoreleasing NSError **)error
+{
+  @try {
+    tryBlock();
+    return YES;
+  }
+  @catch (NSException *exception) {
+    *error = [[NSError alloc] initWithDomain:exception.name code:0 userInfo:exception.userInfo];
+    return NO;
+  }
+}
+
 @end
 
 UIApplication * EXSharedApplication(void)