Write macOS equivalents for all iOS code

shirakaba · shirakaba · commit 993958c3c704 · 2024-07-24T09:03:19.000+09:00
diff --git a/ios/RNCSafeAreaContext.mm b/ios/RNCSafeAreaContext.mm
@@ -1,7 +1,11 @@
 #import "RNCSafeAreaContext.h"
 
 #import <React/RCTUtils.h>
+#if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
+#elif TARGET_OS_OSX
+#import <AppKit/AppKit.h>
+#endif
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <safeareacontext/safeareacontext.h>
 #endif
@@ -32,13 +36,27 @@ - (NSDictionary *)getConstants
   __block NSDictionary *constants;
 
   RCTUnsafeExecuteOnMainQueueSync(^{
+#if TARGET_OS_IPHONE
     UIWindow *window = RCTKeyWindow();
+#elif TARGET_OS_OSX
+    NSWindow *window = RCTKeyWindow();
+#endif
     if (window == nil) {
       constants = @{@"initialWindowMetrics" : [NSNull null]};
       return;
     }
-
+    
+#if TARGET_OS_IPHONE
     UIEdgeInsets safeAreaInsets = window.safeAreaInsets;
+#elif TARGET_OS_OSX
+    NSEdgeInsets safeAreaInsets;
+    if (@available(macOS 10.10, *)) {
+      safeAreaInsets = NSEdgeInsetsZero;
+    } else {
+      safeAreaInsets = NSEdgeInsetsMake(0, 0, 0, 0);
+    }
+#endif
+
     constants = @{
       @"initialWindowMetrics" : @{
         @"insets" : @{
diff --git a/ios/RNCSafeAreaProvider.h b/ios/RNCSafeAreaProvider.h
@@ -1,4 +1,8 @@
+#if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
+#elif TARGET_OS_OSX
+#import <AppKit/AppKit.h>
+#endif
 
 #import <React/RCTView.h>
 
diff --git a/ios/RNCSafeAreaProvider.m b/ios/RNCSafeAreaProvider.m
@@ -13,7 +13,7 @@ @implementation RNCSafeAreaProvider {
 - (instancetype)init
 {
   if ((self = [super init])) {
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_OSX
     [NSNotificationCenter.defaultCenter addObserver:self
                                            selector:@selector(invalidateSafeAreaInsets)
                                                name:UIKeyboardDidShowNotification
@@ -48,11 +48,26 @@ - (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 if (@available(macOS 10.10, *)) {
+    safeAreaInsets = NSEdgeInsetsZero;
+  } else {
+    safeAreaInsets = NSEdgeInsetsMake(0, 0, 0, 0);
+  }
+#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;
   }
diff --git a/ios/RNCSafeAreaProviderManager.m b/ios/RNCSafeAreaProviderManager.m
@@ -8,7 +8,11 @@ @implementation RNCSafeAreaProviderManager
 
 RCT_EXPORT_VIEW_PROPERTY(onInsetsChange, RCTDirectEventBlock)
 
+#if TARGET_OS_IPHONE
 - (UIView *)view
+#elif TARGET_OS_OSX
+- (NSView *)view
+#endif
 {
   return [RNCSafeAreaProvider new];
 }
diff --git a/ios/RNCSafeAreaUtils.h b/ios/RNCSafeAreaUtils.h
@@ -1,10 +1,22 @@
 #import <React/RCTDefines.h>
 #import <React/RCTView.h>
+#if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
+#elif TARGET_OS_OSX
+#import <AppKit/AppKit.h>
+#endif
 
 extern NSString *const RNCSafeAreaDidChange;
 
 RCT_EXTERN BOOL
+#if TARGET_OS_IPHONE
 UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInsets insets2, CGFloat threshold);
+#elif TARGET_OS_OSX
+NSEdgeInsetsEqualToEdgeInsetsWithThreshold(NSEdgeInsets insets1, NSEdgeInsets insets2, CGFloat threshold);
+#endif
 
+#if TARGET_OS_IPHONE
 RCT_EXTERN UIViewController *RNCParentViewController(UIView *view);
+#elif TARGET_OS_OSX
+RCT_EXTERN NSViewController *RNCParentViewController(NSView *view);
+#endif
diff --git a/ios/RNCSafeAreaUtils.m b/ios/RNCSafeAreaUtils.m
@@ -4,12 +4,17 @@
 
 NSString *const RNCSafeAreaDidChange = @"RNCSafeAreaDidChange";
 
+#if TARGET_OS_IPHONE
 BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInsets insets2, CGFloat threshold)
+#elif TARGET_OS_OSX
+BOOL NSEdgeInsetsEqualToEdgeInsetsWithThreshold(NSEdgeInsets insets1, NSEdgeInsets insets2, CGFloat threshold)
+#endif
 {
   return ABS(insets1.left - insets2.left) <= threshold && ABS(insets1.right - insets2.right) <= threshold &&
       ABS(insets1.top - insets2.top) <= threshold && ABS(insets1.bottom - insets2.bottom) <= threshold;
 }
 
+#if TARGET_OS_IPHONE
 UIViewController *RNCParentViewController(UIView *view)
 {
   UIResponder *responder = view.nextResponder;
@@ -21,3 +26,16 @@ BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInse
   }
   return nil;
 }
+#elif TARGET_OS_OSX
+NSViewController *RNCParentViewController(NSView *view)
+{
+  NSResponder *responder = view.nextResponder;
+  while (responder != nil) {
+    if ([responder isKindOfClass:[NSViewController class]]) {
+      return (NSViewController *)responder;
+    }
+    responder = responder.nextResponder;
+  }
+  return nil;
+}
+#endif
diff --git a/ios/RNCSafeAreaView.h b/ios/RNCSafeAreaView.h
@@ -1,6 +1,10 @@
 #import <React/RCTBridge.h>
 #import <React/RCTView.h>
+#if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
+#elif TARGET_OS_OSX
+#import <AppKit/AppKit.h>
+#endif
 
 #import "RNCSafeAreaViewEdges.h"
 #import "RNCSafeAreaViewMode.h"
diff --git a/ios/RNCSafeAreaView.m b/ios/RNCSafeAreaView.m
@@ -11,7 +11,11 @@
 
 @implementation RNCSafeAreaView {
   __weak RCTBridge *_bridge;
+#if TARGET_OS_IPHONE
   UIEdgeInsets _currentSafeAreaInsets;
+#elif TARGET_OS_OSX
+  NSEdgeInsets _currentSafeAreaInsets;
+#endif
   RNCSafeAreaViewMode _mode;
   RNCSafeAreaViewEdges _edges;
   __weak RNCSafeAreaProvider *_Nullable _providerView;
@@ -41,16 +45,35 @@ - (NSString *)description
   if (superDescription.length > 0 && [superDescription characterAtIndex:superDescription.length - 1] == '>') {
     superDescription = [superDescription substringToIndex:superDescription.length - 1];
   }
+  
+#if TARGET_OS_IPHONE
+    NSString *providerViewSafeAreaInsetsString = NSStringFromUIEdgeInsets(_providerView.safeAreaInsets);
+    NSString *currentSafeAreaInsetsString = NSStringFromUIEdgeInsets(_currentSafeAreaInsets);
+#elif TARGET_OS_OSX
+    NSString *providerViewSafeAreaInsetsString;
+    NSString *currentSafeAreaInsetsString;
+    if (@available(macOS 11.0, *)) {
+      providerViewSafeAreaInsetsString = [NSString stringWithFormat:@"{%f,%f,%f,%f}", _providerView.safeAreaInsets.top, _providerView.safeAreaInsets.left, _providerView.safeAreaInsets.bottom, _providerView.safeAreaInsets.right];
+      currentSafeAreaInsetsString = [NSString stringWithFormat:@"{%f,%f,%f,%f}", _currentSafeAreaInsets.top, _currentSafeAreaInsets.left, _currentSafeAreaInsets.bottom, _currentSafeAreaInsets.right];
+    } else {
+      providerViewSafeAreaInsetsString = @"{0.0,0.0,0.0,0.0}";
+      currentSafeAreaInsetsString = @"{0.0,0.0,0.0,0.0}";
+    }
+#endif
 
   return [NSString stringWithFormat:@"%@; RNCSafeAreaInsets = %@; appliedRNCSafeAreaInsets = %@>",
                                     superDescription,
-                                    NSStringFromUIEdgeInsets(_providerView.safeAreaInsets),
-                                    NSStringFromUIEdgeInsets(_currentSafeAreaInsets)];
+                                    providerViewSafeAreaInsetsString,
+                                    currentSafeAreaInsetsString];
 }
 
 - (void)didMoveToWindow
 {
+#if TARGET_OS_IPHONE
   UIView *previousProviderView = _providerView;
+#elif TARGET_OS_OSX
+  NSView *previousProviderView = _providerView;
+#endif
   _providerView = [self findNearestProvider];
 
   [self invalidateSafeAreaInsets];
@@ -79,19 +102,29 @@ - (void)invalidateSafeAreaInsets
   if (_providerView == nil) {
     return;
   }
+#if TARGET_OS_IPHONE
   UIEdgeInsets safeAreaInsets = _providerView.safeAreaInsets;
-
   if (UIEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale())) {
     return;
   }
+#elif TARGET_OS_OSX
+  NSEdgeInsets safeAreaInsets = _providerView.safeAreaInsets;
+  if (NSEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale())) {
+    return;
+  }
+#endif
 
   _currentSafeAreaInsets = safeAreaInsets;
   [self updateLocalData];
 }
 
 - (nullable RNCSafeAreaProvider *)findNearestProvider
 {
+#if TARGET_OS_IPHONE
   UIView *current = self.reactSuperview;
+#elif TARGET_OS_OSX
+  NSView *current = self.reactSuperview;
+#endif
   while (current != nil) {
     if ([current isKindOfClass:RNCSafeAreaProvider.class]) {
       return (RNCSafeAreaProvider *)current;
diff --git a/ios/RNCSafeAreaViewLocalData.h b/ios/RNCSafeAreaViewLocalData.h
@@ -1,4 +1,8 @@
+#if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
+#elif TARGET_OS_OSX
+#import <AppKit/AppKit.h>
+#endif
 
 #import "RNCSafeAreaViewEdges.h"
 #import "RNCSafeAreaViewMode.h"
@@ -7,9 +11,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RNCSafeAreaViewLocalData : NSObject
 
+#if TARGET_OS_IPHONE
 - (instancetype)initWithInsets:(UIEdgeInsets)insets mode:(RNCSafeAreaViewMode)mode edges:(RNCSafeAreaViewEdges)edges;
 
 @property (atomic, readonly) UIEdgeInsets insets;
+#elif TARGET_OS_OSX
+- (instancetype)initWithInsets:(NSEdgeInsets)insets mode:(RNCSafeAreaViewMode)mode edges:(RNCSafeAreaViewEdges)edges;
+
+@property (atomic, readonly) NSEdgeInsets insets;
+#endif
+
 @property (atomic, readonly) RNCSafeAreaViewMode mode;
 @property (atomic, readonly) RNCSafeAreaViewEdges edges;
 
diff --git a/ios/RNCSafeAreaViewLocalData.m b/ios/RNCSafeAreaViewLocalData.m
@@ -2,7 +2,11 @@
 
 @implementation RNCSafeAreaViewLocalData
 
+#if TARGET_OS_IPHONE
 - (instancetype)initWithInsets:(UIEdgeInsets)insets mode:(RNCSafeAreaViewMode)mode edges:(RNCSafeAreaViewEdges)edges
+#elif TARGET_OS_OSX
+- (instancetype)initWithInsets:(NSEdgeInsets)insets mode:(RNCSafeAreaViewMode)mode edges:(RNCSafeAreaViewEdges)edges
+#endif
 {
   if (self = [super init]) {
     _insets = insets;
diff --git a/ios/RNCSafeAreaViewManager.m b/ios/RNCSafeAreaViewManager.m
@@ -9,7 +9,11 @@ @implementation RNCSafeAreaViewManager
 
 RCT_EXPORT_MODULE(RNCSafeAreaView)
 
+#if TARGET_OS_IPHONE
 - (UIView *)view
+#elif TARGET_OS_OSX
+- (NSView *)view
+#endif
 {
   return [[RNCSafeAreaView alloc] initWithBridge:self.bridge];
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,11 @@ @implementation RNCSafeAreaProviderManager`
`8`	`8`
`9`	`9`	`RCT_EXPORT_VIEW_PROPERTY(onInsetsChange, RCTDirectEventBlock)`
`10`	`10`
	`11`	`+#if TARGET_OS_IPHONE`
`11`	`12`	`- (UIView *)view`
	`13`	`+#elif TARGET_OS_OSX`
	`14`	`+- (NSView *)view`
	`15`	`+#endif`
`12`	`16`	`{`
`13`	`17`	`return [RNCSafeAreaProvider new];`
`14`	`18`	`}`