not-react-native-macos 0.87.1-rc.1 → 0.87.1-rc.3

package/Libraries/Alert/RCTAlertManager.macos.js

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `RCTAlertManager` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
+
+export * from './RCTAlertManager.ios';

package/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.macos.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `legacySendAccessibilityEvent` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
+
+import legacySendAccessibilityEvent from './legacySendAccessibilityEvent.ios';
+
+export default legacySendAccessibilityEvent;

package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.macos.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `DrawerLayoutAndroid` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
+
+import DrawerLayoutAndroid from './DrawerLayoutAndroid.ios';
+
+export default DrawerLayoutAndroid;

package/Libraries/Components/ToastAndroid/ToastAndroid.macos.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `ToastAndroid` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
+
+import ToastAndroid from './ToastAndroid.ios';
+
+export default ToastAndroid;

package/Libraries/Image/Image.macos.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `Image` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
+
+import Image from './Image.ios';
+
+export default Image;

package/Libraries/NativeComponent/BaseViewConfig.macos.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `BaseViewConfig` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
+
+import BaseViewConfig from './BaseViewConfig.ios';
+
+export default BaseViewConfig;

package/Libraries/Network/RCTNetworking.macos.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `RCTNetworking` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
+
+import RCTNetworking from './RCTNetworking.ios';
+
+export default RCTNetworking;

package/Libraries/Settings/Settings.macos.js

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `Settings` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+import Platform from '../Utilities/Platform';
+
+let Settings: {
+  get(key: string): any,
+  set(settings: Object): void,
+  watchKeys(keys: string | Array<string>, callback: () => void): number,
+  clearWatch(watchId: number): void,
+  ...
+};
+
+if (Platform.OS === 'ios') {
+  Settings = require('./Settings.ios').default;
+} else {
+  Settings = require('./SettingsFallback').default;
+}
+
+export default Settings;

package/Libraries/StyleSheet/PlatformColorValueTypes.macos.js

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `PlatformColorValueTypes` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
+
+export * from './PlatformColorValueTypes.ios';

package/Libraries/Utilities/BackHandler.macos.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// [macOS] macOS resolves as `.macos` -> `.native` -> shared, so without this
+// file `BackHandler` re-exports itself: the shared file is a
+// stub that expects a platform-suffixed sibling to answer. Point it at the iOS
+// implementation, which is what this fork uses on macOS wherever upstream has
+// no platform-neutral one. macOS]
+
+// NOTE: This file supports backwards compatibility of subpath (deep) imports
+// from 'react-native' with platform-specific extensions. It can be deleted
+// once we remove the "./*" mapping from package.json "exports".
+
+import BackHandler from './BackHandler.ios';
+
+export default BackHandler;

package/Libraries/Utilities/Platform.macos.js

