[DRAFT] feat(fabric): merge the rest of the fabric core fixes branch

packages/react-native/Libraries/Text/TextInput/Multiline/RCTWrappedTextView.h

@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+#if TARGET_OS_OSX // [macOS
+
+#import <React/RCTUIKit.h>
+
+#import "RCTTextUIKit.h"
+
+#import <React/RCTBackedTextInputDelegate.h>
+#import <React/RCTBackedTextInputViewProtocol.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTWrappedTextView : RCTPlatformView <RCTBackedTextInputViewProtocol>
+
+@property (nonatomic, weak) id<RCTBackedTextInputDelegate> textInputDelegate;
+@property (assign) BOOL hideVerticalScrollIndicator;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // macOS]

packages/react-native/Libraries/Text/TextInput/Multiline/RCTWrappedTextView.m

@@ -0,0 +1,221 @@
+/*
+ * 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.
+ */
+
+#if TARGET_OS_OSX // [macOS
+
+#import <React/RCTWrappedTextView.h>
+
+#import <React/RCTUITextView.h>
+#import <React/RCTTextAttributes.h>
+
+@implementation RCTWrappedTextView {
+  RCTUITextView *_forwardingTextView;
+  RCTUIScrollView *_scrollView;
+  RCTClipView *_clipView;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+
+    self.hideVerticalScrollIndicator = NO;
+
+    _scrollView = [[RCTUIScrollView alloc] initWithFrame:self.bounds];
+    _scrollView.backgroundColor = [RCTUIColor clearColor];
+    _scrollView.drawsBackground = NO;
+    _scrollView.borderType = NSNoBorder;
+    _scrollView.hasHorizontalRuler = NO;
+    _scrollView.hasVerticalRuler = NO;
+    _scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    [_scrollView setHasVerticalScroller:YES];
+    [_scrollView setHasHorizontalScroller:NO];
+
+    _clipView = [[RCTClipView alloc] initWithFrame:_scrollView.bounds];
+    [_scrollView setContentView:_clipView];
+
+    _forwardingTextView = [[RCTUITextView alloc] initWithFrame:_scrollView.bounds];
+    _forwardingTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    _forwardingTextView.delegate = self;
+
+    _forwardingTextView.verticallyResizable = YES;
+    _forwardingTextView.horizontallyResizable = YES;
+    _forwardingTextView.textContainer.containerSize = NSMakeSize(FLT_MAX, FLT_MAX);
+    _forwardingTextView.textContainer.widthTracksTextView = YES;
+    _forwardingTextView.textInputDelegate = self;
+
+    _scrollView.documentView = _forwardingTextView;
+    _scrollView.contentView.postsBoundsChangedNotifications = YES;
+
+    // Enable the focus ring by default
+    _scrollView.enableFocusRing = YES;
+    [self addSubview:_scrollView];
+
+    // a register for those notifications on the content view.
+  #if !TARGET_OS_OSX // [macOS]
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(boundsDidChange:)
+                                                 name:NSViewBoundsDidChangeNotification
+                                               object:_scrollView.contentView];
+  #else // [macOS
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(scrollViewDidScroll:)
+                                                 name:NSViewBoundsDidChangeNotification
+                                               object:_scrollView.contentView];
+  #endif // macOS]
+  }
+
+  return self;
+}
+
+- (void)dealloc
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (BOOL)isFlipped
+{
+  return YES;
+}
+
+#pragma mark -
+#pragma mark Method forwarding to text view
+
+- (void)forwardInvocation:(NSInvocation *)invocation
+{
+  [invocation invokeWithTarget:_forwardingTextView];
+}
+
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)selector
+{
+  if ([_forwardingTextView respondsToSelector:selector]) {
+    return [_forwardingTextView methodSignatureForSelector:selector];
+  }
+
+  return [super methodSignatureForSelector:selector];
+}
+
+- (void)boundsDidChange:(NSNotification *)notification
+{
+}
+
+#pragma mark -
+#pragma mark First Responder forwarding
+
+- (NSResponder *)responder
+{
+  return _forwardingTextView;
+}
+
+- (BOOL)acceptsFirstResponder
+{
+  return _forwardingTextView.acceptsFirstResponder;
+}
+
+- (BOOL)becomeFirstResponder
+{
+  return [_forwardingTextView becomeFirstResponder];
+}
+
+- (BOOL)resignFirstResponder
+{
+  return [_forwardingTextView resignFirstResponder];
+}
+
+#pragma mark -
+#pragma mark Text Input delegate forwarding
+
+- (id<RCTBackedTextInputDelegate>)textInputDelegate
+{
+  return _forwardingTextView.textInputDelegate;
+}
+
+- (void)setTextInputDelegate:(id<RCTBackedTextInputDelegate>)textInputDelegate
+{
+  _forwardingTextView.textInputDelegate = textInputDelegate;
+}
+
+#pragma mark -
+#pragma mark Scrolling control
+
+#if TARGET_OS_OSX // [macOS
+- (void)scrollViewDidScroll:(NSNotification *)notification
+{
+  [self.textInputDelegate scrollViewDidScroll:_scrollView];
+}
+#endif // macOS]
+
+- (BOOL)scrollEnabled
+{
+  return _scrollView.isScrollEnabled;
+}
+
+- (void)setScrollEnabled:(BOOL)scrollEnabled
+{
+  if (scrollEnabled) {
+    _scrollView.scrollEnabled = YES;
+    [_clipView setConstrainScrolling:NO];
+  } else {
+    _scrollView.scrollEnabled = NO;
+    [_clipView setConstrainScrolling:YES];
+  }
+}
+
+- (BOOL)shouldShowVerticalScrollbar
+{
+  // Hide vertical scrollbar if explicity set to NO
+  if (self.hideVerticalScrollIndicator) {
+    return NO;
+  }
+
+  // Hide vertical scrollbar if attributed text overflows view
+  CGSize textViewSize = [_forwardingTextView intrinsicContentSize];
+  NSClipView *clipView = (NSClipView *)_scrollView.contentView;
+  if (textViewSize.height > clipView.bounds.size.height) {
+    return YES;
+  };
+
+  return NO;
+}
+
+- (void)textInputDidChange
+{
+  [_scrollView setHasVerticalScroller:[self shouldShowVerticalScrollbar]];
+}
+
+- (void)setAttributedText:(NSAttributedString *)attributedText
+{
+  [_forwardingTextView setAttributedText:attributedText];
+  [_scrollView setHasVerticalScroller:[self shouldShowVerticalScrollbar]];
+}
+
+#pragma mark -
+#pragma mark Text Container Inset override for NSTextView
+
+// This method is there to match the textContainerInset property on RCTUITextField
+- (void)setTextContainerInset:(UIEdgeInsets)textContainerInsets
+{
+  // RCTUITextView has logic in setTextContainerInset[s] to convert th UIEdgeInsets to a valid NSSize struct
+  _forwardingTextView.textContainerInsets = textContainerInsets;
+}
+
+#pragma mark -
+#pragma mark Focus ring
+
+- (BOOL)enableFocusRing
+{
+  return _scrollView.enableFocusRing;
+}
+
+- (void)setEnableFocusRing:(BOOL)enableFocusRing 
+{
+  _scrollView.enableFocusRing = enableFocusRing;
+}
+
+@end
+
+#endif // macOS]

packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm

@@ -398,17 +398,17 @@ - (void)textViewDidChangeSelection:(__unused UITextView *)textView
   [self textViewProbablyDidChangeSelection];
 }
 
+#endif // [macOS]
+
 #pragma mark - UIScrollViewDelegate
 
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+- (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView // [macOS]
 {
   if ([_backedTextInputView.textInputDelegate respondsToSelector:@selector(scrollViewDidScroll:)]) {
     [_backedTextInputView.textInputDelegate scrollViewDidScroll:scrollView];
   }
 }
 
-#endif // [macOS]
-
 #if TARGET_OS_OSX // [macOS
 
 #pragma mark - NSTextViewDelegate

packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h

@@ -38,6 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign, readonly) BOOL textWasPasted;
 #else // [macOS
 @property (nonatomic, assign) BOOL textWasPasted;
+@property (nonatomic, readonly) NSResponder *responder;
+@property (nonatomic, assign) BOOL enableFocusRing;
 #endif // macOS]
 @property (nonatomic, assign, readonly) BOOL dictationRecognizing;
 @property (nonatomic, assign) UIEdgeInsets textContainerInset;
@@ -88,6 +90,7 @@ NS_ASSUME_NONNULL_BEGIN
 #if TARGET_OS_OSX // [macOS
 // UITextInput method for OSX
 - (CGSize)sizeThatFits:(CGSize)size;
