Address PR feedback: fix macOS tags and make all ifdef blocks iOS-first

- Fix #else/#endif comment tags to follow diffs-with-upstream guide
- Flip all macOS-first (#if TARGET_OS_OSX) blocks with #else to iOS-first
- Remove unnecessary TargetConditionals.h and AppKit.h imports
- Add back missing [macOS] tags on modified lines

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Saadnajmi

packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.h

@@ -20,9 +20,19 @@ struct DynamicColor {
   int32_t highContrastDarkColor = 0;
 };
 
+#if TARGET_OS_OSX // [macOS
+struct ColorWithSystemEffect {
+  int32_t color = 0;
+  std::string effect;
+};
+#endif // macOS]
+
 struct Color {
   Color(int32_t color);
   Color(const DynamicColor& dynamicColor);
+#if TARGET_OS_OSX // [macOS
+  Color(const ColorWithSystemEffect& colorWithSystemEffect);
+#endif // macOS]
   Color(const ColorComponents& components);
   Color() : uiColor_(nullptr){};
   int32_t getColor() const;

packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm

@@ -147,7 +147,9 @@ int32_t ColorFromColorComponents(const facebook::react::ColorComponents &compone
 int32_t ColorFromUIColor(RCTPlatformColor *color) // [macOS]
 {
   CGFloat rgba[4];
-#if TARGET_OS_OSX // [macOS
+#if !TARGET_OS_OSX // [macOS]
+  [color getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
+#else // [macOS
   // Resolve dynamic/semantic colors against the current effective appearance
   // so that dark mode colors are correctly extracted.
   NSAppearance *previousAppearance = NSAppearance.currentAppearance;
@@ -159,8 +161,6 @@ int32_t ColorFromUIColor(RCTPlatformColor *color) // [macOS]
     [color getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
   }
   NSAppearance.currentAppearance = previousAppearance;
-#else // macOS]
-  [color getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
 #endif // macOS]
   return ColorFromColorComponents({(float)rgba[0], (float)rgba[1], (float)rgba[2], (float)rgba[3]});
 }
@@ -211,33 +211,7 @@ int32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)
     return 0;
   }
 
-#if TARGET_OS_OSX // [macOS
-  // Hash both light and dark appearance colors to properly distinguish
-  // dynamic colors that change with appearance.
-  RCTPlatformColor *color = (RCTPlatformColor *)unwrapManagedObject(uiColor);
-  int32_t darkColor = 0;
-  int32_t lightColor = 0;
-  NSAppearance *previousAppearance = NSAppearance.currentAppearance;
-
-  NSAppearance.currentAppearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
-  NSColor *darkResolved = [color colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
-  if (darkResolved) {
-    CGFloat rgba[4];
-    [darkResolved getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
-    darkColor = ColorFromColorComponents({(float)rgba[0], (float)rgba[1], (float)rgba[2], (float)rgba[3]});
-  }
-
-  NSAppearance.currentAppearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
-  NSColor *lightResolved = [color colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
-  if (lightResolved) {
-    CGFloat rgba[4];
-    [lightResolved getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
-    lightColor = ColorFromColorComponents({(float)rgba[0], (float)rgba[1], (float)rgba[2], (float)rgba[3]});
-  }
-
-  NSAppearance.currentAppearance = previousAppearance;
-  return facebook::react::hash_combine(darkColor, lightColor);
-#else // macOS]
+#if !TARGET_OS_OSX // [macOS]
   static UITraitCollection *darkModeTraitCollection =
       [UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark];
   auto darkColor = ColorFromUIColorForSpecificTraitCollection(uiColor, darkModeTraitCollection);
@@ -267,6 +241,32 @@ int32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)
       darkAccessibilityContrastColor,
       lightAccessibilityContrastColor,
       UIColorIsP3ColorSpace(uiColor));
+#else // [macOS
+  // Hash both light and dark appearance colors to properly distinguish
+  // dynamic colors that change with appearance.
+  RCTPlatformColor *color = (RCTPlatformColor *)unwrapManagedObject(uiColor);
+  int32_t darkColor = 0;
+  int32_t lightColor = 0;
+  NSAppearance *previousAppearance = NSAppearance.currentAppearance;
+
+  NSAppearance.currentAppearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
+  NSColor *darkResolved = [color colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
+  if (darkResolved) {
+    CGFloat rgba[4];
+    [darkResolved getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
+    darkColor = ColorFromColorComponents({(float)rgba[0], (float)rgba[1], (float)rgba[2], (float)rgba[3]});
+  }
+
+  NSAppearance.currentAppearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
+  NSColor *lightResolved = [color colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
+  if (lightResolved) {
+    CGFloat rgba[4];
+    [lightResolved getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
+    lightColor = ColorFromColorComponents({(float)rgba[0], (float)rgba[1], (float)rgba[2], (float)rgba[3]});
+  }
+
+  NSAppearance.currentAppearance = previousAppearance;
+  return facebook::react::hash_combine(darkColor, lightColor);
 #endif // macOS]
 }
 
@@ -302,7 +302,7 @@ int32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)
       colorWithSystemEffect.color,
       std::hash<std::string>{}(colorWithSystemEffect.effect));
 }
-#endif // macOS
+#endif // macOS]
 
 Color::Color(const ColorComponents &components)
 {

packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/PlatformColorParser.mm

@@ -62,6 +62,24 @@ SharedColor parsePlatformColor(const ContextContainer &contextContainer, int32_t
         items.at("dynamic").hasType<std::unordered_map<std::string, RawValue>>()) {
       auto dynamicItems = (std::unordered_map<std::string, RawValue>)items.at("dynamic");
       return RCTPlatformColorComponentsFromDynamicItems(contextContainer, surfaceId, dynamicItems);
+#if TARGET_OS_OSX // [macOS
+    } else if (
+        items.find("colorWithSystemEffect") != items.end() &&
+        items.at("colorWithSystemEffect").hasType<std::unordered_map<std::string, RawValue>>()) {
+      auto colorWithSystemEffectItems =
+          (std::unordered_map<std::string, RawValue>)items.at("colorWithSystemEffect");
+      if (colorWithSystemEffectItems.find("baseColor") != colorWithSystemEffectItems.end() &&
+          colorWithSystemEffectItems.find("systemEffect") != colorWithSystemEffectItems.end() &&
+          colorWithSystemEffectItems.at("systemEffect").hasType<std::string>()) {
+        SharedColor baseColorShared{};
+        fromRawValue(contextContainer, surfaceId, colorWithSystemEffectItems.at("baseColor"), baseColorShared);
+        if (baseColorShared) {
+          std::string systemEffect = (std::string)colorWithSystemEffectItems.at("systemEffect");
+          auto baseColor = (*baseColorShared).getColor();
+          return SharedColor(Color(ColorWithSystemEffect{baseColor, systemEffect}));
+        }
+      }
+#endif // macOS]
     }
   }
 

packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.mm

@@ -8,16 +8,12 @@
 #import "RCTPlatformColorUtils.h"
 
 #import <Foundation/Foundation.h>
-#import <TargetConditionals.h>
 #import <React/RCTUIKit.h> // [macOS]
-#if TARGET_OS_OSX // [macOS
-#import <AppKit/AppKit.h>
-#endif // macOS]
 #import <react/renderer/graphics/HostPlatformColor.h>
 #import <react/utils/ManagedObjectWrapper.h>
 
 #include <string>
-#include <vector>
+#include <vector> // [macOS]
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -266,17 +262,17 @@
   if (colorInfo) {
 #if !TARGET_OS_OSX // [macOS]
     SEL objcColorSelector = NSSelectorFromString([platformColorString stringByAppendingString:kColorSuffix]);
-    if (![RCTPlatformColor respondsToSelector:objcColorSelector]) {
+    if (![RCTPlatformColor respondsToSelector:objcColorSelector]) { // [macOS]
       NSNumber *fallbackRGB = colorInfo[kFallbackARGBKey];
       if (fallbackRGB) {
         return _UIColorFromHexValue(fallbackRGB);
       }
     } else {
-      Class uiColorClass = [RCTPlatformColor class];
+      Class uiColorClass = [RCTPlatformColor class]; // [macOS]
       IMP imp = [uiColorClass methodForSelector:objcColorSelector];
       id (*getUIColor)(id, SEL) = ((id(*)(id, SEL))imp);
       id colorObject = getUIColor(uiColorClass, objcColorSelector);
-      if ([colorObject isKindOfClass:[RCTPlatformColor class]]) {
+      if ([colorObject isKindOfClass:[RCTPlatformColor class]]) { // [macOS]
         return colorObject;
       }
     }
@@ -331,7 +327,9 @@
 static inline facebook::react::ColorComponents _ColorComponentsFromUIColor(RCTPlatformColor *color) // [macOS]
 {
   CGFloat rgba[4];
-#if TARGET_OS_OSX // [macOS
+#if !TARGET_OS_OSX // [macOS]
+  [color getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
+#else // [macOS
   // Resolve dynamic/semantic colors against the current effective appearance
   // so that dark mode colors are correctly extracted.
   NSAppearance *previousAppearance = NSAppearance.currentAppearance;
@@ -340,8 +338,6 @@
   NSAppearance.currentAppearance = previousAppearance;
   NSColor *finalColor = resolvedColor ?: [color colorUsingColorSpace:[NSColorSpace genericRGBColorSpace]];
   [finalColor getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
-#else // macOS]
-  [color getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
 #endif // macOS]
   return {(float)rgba[0], (float)rgba[1], (float)rgba[2], (float)rgba[3]};
 }