WIP - Fabric ScrollContentView 0_73

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

@@ -8,25 +8,18 @@
  * @flow
  */
 
-import type {
-  HostComponent,
-  PartialViewConfig,
-} from '../../Renderer/shims/ReactNativeTypes';
-import type {ViewProps as Props} from '../View/ViewPropTypes';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
 
-import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
+import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
 
-export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
-  uiViewClassName: 'RCTScrollContentView',
-  bubblingEventTypes: {},
-  directEventTypes: {},
-  validAttributes: {},
-};
+type NativeProps = $ReadOnly<{|
+  ...ViewProps,
+  inverted?: ?boolean,
+|}>;
 
-const ScrollContentViewNativeComponent: HostComponent<Props> =
-  NativeComponentRegistry.get<Props>(
-    'RCTScrollContentView',
-    () => __INTERNAL_VIEW_CONFIG,
-  );
-
-export default ScrollContentViewNativeComponent;
+export default (codegenNativeComponent<NativeProps>('ScrollContentView', {
+  paperComponentName: 'RCTScrollContentView',
+  excludedPlatforms: ['android'],
+  interfaceOnly: true,
+}): HostComponent<NativeProps>);

packages/react-native/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h

@@ -36,6 +36,9 @@ Class<RCTComponentViewProtocol> RCTParagraphCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTPullToRefreshViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTSafeAreaViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTScrollViewCls(void) __attribute__((used));
+#if TARGET_OS_OSX // [macOS
+Class<RCTComponentViewProtocol> RCTScrollContentViewCls(void) __attribute__((used));
+#endif // macOS]
 Class<RCTComponentViewProtocol> RCTSwitchCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTTextInputCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTUnimplementedNativeViewCls(void) __attribute__((used));

packages/react-native/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm

@@ -24,6 +24,9 @@
     {"PullToRefreshView", RCTPullToRefreshViewCls},
     {"SafeAreaView", RCTSafeAreaViewCls},
     {"ScrollView", RCTScrollViewCls},
+#if TARGET_OS_OSX // [macOS
+    {"ScrollContentView", RCTScrollContentViewCls},
+#endif // macOS]
     {"Switch", RCTSwitchCls},
     {"TextInput", RCTTextInputCls},
     {"UnimplementedNativeView", RCTUnimplementedNativeViewCls},

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollContentComponentView.h

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+#import <React/RCTUIKit.h> // [macOS]
+
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTScrollContentComponentView : RCTViewComponentView
+
+@property (nonatomic, assign, getter=isInverted) BOOL inverted;
+
+@end
+
+NS_ASSUME_NONNULL_END

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollContentComponentView.mm

@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+#import "RCTScrollContentComponentView.h"
+
+#import <react/renderer/components/scrollview/ScrollContentViewComponentDescriptor.h>
+#import <react/renderer/components/rncore/EventEmitters.h>
+#import <react/renderer/components/rncore/Props.h>
+
+#import "RCTFabricComponentsPlugins.h"
+
+using namespace facebook::react;
+
+@implementation RCTScrollContentComponentView
+
+ - (instancetype)init
+ {
+   if (self = [super init]) {
+     _props = std::make_shared<ScrollContentViewProps const>();
+   }
+
+   return self;
+ }
+
+- (void)updateProps:(Props::Shared const&)props oldProps:(Props::Shared const&)oldProps {
+  const auto& newViewProps = *std::static_pointer_cast<ScrollContentViewProps const>(props);
+
+  [self setInverted:newViewProps.inverted];
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (BOOL)isFlipped
+{
+  return !self.inverted;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<ScrollContentViewComponentDescriptor>();
+}
+
+Class<RCTComponentViewProtocol> RCTScrollContentViewCls(void)
+{
+  return RCTScrollContentComponentView.class;
+}
+
+@end

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -382,19 +382,27 @@ - (void)_preserveContentOffsetIfNeededWithBlock:(void (^)())block
 
 - (void)mountChildComponentView:(RCTUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index // [macOS]
 {
+#if !TARGET_OS_OSX // [macOS]
   [_containerView insertSubview:childComponentView atIndex:index];
   if (![childComponentView conformsToProtocol:@protocol(RCTCustomPullToRefreshViewProtocol)]) {
     _contentView = childComponentView;
   }
+#else // [macOS
+  [_scrollView setDocumentView:childComponentView];
+#endif // macOS]
 }
 
 - (void)unmountChildComponentView:(RCTUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index // [macOS]
 {
+#if !TARGET_OS_OSX // [macOS]
   [childComponentView removeFromSuperview];
   if (![childComponentView conformsToProtocol:@protocol(RCTCustomPullToRefreshViewProtocol)] &&
       _contentView == childComponentView) {
     _contentView = nil;
   }
+#else // [macOS
+  [_scrollView setDocumentView:_containerView];
+#endif // macOS]
 }
 
 /*

packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollContentViewComponentDescriptor.h

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <react/renderer/components/scrollview/ScrollContentViewShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook {
+namespace react {
+
+using ScrollContentViewComponentDescriptor =
+    ConcreteComponentDescriptor<ScrollContentViewShadowNode>;
+
+} // namespace react
+} // namespace facebook

packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollContentViewShadowNode.cpp

@@ -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.
+ */
+
+#include "ScrollContentViewShadowNode.h"
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/LayoutMetrics.h>
+
+namespace facebook::react {
+
+const char ScrollContentViewComponentName[] = "ScrollContentView";
+
+#if TARGET_OS_OSX // [macOS
+bool ScrollContentViewShadowNode::getIsVerticalAxisFlipped() const {
+  return getConcreteProps().inverted;
+}
+#endif // macOS]
+
+} // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollContentViewShadowNode.h

@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <react/renderer/components/rncore/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/core/LayoutContext.h>
+
+namespace facebook {
+namespace react {
+
+extern const char ScrollContentViewComponentName[];
+
+/*
+ * `ShadowNode` for <ScrollContentView> component.
+ */
+class ScrollContentViewShadowNode final : public ConcreteViewShadowNode<
+                                              ScrollContentViewComponentName,
+                                              ScrollContentViewProps> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+#pragma mark - LayoutableShadowNode
+
+#if TARGET_OS_OSX // [macOS
+  bool getIsVerticalAxisFlipped() const override;
+#endif // macOS]
+};
+
+} // namespace react
+} // namespace facebook

packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp

@@ -69,4 +69,10 @@ Point ScrollViewShadowNode::getContentOriginOffset() const {
   return {-contentOffset.x, -contentOffset.y + stateData.scrollAwayPaddingTop};
 }
 
+#if TARGET_OS_OSX // [macOS
+bool ScrollViewShadowNode::getIsVerticalAxisFlipped() const {
+  return getConcreteProps().inverted;
+}
+#endif // macOS]
+
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h

@@ -39,6 +39,10 @@ class ScrollViewShadowNode final : public ConcreteViewShadowNode<
   void layout(LayoutContext layoutContext) override;
   Point getContentOriginOffset() const override;
 
+#if TARGET_OS_OSX // [macOS
+  bool getIsVerticalAxisFlipped() const override;
+#endif // macOS]
+
  private:
   void updateStateIfNeeded();
   void updateScrollContentOffsetIfNeeded();