expo-screen-orientation 8.0.1 → 8.0.2

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 8.0.2 — 2024-12-19
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed crash when multiple threads access same member in swift ([#33572](https://github.com/expo/expo/pull/33572) by [@chrfalch](https://github.com/chrfalch))
+- Fixed event listeners on web. ([#33361](https://github.com/expo/expo/pull/33361) by [@aleqsio](https://github.com/aleqsio))
+
 ## 8.0.1 — 2024-12-05
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '8.0.1'
+version = '8.0.2'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,6 +14,6 @@ android {
   namespace "expo.modules.screenorientation"
   defaultConfig {
     versionCode 7
-    versionName '8.0.1'
+    versionName '8.0.2'
   }
 }

package/ios/ScreenOrientationRegistry.swift

@@ -17,6 +17,7 @@ public class ScreenOrientationRegistry: NSObject, UIApplicationDelegate {
   public var currentScreenOrientation: UIInterfaceOrientation
   var orientationControllers: [ScreenOrientationController] = []
   var controllerInterfaceMasks: [ObjectIdentifier: UIInterfaceOrientationMask] = [:]
+  private let queue = DispatchQueue(label: "expo.screenorientationregistry", attributes: .concurrent)
   @objc
   public var currentTraitCollection: UITraitCollection?
   var lastOrientationMask: UIInterfaceOrientationMask
@@ -110,7 +111,9 @@ public class ScreenOrientationRegistry: NSObject, UIApplicationDelegate {
   public func setMask(_ mask: UIInterfaceOrientationMask, forController controller: any ScreenOrientationController) {
     let controllerIdentifier = ObjectIdentifier(controller)
 
-    controllerInterfaceMasks[controllerIdentifier] = mask
+    queue.async(flags: .barrier) {
+      self.controllerInterfaceMasks[controllerIdentifier] = mask
+    }
     enforceDesiredDeviceOrientation(withOrientationMask: mask)
   }
 
@@ -121,18 +124,20 @@ public class ScreenOrientationRegistry: NSObject, UIApplicationDelegate {
    */
   @objc
   public func requiredOrientationMask() -> UIInterfaceOrientationMask {
-    if controllerInterfaceMasks.isEmpty {
-      return []
-    }
+    return queue.sync {
+      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
+      // 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 controllerInterfaceMasks {
-      mask = mask.intersection(moduleMask.value)
-    }
+      for moduleMask in controllerInterfaceMasks {
+        mask = mask.intersection(moduleMask.value)
+      }
 
-    return mask
+      return mask
+    }
   }
 
   // MARK: - Events
@@ -199,21 +204,27 @@ public class ScreenOrientationRegistry: NSObject, UIApplicationDelegate {
    Called at the end of the screen orientation change. Notifies the controllers about the orientation change.
    */
   func screenOrientationDidChange(_ newScreenOrientation: UIInterfaceOrientation) {
-    currentScreenOrientation = newScreenOrientation
+    queue.async(flags: .barrier) {
+      self.currentScreenOrientation = newScreenOrientation
 
-    for controller in orientationControllers {
-      controller.screenOrientationDidChange(newScreenOrientation)
+      for controller in self.orientationControllers {
+        controller.screenOrientationDidChange(newScreenOrientation)
+      }
     }
   }
 
   public func registerController(_ controller: ScreenOrientationController) {
-    orientationControllers.append(controller)
+    queue.sync {
+      self.orientationControllers.append(controller)
+    }
   }
 
   public func unregisterController(_ controller: ScreenOrientationController) {
     let controllerIdentifier = ObjectIdentifier(controller)
 
-    controllerInterfaceMasks.removeValue(forKey: controllerIdentifier)
-    orientationControllers.removeAll(where: { $0 === controller })
+    queue.sync {
+      self.controllerInterfaceMasks.removeValue(forKey: controllerIdentifier)
+      self.orientationControllers.removeAll(where: { $0 === controller })
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-screen-orientation",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "Expo universal module for managing device's screen orientation",
   "main": "build/ScreenOrientation.js",
   "types": "build/ScreenOrientation.d.ts",
@@ -42,5 +42,5 @@
     "expo": "*",
     "react-native": "*"
   },
-  "gitHead": "26675b98e703230441234a1fcc149e38309a59e1"
+  "gitHead": "a246df22c427d8c6c905de0915ed50f721fdf062"
 }