Merge pull request microsoft#7 from amgleitman/amgleitman/fb66merge-macos-compile

Get RNTester compiling for macOS

Author: HeyImChris

Libraries/PushNotificationIOS/RCTPushNotificationManager.mm

@@ -7,9 +7,7 @@
 
 #import <React/RCTPushNotificationManager.h>
 
-#if !TARGET_OS_OSX // TODO(macOS GH#774)
 #import <UserNotifications/UserNotifications.h>
-#endif // TODO(macOS GH#774)
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge.h>

Libraries/Text/TextInput/Multiline/RCTUITextView.m

@@ -505,6 +505,7 @@ - (void)_updatePlaceholder
 }
 
 #pragma mark - Caret Manipulation
+#if !TARGET_OS_OSX // TODO(macOS GH#774)
 
 - (CGRect)caretRectForPosition:(UITextPosition *)position
 {
@@ -514,6 +515,7 @@ - (CGRect)caretRectForPosition:(UITextPosition *)position
 
   return [super caretRectForPosition:position];
 }
+#endif
 
 #pragma mark - Utility Methods
 

React/Base/RCTBridgeModule.h

@@ -6,7 +6,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
+#import <React/RCTUIKit.h> // TODO(macOS GH#774)
 
 #import <React/RCTDefines.h>
 
@@ -444,7 +444,7 @@ typedef NSURL * (^RCTBridgelessBundleURLGetter)(void);
 @property NSURL *bundleURL;
 @end
 
-typedef UIView * (^RCTBridgelessComponentViewProvider)(NSNumber *);
+typedef RCTPlatformView * (^RCTBridgelessComponentViewProvider)(NSNumber *); // TODO(macOS GH#774)
 
 /**
  * A class that allows NativeModules to query for views, given React Tags.
@@ -453,7 +453,7 @@ typedef UIView * (^RCTBridgelessComponentViewProvider)(NSNumber *);
 - (void)setBridge:(RCTBridge *)bridge;
 - (void)setBridgelessComponentViewProvider:(RCTBridgelessComponentViewProvider)bridgelessComponentViewProvider;
 
-- (UIView *)viewForReactTag:(NSNumber *)reactTag;
+- (RCTPlatformView *)viewForReactTag:(NSNumber *)reactTag; // TODO(macOS GH#774)
 @end
 
 typedef void (^RCTBridgelessJSModuleMethodInvoker)(

React/Base/RCTConvert.m

@@ -1000,7 +1000,7 @@ + (RCTUIColor *)UIColor:(id)json // TODO(macOS GH#750)
     if ((value = [dictionary objectForKey:@"semantic"])) {
       if ([value isKindOfClass:[NSString class]]) {
         NSString *semanticName = value;
-        RCTUIColor *color = [UIColor colorNamed:semanticName]; // TODO(macOS GH#750)
+        RCTUIColor *color = [RCTUIColor colorNamed:semanticName]; // TODO(macOS GH#750)
         if (color != nil) {
           return color;
         }
@@ -1013,7 +1013,7 @@ + (RCTUIColor *)UIColor:(id)json // TODO(macOS GH#750)
         return color;
       } else if ([value isKindOfClass:[NSArray class]]) {
         for (id name in value) {
-          RCTUIColor *color = [UIColor colorNamed:name]; // TODO(macOS GH#750)
+          RCTUIColor *color = [RCTUIColor colorNamed:name]; // TODO(macOS GH#750)
           if (color != nil) {
             return color;
           }

React/Base/RCTUIKit.h

@@ -63,6 +63,8 @@ UIKIT_STATIC_INLINE CGPathRef UIBezierPathCreateCGPathRef(UIBezierPath *path)
 #define RCTUIView UIView // TODO(macOS ISS#3536887)
 #define RCTUIScrollView UIScrollView // TODO(macOS ISS#3536887)
 
+#define RCTPlatformWindow UIWindow
+
 UIKIT_STATIC_INLINE RCTPlatformView *RCTUIViewHitTestWithEvent(RCTPlatformView *view, CGPoint point, UIEvent *event)
 {
   return [view hitTest:point withEvent:event];
@@ -361,6 +363,8 @@ CGPathRef UIBezierPathCreateCGPathRef(UIBezierPath *path);
 // UIView
 #define RCTPlatformView NSView
 
+#define RCTPlatformWindow NSWindow
+
 @interface RCTUIView : NSView // TODO(macOS ISS#3536887)
 
 @property (nonatomic, readonly) BOOL canBecomeFirstResponder;

React/Base/RCTViewRegistry.m

@@ -26,9 +26,9 @@ - (void)setBridgelessComponentViewProvider:(RCTBridgelessComponentViewProvider)b
   _bridgelessComponentViewProvider = bridgelessComponentViewProvider;
 }
 
-- (UIView *)viewForReactTag:(NSNumber *)reactTag
+- (RCTPlatformView *)viewForReactTag:(NSNumber *)reactTag // TODO(macOS GH#774)
 {
-  UIView *view = nil;
+  RCTPlatformView *view = nil; // TODO(macOS GH#774)
 
   RCTBridge *bridge = _bridge;
   if (bridge) {

React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

@@ -62,7 +62,7 @@ - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
     [self _updateViews];
 
     // For backward compatibility with RCTRootView, set a color here instead of transparent (OS default).
-    self.backgroundColor = [UIColor whiteColor];
+    self.backgroundColor = [RCTUIColor whiteColor];
   }
 
   return self;

React/CoreModules/RCTAlertController.h

@@ -15,7 +15,7 @@
 
 #if !TARGET_OS_OSX // [TODO(macOS GH#774)
 - (void)show:(BOOL)animated completion:(void (^)(void))completion;
-#endif // ]TODO(macOS GH#774)
 - (void)hide;
+#endif // ]TODO(macOS GH#774)
 
 @end

React/CoreModules/RCTAlertController.m

@@ -35,11 +35,11 @@ - (void)show:(BOOL)animated completion:(void (^)(void))completion
   [self.alertWindow makeKeyAndVisible];
   [self.alertWindow.rootViewController presentViewController:self animated:animated completion:completion];
 }
-#endif // ]TODO(macOS GH#774)
 
 - (void)hide
 {
   _alertWindow = nil;
 }
+#endif // ]TODO(macOS GH#774)
 
 @end

React/CoreModules/RCTDevMenu.mm

@@ -190,7 +190,7 @@ - (void)invalidate
 - (void)showOnShake
 {
   if ([((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]) isShakeToShowDevMenuEnabled]) {
-    for (UIWindow *window in [RCTSharedApplication() windows]) {
+    for (RCTPlatformWindow *window in [RCTSharedApplication() windows]) {
       NSString *recursiveDescription = [window valueForKey:@"recursiveDescription"];
       if ([recursiveDescription containsString:@"RCTView"]) {
         [self show];