feat(fabric): merge the rest of relevant changes from meta/pristine

packages/react-native/Libraries/Components/TextInput/TextInput.js

@@ -137,11 +137,9 @@ export type TextInputEditingEvent =
 
 // [macOS macOS-only
 export type SettingChangeEvent = NativeSyntheticEvent<
-  $ReadOnly<{|
-    autoCorrectEnabled: boolean,
-    spellCheckEnabled: boolean,
-    grammarCheckEnabled: boolean,
-  |}>,
+  $ReadOnly<{
+    enabled: boolean,
+  }>,
 >;
 
 export type PasteEvent = NativeSyntheticEvent<
@@ -150,14 +148,14 @@ export type PasteEvent = NativeSyntheticEvent<
   |}>,
 >;
 
-export type SubmitKeyEvent = $ReadOnly<{|
+export type SubmitKeyEvent = $ReadOnly<{
   key: string,
   altKey?: ?boolean,
   ctrlKey?: ?boolean,
   metaKey?: ?boolean,
   shiftKey?: ?boolean,
   functionKey?: ?boolean,
-|}>;
+}>;
 // macOS]
 
 // [macOS
@@ -443,7 +441,7 @@ export type TextInputIOSProps = $ReadOnly<{
 }>;
 
 // [macOS
-type MacOSProps = $ReadOnly<{|
+export type TextInputMacOSProps = $ReadOnly<{
   /**
    * If `true`, clears the text field synchronously before `onSubmitEditing` is emitted.
    *
@@ -528,7 +526,7 @@ type MacOSProps = $ReadOnly<{|
    * @platform macos
    */
   tooltip?: ?string,
-|}>;
+}>;
 // macOS]
 
 export type TextInputAndroidProps = $ReadOnly<{
@@ -624,7 +622,7 @@ export type PastedTypesType = PasteType | $ReadOnlyArray<PasteType>; // [macOS]
 export type TextInputProps = $ReadOnly<{
   ...$Diff<ViewProps, $ReadOnly<{style: ?ViewStyleProp}>>,
   ...TextInputIOSProps,
-  ...MacOSProps, // [macOS]
+  ...TextInputMacOSProps, // [macOS]
   ...TextInputAndroidProps,
 
   /**
@@ -2043,6 +2041,7 @@ const autoCompleteWebToTextContentTypeMap = {
 const ExportedForwardRef: component(
   ref: React.RefSetter<TextInputInstance>,
   ...props: React.ElementConfig<typeof InternalTextInput>
+  // $FlowFixMe[incompatible-call]
 ) = React.forwardRef(function TextInput(
   {
     allowFontScaling = true,

packages/react-native/Libraries/Components/View/DraggedType.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Microsoft Corporation.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

packages/react-native/Libraries/Image/RCTImageLoader.mm

@@ -629,14 +629,23 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
     [self setUp];
   }
 
+#if TARGET_OS_OSX // [macOS
+  BOOL useDefaultLoading = [loadHandler respondsToSelector:@selector(defaultLoadingURL:)];
+  if (useDefaultLoading) {
+    NSMutableURLRequest *updatedRequest = [request mutableCopy];
+    updatedRequest.URL = [loadHandler defaultLoadingURL:request.URL];
+    request = updatedRequest;
+  }
+#endif // macOS]
+
   __weak RCTImageLoader *weakSelf = self;
   dispatch_async(_URLRequestQueue, ^{
     __typeof(self) strongSelf = weakSelf;
     if (atomic_load(cancelled.get()) || !strongSelf) {
       return;
     }
 
-    if (loadHandler) {
+    if (loadHandler && !useDefaultLoading) { // [macOS]
       dispatch_block_t cancelLoadLocal;
       if ([loadHandler conformsToProtocol:@protocol(RCTImageURLLoaderWithAttribution)]) {
         RCTImageURLLoaderRequest *loaderRequest = [(id<RCTImageURLLoaderWithAttribution>)loadHandler

packages/react-native/Libraries/Image/RCTImageURLLoader.h

@@ -78,6 +78,14 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
  */
 - (BOOL)shouldCacheLoadedImages;
 
+#if TARGET_OS_OSX // [macOS
+/**
+ * If defined, the image loading of the RCTImageLoader will be used to load the image using
+ * the returned URL. This allows rewriting the URL before the image loader starts the request.
+ */
+- (NSURL *)defaultLoadingURL:(NSURL *)requestURL;
+#endif // macOS]
+
 @end
 
 NS_ASSUME_NONNULL_END

packages/react-native/Libraries/Image/RCTImageView.mm

@@ -144,6 +144,9 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _bridge = bridge;
 #if TARGET_OS_OSX // [macOS
     self.wantsLayer = YES;
+    _resizeMode = RCTResizeModeCover;
+    _imageView.contentMode = (UIViewContentMode)RCTResizeModeCover;
+    [_imageView unregisterDraggedTypes];
 #endif // macOS]
     _imageView = [RCTUIImageViewAnimated new];
     _imageView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
@@ -195,10 +198,6 @@ - (void)updateWithImage:(UIImage *)image
 #else // [macOS
     image.capInsets = _capInsets;
     image.resizingMode = NSImageResizingModeTile;
-  } else if (_resizeMode == RCTResizeModeCover) {
-    if (!NSEqualSizes(self.bounds.size, NSZeroSize)) {
-      image = RCTFillImagePreservingAspectRatio(image, self.bounds.size, self.window.backingScaleFactor ?: 1.0);
-    }
 #endif // macOS]
   } else if (!UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, _capInsets)) {
     // Applying capInsets of 0 will switch the "resizingMode" of the image to "tile" which is undesired
@@ -284,21 +283,9 @@ - (void)setResizeMode:(RCTResizeMode)resizeMode
     if (_resizeMode == RCTResizeModeRepeat) {
       // Repeat resize mode is handled by the UIImage. Use scale to fill
       // so the repeated image fills the UIImageView.
-#if !TARGET_OS_OSX // [macOS]
       _imageView.contentMode = UIViewContentModeScaleToFill;
-#else // [macOS
-      _imageView.imageScaling = NSImageScaleAxesIndependently;
-#endif // macOS]
     } else {
-#if !TARGET_OS_OSX // [macOS]
       _imageView.contentMode = (UIViewContentMode)resizeMode;
-#else // [macOS
-      // This relies on having previously resampled the image to a size that exceeds the image view.
-      if (resizeMode == RCTResizeModeCover) {
-        resizeMode = RCTResizeModeCenter;
-      }
-      _imageView.imageScaling = (NSImageScaling)resizeMode;
-#endif // macOS]
     }
 
     if ([self shouldReloadImageSourceAfterResize]) {
@@ -566,7 +553,7 @@ - (void)reactSetFrame:(CGRect)frame
          !RCTShouldReloadImageForSizeChange(_targetSize, idealSize)) // [macOS
 #if TARGET_OS_OSX
          // Since macOS doen't support UIViewContentModeScaleAspectFill, we have to manually resample the image
-         // If we're in cover mode we need to ensure that the image is re-sampled to the correct size when the container size (shrinking 
+         // If we're in cover mode we need to ensure that the image is re-sampled to the correct size when the container size (shrinking
          // being the most obvious case) otherwise we will end up in a state an image will not properly scale inside its container
          && (RCTResizeModeFromUIViewContentMode(_imageView.contentMode) != RCTResizeModeCover ||
             (imageSize.width == idealSize.width && imageSize.height == idealSize.height))
@@ -617,13 +604,13 @@ - (void)didMoveToWindow
     [self reloadImage];
   }
 }
