diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.cpp index eb7b4ce7e4a5..473790008213 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.cpp @@ -12,6 +12,31 @@ namespace facebook::react { const char AndroidHorizontalScrollContentViewShadowNodeComponentName[] = "AndroidHorizontalScrollContentView"; +AndroidHorizontalScrollContentViewShadowNode:: + AndroidHorizontalScrollContentViewShadowNode( + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family, + ShadowNodeTraits traits) + : ConcreteViewShadowNode(fragment, family, traits) { + initialize(); +} + +AndroidHorizontalScrollContentViewShadowNode:: + AndroidHorizontalScrollContentViewShadowNode( + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment) + : ConcreteViewShadowNode(sourceShadowNode, fragment) { + initialize(); +} + +void AndroidHorizontalScrollContentViewShadowNode::initialize() noexcept { + if (getConcreteProps().collapsableChildren) { + traits_.unset(ShadowNodeTraits::Trait::ChildrenFormStackingContext); + } else { + traits_.set(ShadowNodeTraits::Trait::ChildrenFormStackingContext); + } +} + void AndroidHorizontalScrollContentViewShadowNode::layout( LayoutContext layoutContext) { ConcreteViewShadowNode::layout(layoutContext); diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h index 53bdd1e19c90..19fe9e769695 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h @@ -25,8 +25,17 @@ class AndroidHorizontalScrollContentViewShadowNode final ScrollViewEventEmitter, ScrollViewState> { public: - using ConcreteViewShadowNode::ConcreteViewShadowNode; + AndroidHorizontalScrollContentViewShadowNode( + const ShadowNodeFragment &fragment, + const ShadowNodeFamily::Shared &family, + ShadowNodeTraits traits); + + AndroidHorizontalScrollContentViewShadowNode(const ShadowNode &sourceShadowNode, const ShadowNodeFragment &fragment); + void layout(LayoutContext layoutContext) override; + + private: + void initialize() noexcept; }; } // namespace facebook::react