react-native-orientation-director 2.6.4 → 3.0.0

package/android/src/main/java/com/orientationdirector/implementation/OrientationSensorsEventListener.kt

@@ -5,52 +5,32 @@ import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
+import android.view.OrientationEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 
 class OrientationSensorsEventListener(
   context: ReactApplicationContext,
-) : SensorEventListener {
+) : SensorEventListener, OrientationEventListener(context, SensorManager.SENSOR_DELAY_UI) {
+  private val rotationMatrix = FloatArray(9)
+
   private var mSensorManager: SensorManager =
     context.getSystemService(SENSOR_SERVICE) as SensorManager
-
   private var mRotationSensor: Sensor? =
     mSensorManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR)
-  private var mAccelerometerSensor: Sensor? =
-    mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
-  private var mMagneticFieldSensor: Sensor? =
-    mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD)
-
   private var hasRotationSensor: Boolean =
-   mRotationSensor != null
-  private var hasAccelerometerAndMagneticFieldSensors: Boolean =
-    mAccelerometerSensor != null && mMagneticFieldSensor != null
+    mRotationSensor != null
 
-  private val accelerometerReading = FloatArray(3)
-  private val magnetometerReading = FloatArray(3)
-
-  private var lastComputedOrientationAngles = FloatArray(3)
-  private var onOrientationAnglesChangedCallback: ((orientationAngles: FloatArray) -> Unit)? = null
-
-  fun setOnOrientationAnglesChangedCallback(callback: (orientation: FloatArray) -> Unit) {
-    onOrientationAnglesChangedCallback = callback
-  }
-
-  override fun onSensorChanged(event: SensorEvent?) {
-    if (event == null) {
-      return
-    }
-
-    if (event.sensor.type == Sensor.TYPE_ROTATION_VECTOR) {
-      computeOrientationFromRotationSensor(event.values);
-      return
-    }
+  private var lastComputedDeviceOrientation = Orientation.UNKNOWN
+  private var lastComputedFaceOrientation = Orientation.UNKNOWN
 
-    computeOrientationFromOtherSensors(event)
+  private var onDeviceOrientationChangedCallback: ((deviceOrientation: Orientation) -> Unit)? = null
+  fun setOnDeviceOrientationChangedCallback(callback: (deviceOrientation: Orientation) -> Unit) {
+    onDeviceOrientationChangedCallback = callback
   }
 
-  override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {}
+  override fun enable() {
+    super.enable()
 
-  fun enable() {
     if (hasRotationSensor) {
       mSensorManager.registerListener(
         this,
@@ -58,72 +38,85 @@ class OrientationSensorsEventListener(
         SensorManager.SENSOR_DELAY_NORMAL,
         SensorManager.SENSOR_DELAY_UI
       )
-      return
     }
 
-    if (hasAccelerometerAndMagneticFieldSensors) {
-      mSensorManager.registerListener(
-        this,
-        mAccelerometerSensor,
-        SensorManager.SENSOR_DELAY_NORMAL,
-        SensorManager.SENSOR_DELAY_UI
-      )
-      mSensorManager.registerListener(
-        this,
-        mMagneticFieldSensor,
-        SensorManager.SENSOR_DELAY_NORMAL,
-        SensorManager.SENSOR_DELAY_UI
-      )
-      return
-    }
+    lastComputedDeviceOrientation = Orientation.UNKNOWN
+    lastComputedFaceOrientation = Orientation.UNKNOWN
   }
 
-  fun disable() {
-    mSensorManager.unregisterListener(this)
-  }
-
-  private fun computeOrientationFromRotationSensor(values: FloatArray) {
-    val rotationMatrix = FloatArray(9)
-    SensorManager.getRotationMatrixFromVector(rotationMatrix, values)
+  override fun disable() {
+    super.disable()
 
-    val orientationAngles = FloatArray(3)
-    SensorManager.getOrientation(rotationMatrix, orientationAngles)
+    if (hasRotationSensor) {
+      mSensorManager.unregisterListener(this)
+    }
 
-    notifyOrientationAnglesChanged(orientationAngles)
+    lastComputedDeviceOrientation = Orientation.UNKNOWN
+    lastComputedFaceOrientation = Orientation.UNKNOWN
   }
 
-  private fun computeOrientationFromOtherSensors(event: SensorEvent) {
-    if (event.sensor.type == Sensor.TYPE_ACCELEROMETER) {
-      System.arraycopy(event.values, 0, accelerometerReading, 0, accelerometerReading.size)
+  override fun onOrientationChanged(angleDegrees: Int) {
+    if (angleDegrees == ORIENTATION_UNKNOWN) {
+      lastComputedDeviceOrientation = Orientation.UNKNOWN
+      return
     }
 
-    if (event.sensor.type == Sensor.TYPE_MAGNETIC_FIELD) {
-      System.arraycopy(event.values, 0, magnetometerReading, 0, magnetometerReading.size)
+    val currentDeviceOrientation = when (angleDegrees) {
+      in LANDSCAPE_RIGHT_START .. LANDSCAPE_RIGHT_END -> Orientation.LANDSCAPE_RIGHT
+      in PORTRAIT_UPSIDE_DOWN_START..PORTRAIT_UPSIDE_DOWN_END -> Orientation.PORTRAIT_UPSIDE_DOWN
+      in LANDSCAPE_LEFT_START..LANDSCAPE_LEFT_END -> Orientation.LANDSCAPE_LEFT
+      else -> Orientation.PORTRAIT
     }
 
-    val rotationMatrix = FloatArray(9)
-    val didComputeMatrix = SensorManager.getRotationMatrix(
-      rotationMatrix,
-      null,
-      accelerometerReading,
-      magnetometerReading
-    )
-    if (!didComputeMatrix) {
+    if (currentDeviceOrientation == lastComputedDeviceOrientation) return
+
+    notifyDeviceOrientationChanged(currentDeviceOrientation)
+  }
+
+  override fun onSensorChanged(event: SensorEvent) {
+    if (event.sensor.type != Sensor.TYPE_ROTATION_VECTOR) return
+
+    if (lastComputedDeviceOrientation != Orientation.UNKNOWN) {
+      lastComputedFaceOrientation = Orientation.UNKNOWN
       return
     }
 
-    val orientationAngles = FloatArray(3)
-    SensorManager.getOrientation(rotationMatrix, orientationAngles)
+    SensorManager.getRotationMatrixFromVector(rotationMatrix, event.values)
+
+    val zUp = rotationMatrix[8]
+    val currentFaceOrientation = when {
+      zUp > FACE_UP_Z_THRESHOLD -> Orientation.FACE_UP
+      zUp < -FACE_DOWN_Z_THRESHOLD -> Orientation.FACE_DOWN
+      else -> null
+    }
+
+    if (currentFaceOrientation == null) return
+
+    if (currentFaceOrientation == lastComputedFaceOrientation) return
 
-    notifyOrientationAnglesChanged(orientationAngles)
+    notifyFaceOrientationChanged(currentFaceOrientation)
   }
 
-  private fun notifyOrientationAnglesChanged(orientationAngles: FloatArray) {
-    if (lastComputedOrientationAngles.contentEquals(orientationAngles)) {
-      return
-    }
+  private fun notifyDeviceOrientationChanged(deviceOrientation: Orientation) {
+    lastComputedDeviceOrientation = deviceOrientation
+    onDeviceOrientationChangedCallback?.invoke(deviceOrientation)
+  }
+
+  private fun notifyFaceOrientationChanged(faceOrientation: Orientation) {
+    lastComputedFaceOrientation = faceOrientation
+    onDeviceOrientationChangedCallback?.invoke(faceOrientation)
+  }
 
-    onOrientationAnglesChangedCallback?.invoke(orientationAngles)
-    lastComputedOrientationAngles = orientationAngles
+  override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) = Unit
+
+  companion object {
+    private const val LANDSCAPE_RIGHT_START = 45
+    private const val LANDSCAPE_RIGHT_END = 134
+    private const val PORTRAIT_UPSIDE_DOWN_START = 135
+    private const val PORTRAIT_UPSIDE_DOWN_END = 224
+    private const val LANDSCAPE_LEFT_START = 225
+    private const val LANDSCAPE_LEFT_END = 314
+    private const val FACE_UP_Z_THRESHOLD   = 0.906f
+    private const val FACE_DOWN_Z_THRESHOLD = 0.906f
   }
 }

package/android/src/main/java/com/orientationdirector/implementation/Utils.kt

@@ -19,51 +19,6 @@ class Utils(private val context: ReactContext) {
     }
   }
 
-  fun convertToDeviceOrientationFrom(orientationAngles: FloatArray): Orientation {
-    if (orientationAngles.size < 3) {
-      return Orientation.PORTRAIT
-    }
-
-    val (_, pitchRadians, rollRadians) = orientationAngles
-
-    val pitch = Math.toDegrees(pitchRadians.toDouble()).toFloat()
-    val roll = Math.toDegrees(rollRadians.toDouble()).toFloat()
-
-    val faceUpDownPitchTolerance = 30f
-
-    fun isValueCloseTo(value: Float, target: Float, tolerance: Float): Boolean {
-      return value in (target - tolerance)..(target + tolerance)
-    }
-
-    return when {
-      // Face up: device is lying flat with screen up
-      isValueCloseTo(pitch, 0f, faceUpDownPitchTolerance) &&
-        isValueCloseTo(roll, 0f, faceUpDownPitchTolerance) -> Orientation.FACE_UP
-
-      // Face down: device is lying flat with screen down
-      isValueCloseTo(pitch, 0f, faceUpDownPitchTolerance) &&
-        (isValueCloseTo(roll, 180f, faceUpDownPitchTolerance) || isValueCloseTo(
-          roll,
-          -180f,
-          faceUpDownPitchTolerance
-        )) -> Orientation.FACE_DOWN
-
-      // Portrait
-      isValueCloseTo(pitch, -90f, 45f) -> Orientation.PORTRAIT
-
-      // Portrait upside down
-      isValueCloseTo(pitch, 90f, 45f) -> Orientation.PORTRAIT_UPSIDE_DOWN
-
-      // Landscape left
-      isValueCloseTo(roll, -90f, 45f) -> Orientation.LANDSCAPE_LEFT
-
-      // Landscape right
-      isValueCloseTo(roll, 90f, 45f) -> Orientation.LANDSCAPE_RIGHT
-
-      else -> Orientation.UNKNOWN
-    }
-  }
-
   fun convertToActivityOrientationFrom(orientation: Orientation): Int {
     return when (orientation) {
       Orientation.LANDSCAPE_RIGHT -> ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
@@ -93,13 +48,4 @@ class Utils(private val context: ReactContext) {
     }
   }
 
-  fun convertToInterfaceOrientationFrom(deviceOrientation: Orientation): Orientation {
-    return when (deviceOrientation) {
-      Orientation.PORTRAIT -> Orientation.PORTRAIT
-      Orientation.LANDSCAPE_RIGHT -> Orientation.LANDSCAPE_LEFT
-      Orientation.PORTRAIT_UPSIDE_DOWN -> Orientation.PORTRAIT_UPSIDE_DOWN
-      Orientation.LANDSCAPE_LEFT -> Orientation.LANDSCAPE_RIGHT
-      else -> Orientation.UNKNOWN
-    }
-  }
 }

package/app.plugin.js

@@ -1 +1 @@
-module.exports = require('./plugin/build');
+module.exports = require('./lib/plugin');

package/ios/OrientationDirector.h

@@ -1,22 +1,5 @@
-#import <React/RCTEventEmitter.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <RNOrientationDirectorSpec/RNOrientationDirectorSpec.h>
 
-NS_ASSUME_NONNULL_BEGIN
-
-@interface OrientationDirector : RCTEventEmitter <NativeOrientationDirectorSpec>
-
-NS_ASSUME_NONNULL_END
-
-#else
-#import <React/RCTBridgeModule.h>
-
-@interface OrientationDirector : RCTEventEmitter <RCTBridgeModule>
-#endif
-
-@property (nonatomic, assign) BOOL isJsListening;
-
-+(UIInterfaceOrientationMask)getSupportedInterfaceOrientationsForWindow;
+@interface OrientationDirector : NativeOrientationDirectorSpecBase <NativeOrientationDirectorSpec>
 
 @end

package/ios/OrientationDirector.mm

@@ -4,13 +4,13 @@
  This condition is needed to support use_frameworks.
  https://github.com/callstack/react-native-builder-bob/discussions/412#discussioncomment-6352402
  */
-#if __has_include("react_native_orientation_director-Swift.h")
-#import "react_native_orientation_director-Swift.h"
+#if __has_include("OrientationDirector-Swift.h")
+#import "OrientationDirector-Swift.h"
 #else
-#import "react_native_orientation_director/react_native_orientation_director-Swift.h"
+#import "OrientationDirector/OrientationDirector-Swift.h"
 #endif
 
-static OrientationDirectorImpl *_director = [OrientationDirectorImpl new];
+static OrientationDirectorImpl *_director = SharedOrientationDirectorImpl.shared;
 
 ///////////////////////////////////////////////////////////////////////////////////////
 ///         EVENT EMITTER SETUP
@@ -21,7 +21,6 @@ static OrientationDirectorImpl *_director = [OrientationDirectorImpl new];
 //////////////////////////////////////////////////////////////////////////////////////////
 
 @implementation OrientationDirector
-RCT_EXPORT_MODULE()
 
 - (instancetype)init
 {
@@ -41,28 +40,19 @@ RCT_EXPORT_MODULE()
     return YES;
 }
 
-+ (UIInterfaceOrientationMask)getSupportedInterfaceOrientationsForWindow
-{
-    return [_director supportedInterfaceOrientations];
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////
 ///         EVENT EMITTER SETUP
 ///
--(void)startObserving {
-    self.isJsListening = YES;
-}
-
--(void)stopObserving {
-    self.isJsListening = NO;
+-(void)emitOnDeviceOrientationDidChangeWithParams:(NSDictionary*)params {
+  [self emitOnDeviceOrientationChanged:params];
 }
 
-- (NSArray<NSString *> *)supportedEvents {
-    return [EventManager supportedEvents];
+-(void)emitOnInterfaceOrientationDidChangeWithParams:(NSDictionary*)params {
+  [self emitOnInterfaceOrientationChanged:params];
 }
 
-- (void)sendEventWithName:(NSString * _Nonnull)name params:(NSDictionary *)params {
-    [self sendEventWithName:name body:params];
+-(void)emitOnLockChangedWithParams:(NSDictionary*)params {
+  [self emitOnLockChanged:params];
 }
 ///
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -70,28 +60,29 @@ RCT_EXPORT_MODULE()
 ///////////////////////////////////////////////////////////////////////////////////////
 ///         EXPORTED METHODS
 ///
-RCT_EXPORT_METHOD(getInterfaceOrientation:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+
+- (void)getInterfaceOrientation:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         resolve(@([_director getInterfaceOrientation]));
     });
 }
 
-RCT_EXPORT_METHOD(getDeviceOrientation:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+- (void)getDeviceOrientation:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         resolve(@([_director getDeviceOrientation]));
     });
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(isLocked)
+- (NSNumber *)isLocked
 {
     return @([_director getIsLocked]);
 }
 
-RCT_EXPORT_METHOD(lockTo:(double)jsOrientation)
+- (void)lockTo:(double)jsOrientation
 {
     NSNumber *jsOrientationNumber = @(jsOrientation);
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -99,37 +90,46 @@ RCT_EXPORT_METHOD(lockTo:(double)jsOrientation)
     });
 }
 
-RCT_EXPORT_METHOD(unlock)
+- (void)unlock
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         [_director unlock];
     });
 }
 
-RCT_EXPORT_METHOD(resetSupportedInterfaceOrientations)
+- (void)resetSupportedInterfaceOrientations
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         [_director resetSupportedInterfaceOrientations];
     });
 }
 
