Skip to content

Commit 2e54e01

Browse files
react-native: Platformize android|ios textinput (#41600)
Summary: Changelog: [Internal] Reviewed By: cipolleschi Differential Revision: D51515743
1 parent 847f5de commit 2e54e01

24 files changed

+6
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Pod::Spec.new do |s|
7575
add_dependency(s, "React-FabricImage")
7676
add_dependency(s, "React-Fabric", :additional_framework_paths => [
7777
"react/renderer/textlayoutmanager/platform/ios",
78-
"react/renderer/components/textinput/iostextinput",
78+
"react/renderer/components/textinput/platform/ios",
7979
"react/renderer/components/view/platform/cxx",
8080
"react/renderer/imagemanager/platform/ios",
8181
])

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Pod::Spec.new do |s|
9797
if ENV['USE_FRAMEWORKS']
9898
header_search_path = header_search_path + [
9999
"\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
100-
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/iostextinput\"",
100+
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
101101
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
102102
]
103103
end
@@ -198,8 +198,7 @@ Pod::Spec.new do |s|
198198
ss.subspec "textinput" do |sss|
199199
sss.dependency folly_dep_name, folly_version
200200
sss.compiler_flags = folly_compiler_flags
201-
sss.source_files = "react/renderer/components/textinput/iostextinput/**/*.{m,mm,cpp,h}"
202-
sss.exclude_files = "react/renderer/components/textinput/iostextinput/tests"
201+
sss.source_files = "react/renderer/components/textinput/platform/ios/**/*.{m,mm,cpp,h}"
203202
sss.header_dir = "react/renderer/components/iostextinput"
204203

205204
end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if ENV['USE_FRAMEWORKS']
3535
header_search_path = header_search_path + [
3636
"\"$(PODS_TARGET_SRCROOT)\"",
3737
"\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
38-
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/iostextinput\"",
38+
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
3939
# "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\"",
4040
]
4141
end

packages/react-native/ReactCommon/react/renderer/components/textinput/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ add_compile_options(
1515
-Wno-gnu-zero-variadic-macro-arguments
1616
-DLOG_TAG=\"Fabric\")
1717

18-
file(GLOB rrc_textinput_SRC CONFIGURE_DEPENDS androidtextinput/react/renderer/components/androidtextinput/*.cpp)
18+
file(GLOB rrc_textinput_SRC CONFIGURE_DEPENDS platform/android/react/renderer/components/androidtextinput/*.cpp)
1919
add_library(rrc_textinput SHARED ${rrc_textinput_SRC})
2020

2121
target_include_directories(rrc_textinput
2222
PUBLIC
23-
${CMAKE_CURRENT_SOURCE_DIR}/androidtextinput/
23+
${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
2424
)
2525

2626
target_link_libraries(rrc_textinput

0 commit comments

Comments
 (0)