react-native-orientation-director 2.4.0 → 2.5.1

package/README.md

@@ -107,7 +107,7 @@ To properly handle interface orientation changes in iOS, you need to update your
 
 ##### Objective-C
 
-In your AppDelegate.h file, import "OrientationDirector.h" and implement supportedInterfaceOrientationsForWindow method as follows:
+In your AppDelegate.mm file, import "OrientationDirector.h" and implement supportedInterfaceOrientationsForWindow method as follows:
 
 ```objc
 #import <OrientationDirector.h>
@@ -135,6 +135,8 @@ override func application(_ application: UIApplication, supportedInterfaceOrient
 }
 ```
 
+Note: if you are targeting react-native > 79.x, you can omit the `override` keyword.
+
 If you need help, you can check the example project.
 
 ## Usage

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/lib/module/NativeOrientationDirector.js

@@ -0,0 +1,5 @@
+"use strict";
+
+import { TurboModuleRegistry } from 'react-native';
+export default TurboModuleRegistry.getEnforcing('OrientationDirector');
+//# sourceMappingURL=NativeOrientationDirector.js.map

package/lib/module/NativeOrientationDirector.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeOrientationDirector.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;AA0BlD,eAAeA,mBAAmB,CAACC,YAAY,CAAO,qBAAqB,CAAC","ignoreList":[]}

package/package.json

@@ -1,18 +1,10 @@
 {
   "name": "react-native-orientation-director",
-  "version": "2.4.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",
-  "types": "lib/typescript/src/index.d.ts",
-  "source": "./src/index.tsx",
-  "exports": {
-    ".": {
-      "types": "./lib/typescript/src/index.d.ts",
-      "default": "./lib/module/index.js"
-    },
-    "./package.json": "./package.json"
-  },
+  "module": "./lib/module/index.js",
+  "types": "./lib/typescript/src/index.d.ts",
   "files": [
     "src",
     "lib",
@@ -23,6 +15,7 @@
     "plugin/tsconfig.json",
     "app.plugin.js",
     "*.podspec",
+    "react-native.config.js",
     "!ios/build",
     "!android/build",
     "!android/gradle",
@@ -63,32 +56,33 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^17.0.2",
+    "@commitlint/config-conventional": "^19.6.0",
+    "@eslint/compat": "^1.2.7",
+    "@eslint/eslintrc": "^3.3.0",
+    "@eslint/js": "^9.22.0",
     "@evilmartians/lefthook": "^1.5.0",
-    "@react-native/eslint-config": "0.78.2",
-    "@release-it/conventional-changelog": "^5.0.0",
+    "@react-native-community/cli": "15.0.0-alpha.2",
+    "@react-native/babel-preset": "0.79.2",
+    "@react-native/eslint-config": "^0.78.0",
+    "@release-it/conventional-changelog": "^9.0.2",
     "@types/jest": "^29.5.5",
     "@types/react": "^19.0.0",
-    "commitlint": "^17.0.2",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "commitlint": "^19.6.1",
     "del-cli": "^5.1.0",
-    "eslint": "^8.51.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.1",
-    "expo": "^52.0.35",
+    "eslint": "^9.22.0",
+    "eslint-config-prettier": "^10.1.1",
+    "eslint-plugin-jest": "^27.9.0",
+    "eslint-plugin-prettier": "^5.2.3",
     "jest": "^29.7.0",
     "prettier": "^3.0.3",
     "react": "19.0.0",
-    "react-native": "0.78.2",
-    "react-native-builder-bob": "^0.40.0",
-    "release-it": "^15.0.0",
+    "react-native": "0.79.2",
+    "react-native-builder-bob": "^0.40.10",
+    "release-it": "^17.10.0",
     "turbo": "^1.10.7",
     "typescript": "^5.2.2"
   },
-  "resolutions": {
-    "@types/react": "^19.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1"
-  },
   "peerDependencies": {
     "expo": ">=47.0.0",
     "react": "*",
@@ -99,6 +93,10 @@
       "optional": true
     }
   },
