Merge branch 'main' into more-2

Author: Saadnajmi

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

@@ -71,11 +71,6 @@ - (instancetype)initWithFrame:(CGRect)frame
   return self;
 }
 
-- (void)dealloc
-{
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
 - (BOOL)isFlipped
 {
   return YES;
@@ -155,13 +150,8 @@ - (BOOL)scrollEnabled
 
 - (void)setScrollEnabled:(BOOL)scrollEnabled
 {
-  if (scrollEnabled) {
-    _scrollView.scrollEnabled = YES;
-    [_clipView setConstrainScrolling:NO];
-  } else {
-    _scrollView.scrollEnabled = NO;
-    [_clipView setConstrainScrolling:YES];
-  }
+  _scrollView.scrollEnabled = scrollEnabled;
+  [_clipView setConstrainScrolling:!scrollEnabled];
 }
 
 - (BOOL)shouldShowVerticalScrollbar

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

@@ -129,6 +129,7 @@ @implementation RCTUIView
   BOOL _clipsToBounds;
   BOOL _userInteractionEnabled;
   BOOL _mouseDownCanMoveWindow;
+  BOOL _respondsToDisplayLayer;
 }
 
 + (NSSet<NSString *> *)keyPathsForValuesAffectingValueForKey:(NSString *)key
@@ -158,6 +159,7 @@ @implementation RCTUIView
     self->_userInteractionEnabled = YES;
     self->_enableFocusRing = YES;
     self->_mouseDownCanMoveWindow = YES;
+    self->_respondsToDisplayLayer = [self respondsToSelector:@selector(displayLayer:)];
   }
   return self;
 }
@@ -259,7 +261,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

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -2025,6 +2025,11 @@ - (NSString *)componentViewName_DO_NOT_USE_THIS_IS_BROKEN
   return RCTNSStringFromString([[self class] componentDescriptorProvider].name);
 }
 
+- (BOOL)wantsUpdateLayer
+{
+  return YES;
+}
+
 @end
 
 #ifdef __cplusplus