fix: revert upgrade changes

Author: Gregoirevda

ios/RNCSafeAreaProvider.h

@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher NS_DESIGNATED_INITIALIZER;
 
 // NOTE: currently these event props are only declared so we can export the
-// event names to JS - we don't call the blocks directly because scroll events
+// event names to JS - we don't call the blocks directly because events
 // need to be coalesced before sending, for performance reasons.
 @property (nonatomic, copy) RCTBubblingEventBlock onInsetsChange;
 

ios/RNCSafeAreaProvider.m

@@ -24,7 +24,7 @@ - (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDis
     RCTAssertParam(eventDispatcher);
 
     if ((self = [super initWithFrame:CGRectZero])) {
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_OSX
 
     _eventDispatcher = eventDispatcher;
 
@@ -62,28 +62,28 @@ - (void)invalidateSafeAreaInsets
     return;
   }
 
-  #if TARGET_OS_IPHONE
-    UIEdgeInsets safeAreaInsets = self.safeAreaInsets;
-  #elif TARGET_OS_OSX
-    NSEdgeInsets safeAreaInsets;
-    if (@available(macOS 11.0, *)) {
-      safeAreaInsets = self.safeAreaInsets;
-    } else {
-      safeAreaInsets = NSEdgeInsetsZero;
-    }
-  #endif
+#if TARGET_OS_IPHONE
+  UIEdgeInsets safeAreaInsets = self.safeAreaInsets;
+#elif TARGET_OS_OSX
+  NSEdgeInsets safeAreaInsets;
+  if (@available(macOS 11.0, *)) {
+    safeAreaInsets = self.safeAreaInsets;
+  } else {
+    safeAreaInsets = NSEdgeInsetsZero;
+  }
+#endif
 
   CGRect frame = [self convertRect:self.bounds toView:RNCParentViewController(self).view];
 
   if (_initialInsetsSent &&
-  #if TARGET_OS_IPHONE
-        UIEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale()) &&
-  #elif TARGET_OS_OSX
-        NSEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale()) &&
-  #endif
-        CGRectEqualToRect(frame, _currentFrame)) {
-      return;
-    }
+#if TARGET_OS_IPHONE
+      UIEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale()) &&
+#elif TARGET_OS_OSX
+      NSEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale()) &&
+#endif
+      CGRectEqualToRect(frame, _currentFrame)) {
+    return;
+  }
 
   _initialInsetsSent = YES;
   _currentSafeAreaInsets = safeAreaInsets;