+- (void)setReadablePasteBoardTypes:(NSArray<NSPasteboardType> *)readablePasteboardTypes;
 #endif // macOS]
 
 // This protocol disallows direct access to `text` property because

packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.h

@@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 #if !TARGET_OS_OSX // [macOS]
 @property (nonatomic, assign, getter=isEditable) BOOL editable;
 #else // [macOS
-@property (assign, getter=isEditable) BOOL editable;
+@property (atomic, assign, getter=isEditable) BOOL editable;
 #endif // macOS]
 @property (nonatomic, getter=isScrollEnabled) BOOL scrollEnabled;
 @property (nonatomic, strong, nullable) NSString *inputAccessoryViewID;
@@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN
 #if TARGET_OS_OSX // [macOS
 @property (nonatomic, copy, nullable) NSString *text;
 @property (nonatomic, copy, nullable) NSAttributedString *attributedText;
-@property (nonatomic, copy) NSDictionary<NSAttributedStringKey, id> *defaultTextAttributes;
+@property (nonatomic, strong, nullable) NSDictionary<NSAttributedStringKey, id> *defaultTextAttributes;
 @property (nullable, nonatomic, copy) NSDictionary<NSAttributedStringKey, id> *typingAttributes;
 @property (nonatomic, assign) NSTextAlignment textAlignment;
 @property (nonatomic, getter=isAutomaticTextReplacementEnabled) BOOL automaticTextReplacementEnabled;
@@ -69,6 +69,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, nullable) RCTUIColor *selectionColor;
 @property (weak, nullable) id<RCTUITextFieldDelegate> delegate;
 @property (nonatomic, assign) CGFloat pointScaleFactor;
+
+- (void)setReadablePasteBoardTypes:(NSArray<NSPasteboardType> *)readablePasteboardTypes;
 #endif // macOS]
 
 @property (nonatomic, getter=isGhostTextChanging) BOOL ghostTextChanging; // [macOS]

packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm

@@ -99,6 +99,7 @@ @implementation RCTUITextField {
 #endif // [macOS]
 #if TARGET_OS_OSX // [macOS
   BOOL _isUpdatingPlaceholderText;
+  NSArray<NSPasteboardType> *_readablePasteboardTypes;
 #endif // macOS]
 }
 
@@ -216,6 +217,11 @@ - (void)setTextContainerInset:(UIEdgeInsets)textContainerInset
 
 #if TARGET_OS_OSX // [macOS
 
+- (NSResponder *)responder
+{
+  return self;
+}
+
 + (Class)cellClass
 {
   return RCTUITextFieldCell.class;
@@ -705,5 +711,12 @@ - (void)keyUp:(NSEvent *)event {
   }
 }
 #endif // macOS]
+
+#if TARGET_OS_OSX // [macOS
+- (void)setReadablePasteBoardTypes:(NSArray<NSPasteboardType> *)readablePasteboardTypes
+{
+  _readablePasteboardTypes = readablePasteboardTypes;
+}
+#endif // macOS]
 
 @end

packages/react-native/React/Base/macOS/RCTUIKit.m

@@ -182,6 +182,7 @@ @implementation RCTUIView
   BOOL _userInteractionEnabled;
   NSTrackingArea *_trackingArea;
   BOOL _mouseDownCanMoveWindow;
+  BOOL _respondsToDisplayLayer;
 }
 
 + (NSSet<NSString *> *)keyPathsForValuesAffectingValueForKey:(NSString *)key
@@ -211,6 +212,7 @@ @implementation RCTUIView
     self->_userInteractionEnabled = YES;
     self->_enableFocusRing = YES;
     self->_mouseDownCanMoveWindow = YES;
+    self->_respondsToDisplayLayer = [self respondsToSelector:@selector(displayLayer:)];
   }
   return self;
 }
@@ -474,7 +476,12 @@ - (void)updateLayer
     // so it has to be reset from the view's NSColor ivar.
     [layer setBackgroundColor:[_backgroundColor CGColor]];
   }
-  [(id<CALayerDelegate>)self displayLayer:layer];
+
+  // In Fabric, wantsUpdateLayer is always enabled and doesn't guarantee that
+  // the instance has a displayLayer method.
+  if (_respondsToDisplayLayer) {
+    [(id<CALayerDelegate>)self displayLayer:layer];
+  }
 }
 
 - (void)drawRect:(CGRect)rect