From 586e485a4bf8469c42069a12e48b8622ab1392c1 Mon Sep 17 00:00:00 2001 From: lazerg Date: Sat, 21 Nov 2026 09:40:47 +0500 Subject: [PATCH 1/2] Honor collapsableChildren on the Android horizontal ScrollView content view --- ...dHorizontalScrollContentViewShadowNode.cpp | 25 +++++++++++++++++++ ...oidHorizontalScrollContentViewShadowNode.h | 13 +++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) 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..2ca79cc0d4f6 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,19 @@ 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 From 6abc1bc4f6cc3358b8afc65d74f691720501198d Mon Sep 17 00:00:00 2001 From: lazerg Date: Sat, 21 Nov 2026 17:38:10 +0500 Subject: [PATCH 2/2] Apply clang-format to AndroidHorizontalScrollContentViewShadowNode.h --- .../AndroidHorizontalScrollContentViewShadowNode.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 2ca79cc0d4f6..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 @@ -26,13 +26,11 @@ class AndroidHorizontalScrollContentViewShadowNode final ScrollViewState> { public: AndroidHorizontalScrollContentViewShadowNode( - const ShadowNodeFragment& fragment, - const ShadowNodeFamily::Shared& family, + const ShadowNodeFragment &fragment, + const ShadowNodeFamily::Shared &family, ShadowNodeTraits traits); - AndroidHorizontalScrollContentViewShadowNode( - const ShadowNode& sourceShadowNode, - const ShadowNodeFragment& fragment); + AndroidHorizontalScrollContentViewShadowNode(const ShadowNode &sourceShadowNode, const ShadowNodeFragment &fragment); void layout(LayoutContext layoutContext) override;