@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+// [macOS] The macOS implementation of Platform.
+//
+// `PlatformTypes.js` upstream already declares `'macos'` in `PlatformOSType`
+// and a `MacOSPlatform` shape; only the module was missing, so `Platform.OS`
+// came out as `'ios'` and every `Platform.select({macos: ...})` in the
+// ecosystem silently took the iOS branch.
+//
+// The native constants come from the same `PlatformConstants` turbo module iOS
+// uses -- the fork builds it for macOS and `RCTConstants.m` reports
+// `RCTPlatformName` as `"macos"`. There is no interface idiom on macOS, so
+// `isTV` and `isVision` are constants rather than reads. macOS]
+
+import type {PlatformSelectSpec, PlatformType} from './PlatformTypes';
+
+import NativePlatformConstantsIOS from './NativePlatformConstantsIOS';
+
+const Platform: PlatformType = {
+  __constants: null,
+  OS: 'macos',
+  // $FlowFixMe[unsafe-getters-setters]
+  get Version(): string {
+    // $FlowFixMe[object-this-reference]
+    return this.constants.osVersion;
+  },
+  // $FlowFixMe[unsafe-getters-setters]
+  get constants(): {
+    isTesting: boolean,
+    osVersion: string,
+    reactNativeVersion: {
+      major: number,
+      minor: number,
+      patch: number,
+      prerelease: ?number,
+    },
+    systemName: string,
+  } {
+    // $FlowFixMe[object-this-reference]
+    if (this.__constants == null) {
+      // $FlowFixMe[object-this-reference]
+      this.__constants = NativePlatformConstantsIOS.getConstants();
+    }
+    // $FlowFixMe[object-this-reference]
+    return this.__constants;
+  },
+  // $FlowFixMe[unsafe-getters-setters]
+  get isTV(): boolean {
+    return false;
+  },
+  // $FlowFixMe[unsafe-getters-setters]
+  get isVision(): boolean {
+    return false;
+  },
+  // $FlowFixMe[unsafe-getters-setters]
+  get isTesting(): boolean {
+    if (__DEV__) {
+      // $FlowFixMe[object-this-reference]
+      return this.constants.isTesting;
+    }
+    return false;
+  },
+  // $FlowFixMe[unsafe-getters-setters]
+  get isDisableAnimations(): boolean {
+    // $FlowFixMe[object-this-reference]
+    return this.constants.isDisableAnimations ?? this.isTesting;
+  },
+  // `macos` first, then `ios`, then `native`, then `default`. The iOS step
+  // matters: almost every `Platform.select` in the ecosystem predates macOS and
+  // only offers an `ios` branch, which is the right one to take here.
+  select: <T>(spec: PlatformSelectSpec<T>): T =>
+    // $FlowFixMe[incompatible-type]
+    'macos' in spec
+      ? spec.macos
+      : 'ios' in spec
+        ? spec.ios
+        : 'native' in spec
+          ? spec.native
+          : spec.default,
+};
+
+export default Platform;

package/React/Base/RCTRootView.h

@@ -49,7 +49,7 @@ extern
  */
 #pragma clang diagnostic push
 #pragma clang diagnostic warning "-Wdeprecated"
