Skip to content

Commit a314e34

Browse files
Nick Lefeverfacebook-github-bot
authored andcommitted
Move Android ScrollView props to HostPlatformScrollViewProps (#51517)
Summary: Pull Request resolved: #51517 The Props 2.0 implementation for ScrollView added two missing props which were Android specific. This diff moves these to a separate HostPlatformScrollViewProps class so that other platforms wouldn't include them Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D75183132 fbshipit-source-id: 44d0e0aa974e69f8584ad6bd681fad100c3493d8
1 parent 1da4abd commit a314e34

10 files changed

Lines changed: 518 additions & 390 deletions

File tree

packages/react-native/React/React-RCTFabric.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,13 @@ Pod::Spec.new do |s|
6666

6767
add_dependency(s, "React-FabricImage")
6868
add_dependency(s, "React-Fabric", :additional_framework_paths => [
69+
"react/renderer/components/scrollview/platform/cxx",
6970
"react/renderer/components/view/platform/cxx",
7071
"react/renderer/imagemanager/platform/ios",
7172
])
7273
add_dependency(s, "React-FabricComponents", :additional_framework_paths => [
7374
"react/renderer/textlayoutmanager/platform/ios",
75+
"react/renderer/components/scrollview/platform/cxx",
7476
"react/renderer/components/text/platform/cxx",
7577
"react/renderer/components/textinput/platform/ios",
7678
]);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Pod::Spec.new do |s|
7777
if ENV['USE_FRAMEWORKS']
7878
header_search_path = header_search_path + [
7979
"\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
80+
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"",
8081
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"",
8182
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
8283
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
@@ -118,9 +119,9 @@ Pod::Spec.new do |s|
118119
end
119120

120121
ss.subspec "scrollview" do |sss|
121-
sss.source_files = "react/renderer/components/scrollview/*.{m,mm,cpp,h}"
122+
sss.source_files = "react/renderer/components/scrollview/**/*.{m,mm,cpp,h}"
122123
sss.header_dir = "react/renderer/components/scrollview"
123-
ss.exclude_files = "react/renderer/components/scrollview/tests"
124+
sss.exclude_files = "react/renderer/components/scrollview/tests", "react/renderer/components/scrollview/platform/android"
124125
end
125126

126127
ss.subspec "legacyviewmanagerinterop" do |sss|

packages/react-native/ReactCommon/React-FabricComponents.podspec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Pod::Spec.new do |s|
2929
if ENV['USE_FRAMEWORKS']
3030
header_search_path = header_search_path + [
3131
"\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
32+
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"",
3233
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
3334
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"",
3435
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
@@ -72,6 +73,7 @@ Pod::Spec.new do |s|
7273
add_dependency(s, "React-rendererdebug")
7374
add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
7475
add_dependency(s, "React-Fabric", :additional_framework_paths => [
76+
"react/renderer/components/scrollview/platform/cxx",
7577
"react/renderer/components/view/platform/cxx",
7678
"react/renderer/imagemanager/platform/ios"
7779
])
@@ -105,7 +107,9 @@ Pod::Spec.new do |s|
105107
end
106108

107109
ss.subspec "scrollview" do |sss|
108-
sss.source_files = "react/renderer/components/scrollview/*.{m,mm,cpp,h}"
110+
sss.source_files = "react/renderer/components/scrollview/*.{m,mm,cpp,h}",
111+
"react/renderer/components/scrollview/platform/cxx/**/*.{m,mm,cpp,h}"
112+
sss.exclude_files = "react/renderer/components/scrollview/tests"
109113
sss.header_dir = "react/renderer/components/scrollview"
110114

111115
end

0 commit comments

Comments
 (0)