More new architecture and macOS fixes

Author: Saadnajmi

Libraries/AppDelegate/RCTAppDelegate.mm

@@ -27,8 +27,15 @@ @interface RCTAppDelegate () {
 
 @implementation RCTAppDelegate
 
+#if !TARGET_OS_OSX // [macOS]
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+#else // [macOS
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    NSApplication *application = [notification object];
+    NSDictionary *launchOptions = [notification userInfo];
+#endif // macOS]
   BOOL enableTM = NO;
 #if RCT_NEW_ARCH_ENABLED
   enableTM = self.turboModuleEnabled;
@@ -67,14 +74,14 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   rootViewController.view = rootView;
   self.window.rootViewController = rootViewController;
   [self.window makeKeyAndVisible];
+  return YES;
 #else // [macOS
   self.window = [[NSWindow alloc] init];
   NSViewController *rootViewController = [self createRootViewController];
   rootViewController.view = rootView;
   self.window.contentViewController = rootViewController;
   [self.window makeKeyAndOrderFront:self];
 #endif // macOS]
-  return YES;
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
@@ -118,7 +125,7 @@ - (RCTPlatformView *)createRootViewWithBridge:(RCTBridge *)bridge // [macOS]
   return RCTAppSetupDefaultRootView(bridge, moduleName, initProps, enableFabric);
 }
 
-#if !TARGET_OS_OSX
+#if !TARGET_OS_OSX // [macOS]
 - (UIViewController *)createRootViewController
 {
   return [UIViewController new];

Libraries/AppDelegate/React-RCTAppDelegate.podspec

@@ -47,7 +47,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/actionsheetios"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :osx => "10.15" }
+  s.platforms              = { :ios => "12.4", :osx => "10.15" } # [macOS]
   s.source                 = source
   s.source_files            = "**/*.{c,h,m,mm,S,cpp}"
 

React-Core.podspec

@@ -109,7 +109,6 @@ Pod::Spec.new do |s|
   end
 
   s.dependency "RCT-Folly", folly_version
-  s.osx.dependency "RCT-Folly/Futures", folly_version # [macOS] Github issue ##1733: macOS needs this extra dependency
   s.dependency "React-cxxreact", version
   s.dependency "React-perflogger", version
   s.dependency "React-jsi", version

React/Views/RCTViewManager.h

@@ -19,7 +19,7 @@
 @class RCTSparseArray;
 @class RCTUIManager;
 
-typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTPlatformView *> *viewRegistry); // [macOS]
+typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTUIView *> *viewRegistry); // [macOS]
 
 @interface RCTViewManager : NSObject <RCTBridgeModule>
 

packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.mm

@@ -20,7 +20,7 @@ @interface RNTMyNativeViewComponentView () <RCTRNTMyNativeViewViewProtocol>
 @end
 
 @implementation RNTMyNativeViewComponentView {
-  UIView *_view;
+  RCTUIView *_view; // [macOS]
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
@@ -34,34 +34,34 @@ - (instancetype)initWithFrame:(CGRect)frame
     static const auto defaultProps = std::make_shared<const RNTMyNativeViewProps>();
     _props = defaultProps;
 
-    _view = [[UIView alloc] init];
-    _view.backgroundColor = [UIColor redColor];
+    _view = [[RCTUIView alloc] init]; // [macOS]
+    _view.backgroundColor = [RCTUIColor redColor]; // [macOS]
 
     self.contentView = _view;
   }
 
   return self;
 }
 
-- (UIColor *)UIColorFromHexString:(const std::string)hexString
+- (RCTUIColor *)RCTUIColorFromHexString:(const std::string)hexString // [macOS]
 {
   unsigned rgbValue = 0;
   NSString *colorString = [NSString stringWithCString:hexString.c_str() encoding:[NSString defaultCStringEncoding]];
   NSScanner *scanner = [NSScanner scannerWithString:colorString];
   [scanner setScanLocation:1]; // bypass '#' character
   [scanner scanHexInt:&rgbValue];
-  return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0
-                         green:((rgbValue & 0xFF00) >> 8) / 255.0
-                          blue:(rgbValue & 0xFF) / 255.0
-                         alpha:1.0];
+  return [RCTUIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0 // [macOS]
+                            green:((rgbValue & 0xFF00) >> 8) / 255.0
+                             blue:(rgbValue & 0xFF) / 255.0
+                            alpha:1.0];
 }
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
   [super updateProps:props oldProps:oldProps];
 }
 
