expo-screen-orientation 6.0.2 → 6.0.3

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 6.0.3 — 2023-07-12
+
+### 🐛 Bug fixes
+
+- [iOS] When config plugin is not configured the initial orientation is now based on values in `Info.plist` instead of being set to portrait. ([#23456](https://github.com/expo/expo/pull/23456) by [@behenate](https://github.com/behenate))
+
 ## 6.0.2 — 2023-07-04
 
 ### 💡 Others

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '6.0.2'
+version = '6.0.3'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -67,7 +67,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 7
-    versionName '6.0.2'
+    versionName '6.0.3'
   }
   lintOptions {
     abortOnError false

package/ios/ScreenOrientationUtilities.swift

@@ -73,6 +73,21 @@ internal func plistStringToInterfaceOrientationMask(_ maskName: String) -> UIInt
   }
 }
 
+internal func orientationStringToInterfaceOrientationMask(_ orientationString: String) -> UIInterfaceOrientationMask? {
+  switch orientationString {
+  case "UIInterfaceOrientationPortrait":
+    return .portrait
+  case "UIInterfaceOrientationPortraitUpsideDown":
+    return .portraitUpsideDown
+  case "UIInterfaceOrientationLandscapeRight":
+    return .landscapeRight
+  case "UIInterfaceOrientationLandscapeLeft":
+    return .landscapeLeft
+  default:
+    return nil
+  }
+}
+
 extension UIInterfaceOrientation {
   internal func toInterfaceOrientationMask() -> UIInterfaceOrientationMask {
     return UIInterfaceOrientationMask(rawValue: 1 << self.rawValue)

package/ios/ScreenOrientationViewController.swift

@@ -1,34 +1,44 @@
 import ExpoModulesCore
 
-let defaultScreenOrientationMask = "EXDefaultScreenOrientationMask"
+let defaultScreenOrientationMaskKey = "EXDefaultScreenOrientationMask"
+let supportedOrientationsKey = "UISupportedInterfaceOrientations"
+let ipadSupportedOrientationsKey = "UISupportedInterfaceOrientations~ipad"
 
 class ScreenOrientationViewController: UIViewController {
   let screenOrientationRegistry = ScreenOrientationRegistry.shared
   private var defaultOrientationMask: UIInterfaceOrientationMask
 
-  init(defaultOrientationMask: UIInterfaceOrientationMask = .portrait) {
+  init(defaultOrientationMask: UIInterfaceOrientationMask = doesDeviceHaveNotch ? .allButUpsideDown : .all) {
     self.defaultOrientationMask = defaultOrientationMask
     super.init(nibName: nil, bundle: nil)
   }
 
   convenience init(defaultScreenOrientationFromPlist: Void) {
-    guard let orientationString = Bundle.main.object(forInfoDictionaryKey: defaultScreenOrientationMask) as? String else {
-      self.init(defaultOrientationMask: .portrait)
+    let supportedInterfaceOrientations = ScreenOrientationViewController.getSupportedInterfaceOrientations()
+
+    guard let orientationString = Bundle.main.object(forInfoDictionaryKey: defaultScreenOrientationMaskKey) as? String else {
+      // If user hasn't defined a default interface orientation using the config plugin use the allowed values from Info.plist as the
+      // default orientation. Values in Info.plist are set with the "orientation" key in app.json
+      self.init(defaultOrientationMask: supportedInterfaceOrientations)
       return
     }
 
     guard let mask = plistStringToInterfaceOrientationMask(orientationString) else {
-      log.warn("Orientation lock string '\(orientationString)' provided in Info.plist does not correspond to a valid orientation mask. Application will default to portrait orientation lock.")
-      self.init(defaultOrientationMask: .portrait)
+      log.warn("Orientation lock string '\(orientationString)' provided in Info.plist does not correspond to a valid orientation mask. Application will default to orientation mask set in \(supportedOrientationsKey).")
+      self.init(defaultOrientationMask: supportedInterfaceOrientations)
       return
     }
 
     guard mask.isSupportedByDevice() else {
-      log.warn("Orientation lock string '\(orientationString)' provided in Info.plist is not supported by the device. Application will default to portrait orientation lock.")
-      self.init(defaultOrientationMask: .portrait)
+      log.warn("Orientation lock string '\(orientationString)' provided in Info.plist is not supported by the device. Application will default to orientation lock set in \(supportedOrientationsKey).")
+      self.init(defaultOrientationMask: supportedInterfaceOrientations)
       return
     }
 
+    if mask != mask.intersection(supportedInterfaceOrientations) {
+      log.warn("Info.plist: Orientations allowed in `\(supportedOrientationsKey)` are in conflict with the values allowed in `\(defaultScreenOrientationMaskKey)`. Values from `\(defaultScreenOrientationMaskKey)` will be used. When setting the initial orientation using the config plugin delete the `\"orientation\"` key from `app.json`")
+    }
+
     self.init(defaultOrientationMask: mask)
   }
 
@@ -61,4 +71,27 @@ class ScreenOrientationViewController: UIViewController {
     }
     return screenWindowTraitsClass.shouldAskScreensForScreenOrientation?(in: self) ?? false
   }
+
+  /**
+   * Parses the lists under the key 'UISupportedInterfaceOrientations' in Info.plist into a UIInterfaceOrientation mask. Also checks for ipad specific settings.
+   * If no orientation is found all possible orientations will be returned.
+   */
+  private static func getSupportedInterfaceOrientations() -> UIInterfaceOrientationMask {
+    let allPossibleOrientations: UIInterfaceOrientationMask = doesDeviceHaveNotch ? .allButUpsideDown : .all
+    let ipadSupportedOrientationStrings = Bundle.main.object(forInfoDictionaryKey: ipadSupportedOrientationsKey) as? [String] ?? []
+    let commonSupportedOrientationStrings = Bundle.main.object(forInfoDictionaryKey: supportedOrientationsKey) as? [String] ?? []
+    let supportedOrientationStrings = (isPad() && !ipadSupportedOrientationStrings.isEmpty) ?
+      ipadSupportedOrientationStrings : commonSupportedOrientationStrings
+    var orientationMask: UIInterfaceOrientationMask = []
+
+    for orientationString in supportedOrientationStrings {
+      guard let orientation = orientationStringToInterfaceOrientationMask(orientationString) else {
+        log.warn("Info.plist: \(orientationString) is not a valid value for the \(supportedOrientationsKey) key")
+        continue
+      }
+      orientationMask.insert(orientation)
+    }
+
+    return orientationMask.isEmpty ? allPossibleOrientations : orientationMask
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-screen-orientation",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Expo universal module for managing device's screen orientation",
   "main": "build/ScreenOrientation.js",
   "types": "build/ScreenOrientation.d.ts",
@@ -41,5 +41,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "cf90d5c30c2a08a6493ebfa8aa3791aa70666759"
+  "gitHead": "8fdc53c90c52242a80ea511ee3073d9ab950bc68"
 }