-/**
- This method is a pure stub since we cannot access auto rotation setting in iOS
- */
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(isAutoRotationEnabled)
+///////////////////////////////////////////////////////////////////////////////////////
+///         STUBS
+///
+
+- (NSNumber *)isAutoRotationEnabled
 {
     return @(NO);
 }
+
+- (void)disableOrientationSensors {}
+
+
+- (void)enableOrientationSensors {}
+
 ///
 ///////////////////////////////////////////////////////////////////////////////////////
 
-// Don't compile this code when we build for the old architecture.
-#ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
     return std::make_shared<facebook::react::NativeOrientationDirectorSpecJSI>(params);
 }
-#endif
+
++ (NSString *)moduleName
+{
+  return @"OrientationDirector";
+}
 
 @end

package/ios/SharedOrientationDirectorImpl.swift

@@ -0,0 +1,12 @@
+//
+//  SharedOrientationDirectorImpl.swift
+//  react-native-orientation-director
+//
+//  Created by Mirko Quaglia on 14/03/26.
+//
+
+import Foundation
+
+@objc public class SharedOrientationDirectorImpl: NSObject {
+    @objc public static let shared = OrientationDirectorImpl()
+}

package/ios/implementation/EventManager.swift

@@ -7,33 +7,25 @@
 
 import Foundation
 
