expo-modules-core 1.5.7 → 1.5.8

package/CHANGELOG.md

@@ -10,13 +10,21 @@
 
 ### 💡 Others
 
+## 1.5.8 — 2023-07-23
+
+### 🐛 Bug fixes
+
+- Fork `uuid@3.4.0` and move into `expo-modules-core`. Remove the original dependency. ([#23249](https://github.com/expo/expo/pull/23249) by [@alanhughes](https://github.com/alanjhughes))
+- Fixed the `ErrorViewGroup` cannot be cast to module view class exception on Android. ([#23651](https://github.com/expo/expo/pull/23651) by [@lukmccall](https://github.com/lukmccall))
+- [iOS] Fix allowed orientations set in `Info.plist` being ignored when no delegates requested a different orientation. ([#23593](https://github.com/expo/expo/pull/23593) by [@behenate](https://github.com/behenate))
+
 ## 1.5.7 — 2023-07-12
 
 ### 🐛 Bug fixes
 
 - Fixed regressions and crashes in the dev client introduced by [#23405](https://github.com/expo/expo/pull/23405). ([#23491](https://github.com/expo/expo/pull/23491) by [@kudo](https://github.com/kudo))
 
-## 1.5.6 — 2023-07-10
+## 1.5.6 - 2023-07-10
 
 ### 🐛 Bug fixes
 
@@ -24,14 +32,14 @@
 - Fixed `SoLoader` does not work on Android. ([#23415](https://github.com/expo/expo/pull/23415) by [@kudo](https://github.com/kudo))
 - Fixed slower boot time on Android. ([#23345](https://github.com/expo/expo/pull/23345) by [@lukmccall](https://github.com/lukmccall))
 
-## 1.5.5 — 2023-07-07
+## 1.5.5 - 2023-07-07
 
 ### 🐛 Bug fixes
 
 - Improved the OkHttp network inspector stability on Android. ([#23350](https://github.com/expo/expo/pull/23350) by [@kudo](https://github.com/kudo))
-- [iOS] Fix conversion to `URL` type that failed despite receiving a string that contained a valid URL. ([#23331](https://github.com/expo/expo/pull/23331) by [@alanhughes](https://github.com/alanjhughes))
+- [iOS] Fix conversion to `URL` type that failed despite receiving a string that contained a valid URL. ([#23331](https://github.com/expo/expo/pull/23331) by [@alanhughes](https://github.com/alanjhughes)) ([#23331](https://github.com/expo/expo/pull/23331) by [@alanjhughes](https://github.com/alanjhughes))
 
-## 1.5.4 — 2023-07-04
+## 1.5.4 - 2023-07-04
 
 ### 🐛 Bug fixes
 

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.5.7'
+version = '1.5.8'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -160,7 +160,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.5.7"
+    versionName "1.5.8"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -279,6 +279,8 @@ dependencies {
   implementation "androidx.activity:activity-ktx:1.7.1" // androidx.appcompat:appcompat:1.4.1 depends on version 1.2.3, so we enforce higher one here
   implementation "androidx.fragment:fragment-ktx:1.5.7" // androidx.appcomapt:appcompat:1.4.1 depends on version 1.3.4, so we enforce higher one here
 
+  implementation("androidx.tracing:tracing-ktx:1.1.0")
+
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
 

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

@@ -40,6 +40,7 @@ import expo.modules.kotlin.jni.JSIInteropModuleRegistry
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.providers.CurrentActivityProvider
 import expo.modules.kotlin.sharedobjects.SharedObjectRegistry
+import expo.modules.kotlin.tracing.trace
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -120,26 +121,28 @@ class AppContext(
    * Initializes a JSI part of the module registry.
    * It will be a NOOP if the remote debugging was activated.
    */
-  fun installJSIInterop() = synchronized<Unit>(this) {
-    try {
-      jsiInterop = JSIInteropModuleRegistry(this)
-      val reactContext = reactContextHolder.get() ?: return
-      val jsContextProvider = legacyModule<JavaScriptContextProvider>() ?: return
-      val jsContextHolder = jsContextProvider.javaScriptContextRef
-      val catalystInstance = reactContext.catalystInstance ?: return
-      jsContextHolder
-        .takeIf { it != 0L }
-        ?.let {
-          jsiInterop.installJSI(
-            it,
-            jniDeallocator,
-            jsContextProvider.jsCallInvokerHolder,
-            catalystInstance.nativeCallInvokerHolder as CallInvokerHolderImpl
-          )
-          logger.info("✅ JSI interop was installed")
-        }
-    } catch (e: Throwable) {
-      logger.error("❌ Cannot install JSI interop: $e", e)
+  fun installJSIInterop() = synchronized(this) {
+    trace("AppContext.installJSIInterop") {
+      try {
+        jsiInterop = JSIInteropModuleRegistry(this)
+        val reactContext = reactContextHolder.get() ?: return@trace
+        val jsContextProvider = legacyModule<JavaScriptContextProvider>() ?: return@trace
+        val jsContextHolder = jsContextProvider.javaScriptContextRef
+        val catalystInstance = reactContext.catalystInstance ?: return@trace
+        jsContextHolder
+          .takeIf { it != 0L }
+          ?.let {
+            jsiInterop.installJSI(
+              it,
+              jniDeallocator,
+              jsContextProvider.jsCallInvokerHolder,
+              catalystInstance.nativeCallInvokerHolder as CallInvokerHolderImpl
+            )
+            logger.info("✅ JSI interop was installed")
+          }
+      } catch (e: Throwable) {
+        logger.error("❌ Cannot install JSI interop: $e", e)
+      }
     }
   }
 
@@ -271,7 +274,7 @@ class AppContext(
   internal val errorManager: ErrorManagerModule?
     get() = registry.getModule()
 
-  internal fun onDestroy() {
+  internal fun onDestroy() = trace("AppContext.onDestroy") {
     reactContextHolder.get()?.removeLifecycleEventListener(reactLifecycleDelegate)
     registry.post(EventName.MODULE_DESTROY)
     registry.cleanUp()

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

@@ -7,6 +7,7 @@ import expo.modules.adapters.react.NativeModulesProxy
 import expo.modules.kotlin.defaultmodules.NativeModulesProxyModuleName
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.UnexpectedException
+import expo.modules.kotlin.tracing.trace
 import expo.modules.kotlin.views.GroupViewManagerWrapper
 import expo.modules.kotlin.views.SimpleViewManagerWrapper
 import expo.modules.kotlin.views.ViewManagerWrapperDelegate
@@ -42,55 +43,61 @@ class KotlinInteropModuleRegistry(
     }
   }
 
-  fun exportedModulesConstants(): Map<ModuleName, ModuleConstants> {
-    return registry
-      // prevent infinite recursion - exclude NativeProxyModule constants
-      .filter { holder -> holder.name != NativeModulesProxyModuleName }
-      .associate { holder ->
-        holder.name to holder.definition.constantsProvider()
+  fun exportedModulesConstants(): Map<ModuleName, ModuleConstants> =
+    trace("KotlinInteropModuleRegistry.exportedModulesConstants") {
+      registry
+        // prevent infinite recursion - exclude NativeProxyModule constants
+        .filter { holder -> holder.name != NativeModulesProxyModuleName }
+        .associate { holder ->
+          holder.name to holder.definition.constantsProvider()
+        }
+    }
+
+  fun exportMethods(exportKey: (String, List<ModuleMethodInfo>) -> Unit = { _, _ -> }): Map<ModuleName, List<ModuleMethodInfo>> =
+    trace("KotlinInteropModuleRegistry.exportMethods") {
+      registry.associate { holder ->
+        val methodsInfo = holder
+          .definition
+          .asyncFunctions
+          .map { (name, method) ->
+            mapOf(
+              "name" to name,
+              "argumentsCount" to method.argsCount
+            )
+          }
+        exportKey(holder.name, methodsInfo)
+        holder.name to methodsInfo
       }
-  }
+    }
 
-  fun exportMethods(exportKey: (String, List<ModuleMethodInfo>) -> Unit = { _, _ -> }): Map<ModuleName, List<ModuleMethodInfo>> {
-    return registry.associate { holder ->
-      val methodsInfo = holder
-        .definition
-        .asyncFunctions
-        .map { (name, method) ->
-          mapOf(
-            "name" to name,
-            "argumentsCount" to method.argsCount
-          )
+  fun exportViewManagers(): List<ViewManager<*, *>> =
+    trace("KotlinInteropModuleRegistry.exportViewManagers") {
+      registry
+        .filter { it.definition.viewManagerDefinition != null }
+        .map {
+          val wrapperDelegate = ViewManagerWrapperDelegate(it)
+          when (it.definition.viewManagerDefinition!!.getViewManagerType()) {
+            expo.modules.core.ViewManager.ViewManagerType.SIMPLE -> SimpleViewManagerWrapper(wrapperDelegate)
+            expo.modules.core.ViewManager.ViewManagerType.GROUP -> GroupViewManagerWrapper(wrapperDelegate)
+          }
         }
-      exportKey(holder.name, methodsInfo)
-      holder.name to methodsInfo
     }
-  }
 
-  fun exportViewManagers(): List<ViewManager<*, *>> {
-    return registry
-      .filter { it.definition.viewManagerDefinition != null }
-      .map {
-        val wrapperDelegate = ViewManagerWrapperDelegate(it)
-        when (it.definition.viewManagerDefinition!!.getViewManagerType()) {
-          expo.modules.core.ViewManager.ViewManagerType.SIMPLE -> SimpleViewManagerWrapper(wrapperDelegate)
-          expo.modules.core.ViewManager.ViewManagerType.GROUP -> GroupViewManagerWrapper(wrapperDelegate)
+  fun viewManagersMetadata(): Map<String, Map<String, Any>> =
+    trace("KotlinInteropModuleRegistry.viewManagersMetadata") {
+      registry
+        .filter { it.definition.viewManagerDefinition != null }
+        .associate { holder ->
+          holder.name to mapOf(
+            "propsNames" to (holder.definition.viewManagerDefinition?.propsNames ?: emptyList())
+          )
         }
-      }
-  }
-
-  fun viewManagersMetadata(): Map<String, Map<String, Any>> {
-    return registry
-      .filter { it.definition.viewManagerDefinition != null }
-      .associate { holder ->
-        holder.name to mapOf(
-          "propsNames" to (holder.definition.viewManagerDefinition?.propsNames ?: emptyList())
-        )
-      }
-  }
+    }
 
   fun extractViewManagersDelegateHolders(viewManagers: List<ViewManager<*, *>>): List<ViewWrapperDelegateHolder> =
-    viewManagers.filterIsInstance<ViewWrapperDelegateHolder>()
+    trace("KotlinInteropModuleRegistry.extractViewManagersDelegateHolders") {
+      viewManagers.filterIsInstance<ViewWrapperDelegateHolder>()
+    }
 
   /**
    * Since React Native v0.55, {@link com.facebook.react.ReactPackage#createViewManagers(ReactApplicationContext)}
@@ -100,15 +107,16 @@ class KotlinInteropModuleRegistry(
    * the instance that was bound with the prop method won't be the same as the instance returned by module registry.
    * To fix that we need to update all modules holder in exported view managers.
    */
-  fun updateModuleHoldersInViewManagers(viewWrapperHolders: List<ViewWrapperDelegateHolder>) {
-    viewWrapperHolders
-      .map { it.viewWrapperDelegate }
-      .forEach { holderWrapper ->
-        holderWrapper.moduleHolder = requireNotNull(registry.getModuleHolder(holderWrapper.moduleHolder.name)) {
-          "Cannot update the module holder for ${holderWrapper.moduleHolder.name}."
+  fun updateModuleHoldersInViewManagers(viewWrapperHolders: List<ViewWrapperDelegateHolder>) =
+    trace("KotlinInteropModuleRegistry.updateModuleHoldersInViewManagers") {
+      viewWrapperHolders
+        .map { it.viewWrapperDelegate }
+        .forEach { holderWrapper ->
+          holderWrapper.moduleHolder = requireNotNull(registry.getModuleHolder(holderWrapper.moduleHolder.name)) {
+            "Cannot update the module holder for ${holderWrapper.moduleHolder.name}."
+          }
         }
-      }
-  }
+    }
 
   fun onDestroy() {
     appContext.onDestroy()

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

@@ -11,6 +11,7 @@ import expo.modules.kotlin.exception.MethodNotFoundException
 import expo.modules.kotlin.exception.exceptionDecorator
 import expo.modules.kotlin.jni.JavaScriptModuleObject
 import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.tracing.trace
 import kotlinx.coroutines.launch
 import kotlin.reflect.KClass
 
@@ -23,38 +24,40 @@ class ModuleHolder(val module: Module) {
    * Cached instance of HybridObject used by CPP to interact with underlying [expo.modules.kotlin.modules.Module] object.
    */
   val jsObject by lazy {
-    val appContext = module.appContext
-    val jniDeallocator = appContext.jniDeallocator
+    trace("$name.jsObject") {
+      val appContext = module.appContext
+      val jniDeallocator = appContext.jniDeallocator
 
-    JavaScriptModuleObject(jniDeallocator, name).apply {
-      initUsingObjectDefinition(appContext, definition.objectDefinition)
+      JavaScriptModuleObject(jniDeallocator, name).apply {
+        initUsingObjectDefinition(appContext, definition.objectDefinition)
 
-      val viewFunctions = definition.viewManagerDefinition?.asyncFunctions
-      if (viewFunctions?.isNotEmpty() == true) {
-        val viewPrototype = JavaScriptModuleObject(jniDeallocator, "${name}_${definition.viewManagerDefinition?.viewType?.name}")
-        appContext.jniDeallocator.addReference(viewPrototype)
+        val viewFunctions = definition.viewManagerDefinition?.asyncFunctions
+        if (viewFunctions?.isNotEmpty() == true) {
+          val viewPrototype = JavaScriptModuleObject(jniDeallocator, "${name}_${definition.viewManagerDefinition?.viewType?.name}")
+          appContext.jniDeallocator.addReference(viewPrototype)
 
-        viewFunctions.forEach { function ->
-          function.attachToJSObject(appContext, viewPrototype)
-        }
+          viewFunctions.forEach { function ->
+            function.attachToJSObject(appContext, viewPrototype)
+          }
 
-        registerViewPrototype(viewPrototype)
-      }
+          registerViewPrototype(viewPrototype)
+        }
 
-      definition.classData.forEach { clazz ->
-        val clazzModuleObject = JavaScriptModuleObject(jniDeallocator, clazz.name)
-          .initUsingObjectDefinition(module.appContext, clazz.objectDefinition)
-        appContext.jniDeallocator.addReference(clazzModuleObject)
-
-        val constructor = clazz.constructor
-        registerClass(
-          clazz.name,
-          clazzModuleObject,
-          constructor.takesOwner,
-          constructor.argsCount,
-          constructor.getCppRequiredTypes().toTypedArray(),
-          constructor.getJNIFunctionBody(clazz.name, appContext)
-        )
+        definition.classData.forEach { clazz ->
+          val clazzModuleObject = JavaScriptModuleObject(jniDeallocator, clazz.name)
+            .initUsingObjectDefinition(module.appContext, clazz.objectDefinition)
+          appContext.jniDeallocator.addReference(clazzModuleObject)
+
+          val constructor = clazz.constructor
+          registerClass(
+            clazz.name,
+            clazzModuleObject,
+            constructor.takesOwner,
+            constructor.argsCount,
+            constructor.getCppRequiredTypes().toTypedArray(),
+            constructor.getJNIFunctionBody(clazz.name, appContext)
+          )
+        }
       }
     }
   }

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

@@ -2,6 +2,7 @@ package expo.modules.kotlin
 
 import expo.modules.kotlin.events.EventName
 import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.tracing.trace
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -16,7 +17,7 @@ class ModuleRegistry(
   @PublishedApi
   internal val registry = mutableMapOf<String, ModuleHolder>()
 
-  fun register(module: Module) {
+  fun register(module: Module) = trace("ModuleRegistry.register(${module.javaClass})") {
     module._appContext = requireNotNull(appContext.get()) { "Cannot create a module for invalid app context." }
 
     val holder = ModuleHolder(module)

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

@@ -3,6 +3,7 @@ package expo.modules.kotlin.modules
 import android.os.Bundle
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.providers.AppContextProvider
+import expo.modules.kotlin.tracing.trace
 import kotlinx.coroutines.CoroutineScope
 
 abstract class Module : AppContextProvider {
@@ -35,6 +36,6 @@ abstract class Module : AppContextProvider {
 }
 
 @Suppress("FunctionName")
-inline fun Module.ModuleDefinition(block: ModuleDefinitionBuilder.() -> Unit): ModuleDefinitionData {
-  return ModuleDefinitionBuilder(this).also(block).buildModule()
+inline fun Module.ModuleDefinition(crossinline block: ModuleDefinitionBuilder.() -> Unit): ModuleDefinitionData {
+  return trace("${this.javaClass}.ModuleDefinition") { ModuleDefinitionBuilder(this).also(block).buildModule() }
 }

package/android/src/main/java/expo/modules/kotlin/tracing/ExpoTrace.kt

@@ -0,0 +1,13 @@
+package expo.modules.kotlin.tracing
+
+import androidx.tracing.Trace
+
+/**
+ * Wrap the specified [block] in calls to [Trace.beginSection] (with expo tag and the supplied [blockName])
+ * and [Trace.endSection].
+ *
+ * @param blockName A name of the code section to appear in the trace.
+ * @param block A block of code which is being traced.
+ */
+inline fun <T> trace(blockName: String, crossinline block: () -> T) =
+  androidx.tracing.trace("[ExpoModulesCore] $blockName", block)

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

@@ -0,0 +1,21 @@
+package expo.modules.kotlin.views
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+
+/**
+ * A NOOP view, which is used when an error occurs.
+ */
+open class ErrorView(context: Context) : View(context)
+
+/**
+ * A NOOP view group, which is used when an error occurs.
+ */
+class ErrorGroupView(context: Context) : ViewGroup(context) {
+  override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) = Unit
+}
+
+fun View.isErrorView(): Boolean {
+  return this is ErrorView || this is ErrorGroupView
+}

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

@@ -336,9 +336,9 @@ class ViewDefinitionBuilder<T : View>(
     )
 
     return if (ViewGroup::class.java.isAssignableFrom(viewClass.java)) {
-      ErrorViewGroup(context)
+      ErrorGroupView(context)
     } else {
-      View(context)
+      ErrorView(context)
     }
   }
 

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

@@ -4,16 +4,11 @@ import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import com.facebook.react.bridge.ReactContext
-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.toCodedException
 import expo.modules.kotlin.functions.BaseAsyncFunctionComponent
-import expo.modules.kotlin.logger
-import expo.modules.kotlin.recycle
 
 class ViewManagerDefinition(
   private val viewFactory: (Context, AppContext) -> View,
@@ -38,29 +33,6 @@ class ViewManagerDefinition(
     }
   }
 
-  fun setProps(propsToSet: ReadableMap, onView: View) {
-    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,
-          exception.toCodedException()
-        )
-      }
-    }
-  }
-
   fun handleException(view: View, exception: CodedException) {
     val reactContext = (view.context as? ReactContext) ?: return
     val nativeModulesProxy = reactContext

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

@@ -7,9 +7,9 @@ import com.facebook.react.common.MapBuilder
 import expo.modules.core.utilities.ifNull
 import expo.modules.kotlin.ModuleHolder
 import expo.modules.kotlin.events.normalizeEventName
-import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.OnViewDidUpdatePropsException
 import expo.modules.kotlin.exception.exceptionDecorator
+import expo.modules.kotlin.exception.toCodedException
 import expo.modules.kotlin.logger
 import expo.modules.kotlin.viewevent.ViewEventDelegate
 import kotlin.reflect.full.declaredMemberProperties
@@ -42,9 +42,16 @@ class ViewManagerWrapperDelegate(internal var moduleHolder: ModuleHolder) {
         exceptionDecorator({ OnViewDidUpdatePropsException(view.javaClass.kotlin, it) }) {
           it.invoke(view)
         }
-      } catch (exception: CodedException) {
-        logger.error("❌ Error occurred when invoking 'onViewDidUpdateProps' on '${view.javaClass.simpleName}'", exception)
-        definition.handleException(view, exception)
+      } catch (exception: Throwable) {
+        // The view wasn't constructed correctly, so errors are expected.
+        // We can ignore them.
+        if (view.isErrorView()) {
+          return@let
+        }
+
+        val codedException = exception.toCodedException()
+        logger.error("❌ Error occurred when invoking 'onViewDidUpdateProps' on '${view.javaClass.simpleName}'", codedException)
+        definition.handleException(view, codedException)
       }
     }
   }
@@ -65,15 +72,47 @@ class ViewManagerWrapperDelegate(internal var moduleHolder: ModuleHolder) {
     while (iterator.hasNextKey()) {
       val key = iterator.nextKey()
       expoProps[key]?.let { expoProp ->
-        expoProp.set(propsMap.getDynamic(key), view)
-        handledProps.add(key)
+        try {
+          expoProp.set(propsMap.getDynamic(key), view)
+        } catch (exception: Throwable) {
+          // The view wasn't constructed correctly, so errors are expected.
+          // We can ignore them.
+          if (view.isErrorView()) {
+            return@let
+          }
+
+          val codedException = exception.toCodedException()
+          logger.error("❌ Cannot set the '$name' prop on the '$view'", codedException)
+          definition.handleException(
+            view,
+            codedException
+          )
+        } finally {
+          handledProps.add(key)
+        }
       }
     }
     return handledProps
   }
 
-  fun onDestroy(view: View) =
-    definition.onViewDestroys?.invoke(view)
+  fun onDestroy(view: View) {
+    try {
+      definition.onViewDestroys?.invoke(view)
+    } catch (exception: Throwable) {
+      // The view wasn't constructed correctly, so errors are expected.
+      // We can ignore them.
+      if (view.isErrorView()) {
+        return
+      }
+
+      val codedException = exception.toCodedException()
+      logger.error("❌ '$view' wasn't able to destroy itself", codedException)
+      definition.handleException(
+        view,
+        codedException
+      )
+    }
+  }
 
   fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
     val builder = MapBuilder.builder<String, Any>()

package/ios/AppDelegates/ExpoAppDelegate.swift

@@ -290,11 +290,27 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
 
   // MARK: - Managing Interface Geometry
 
+  /**
+   * Sets allowed orientations for the application. It will use the values from `Info.plist`as the orientation mask unless a subscriber requested
+   * a different orientation.
+   */
   public func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
+    let deviceOrientationMask = allowedOrientations(for: UIDevice.current.userInterfaceIdiom)
+    let universalOrientationMask = allowedOrientations(for: .unspecified)
+    let infoPlistOrientations = deviceOrientationMask.isEmpty ? universalOrientationMask : deviceOrientationMask
+
+    let parsedSubscribers = subscribers.filter {
+      $0.responds(to: #selector(application(_:supportedInterfaceOrientationsFor:)))
+    }
+
     // We want to create an intersection of all orientations set by subscribers.
-    return subscribers.reduce(.all) { result, subscriber in
-      return subscriber.application?(application, supportedInterfaceOrientationsFor: window).intersection(result) ?? result
+    let subscribersMask: UIInterfaceOrientationMask = parsedSubscribers.reduce(.all) { result, subscriber in
+      guard let requestedOrientation = subscriber.application?(application, supportedInterfaceOrientationsFor: window) else {
+        return result
+      }
+      return requestedOrientation.intersection(result)
     }
+    return parsedSubscribers.isEmpty ? infoPlistOrientations : subscribersMask
   }
 
   // MARK: - Statics
@@ -330,3 +346,28 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
       }
   }
 }
+
+private func allowedOrientations(for userInterfaceIdiom: UIUserInterfaceIdiom) -> UIInterfaceOrientationMask {
+  // For now only iPad-specific orientations are supported
+  let deviceString = userInterfaceIdiom == .pad ? "~pad" : ""
+  var mask: UIInterfaceOrientationMask = []
+  guard let orientations = Bundle.main.infoDictionary?["UISupportedInterfaceOrientations\(deviceString)"] as? [String] else {
+    return mask
+  }
+
+  for orientation in orientations {
+    switch orientation {
+    case "UIInterfaceOrientationPortrait":
+      mask.insert(.portrait)
+    case "UIInterfaceOrientationLandscapeLeft":
+      mask.insert(.landscapeLeft)
+    case "UIInterfaceOrientationLandscapeRight":
+      mask.insert(.landscapeRight)
+    case "UIInterfaceOrientationPortraitUpsideDown":
+      mask.insert(.portraitUpsideDown)
+    default:
+      break
+    }
+  }
+  return mask
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "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": "8fdc53c90c52242a80ea511ee3073d9ab950bc68"
+  "gitHead": "c0d646e9295094bca877513e500d3c9f2e990c42"
 }

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

@@ -1,11 +0,0 @@
-package expo.modules.kotlin.views
-
-import android.content.Context
-import android.view.ViewGroup
-
-/**
- * A NOOP view group, which is used when an error occurs.
- */
-class ErrorViewGroup(context: Context) : ViewGroup(context) {
-  override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) = Unit
-}