-- (void)onChange:(UIView *)sender
+- (void)onChange:(RCTUIView *)sender // [macOS]
 {
   // No-op
   //  std::dynamic_pointer_cast<const ViewEventEmitter>(_eventEmitter)
@@ -77,7 +77,7 @@ - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
 
 - (void)callNativeMethodToChangeBackgroundColor:(NSString *)colorString
 {
-  UIColor *color = [self UIColorFromHexString:std::string([colorString UTF8String])];
+  RCTUIColor *color = [self RCTUIColorFromHexString:std::string([colorString UTF8String])]; // [macOS]
   _view.backgroundColor = color;
 }
 @end

packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewManager.mm

@@ -20,9 +20,9 @@ @implementation RNTMyNativeViewManager
 
 RCT_EXPORT_METHOD(callNativeMethodToChangeBackgroundColor : (nonnull NSNumber *)reactTag color : (NSString *)color)
 {
-  [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    UIView *view = viewRegistry[reactTag];
-    if (!view || ![view isKindOfClass:[UIView class]]) {
+  [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTUIView *> *viewRegistry) { // [macOS]
+    RCTUIView *view = viewRegistry[reactTag]; // [macOS]
+    if (!view || ![view isKindOfClass:[RCTPlatformView class]]) { // [macOS]
       RCTLogError(@"Cannot find NativeView with tag #%@", reactTag);
       return;
     }
@@ -33,17 +33,16 @@ @implementation RNTMyNativeViewManager
     NSScanner *scanner = [NSScanner scannerWithString:colorString];
     [scanner setScanLocation:1]; // bypass '#' character
     [scanner scanHexInt:&rgbValue];
-
-    view.backgroundColor = [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0
-                                           green:((rgbValue & 0xFF00) >> 8) / 255.0
-                                            blue:(rgbValue & 0xFF) / 255.0
-                                           alpha:1.0];
+    view.backgroundColor = [RCTUIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0 // [macOS
+                                              green:((rgbValue & 0xFF00) >> 8) / 255.0
+                                               blue:(rgbValue & 0xFF) / 255.0
+                                              alpha:1.0];
   }];
 }
 
-- (UIView *)view
+- (RCTUIView *)view // [macOS]
 {
-  return [[UIView alloc] init];
+  return [[RCTUIView alloc] init]; // [macOS]
 }
 
 @end

packages/rn-tester/NativeComponentExample/js/MyNativeView.js

@@ -29,20 +29,6 @@ const colors = [
 export default function MyNativeView(props: {}): React.Node {
   const ref = useRef<React.ElementRef<MyNativeViewType> | null>(null);
   const [opacity, setOpacity] = useState(1.0);
-
-  // [macOS Use this "hack" to only render this example if Fabric is enabled and allow CI to pass
-  // Fabric Detection
-  const [isFabric, setIsFabric] = useState<boolean>(false);
-  // Avoid dot notation because at Meta, private properties are obfuscated.
-  // $FlowFixMe[prop-missing]
-  const _internalInstanceHandler = ref['_internalInstanceHandle']; // eslint-disable-line dot-notation
-  setIsFabric(Boolean(_internalInstanceHandler?.stateNode?.canonical));
-
-  if (!isFabric) {
-    return <View ref={ref} />;
-  }
-  // macOS]
-
   return (
     <View style={{flex: 1}}>
       <RNTMyNativeView ref={ref} style={{flex: 1}} opacity={opacity} />

packages/rn-tester/Podfile

@@ -19,7 +19,7 @@ def pods(target_name, options = {}, use_flipper: !IN_CI && !USE_FRAMEWORKS)
   project 'RNTesterPods.xcodeproj'
 
   # [macOS Disable Fabric by default till macOS supports it
-  fabric_enabled = ENV['USE_FABRIC'] == '1' 
+  fabric_enabled = ENV['USE_FABRIC'] == '1' || ENV['RCT_NEW_ARCH_ENABLED'] == '1' 
   # macOS]
 
   # Hermes is now enabled by default.
@@ -56,9 +56,6 @@ def pods(target_name, options = {}, use_flipper: !IN_CI && !USE_FRAMEWORKS)
 
   # RNTester native modules and components
   pod 'ScreenshotManager', :path => "NativeModuleExample"
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-    pod 'NativeCxxModuleExample', :path => "NativeCxxModuleExample"
-  end 
 end
 
 target 'RNTester' do