expo-screen-orientation 6.0.0 → 6.0.2

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 6.0.2 — 2023-07-04
+
+### 💡 Others
+
+- [iOS] Refactor the singleton class to work properly in versioned code in Expo Go. ([#23228](https://github.com/expo/expo/pull/23228) by [@tsapeta](https://github.com/tsapeta))
+
+## 6.0.1 — 2023-06-23
+
+### 🐛 Bug fixes
+
+- [iOS] Fix crash when reading `rootViewController` value. ([#23039](https://github.com/expo/expo/pull/23039) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ## 6.0.0 — 2023-06-21
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '6.0.0'
+version = '6.0.2'
 
 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.0'
+    versionName '6.0.2'
   }
   lintOptions {
     abortOnError false

package/ios/ScreenOrientationAppDelegate.swift

@@ -2,6 +2,7 @@
 
 import ExpoModulesCore
 
+@objc(EXScreenOrientationAppDelegate)
 public class ScreenOrientationAppDelegate: ExpoAppDelegateSubscriber {
   public func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
     ScreenOrientationRegistry.shared.updateCurrentScreenOrientation()

package/ios/ScreenOrientationModule.swift

@@ -1,6 +1,6 @@
 import ExpoModulesCore
 
-public class ScreenOrientationModule: Module, OrientationListener, Hashable {
+public class ScreenOrientationModule: Module, ScreenOrientationController {
   static let didUpdateDimensionsEvent = "expoDidUpdateDimensions"
 
   let screenOrientationRegistry = ScreenOrientationRegistry.shared
@@ -22,7 +22,7 @@ public class ScreenOrientationModule: Module, OrientationListener, Hashable {
         throw UnsupportedOrientationLockException(orientationLock)
       }
 
-      screenOrientationRegistry.setMask(orientationMask, forModule: self)
+      screenOrientationRegistry.setMask(orientationMask, forController: self)
     }
 
     AsyncFunction("lockPlatformAsync") { (allowedOrientations: [ModuleOrientation]) in
@@ -43,7 +43,7 @@ public class ScreenOrientationModule: Module, OrientationListener, Hashable {
         throw UnsupportedOrientationLockException(nil)
       }
 
-      screenOrientationRegistry.setMask(allowedOrientationsMask, forModule: self)
+      screenOrientationRegistry.setMask(allowedOrientationsMask, forController: self)
     }
 
     AsyncFunction("getOrientationLockAsync") {
@@ -75,23 +75,18 @@ public class ScreenOrientationModule: Module, OrientationListener, Hashable {
       return ModuleOrientation.from(orientation: screenOrientationRegistry.currentScreenOrientation).rawValue
     }
 
-    OnStartObserving {
-      screenOrientationRegistry.registerModuleToReceiveNotification(self)
-    }
-
-    OnStopObserving {
-      screenOrientationRegistry.unregisterModuleFromReceivingNotification(self)
+    OnCreate {
+      screenOrientationRegistry.registerController(self)
     }
 
     OnDestroy {
-      screenOrientationRegistry.unregisterModuleFromReceivingNotification(self)
-      screenOrientationRegistry.moduleWillDeallocate(self)
+      screenOrientationRegistry.unregisterController(self)
     }
   }
 
-  // MARK: - ScreenOrientationListener
+  // MARK: - ScreenOrientationController
 
-  func screenOrientationDidChange(_ orientation: UIInterfaceOrientation) {
+  public func screenOrientationDidChange(_ orientation: UIInterfaceOrientation) {
     guard let currentTraitCollection = screenOrientationRegistry.currentTraitCollection else {
       return
     }
@@ -105,14 +100,4 @@ public class ScreenOrientationModule: Module, OrientationListener, Hashable {
       ] as [String: Any]
     ])
   }
-
-  // MARK: - Hashable
-
-  public func hash(into hasher: inout Hasher) {
-    hasher.combine(ObjectIdentifier(self))
-  }
-
-  public static func == (lhs: ScreenOrientationModule, rhs: ScreenOrientationModule) -> Bool {
-    return ObjectIdentifier(lhs) == ObjectIdentifier(rhs)
-  }
 }

package/ios/ScreenOrientationReactDelegateHandler.swift

@@ -2,6 +2,7 @@
 
 import ExpoModulesCore
 
+@objc(EXScreenOrientationReactDelegateHandler)
 public class ScreenOrientationReactDelegateHandler: ExpoReactDelegateHandler {
   public override func createRootViewController(reactDelegate: ExpoReactDelegate) -> UIViewController? {
     return ScreenOrientationViewController(defaultScreenOrientationFromPlist: ())

package/ios/ScreenOrientationRegistry.swift

@@ -1,7 +1,7 @@
 import Foundation
 import ExpoModulesCore
 
-protocol OrientationListener {
+public protocol ScreenOrientationController: AnyObject {
   func screenOrientationDidChange(_ orientation: UIInterfaceOrientation)
 }
 
@@ -14,16 +14,22 @@ public class ScreenOrientationRegistry: NSObject, UIApplicationDelegate {
   @objc
   public static let shared = ScreenOrientationRegistry()
 
-  var currentScreenOrientation: UIInterfaceOrientation
-  var orientationListeners: [ScreenOrientationModule?] = []
-  var moduleInterfaceMasks: [ScreenOrientationModule: UIInterfaceOrientationMask] = [:]
-  weak var currentTraitCollection: UITraitCollection?
+  public var currentScreenOrientation: UIInterfaceOrientation
+  var orientationControllers: [ScreenOrientationController] = []
+  var controllerInterfaceMasks: [ObjectIdentifier: UIInterfaceOrientationMask] = [:]
+  public weak var currentTraitCollection: UITraitCollection?
   var lastOrientationMask: UIInterfaceOrientationMask
   var rootViewController: UIViewController? {
-    return UIApplication.shared.keyWindow?.rootViewController
+    let keyWindow = UIApplication
+      .shared
+      .connectedScenes
+      .flatMap { ($0 as? UIWindowScene)?.windows ?? [] }
+      .last { $0.isKeyWindow }
+
+    return keyWindow?.rootViewController
   }
 
-  var currentOrientationMask: UIInterfaceOrientationMask {
+  public var currentOrientationMask: UIInterfaceOrientationMask {
     var currentOrientationMask: UIInterfaceOrientationMask = []
 
     EXUtilities.performSynchronously {
@@ -55,7 +61,7 @@ public class ScreenOrientationRegistry: NSObject, UIApplicationDelegate {
   /**
    Called by ScreenOrientationAppDelegate in order to set initial interface orientation.
    */
-  func updateCurrentScreenOrientation() {
+  public func updateCurrentScreenOrientation() {
     let windows = UIApplication.shared.windows
     if !windows.isEmpty {
       self.currentScreenOrientation = windows[0].windowScene?.interfaceOrientation ?? .unknown
@@ -106,8 +112,10 @@ public class ScreenOrientationRegistry: NSObject, UIApplicationDelegate {
     }
   }
 
-  func setMask(_ mask: UIInterfaceOrientationMask, forModule module: ScreenOrientationModule) {
-    moduleInterfaceMasks[module] = mask
+  public func setMask(_ mask: UIInterfaceOrientationMask, forController controller: any ScreenOrientationController) {
+    let controllerIdentifier = ObjectIdentifier(controller)
+
+    controllerInterfaceMasks[controllerIdentifier] = mask
     enforceDesiredDeviceOrientation(withOrientationMask: mask)
   }
 
@@ -118,14 +126,14 @@ public class ScreenOrientationRegistry: NSObject, UIApplicationDelegate {
    */
   @objc
   public func requiredOrientationMask() -> UIInterfaceOrientationMask {
-    if moduleInterfaceMasks.isEmpty {
+    if controllerInterfaceMasks.isEmpty {
       return []
     }
 
     // We want to apply an orientation mask which is an intersection of locks applied by the modules.
     var mask = doesDeviceHaveNotch ? UIInterfaceOrientationMask.allButUpsideDown : UIInterfaceOrientationMask.all
 
-    for moduleMask in moduleInterfaceMasks {
+    for moduleMask in controllerInterfaceMasks {
       mask = mask.intersection(moduleMask.value)
     }
 
@@ -225,28 +233,24 @@ public class ScreenOrientationRegistry: NSObject, UIApplicationDelegate {
   }
 
   /**
-   Called at the end of the screen orientation change. Notifies modules about the orientation change.
+   Called at the end of the screen orientation change. Notifies the controllers about the orientation change.
    */
   func screenOrientationDidChange(_ newScreenOrientation: UIInterfaceOrientation) {
     currentScreenOrientation = newScreenOrientation
-    for module in orientationListeners {
-      module?.screenOrientationDidChange(newScreenOrientation)
+
+    for controller in orientationControllers {
+      controller.screenOrientationDidChange(newScreenOrientation)
     }
   }
 
-  func moduleWillDeallocate(_ module: ScreenOrientationModule) {
-    moduleInterfaceMasks.removeValue(forKey: module)
+  public func registerController(_ controller: ScreenOrientationController) {
+    orientationControllers.append(controller)
   }
 
-  func registerModuleToReceiveNotification(_ module: ScreenOrientationModule) {
-    orientationListeners.append(module)
-  }
+  public func unregisterController(_ controller: ScreenOrientationController) {
+    let controllerIdentifier = ObjectIdentifier(controller)
 
-  func unregisterModuleFromReceivingNotification(_ module: ScreenOrientationModule) {
-    for i in (0..<orientationListeners.count).reversed() {
-      if orientationListeners[i] === module || orientationListeners[i] == nil {
-        orientationListeners.remove(at: i)
-      }
-    }
+    controllerInterfaceMasks.removeValue(forKey: controllerIdentifier)
+    orientationControllers.removeAll(where: { $0 === controller })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-screen-orientation",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "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": "fa5ecca8251986b9f197cc14074eec0ab6dfb6db"
+  "gitHead": "cf90d5c30c2a08a6493ebfa8aa3791aa70666759"
 }