-    
+
 #if TARGET_OS_OSX // [macOS
 - (void)viewDidChangeBackingProperties
 {
   [self reloadImage];
 }
-  
+
 - (RCTPlatformView *)reactAccessibilityElement
 {
   return _imageView;

packages/react-native/Libraries/Image/RCTResizeMode.h

@@ -8,21 +8,12 @@
 #import <React/RCTConvert.h>
 
 typedef NS_ENUM(NSInteger, RCTResizeMode) {
-#if !TARGET_OS_OSX // [macOS]
   RCTResizeModeCover = UIViewContentModeScaleAspectFill,
   RCTResizeModeContain = UIViewContentModeScaleAspectFit,
   RCTResizeModeStretch = UIViewContentModeScaleToFill,
   RCTResizeModeCenter = UIViewContentModeCenter,
-  RCTResizeModeRepeat = -1, // Use negative values to avoid
   RCTResizeModeNone = UIViewContentModeTopLeft,
-#else // [macOS
-  RCTResizeModeCover = -2, // Not supported by NSImageView
-  RCTResizeModeContain = NSImageScaleProportionallyUpOrDown,
-  RCTResizeModeStretch = NSImageScaleAxesIndependently,
-  RCTResizeModeCenter = -3, // assumes NSImageAlignmentCenter
-  RCTResizeModeRepeat = -1,
-  RCTResizeModeNone = NSImageScaleNone,
-#endif // macOS]
+  RCTResizeModeRepeat = -1, // Use negative values to avoid conflicts with iOS enum values.
 };
 
 static inline RCTResizeMode RCTResizeModeFromUIViewContentMode(UIViewContentMode mode)

packages/react-native/Libraries/NativeComponent/BaseViewConfig.macos.js

@@ -34,6 +34,9 @@ const bubblingEventTypes = {
 
 const directEventTypes = {
   ...PlatformBaseViewConfigIos.directEventTypes,
+  topDoubleClick: {
+    registrationName: 'onDoubleClick',
+  },
   topDragEnter: {
     registrationName: 'onDragEnter',
   },
@@ -67,6 +70,7 @@ const validAttributesForNonEventProps = {
 
 // Props for bubbling and direct events
 const validAttributesForEventProps = ConditionallyIgnoredEventHandlers({
+  onDoubleClick: true,
   onBlur: true,
   onDragEnter: true,
   onDragLeave: true,

packages/react-native/Libraries/StyleSheet/PlatformColorValueTypesMacOS.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Microsoft Corporation.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

packages/react-native/Libraries/StyleSheet/PlatformColorValueTypesMacOS.macos.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Microsoft Corporation.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,11 +14,6 @@
 
 import type {ColorValue} from './StyleSheet';
 
-import {
-  ColorWithSystemEffectMacOSPrivate,
-  DynamicColorMacOSPrivate,
-} from './PlatformColorValueTypes.macos';
-
 export type DynamicColorMacOSTuple = {
   light: ColorValue,
   dark: ColorValue,
@@ -29,12 +24,7 @@ export type DynamicColorMacOSTuple = {
 export const DynamicColorMacOS = (
   tuple: DynamicColorMacOSTuple,
 ): ColorValue => {
-  return DynamicColorMacOSPrivate({
-    light: tuple.light,
-    dark: tuple.dark,
-    highContrastLight: tuple.highContrastLight,
-    highContrastDark: tuple.highContrastDark,
-  });
+  throw new Error('DynamicColorMacOS is not available on this platform.');
 };
 
 export type SystemEffectMacOS =
@@ -48,5 +38,7 @@ export const ColorWithSystemEffectMacOS = (
   color: ColorValue,
   effect: SystemEffectMacOS,
 ): ColorValue => {
-  return ColorWithSystemEffectMacOSPrivate(color, effect);
+  throw new Error(
+    'ColorWithSystemEffectMacOS is not available on this platform.',
+  );
 };

packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm

@@ -60,6 +60,7 @@ - (RCTShadowView *)shadowView
 
 #if TARGET_OS_OSX // [macOS
 RCT_REMAP_SHADOW_PROPERTY(cursor, textAttributes.cursor, RCTCursor)
+RCT_REMAP_SHADOW_PROPERTY(href, textAttributes.href, NSString)
 #endif // macOS]
 
 @end

packages/react-native/Libraries/Text/RCTTextAttributes.h

@@ -61,6 +61,7 @@ extern NSString *const RCTTextAttributesTagAttributeName;
 
 #if TARGET_OS_OSX // [macOS
 @property (nonatomic, assign) RCTCursor cursor;
+@property (nonatomic, copy, nullable) NSString *href;
 #endif // macOS]
 
 #pragma mark - Inheritance

packages/react-native/Libraries/Text/RCTTextAttributes.mm

@@ -111,6 +111,7 @@ - (void)applyTextAttributes:(RCTTextAttributes *)textAttributes
       textAttributes->_textTransform != RCTTextTransformUndefined ? textAttributes->_textTransform : _textTransform;
 #if TARGET_OS_OSX // [macOS
   _cursor = textAttributes->_cursor != RCTCursorAuto ? textAttributes->_cursor : _cursor;
+  _href = textAttributes->_href ?: _href;
 #endif // macOS]
 }
 
@@ -237,6 +238,9 @@ - (NSParagraphStyle *)effectiveParagraphStyle
   if (_cursor != RCTCursorAuto) {
     attributes[NSCursorAttributeName] = NSCursorFromRCTCursor(_cursor);
   }
+  if (_href) {
+    attributes[NSLinkAttributeName] = [RCTConvert NSURL:_href];
+  }
 #endif // macOS]
 
   return [attributes copy];

packages/react-native/Libraries/Text/Text/RCTTextView.h

@@ -12,7 +12,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#if !TARGET_OS_OSX // [macOS]
 @interface RCTTextView : RCTUIView // [macOS]
+#else // [macOS
+@interface RCTTextView : RCTUIView <ExtensibleNativeMenuProtocol>
+#endif // macOS]
 
 - (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher; // [macOS]