Skip to content

Commit 66a7057

Browse files
j-piaseckimeta-codesync[bot]
authored andcommitted
Move RCTComponentViewHelpers to ios specific directory (#55565)
Summary: Pull Request resolved: #55565 Changelog: [Internal] `RCTComponentViewHelpers.h` is inside `scrollview` directory shared by all platforms, while it's apple specific. This diff moves it to the `platforms/ios` directory, similarly to how it's handled for text inputs, or android files for scroll view. Reviewed By: cipolleschi Differential Revision: D93410394 fbshipit-source-id: 33df55b4979a22899f0b275889489d02f54dd681
1 parent a175bff commit 66a7057

5 files changed

Lines changed: 10 additions & 3 deletions

File tree

packages/react-native/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ let reactFabric = RNTarget(
456456
"components/root/tests",
457457
],
458458
dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga],
459-
sources: ["animationbackend", "animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "observers/intersection", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"]
459+
sources: ["animationbackend", "animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/scrollview/platform/ios", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "observers/intersection", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"]
460460
)
461461

462462
let reactFabricInputAccessory = RNTarget(

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,14 @@ Pod::Spec.new do |s|
6868
add_dependency(s, "React-FabricImage")
6969
add_dependency(s, "React-Fabric", :additional_framework_paths => [
7070
"react/renderer/components/scrollview/platform/cxx",
71+
"react/renderer/components/scrollview/platform/ios",
7172
"react/renderer/components/view/platform/cxx",
7273
"react/renderer/imagemanager/platform/ios",
7374
])
7475
add_dependency(s, "React-FabricComponents", :additional_framework_paths => [
7576
"react/renderer/textlayoutmanager/platform/ios",
7677
"react/renderer/components/scrollview/platform/cxx",
78+
"react/renderer/components/scrollview/platform/ios",
7779
"react/renderer/components/text/platform/cxx",
7880
"react/renderer/components/textinput/platform/ios",
7981
"react/renderer/components/switch/iosswitch",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ Pod::Spec.new do |s|
9696
header_search_path = header_search_path + [
9797
"\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
9898
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"",
99+
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/ios\"",
99100
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"",
100101
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
101102
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if ENV['USE_FRAMEWORKS']
2828
header_search_path = header_search_path + [
2929
"\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
3030
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"",
31+
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/ios\"",
3132
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
3233
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"",
3334
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
@@ -70,6 +71,7 @@ Pod::Spec.new do |s|
7071
add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
7172
add_dependency(s, "React-Fabric", :additional_framework_paths => [
7273
"react/renderer/components/scrollview/platform/cxx",
74+
"react/renderer/components/scrollview/platform/ios",
7375
"react/renderer/components/view/platform/cxx",
7476
"react/renderer/imagemanager/platform/ios"
7577
])
@@ -101,9 +103,11 @@ Pod::Spec.new do |s|
101103

102104
ss.subspec "scrollview" do |sss|
103105
sss.source_files = podspec_sources(["react/renderer/components/scrollview/*.{m,mm,cpp,h}",
104-
"react/renderer/components/scrollview/platform/cxx/**/*.{m,mm,cpp,h}"],
106+
"react/renderer/components/scrollview/platform/cxx/**/*.{m,mm,cpp,h}",
107+
"react/renderer/components/scrollview/platform/ios/**/*.{m,mm,cpp,h}"],
105108
["react/renderer/components/scrollview/*.h",
106-
"react/renderer/components/scrollview/platform/cxx/**/*.h"])
109+
"react/renderer/components/scrollview/platform/cxx/**/*.h",
110+
"react/renderer/components/scrollview/platform/ios/**/*.h"])
107111
sss.exclude_files = "react/renderer/components/scrollview/tests"
108112
sss.header_dir = "react/renderer/components/scrollview"
109113
end

packages/react-native/ReactCommon/react/renderer/components/scrollview/RCTComponentViewHelpers.h renamed to packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/ios/react/renderer/components/scrollview/RCTComponentViewHelpers.h

File renamed without changes.

0 commit comments

Comments
 (0)