Skip to content

Commit 01d2196

Browse files
coadometa-codesync[bot]
authored andcommitted
Use public umbrellas in scrollview headers (#58682)
Summary: Pull Request resolved: #58682 Route ScrollView framework header dependencies through their supported public umbrella entry points while preserving the module's framework-tier classification. Add direct standard-library and graphics includes where the exported declarations would otherwise rely on transitive coverage. Changelog: [Internal] Differential Revision: D121191600
1 parent 69611cd commit 01d2196

11 files changed

Lines changed: 33 additions & 19 deletions

File tree

‎packages/react-native/ReactCommon/React-Fabric.podspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Pod::Spec.new do |s|
161161
end
162162

163163
ss.subspec "scrollview" do |sss|
164+
sss.dependency "React-Fabric/coreUmbrella"
165+
sss.dependency "React-Fabric/components/viewUmbrella"
164166
sss.source_files = podspec_sources("react/renderer/components/scrollview/**/*.{m,mm,cpp,h}", "react/renderer/components/scrollview/**/*.{h}")
165167
sss.header_dir = "react/renderer/components/scrollview"
166168
sss.exclude_files = "react/renderer/components/scrollview/tests", "react/renderer/components/scrollview/platform/android"

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
13+
#include <React/View.h>
1214
#include <react/renderer/components/scrollview/primitives.h>
13-
#include <react/renderer/components/view/ViewProps.h>
14-
#include <react/renderer/core/PropsParserContext.h>
1515

1616
#include <optional>
17+
#include <vector>
1718

1819
namespace facebook::react {
1920

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
13+
#include <React/RendererDebug.h>
1214
#include <folly/dynamic.h>
13-
#include <react/renderer/core/EventPayload.h>
14-
#include <react/renderer/debug/DebugStringConvertible.h>
1515
#include <react/renderer/graphics/RectangleEdges.h>
1616
#include <react/renderer/graphics/Size.h>
1717

18+
#include <optional>
19+
#include <string>
20+
#include <vector>
21+
1822
namespace facebook::react {
1923

2024
struct ScrollEvent : public EventPayload {

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewComponentDescriptor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
1213
#include <react/renderer/components/scrollview/ScrollViewShadowNode.h>
13-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
1414

1515
namespace facebook::react {
1616

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12-
#include <memory>
13-
12+
#include <React/View.h>
1413
#include <react/renderer/components/scrollview/ScrollEvent.h>
15-
#include <react/renderer/components/view/ViewEventEmitter.h>
16-
#include <react/renderer/core/EventEmitter.h>
14+
15+
#include <string>
1716

1817
namespace facebook::react {
1918

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
#include <react/renderer/components/scrollview/HostPlatformScrollViewProps.h>
1313

14+
#include <memory>
15+
1416
namespace facebook::react {
1517
using ScrollViewProps = HostPlatformScrollViewProps;
1618
using SharedScrollViewProps = std::shared_ptr<const ScrollViewProps>;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
13+
#include <React/View.h>
1214
#include <react/renderer/components/scrollview/ScrollViewEventEmitter.h>
1315
#include <react/renderer/components/scrollview/ScrollViewProps.h>
1416
#include <react/renderer/components/scrollview/ScrollViewState.h>
15-
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
16-
#include <react/renderer/core/LayoutContext.h>
17-
#include <react/renderer/core/ShadowNodeFamily.h>
1817

1918
namespace facebook::react {
2019

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
1213
#include <react/renderer/components/scrollview/primitives.h>
13-
#include <react/renderer/core/PropsParserContext.h>
14-
#include <react/renderer/core/propsConversions.h>
14+
15+
#include <cstdlib>
16+
#include <optional>
17+
#include <string>
1518
#include <unordered_map>
1619

1720
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
1213
#include <react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h>
13-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
1414

1515
namespace facebook::react {
1616

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
13+
#include <React/View.h>
1214
#include <react/renderer/components/scrollview/ScrollViewEventEmitter.h>
1315
#include <react/renderer/components/scrollview/ScrollViewState.h>
14-
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
15-
#include <react/renderer/core/LayoutContext.h>
1616

1717
namespace facebook::react {
1818

0 commit comments

Comments
 (0)