UIKitForMac support - initial commit

Libraries/Image/RCTUIImageViewAnimated.m

@@ -173,7 +173,12 @@ - (BOOL)paused
 
 - (void)displayDidRefresh:(CADisplayLink *)displayLink
 {
+#if TARGET_OS_UIKITFORMAC
+  // TODO: `displayLink.frameInterval` is not available on UIKitForMac
+  NSTimeInterval duration = displayLink.duration;
+#else
   NSTimeInterval duration = displayLink.duration * displayLink.frameInterval;
+#endif
   NSUInteger totalFrameCount = self.totalFrameCount;
   NSUInteger currentFrameIndex = self.currentFrameIndex;
   NSUInteger nextFrameIndex = (currentFrameIndex + 1) % totalFrameCount;

Libraries/LinkingIOS/RCTLinkingManager.m

@@ -101,12 +101,15 @@ - (void)handleOpenURLNotification:(NSNotification *)notification
       }
     }];
   } else {
+#if !TARGET_OS_UIKITFORMAC
+    // Note: this branch will never be taken on UIKitForMac
     BOOL opened = [RCTSharedApplication() openURL:URL];
     if (opened) {
       resolve(@YES);
     } else {
       reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@", URL], nil);
     }
+#endif
   }
 
 }
@@ -170,12 +173,15 @@ - (void)handleOpenURLNotification:(NSNotification *)notification
       }
     }];
   } else {
+#if !TARGET_OS_UIKITFORMAC
+   // Note: This branch will never be taken on UIKitForMac
    BOOL opened = [RCTSharedApplication() openURL:url];
    if (opened) {
      resolve(nil);
    } else {
      reject(RCTErrorUnspecified, @"Unable to open app settings", nil);
    }
+#endif
   }
 }
 

Libraries/Network/RCTNetInfo.m

@@ -7,7 +7,7 @@
 
 #import "RCTNetInfo.h"
 
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
   #import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #endif
 #import <React/RCTAssert.h>
@@ -148,7 +148,7 @@ - (BOOL)setReachabilityStatus:(SCNetworkReachabilityFlags)flags
     status = RCTReachabilityStateNone;
   }
 
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
 
   else if ((flags & kSCNetworkReachabilityFlagsIsWWAN) != 0) {
     connectionType = RCTConnectionTypeCellular;

Libraries/PushNotificationIOS/RCTPushNotificationManager.h

@@ -13,7 +13,7 @@ extern NSString *const RCTRemoteNotificationReceived;
 
 typedef void (^RCTRemoteNotificationCallback)(UIBackgroundFetchResult result);
 
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
 + (void)didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings;
 + (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification;

Libraries/PushNotificationIOS/RCTPushNotificationManager.m

@@ -23,7 +23,7 @@
 
 static NSString *const kErrorUnableToRequestPermissions = @"E_UNABLE_TO_REQUEST_PERMISSIONS";
 
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
 @implementation RCTConvert (NSCalendarUnit)
 
 RCT_ENUM_CONVERTER(NSCalendarUnit,
@@ -74,14 +74,14 @@ + (UILocalNotification *)UILocalNotification:(id)json
 }), UIBackgroundFetchResultNoData, integerValue)
 
 @end
-#endif //TARGET_OS_TV
+#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
 
 @implementation RCTPushNotificationManager
 {
   RCTPromiseResolveBlock _requestPermissionsResolveBlock;
 }
 
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
 
 static NSDictionary *RCTFormatLocalNotification(UILocalNotification *notification)
 {
@@ -125,7 +125,7 @@ @implementation RCTPushNotificationManager
   return formattedNotification;
 }
 
-#endif //TARGET_OS_TV
+#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
 
 RCT_EXPORT_MODULE()
 
@@ -134,7 +134,7 @@ - (dispatch_queue_t)methodQueue
   return dispatch_get_main_queue();
 }
 
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
 - (void)startObserving
 {
   [[NSNotificationCenter defaultCenter] addObserver:self
@@ -464,13 +464,13 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
   }
 }
 
-#else //TARGET_OS_TV
+#else //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
 
 - (NSArray<NSString *> *)supportedEvents
 {
   return @[];
 }
 
-#endif //TARGET_OS_TV
+#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
 
 @end

Libraries/Text/Text/RCTTextView.m

@@ -294,7 +294,8 @@ - (void)disableContextMenu
 
 - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
 {
-#if !TARGET_OS_TV
+  // TODO: Adopt showMenuFromRect (necessary for UIKitForMac)
+#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
   UIMenuController *menuController = [UIMenuController sharedMenuController];
 
   if (menuController.isMenuVisible) {

Libraries/WebSocket/RCTSRWebSocket.m

@@ -14,6 +14,8 @@
 //   limitations under the License.
 //
 
+#if !TARGET_OS_UIKITFORMAC
+
 #import "RCTSRWebSocket.h"
 
 #import <Availability.h>
@@ -1635,3 +1637,5 @@ - (NSRunLoop *)runLoop;
 }
 
 @end
+
+#endif

Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj

@@ -43,7 +43,6 @@
 				3C86DF7A1ADF695F0047B81A /* RCTWebSocketModule.h */,
 				3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */,
 				3C86DF471ADF2C930047B81A /* Products */,
-				13526A501F362F7F0008EF00 /* Frameworks */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -67,12 +66,10 @@
 			buildConfigurationList = 2D2A28901D9B049200D4039D /* Build configuration list for PBXNativeTarget "RCTWebSocket-tvOS" */;
 			buildPhases = (
 				2D2A28841D9B049200D4039D /* Sources */,
-				2DC5E5151F3A6C39000EE84B /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				3DBE0D111F3B184D0099AA32 /* PBXTargetDependency */,
 			);
 			name = "RCTWebSocket-tvOS";
 			productName = "RCTWebSocket-tvOS";
@@ -84,12 +81,10 @@
 			buildConfigurationList = 3C86DF5A1ADF2C930047B81A /* Build configuration list for PBXNativeTarget "RCTWebSocket" */;
 			buildPhases = (
 				3C86DF421ADF2C930047B81A /* Sources */,
-				13526A4F1F362F770008EF00 /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				3DBE0D0F1F3B18490099AA32 /* PBXTargetDependency */,
 			);
 			name = RCTWebSocket;
 			productName = WebSocket;
@@ -119,6 +114,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 3C86DF3D1ADF2C930047B81A;
@@ -313,6 +309,7 @@
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTS_UIKITFORMAC = NO;
 			};
 			name = Debug;
 		};
@@ -324,56 +321,7 @@
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		3DBE0CFE1F3B181A0099AA32 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				EXECUTABLE_PREFIX = lib;
-				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		3DBE0CFF1F3B181A0099AA32 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				EXECUTABLE_PREFIX = lib;
-				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		3DBE0D0B1F3B181C0099AA32 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVES = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_TESTABILITY = YES;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
-			};
-			name = Debug;
-		};
-		3DBE0D0C1F3B181C0099AA32 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVES = YES;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
+				SUPPORTS_UIKITFORMAC = NO;
 			};
 			name = Release;
 		};