diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift index 275a70f82917..ee863c27a3b6 100644 --- a/packages/react-native/Package.swift +++ b/packages/react-native/Package.swift @@ -456,7 +456,7 @@ let reactFabric = RNTarget( "components/root/tests", ], dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga], - 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"] + 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"] ) let reactFabricInputAccessory = RNTarget( diff --git a/packages/react-native/React/React-RCTFabric.podspec b/packages/react-native/React/React-RCTFabric.podspec index 2fdd609a18f6..5d708f11036a 100644 --- a/packages/react-native/React/React-RCTFabric.podspec +++ b/packages/react-native/React/React-RCTFabric.podspec @@ -68,12 +68,14 @@ Pod::Spec.new do |s| add_dependency(s, "React-FabricImage") add_dependency(s, "React-Fabric", :additional_framework_paths => [ "react/renderer/components/scrollview/platform/cxx", + "react/renderer/components/scrollview/platform/ios", "react/renderer/components/view/platform/cxx", "react/renderer/imagemanager/platform/ios", ]) add_dependency(s, "React-FabricComponents", :additional_framework_paths => [ "react/renderer/textlayoutmanager/platform/ios", "react/renderer/components/scrollview/platform/cxx", + "react/renderer/components/scrollview/platform/ios", "react/renderer/components/text/platform/cxx", "react/renderer/components/textinput/platform/ios", "react/renderer/components/switch/iosswitch", diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index dc9f5e31f35e..436d74a9bf9a 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -96,6 +96,7 @@ Pod::Spec.new do |s| header_search_path = header_search_path + [ "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"", + "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/ios\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"", diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec index a501b020470b..dda0797fc765 100644 --- a/packages/react-native/ReactCommon/React-FabricComponents.podspec +++ b/packages/react-native/ReactCommon/React-FabricComponents.podspec @@ -28,6 +28,7 @@ if ENV['USE_FRAMEWORKS'] header_search_path = header_search_path + [ "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"", + "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/ios\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"", @@ -70,6 +71,7 @@ Pod::Spec.new do |s| add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"]) add_dependency(s, "React-Fabric", :additional_framework_paths => [ "react/renderer/components/scrollview/platform/cxx", + "react/renderer/components/scrollview/platform/ios", "react/renderer/components/view/platform/cxx", "react/renderer/imagemanager/platform/ios" ]) @@ -101,9 +103,11 @@ Pod::Spec.new do |s| ss.subspec "scrollview" do |sss| sss.source_files = podspec_sources(["react/renderer/components/scrollview/*.{m,mm,cpp,h}", - "react/renderer/components/scrollview/platform/cxx/**/*.{m,mm,cpp,h}"], + "react/renderer/components/scrollview/platform/cxx/**/*.{m,mm,cpp,h}", + "react/renderer/components/scrollview/platform/ios/**/*.{m,mm,cpp,h}"], ["react/renderer/components/scrollview/*.h", - "react/renderer/components/scrollview/platform/cxx/**/*.h"]) + "react/renderer/components/scrollview/platform/cxx/**/*.h", + "react/renderer/components/scrollview/platform/ios/**/*.h"]) sss.exclude_files = "react/renderer/components/scrollview/tests" sss.header_dir = "react/renderer/components/scrollview" end diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/RCTComponentViewHelpers.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/ios/react/renderer/components/scrollview/RCTComponentViewHelpers.h similarity index 100% rename from packages/react-native/ReactCommon/react/renderer/components/scrollview/RCTComponentViewHelpers.h rename to packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/ios/react/renderer/components/scrollview/RCTComponentViewHelpers.h