-__deprecated_msg("This API will be removed along with the legacy architecture.") @interface RCTRootView : RCTPlatformView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
+__deprecated_msg("This API will be removed along with the legacy architecture.") @interface RCTRootView : RCTUIView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
 
 /**
  * - Designated initializer -

package/React/Base/RCTTextView.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// [macOS] Compatibility header for third-party code written against
+// microsoft/react-native-macos, which still carries the legacy Paper text view.
+//
+// Upstream React Native removed RCTTextView when Fabric replaced the old text
+// implementation, but published macOS modules still import it. react-native-svg
+// is the case in hand: RNSVGTopAlignedLabel.h imports this header and then
+// derives from NSTextView, using nothing the header declares.
+//
+// So this provides the include, not the class. A module that genuinely needs
+// the legacy view will now fail on the unknown type, which says what is wrong
+// far better than a missing file does.
+//
+// See React/Base/RCTUIKit.h for the rest of the react-native-macos
+// compatibility surface. macOS]
+
+#pragma once
+
+#import <TargetConditionals.h>
+
+#if TARGET_OS_OSX
+#import <AppKit/AppKit.h>
+#endif
+
+#import <React/RCTUIKit.h>

package/React/Base/RCTUIKit.h

@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// [macOS] Compatibility header for third-party code written against
+// microsoft/react-native-macos.
+//
+// That fork routes every platform type through <React/RCTUIKit.h>: RCTUIColor,
+// RCTUIImage, RCTUIView and friends. This fork does not need those names --
+// it serves a real UIKit header set, so upstream and iOS-shaped code compiles
+// with the names it already uses. But published packages do import this header
+// by name, and a macOS React Native that cannot build react-native-webview or
+// expo-modules-core is not much use, so the names are provided here.
+//
+// This is the only file in the fork that exists purely for other people's code.
+// macOS]
+
+#pragma once
+
+#import <TargetConditionals.h>
+
+// react-native-macos's RCTUIKit.h pulls these in transitively, and third-party
+// code relies on that: react-native-svg's RNSVGUIKit.h imports only RCTUIKit.h
+// and then calls RCTAssert.
+#import <React/RCTAssert.h>
+#import <React/RCTDefines.h>
+
+#if TARGET_OS_OSX
+
+#import <AppKit/AppKit.h>
+#import <UIKit/UIKit.h> // The AppKit-backed shim: UIView, UIColor, UIImage, ...
+
+// Colour and image are plain aliases in both forks, so these agree exactly.
+@compatibility_alias RCTUIColor NSColor;
+@compatibility_alias RCTPlatformColor NSColor;
+@compatibility_alias RCTUIImage NSImage;
+@compatibility_alias RCTPlatformImage NSImage;
+
+// RCTUIView and RCTPlatformView are declared by the UIKit shim imported above,
+// with the same split react-native-macos uses: RCTPlatformView is NSView, and
+// RCTUIView is the concrete subclass carrying the UIKit method surface. See
+// MACOS-FORK.md section 4.5.
+
+// The rest of the RCTUI* / RCTPlatform* vocabulary. Each one already exists in
+// the shim under its UIKit name, so these are pure renames -- which is the
+// whole point: react-native-macos had to invent the names because it has no
+// UIKit to borrow them from.
+@compatibility_alias RCTUIScrollView UIScrollView;
+@compatibility_alias RCTUISlider UISlider;
+@compatibility_alias RCTUILabel UILabel;
+@compatibility_alias RCTUISwitch UISwitch;
+@compatibility_alias RCTUIActivityIndicatorView UIActivityIndicatorView;
+@compatibility_alias RCTUITouch UITouch;
+@compatibility_alias RCTUIImageView UIImageView;
+@compatibility_alias RCTUIPanGestureRecognizer UIPanGestureRecognizer;
+@compatibility_alias RCTUIGraphicsImageRenderer UIGraphicsImageRenderer;
+@compatibility_alias RCTUIGraphicsImageRendererFormat UIGraphicsImageRendererFormat;
+@compatibility_alias RCTUIGraphicsImageRendererContext UIGraphicsImageRendererContext;
+@compatibility_alias RCTUIApplication UIApplication;
+@compatibility_alias RCTPlatformWindow UIWindow;
+@compatibility_alias RCTPlatformViewController UIViewController;
+@compatibility_alias RCTPlatformSwitch UISwitch;
+
+// Protocols and non-class names cannot use @compatibility_alias.
+#define RCTUIScrollViewDelegate UIScrollViewDelegate
+typedef UIAccessibilityTraits RCTUIAccessibilityTraits;
+typedef void (^RCTUIGraphicsImageDrawingActions)(UIGraphicsImageRendererContext *rendererContext);
+
+#import <React/RCTConvert.h>
+
+/**
+ * react-native-macos spells RCTConvert's colour and image entry points with
+ * AppKit names, and third-party code calls them that way -- react-native-svg
+ * does `[RCTConvert RNSVGColor:json]`, where RNSVGColor expands to NSColor.
+ *
+ * This fork keeps the UIKit names, because upstream React Native calls those
+ * and `UIColor` is already an alias for `NSColor`. A `@compatibility_alias`
+ * renames a type, not a selector, so `+UIColor:` does not answer to `NSColor:`
+ * and the two spellings have to be bridged explicitly.
+ */
+@interface RCTConvert (RCTUIKitCompat)
+
++ (nullable NSColor *)NSColor:(nullable id)json;
++ (nullable NSImage *)NSImage:(nullable id)json;
+
+@end
+
+#else
+
+#import <UIKit/UIKit.h>
+
+@compatibility_alias RCTUIColor UIColor;
+@compatibility_alias RCTPlatformColor UIColor;
+@compatibility_alias RCTUIImage UIImage;
+@compatibility_alias RCTPlatformImage UIImage;
+// RCTUIView and RCTPlatformView come from the force-included prelude here.
+
+@compatibility_alias RCTUIScrollView UIScrollView;
+@compatibility_alias RCTUISlider UISlider;
+@compatibility_alias RCTUILabel UILabel;
+@compatibility_alias RCTUISwitch UISwitch;
+@compatibility_alias RCTUIActivityIndicatorView UIActivityIndicatorView;
+@compatibility_alias RCTUITouch UITouch;
+@compatibility_alias RCTUIImageView UIImageView;
+@compatibility_alias RCTUIPanGestureRecognizer UIPanGestureRecognizer;
+@compatibility_alias RCTUIGraphicsImageRenderer UIGraphicsImageRenderer;
+@compatibility_alias RCTUIGraphicsImageRendererFormat UIGraphicsImageRendererFormat;
+@compatibility_alias RCTUIApplication UIApplication;
+@compatibility_alias RCTPlatformWindow UIWindow;
+@compatibility_alias RCTPlatformViewController UIViewController;
+@compatibility_alias RCTPlatformSwitch UISwitch;
+
+#define RCTUIScrollViewDelegate UIScrollViewDelegate
+typedef UIAccessibilityTraits RCTUIAccessibilityTraits;
+typedef UIGraphicsImageRendererContext RCTUIGraphicsImageRendererContext;
+typedef UIGraphicsImageDrawingActions RCTUIGraphicsImageDrawingActions;
+
+#endif // TARGET_OS_OSX