-@objc public class EventManager: NSObject {
-    @objc public weak var delegate: OrientationEventEmitterDelegate?
+public class EventManager: NSObject {
+    public weak var delegate: OrientationEventEmitterDelegate?
 
-    func sendDeviceOrientationDidChange(orientationValue: Int) {
+    func sendDeviceOrientationDidChange(value: Int) {
         guard let delegate = delegate else {
             return
         }
 
-        if !delegate.isJsListening {
-            return
-        }
-
-        let params = Dictionary(dictionaryLiteral: ("orientation", orientationValue))
-        delegate.sendEvent(name: Event.DeviceOrientationDidChange.rawValue, params: params as NSDictionary)
+        let params = Dictionary(dictionaryLiteral: ("orientation", value))
+        delegate.emitOnDeviceOrientationDidChange(params: params as NSDictionary)
     }
 
-    func sendInterfaceOrientationDidChange(orientationValue: Int) {
+    func sendInterfaceOrientationDidChange(value: Int) {
         guard let delegate = delegate else {
             return
         }
 
-        if !delegate.isJsListening {
-            return
-        }
-
-        let params = Dictionary(dictionaryLiteral: ("orientation", orientationValue))
-        delegate.sendEvent(name: Event.InterfaceOrientationDidChange.rawValue, params: params as NSDictionary)
+        let params = Dictionary(dictionaryLiteral: ("orientation", value))
+        delegate.emitOnInterfaceOrientationDidChange(params: params as NSDictionary)
     }
 
     func sendLockDidChange(value: Bool) {
@@ -41,30 +33,13 @@ import Foundation
             return
         }
 
-        if !delegate.isJsListening {
-            return
-        }
-
         let params = Dictionary(dictionaryLiteral: ("locked", value))
-        delegate.sendEvent(name: Event.LockDidChange.rawValue, params: params as NSDictionary)
+        delegate.emitOnLockChanged(params: params as NSDictionary)
     }
 }
 
 @objc public protocol OrientationEventEmitterDelegate {
-    var isJsListening: Bool { get set }
-
-    func sendEvent(name: String, params: NSDictionary)
-}
-
-public extension EventManager {
-
-  enum Event: String, CaseIterable {
-    case DeviceOrientationDidChange
-    case InterfaceOrientationDidChange
-    case LockDidChange
-  }
-
-  @objc static var supportedEvents: [String] {
-    return Event.allCases.map(\.rawValue)
-  }
+    func emitOnLockChanged(params: NSDictionary)
+    func emitOnDeviceOrientationDidChange(params: NSDictionary)
+    func emitOnInterfaceOrientationDidChange(params: NSDictionary)
 }

package/ios/implementation/OrientationDirectorImpl.swift

@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 
-@objc public class OrientationDirectorImpl: NSObject {
+@objcMembers public class OrientationDirectorImpl: NSObject {
     private static let TAG = "OrientationDirectorImpl"
 
     private let bundleManager: BundleManager = BundleManager()
@@ -19,7 +19,7 @@ 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
@@ -174,11 +174,11 @@ import UIKit
 
     private func onOrientationChanged(uiDeviceOrientation: UIDeviceOrientation) {
         let deviceOrientation = utils.convertToOrientationFrom(deviceOrientation: uiDeviceOrientation)
-        
+
         if (!self.isLocking) {
-          self.eventManager.sendDeviceOrientationDidChange(orientationValue: deviceOrientation.rawValue)
+          self.eventManager.sendDeviceOrientationDidChange(value: deviceOrientation.rawValue)
         }
-      
+
         lastDeviceOrientation = deviceOrientation
         adaptInterfaceTo(deviceOrientation: deviceOrientation)
     }
@@ -203,7 +203,7 @@ import UIKit
     }
 
     private func updateLastInterfaceOrientationTo(value: Orientation) {
-        self.eventManager.sendInterfaceOrientationDidChange(orientationValue: value.rawValue)
+      self.eventManager.sendInterfaceOrientationDidChange(value: value.rawValue)
         lastInterfaceOrientation = value
     }
 

package/lib/module/EventEmitter.js

@@ -1,25 +1,25 @@
 "use strict";
 
 import { Platform } from 'react-native';
-import Module, { ModuleEventEmitter } from "./module.js";
-import Event from "./types/Event.enum.js";
+import Module from "./module.js";
 class EventEmitter {
+  static androidListenerCount = 0;
   static addDeviceOrientationDidChangeListener(callback) {
-    let listener = ModuleEventEmitter.addListener(Event.DeviceOrientationDidChange, callback);
+    let listener = Module.onDeviceOrientationChanged(callback);
     if (Platform.OS !== 'android') {
       return listener;
     }
-    const listenerCount = ModuleEventEmitter.listenerCount(Event.DeviceOrientationDidChange);
-    if (listenerCount === 1) {
+    EventEmitter.androidListenerCount++;
+    if (EventEmitter.androidListenerCount === 1) {
       Module.enableOrientationSensors();
     }
     return EventEmitter.createDeviceOrientationListenerProxy(listener);
   }
   static addInterfaceOrientationDidChangeListener(callback) {
-    return ModuleEventEmitter.addListener(Event.InterfaceOrientationDidChange, callback);
+    return Module.onInterfaceOrientationChanged(callback);
   }
   static addLockDidChangeListener(callback) {
-    return ModuleEventEmitter.addListener(Event.LockDidChange, callback);
+    return Module.onLockChanged(callback);
   }
   static createDeviceOrientationListenerProxy(listener) {
     const handler = {
@@ -32,10 +32,16 @@ class EventEmitter {
     };
     return new Proxy(listener, handler);
     function disableOrientationSensorsIfLastListener() {
-      const listenerCount = ModuleEventEmitter.listenerCount(Event.DeviceOrientationDidChange);
-      if (listenerCount === 1) {
+      if (EventEmitter.androidListenerCount === 1) {
+        EventEmitter.androidListenerCount = 0;
         Module.disableOrientationSensors();
+        return;
       }
+      if (EventEmitter.androidListenerCount === 0) {
+        return;
+      }
+      EventEmitter.androidListenerCount--;
+      return;
     }
   }
 }

package/lib/module/EventEmitter.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","Module","ModuleEventEmitter","Event","EventEmitter","addDeviceOrientationDidChangeListener","callback","listener","addListener","DeviceOrientationDidChange","OS","listenerCount","enableOrientationSensors","createDeviceOrientationListenerProxy","addInterfaceOrientationDidChangeListener","InterfaceOrientationDidChange","addLockDidChangeListener","LockDidChange","handler","get","target","propertyKey","receiver","disableOrientationSensorsIfLastListener","Reflect","Proxy","disableOrientationSensors"],"sourceRoot":"../../src","sources":["EventEmitter.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAkC,cAAc;AACjE,OAAOC,MAAM,IAAIC,kBAAkB,QAAQ,aAAU;AACrD,OAAOC,KAAK,MAAM,uBAAoB;AAItC,MAAMC,YAAY,CAAC;EACjB,OAAOC,qCAAqCA,CAC1CC,QAAiD,EACjD;IACA,IAAIC,QAAQ,GAAGL,kBAAkB,CAACM,WAAW,CAC3CL,KAAK,CAACM,0BAA0B,EAChCH,QACF,CAAC;IAED,IAAIN,QAAQ,CAACU,EAAE,KAAK,SAAS,EAAE;MAC7B,OAAOH,QAAQ;IACjB;IAEA,MAAMI,aAAa,GAAGT,kBAAkB,CAACS,aAAa,CACpDR,KAAK,CAACM,0BACR,CAAC;IAED,IAAIE,aAAa,KAAK,CAAC,EAAE;MACvBV,MAAM,CAACW,wBAAwB,CAAC,CAAC;IACnC;IAEA,OAAOR,YAAY,CAACS,oCAAoC,CAACN,QAAQ,CAAC;EACpE;EAEA,OAAOO,wCAAwCA,CAC7CR,QAAiD,EACjD;IACA,OAAOJ,kBAAkB,CAACM,WAAW,CACnCL,KAAK,CAACY,6BAA6B,EACnCT,QACF,CAAC;EACH;EAEA,OAAOU,wBAAwBA,CAACV,QAAsC,EAAE;IACtE,OAAOJ,kBAAkB,CAACM,WAAW,CAACL,KAAK,CAACc,aAAa,EAAEX,QAAQ,CAAC;EACtE;EAEA,OAAeO,oCAAoCA,CACjDN,QAA6B,EAC7B;IACA,MAAMW,OAA0C,GAAG;MACjDC,GAAGA,CAACC,MAAM,EAAEC,WAAW,EAAEC,QAAQ,EAAE;QACjC,IAAID,WAAW,KAAK,QAAQ,EAAE;UAC5BE,uCAAuC,CAAC,CAAC;QAC3C;QACA,OAAOC,OAAO,CAACL,GAAG,CAACC,MAAM,EAAEC,WAAW,EAAEC,QAAQ,CAAC;MACnD;IACF,CAAC;IAED,OAAO,IAAIG,KAAK,CAAClB,QAAQ,EAAEW,OAAO,CAAC;IAEnC,SAASK,uCAAuCA,CAAA,EAAG;MACjD,MAAMZ,aAAa,GAAGT,kBAAkB,CAACS,aAAa,CACpDR,KAAK,CAACM,0BACR,CAAC;MAED,IAAIE,aAAa,KAAK,CAAC,EAAE;QACvBV,MAAM,CAACyB,yBAAyB,CAAC,CAAC;MACpC;IACF;EACF;AACF;AAEA,eAAetB,YAAY","ignoreList":[]}
+{"version":3,"names":["Platform","Module","EventEmitter","androidListenerCount","addDeviceOrientationDidChangeListener","callback","listener","onDeviceOrientationChanged","OS","enableOrientationSensors","createDeviceOrientationListenerProxy","addInterfaceOrientationDidChangeListener","onInterfaceOrientationChanged","addLockDidChangeListener","onLockChanged","handler","get","target","propertyKey","receiver","disableOrientationSensorsIfLastListener","Reflect","Proxy","disableOrientationSensors"],"sourceRoot":"../../src","sources":["EventEmitter.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAgC,cAAc;AAC/D,OAAOC,MAAM,MAAM,aAAU;AAI7B,MAAMC,YAAY,CAAC;EACjB,OAAeC,oBAAoB,GAAG,CAAC;EAEvC,OAAOC,qCAAqCA,CAC1CC,QAAiD,EACjD;IACA,IAAIC,QAAQ,GAAGL,MAAM,CAACM,0BAA0B,CAACF,QAAQ,CAAC;IAE1D,IAAIL,QAAQ,CAACQ,EAAE,KAAK,SAAS,EAAE;MAC7B,OAAOF,QAAQ;IACjB;IAEAJ,YAAY,CAACC,oBAAoB,EAAE;IACnC,IAAID,YAAY,CAACC,oBAAoB,KAAK,CAAC,EAAE;MAC3CF,MAAM,CAACQ,wBAAwB,CAAC,CAAC;IACnC;IAEA,OAAOP,YAAY,CAACQ,oCAAoC,CAACJ,QAAQ,CAAC;EACpE;EAEA,OAAOK,wCAAwCA,CAC7CN,QAAiD,EACjD;IACA,OAAOJ,MAAM,CAACW,6BAA6B,CAACP,QAAQ,CAAC;EACvD;EAEA,OAAOQ,wBAAwBA,CAACR,QAAsC,EAAE;IACtE,OAAOJ,MAAM,CAACa,aAAa,CAACT,QAAQ,CAAC;EACvC;EAEA,OAAeK,oCAAoCA,CACjDJ,QAA2B,EAC3B;IACA,MAAMS,OAAwC,GAAG;MAC/CC,GAAGA,CAACC,MAAM,EAAEC,WAAW,EAAEC,QAAQ,EAAE;QACjC,IAAID,WAAW,KAAK,QAAQ,EAAE;UAC5BE,uCAAuC,CAAC,CAAC;QAC3C;QACA,OAAOC,OAAO,CAACL,GAAG,CAACC,MAAM,EAAEC,WAAW,EAAEC,QAAQ,CAAC;MACnD;IACF,CAAC;IAED,OAAO,IAAIG,KAAK,CAAChB,QAAQ,EAAES,OAAO,CAAC;IAEnC,SAASK,uCAAuCA,CAAA,EAAG;MACjD,IAAIlB,YAAY,CAACC,oBAAoB,KAAK,CAAC,EAAE;QAC3CD,YAAY,CAACC,oBAAoB,GAAG,CAAC;QACrCF,MAAM,CAACsB,yBAAyB,CAAC,CAAC;QAClC;MACF;MAEA,IAAIrB,YAAY,CAACC,oBAAoB,KAAK,CAAC,EAAE;QAC3C;MACF;MAEAD,YAAY,CAACC,oBAAoB,EAAE;MACnC;IACF;EACF;AACF;AAEA,eAAeD,YAAY","ignoreList":[]}

package/lib/module/NativeOrientationDirector.js.map

@@ -1 +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":[]}
+{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeOrientationDirector.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;AA+BlD,eAAeA,mBAAmB,CAACC,YAAY,CAAO,qBAAqB,CAAC","ignoreList":[]}