fix: remove view config mismatches (#2642)

Author: Saadnajmi

packages/react-native/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js

@@ -20,7 +20,11 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
   uiViewClassName: 'RCTScrollContentView',
   bubblingEventTypes: {},
   directEventTypes: {},
-  validAttributes: {},
+  // [macOS
+  validAttributes: {
+    inverted: true,
+  },
+  // macOS]
 };
 
 const ScrollContentViewNativeComponent: HostComponent<Props> =

packages/react-native/Libraries/Components/ScrollView/ScrollViewNativeComponent.js

@@ -114,6 +114,16 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
           topScrollToTop: {
             registrationName: 'onScrollToTop',
           },
+          // [macOS
+          ...(Platform.OS === 'macos' && {
+            topPreferredScrollerStyleDidChange: {
+              registrationName: 'onPreferredScrollerStyleDidChange',
+            },
+            topInvertedDidChange: {
+              registrationName: 'onInvertedDidChange',
+            },
+          }),
+          // macOS]
         },
         validAttributes: {
           alwaysBounceHorizontal: true,

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

@@ -92,6 +92,9 @@ const RCTTextInputViewConfig = {
       registrationName: 'onKeyPressSync',
     },
     // [macOS
+    topPaste: {
+      registrationName: 'onPaste',
+    },
     topAutoCorrectChange: {
       registrationName: 'onAutoCorrectChange',
     },
@@ -182,6 +185,7 @@ const RCTTextInputViewConfig = {
       onChangeSync: true,
       onKeyPressSync: true,
       // [macOS
+      onSubmitEditing: true,
       onPaste: true,
       onAutoCorrectChange: true,
       onSpellCheckChange: true,

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

@@ -106,7 +106,7 @@ function focusTextInput(textField: ?HostInstance) {
       // [macOS currentlyFocusedInputRef does not account for the fact that any arbritrary view can
       // recieve focus on desktop. https://github.com/facebook/react-native/pull/52472/ fixes this,
       // disable the check for now
-      // currentlyFocusedInputRef !== textField &&
+      (Platform.OS === 'macos' || currentlyFocusedInputRef !== textField) &&
       // macOS]
       // $FlowFixMe - `currentProps` is missing in `NativeMethods`
       textField.currentProps?.editable !== false;

packages/react-native/React/Base/RCTUIKit.h

@@ -447,10 +447,6 @@ CGPathRef UIBezierPathCreateCGPathRef(UIBezierPath *path);
 @property (nonatomic, copy) RCTDirectEventBlock onDragLeave;
 @property (nonatomic, copy) RCTDirectEventBlock onDrop;
 
-// Focus events
-@property (nonatomic, copy) RCTBubblingEventBlock onBlur;
-@property (nonatomic, copy) RCTBubblingEventBlock onFocus;
-
 @property (nonatomic, copy) RCTBubblingEventBlock onResponderGrant;
 @property (nonatomic, copy) RCTBubblingEventBlock onResponderMove;
 @property (nonatomic, copy) RCTBubblingEventBlock onResponderRelease;

packages/react-native/React/Views/RCTView.h

@@ -162,6 +162,9 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait;
  * macOS Properties
  */
 
+@property (nonatomic, copy) RCTBubblingEventBlock onFocus;
+@property (nonatomic, copy) RCTBubblingEventBlock onBlur;
+
 // `allowsVibrancy` is readonly on NSView, so let's create a new property to make it assignable
 // that we can set through JS and the getter for `allowsVibrancy` can read in RCTView.
 @property (nonatomic, assign) BOOL allowsVibrancyInternal;
@@ -176,16 +179,10 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait;
 @property (nonatomic, copy) NSArray<RCTHandledKey*> *keyUpEvents;
 
 // Shadow Properties
-@property (nonatomic, strong) NSColor *shadowColor;
+@property (nonatomic, assign) CGColorRef shadowColor;
 @property (nonatomic, assign) CGFloat shadowOpacity;
 @property (nonatomic, assign) CGFloat shadowRadius;
 @property (nonatomic, assign) CGSize shadowOffset;
 #endif // macOS]
 
-/**
- * Common Focus Properties
- */
-@property (nonatomic, copy) RCTBubblingEventBlock onFocus;
-@property (nonatomic, copy) RCTBubblingEventBlock onBlur;
-
 @end

packages/react-native/React/Views/RCTView.m

@@ -725,7 +725,7 @@ - (NSString *)description
 }
 
 #if TARGET_OS_OSX // [macOS
-- (void)setShadowColor:(NSColor *)shadowColor
+- (void)setShadowColor:(CGColorRef)shadowColor
 {
     if (_shadowColor != shadowColor)
     {
@@ -764,7 +764,8 @@ - (void)setShadowRadius:(CGFloat)shadowRadius
 -(void)didUpdateShadow
 {
     NSShadow *shadow = [NSShadow new];
-    shadow.shadowColor = [[self shadowColor] colorWithAlphaComponent:[self shadowOpacity]];
+    NSColor *baseShadowColor = [NSColor colorWithCGColor:_shadowColor];
+    shadow.shadowColor = [baseShadowColor colorWithAlphaComponent:[self shadowOpacity]];
     shadow.shadowOffset = [self shadowOffset];
     shadow.shadowBlurRadius = [self shadowRadius];
     [self setShadow:shadow];

packages/react-native/React/Views/RCTViewManager.m

@@ -254,7 +254,7 @@ - (RCTShadowView *)shadowView
 RCT_REMAP_VIEW_PROPERTY(shadowOpacity, layer.shadowOpacity, float)
 RCT_REMAP_VIEW_PROPERTY(shadowRadius, layer.shadowRadius, CGFloat)
 #else // [macOS
-RCT_EXPORT_VIEW_PROPERTY(shadowColor, NSColor)
+RCT_EXPORT_VIEW_PROPERTY(shadowColor, CGColor)
 RCT_EXPORT_VIEW_PROPERTY(shadowOffset, CGSize)
 RCT_EXPORT_VIEW_PROPERTY(shadowOpacity, CGFloat)
 RCT_EXPORT_VIEW_PROPERTY(shadowRadius, CGFloat)
@@ -634,15 +634,13 @@ - (void) updateAccessibilityRole:(RCTView *)view withDefaultView:(RCTView *)defa
 RCT_REMAP_VIEW_PROPERTY(display, reactDisplay, YGDisplay)
 RCT_REMAP_VIEW_PROPERTY(zIndex, reactZIndex, NSInteger)
 
-// [macOS
-RCT_EXPORT_VIEW_PROPERTY(onFocus, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onBlur, RCTBubblingEventBlock)
-// macOS]
-
-
 #if TARGET_OS_OSX // [macOS
+
 #pragma mark - macOS properties
 
+RCT_EXPORT_VIEW_PROPERTY(onFocus, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onBlur, RCTBubblingEventBlock)
+
 RCT_EXPORT_VIEW_PROPERTY(onMouseEnter, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMouseLeave, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onDragEnter, RCTDirectEventBlock)