package/React/Base/RCTUIKit.m

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// [macOS] Implementation of the react-native-macos compatibility surface
+// declared in RCTUIKit.h. See that header for why it exists. macOS]
+
+#import <React/RCTUIKit.h>
+
+#if TARGET_OS_OSX
+
+@implementation RCTConvert (RCTUIKitCompat)
+
++ (NSColor *)NSColor:(id)json
+{
+  return [RCTConvert UIColor:json];
+}
+
++ (NSImage *)NSImage:(id)json
+{
+  return [RCTConvert UIImage:json];
+}
+
+@end
+
+#endif // TARGET_OS_OSX

package/React/Base/Surface/RCTSurfaceView.h

@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * UIView instance which represents the Surface
  */
-@interface RCTSurfaceView : RCTPlatformView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
+@interface RCTSurfaceView : RCTUIView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
 
 - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface NS_DESIGNATED_INITIALIZER;
 

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h

@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
  * This class can be used as easy-to-use general purpose integration point
  * of ReactNative-powered experiences in UIKit based apps.
  */
-@interface RCTSurfaceHostingView : RCTPlatformView <RCTSurfaceDelegate>  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
+@interface RCTSurfaceHostingView : RCTUIView <RCTSurfaceDelegate>  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
 
 /**
  * Designated initializer.

package/React/CoreModules/RCTDevLoadingView.mm

@@ -145,7 +145,7 @@ RCT_EXPORT_MODULE()
     self->_label.text = message;
 
     if (self->_container == nullptr) {
-      self->_container = [[RCTPlatformView alloc] init];  // [macOS] needs a flipped, layer-backed view
+      self->_container = [[RCTUIView alloc] init];  // [macOS] needs a flipped, layer-backed view
       self->_container.translatesAutoresizingMaskIntoConstraints = NO;
       UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hide)];
       [self->_container addGestureRecognizer:tapGesture];

package/React/CoreModules/RCTFPSGraph.h

@@ -11,7 +11,7 @@
 
 #if RCT_DEV
 
-@interface RCTFPSGraph : RCTPlatformView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
+@interface RCTFPSGraph : RCTUIView  // [macOS] concrete flipped, layer-backed view; UIView is an alias for NSView
 
 @property (nonatomic, assign, readonly) NSUInteger FPS;
 @property (nonatomic, assign, readonly) NSUInteger maxFPS;

package/React/CoreModules/RCTPerfMonitor.mm

@@ -172,7 +172,7 @@ RCT_EXPORT_MODULE()
     UIEdgeInsets safeInsets = RCTKeyWindow().safeAreaInsets;
 
     _container =
-        [[RCTPlatformView alloc] initWithFrame:CGRectMake(safeInsets.left, safeInsets.top, 180, RCTPerfMonitorBarHeight)];  // [macOS] needs a flipped, layer-backed view
+        [[RCTUIView alloc] initWithFrame:CGRectMake(safeInsets.left, safeInsets.top, 180, RCTPerfMonitorBarHeight)];  // [macOS] needs a flipped, layer-backed view
     _container.layer.borderWidth = 2;
     _container.layer.borderColor = [UIColor lightGrayColor].CGColor;
     [_container addGestureRecognizer:self.gestureRecognizer];

package/React/CoreModules/RCTRedBox2Controller.mm

@@ -118,7 +118,7 @@ static const NSTimeInterval kAutoRetryInterval = 20.0;
 
 - (UIView *)createHeaderBar
 {
-  UIView *headerContainer = [[RCTPlatformView alloc] init];  // [macOS] needs a flipped, layer-backed view
+  UIView *headerContainer = [[RCTUIView alloc] init];  // [macOS] needs a flipped, layer-backed view
   headerContainer.translatesAutoresizingMaskIntoConstraints = NO;
   headerContainer.backgroundColor = RCTRedBox2ErrorColor();
 
@@ -561,7 +561,7 @@ static const NSTimeInterval kAutoRetryInterval = 20.0;
     cell.detailTextLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightLight];
     cell.detailTextLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
     cell.backgroundColor = [UIColor clearColor];
-    cell.selectedBackgroundView = [RCTPlatformView new];  // [macOS] needs a flipped, layer-backed view
+    cell.selectedBackgroundView = [RCTUIView new];  // [macOS] needs a flipped, layer-backed view
     cell.selectedBackgroundView.backgroundColor = RCTRedBox2BackgroundColor();
     cell.selectedBackgroundView.layer.cornerRadius = 5;
   }
@@ -598,7 +598,7 @@ static const NSTimeInterval kAutoRetryInterval = 20.0;
   }
 
   // Code frame container with rounded corners
-  UIView *container = [[RCTPlatformView alloc] init];  // [macOS] needs a flipped, layer-backed view
+  UIView *container = [[RCTUIView alloc] init];  // [macOS] needs a flipped, layer-backed view
   container.translatesAutoresizingMaskIntoConstraints = NO;
   container.backgroundColor = RCTRedBox2BackgroundColor();
   container.layer.cornerRadius = 3;
@@ -689,7 +689,7 @@ static const NSTimeInterval kAutoRetryInterval = 20.0;
 
 - (UIView *)sectionHeaderViewWithTitle:(NSString *)title
 {
-  UIView *headerView = [[RCTPlatformView alloc] initWithFrame:CGRectMake(0, 0, 0, 38)];  // [macOS] needs a flipped, layer-backed view
+  UIView *headerView = [[RCTUIView alloc] initWithFrame:CGRectMake(0, 0, 0, 38)];  // [macOS] needs a flipped, layer-backed view
   headerView.backgroundColor = [UIColor clearColor];
 
   UILabel *label = [[UILabel alloc] init];

package/React/CoreModules/RCTRedBoxController.mm

@@ -160,7 +160,7 @@
     [buttonStackView addArrangedSubview:button];
   }
 
-  UIView *topBorder = [[RCTPlatformView alloc] init];  // [macOS] needs a flipped, layer-backed view
+  UIView *topBorder = [[RCTUIView alloc] init];  // [macOS] needs a flipped, layer-backed view
   topBorder.translatesAutoresizingMaskIntoConstraints = NO;
   topBorder.backgroundColor = [UIColor colorWithRed:0.70 green:0.70 blue:0.70 alpha:1.0];
   [topBorder.heightAnchor constraintEqualToConstant:1].active = YES;
@@ -364,7 +364,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
     cell.detailTextLabel.font = [UIFont fontWithName:@"Menlo-Regular" size:11];
     cell.detailTextLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
     cell.backgroundColor = [UIColor clearColor];
-    cell.selectedBackgroundView = [RCTPlatformView new];  // [macOS] needs a flipped, layer-backed view
+    cell.selectedBackgroundView = [RCTUIView new];  // [macOS] needs a flipped, layer-backed view
     cell.selectedBackgroundView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.2];
   }
 

package/React/CoreModules/React-CoreModules.podspec

@@ -34,12 +34,6 @@ Pod::Spec.new do |s|
 
   s.source_files           = podspec_sources("**/*.{c,m,mm,cpp}", "**/*.h")
 
-  # [macOS] The macOS build does not ship these; see
-
-  # macos/UIKitCompat/macos-excludes.txt, which this reads.
-
-  s.osx.exclude_files = macos_excluded_files.map { |p| p.sub('React/CoreModules/', '') }
-
   s.ios.exclude_files      = "PlatformStubs/**/*"
   exclude_files            = ["RCTStatusBarManager.mm"]
   s.macos.exclude_files    = exclude_files