+  "resolutions": {
+    "eslint-plugin-jest": "^27.9.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0"
+  },
   "workspaces": [
     "example",
     "plugin"
@@ -146,33 +144,6 @@
       }
     }
   },
-  "eslintConfig": {
-    "root": true,
-    "extends": [
-      "@react-native",
-      "prettier"
-    ],
-    "plugins": [
-      "prettier"
-    ],
-    "rules": {
-      "react/react-in-jsx-scope": "off",
-      "prettier/prettier": [
-        "error",
-        {
-          "quoteProps": "consistent",
-          "singleQuote": true,
-          "tabWidth": 2,
-          "trailingComma": "es5",
-          "useTabs": false
-        }
-      ]
-    }
-  },
-  "eslintIgnore": [
-    "node_modules/",
-    "lib/"
-  ],
   "prettier": {
     "quoteProps": "consistent",
     "singleQuote": true,
@@ -190,7 +161,12 @@
           "esm": true
         }
       ],
-      "typescript"
+      [
+        "typescript",
+        {
+          "project": "tsconfig.build.json"
+        }
+      ]
     ]
   },
   "codegenConfig": {
@@ -202,8 +178,8 @@
     }
   },
   "create-react-native-library": {
-    "type": "turbo-module",
     "languages": "kotlin-objc",
-    "version": "0.48.0"
+    "type": "turbo-module",
+    "version": "0.50.2"
   }
 }

package/lib/module/NativeOrientationDirector.ts

@@ -1,28 +0,0 @@
-import type { TurboModule } from 'react-native';
-import { TurboModuleRegistry } from 'react-native';
-
-export interface Spec extends TurboModule {
-  getInterfaceOrientation(): Promise<number>;
-  getDeviceOrientation(): Promise<number>;
-  lockTo(orientation: number): void;
-  unlock(): void;
-  isLocked(): boolean;
-  resetSupportedInterfaceOrientations(): void;
-
-  ////////////////////////////////////
-  //
-  // ANDROID ONLY
-  //
-
-  isAutoRotationEnabled(): boolean;
-  enableOrientationSensors(): void;
-  disableOrientationSensors(): void;
-
-  //
-  ////////////////////////////////////
-
-  addListener: (eventType: string) => void;
-  removeListeners: (count: number) => void;
-}
-
-export default TurboModuleRegistry.getEnforcing<Spec>('OrientationDirector');

package/lib/typescript/example/src/App.d.ts

@@ -1,2 +0,0 @@
-export default function App(): import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=App.d.ts.map

package/lib/typescript/example/src/App.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../example/src/App.tsx"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,GAAG,4CAE1B"}

package/lib/typescript/example/src/AppNavigationContainer.d.ts

@@ -1,3 +0,0 @@
-declare function AppNavigationContainer(): import("react/jsx-runtime").JSX.Element;
-export default AppNavigationContainer;
-//# sourceMappingURL=AppNavigationContainer.d.ts.map

package/lib/typescript/example/src/AppNavigationContainer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AppNavigationContainer.d.ts","sourceRoot":"","sources":["../../../../example/src/AppNavigationContainer.tsx"],"names":[],"mappings":"AAOA,iBAAS,sBAAsB,4CA8B9B;AAED,eAAe,sBAAsB,CAAC"}

package/lib/typescript/example/src/screens/Explore.d.ts

@@ -1,3 +0,0 @@
-declare function Explore(): import("react/jsx-runtime").JSX.Element;
-export default Explore;
-//# sourceMappingURL=Explore.d.ts.map

package/lib/typescript/example/src/screens/Explore.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Explore.d.ts","sourceRoot":"","sources":["../../../../../example/src/screens/Explore.tsx"],"names":[],"mappings":"AASA,iBAAS,OAAO,4CAwCf;AAED,eAAe,OAAO,CAAC"}

