react-native-orientation-director 2.5.0 → 2.5.1

package/ios/implementation/OrientationDirectorImpl.swift

@@ -19,6 +19,13 @@ import UIKit
     private var lastInterfaceOrientation = Orientation.UNKNOWN
     private var lastDeviceOrientation = Orientation.UNKNOWN
     private var isLocked = false
+  
+    /// # Only on iOS < 16
+    /// This variable is needed to prevent a loop where
+    /// we lock the interface to a specific orientation
+    /// and the sensor picks it up, therefore triggering
+    /// the orientation did change event.
+    private var isLocking = false
 
     @objc public var supportedInterfaceOrientations: UIInterfaceOrientationMask = UIInterfaceOrientationMask.all
 
@@ -56,6 +63,7 @@ import UIKit
     }
 
     @objc public func lockTo(jsValue: NSNumber) {
+        self.isLocking = true;
         let jsOrientation = utils.convertToOrientationFrom(jsValue: jsValue)
         let mask = utils.convertToMaskFrom(jsOrientation: jsOrientation)
         self.requestInterfaceUpdateTo(mask: mask)
@@ -65,17 +73,20 @@ import UIKit
         let orientationCanBeUpdatedDirectly = jsOrientation != Orientation.LANDSCAPE
         if orientationCanBeUpdatedDirectly {
             updateLastInterfaceOrientationTo(value: jsOrientation)
+            self.isLocking = false;
             return
         }
 
         let lastInterfaceOrientationIsAlreadyInLandscape = lastInterfaceOrientation == Orientation.LANDSCAPE_RIGHT || lastInterfaceOrientation == Orientation.LANDSCAPE_LEFT
         if lastInterfaceOrientationIsAlreadyInLandscape {
             updateLastInterfaceOrientationTo(value: lastInterfaceOrientation)
+            self.isLocking = false;
             return
         }
 
         let systemDefaultLandscapeOrientation = Orientation.LANDSCAPE_RIGHT
         updateLastInterfaceOrientationTo(value: systemDefaultLandscapeOrientation)
+        self.isLocking = false;
     }
 
     @objc public func unlock() {
@@ -155,14 +166,19 @@ import UIKit
                 print("\(OrientationDirectorImpl.TAG) - requestGeometryUpdate error", error)
             }
         } else {
-            UIDevice.current.setValue(mask.rawValue, forKey: "orientation")
+            let interfaceOrientation = self.utils.convertToInterfaceOrientationFrom(mask: mask)
+            UIDevice.current.setValue(interfaceOrientation.rawValue, forKey: "orientation")
             UIViewController.attemptRotationToDeviceOrientation()
         }
     }
 
     private func onOrientationChanged(uiDeviceOrientation: UIDeviceOrientation) {
         let deviceOrientation = utils.convertToOrientationFrom(deviceOrientation: uiDeviceOrientation)
-        self.eventManager.sendDeviceOrientationDidChange(orientationValue: deviceOrientation.rawValue)
+        
+        if (!self.isLocking) {
+          self.eventManager.sendDeviceOrientationDidChange(orientationValue: deviceOrientation.rawValue)
+        }
+      
         lastDeviceOrientation = deviceOrientation
         adaptInterfaceTo(deviceOrientation: deviceOrientation)
     }

package/ios/implementation/Utils.swift

@@ -78,6 +78,21 @@ class Utils {
         }
     }
 
+    public func convertToInterfaceOrientationFrom(mask: UIInterfaceOrientationMask) -> UIInterfaceOrientation {
+      switch mask {
+        case .portrait:
+          return .portrait
+        case .landscapeRight:
+          return .landscapeRight
+        case .portraitUpsideDown:
+          return .portraitUpsideDown
+        case .landscapeLeft:
+          return .landscapeLeft
+        default:
+          return .unknown
+      }
+    }
+
     public func getInterfaceOrientation() -> UIInterfaceOrientation {
         guard let windowScene = self.getCurrentWindow()?.windowScene else {
             return UIInterfaceOrientation.unknown

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-orientation-director",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "A Modern React Native library that allows you to access orientation",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",