package/lib/typescript/example/src/screens/Home.d.ts

@@ -1,3 +0,0 @@
-declare function Home(): import("react/jsx-runtime").JSX.Element;
-export default Home;
-//# sourceMappingURL=Home.d.ts.map

package/lib/typescript/example/src/screens/Home.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Home.d.ts","sourceRoot":"","sources":["../../../../../example/src/screens/Home.tsx"],"names":[],"mappings":"AAOA,iBAAS,IAAI,4CAmHZ;AAED,eAAe,IAAI,CAAC"}

package/lib/typescript/example/src/screens/InnerExplore.d.ts

@@ -1,3 +0,0 @@
-declare function InnerExplore(): import("react/jsx-runtime").JSX.Element;
-export default InnerExplore;
-//# sourceMappingURL=InnerExplore.d.ts.map

package/lib/typescript/example/src/screens/InnerExplore.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"InnerExplore.d.ts","sourceRoot":"","sources":["../../../../../example/src/screens/InnerExplore.tsx"],"names":[],"mappings":"AAMA,iBAAS,YAAY,4CAkBpB;AAED,eAAe,YAAY,CAAC"}

package/lib/typescript/example/src/screens/styles.d.ts

@@ -1,51 +0,0 @@
-export declare const homepageStyle: {
-    container: {
-        flexGrow: number;
-        padding: number;
-    };
-    marginBottom: {
-        marginBottom: number;
-    };
-    buttonsContainer: {
-        flex: number;
-        justifyContent: "center";
-    };
-    text: {
-        color: string;
-    };
-};
-export declare const exploreStyle: {
-    container: {
-        flexGrow: number;
-        padding: number;
-    };
-    marginBottom: {
-        marginBottom: number;
-    };
-    text: {
-        color: string;
-    };
-    body: {
-        flex: number;
-        justifyContent: "center";
-        alignItems: "center";
-    };
-};
-export declare const innerExploreStyle: {
-    container: {
-        flexGrow: number;
-        padding: number;
-    };
-    marginBottom: {
-        marginBottom: number;
-    };
-    text: {
-        color: string;
-    };
-    body: {
-        flex: number;
-        justifyContent: "center";
-        alignItems: "center";
-    };
-};
-//# sourceMappingURL=styles.d.ts.map

package/lib/typescript/example/src/screens/styles.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../example/src/screens/styles.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;CAexB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;CASvB,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;CAE5B,CAAC"}

package/lib/typescript/lib/module/NativeOrientationDirector.d.ts

@@ -1,17 +0,0 @@
-import type { TurboModule } from 'react-native';
-export interface Spec extends TurboModule {
-    getInterfaceOrientation(): Promise<number>;
-    getDeviceOrientation(): Promise<number>;
-    lockTo(orientation: number): void;
-    unlock(): void;
-    isLocked(): boolean;
-    resetSupportedInterfaceOrientations(): void;
-    isAutoRotationEnabled(): boolean;
-    enableOrientationSensors(): void;
-    disableOrientationSensors(): void;
-    addListener: (eventType: string) => void;
-    removeListeners: (count: number) => void;
-}
-declare const _default: Spec;
-export default _default;
-//# sourceMappingURL=NativeOrientationDirector.d.ts.map

package/lib/typescript/lib/module/NativeOrientationDirector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NativeOrientationDirector.d.ts","sourceRoot":"","sources":["../../../module/NativeOrientationDirector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3C,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,MAAM,IAAI,IAAI,CAAC;IACf,QAAQ,IAAI,OAAO,CAAC;IACpB,mCAAmC,IAAI,IAAI,CAAC;IAO5C,qBAAqB,IAAI,OAAO,CAAC;IACjC,wBAAwB,IAAI,IAAI,CAAC;IACjC,yBAAyB,IAAI,IAAI,CAAC;IAKlC,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C;;AAED,wBAA6E"}