From 56cb43a782d2c7f3a24689f5d336b8c07ac7208a Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 21 Mar 2024 11:52:49 +0100 Subject: [PATCH 1/4] Fix prefab paths for `rrc_text` and `rrc_textinput` --- .../react-native/ReactAndroid/build.gradle.kts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts index 0c7d24db69ec6e..79398d38c141ae 100644 --- a/packages/react-native/ReactAndroid/build.gradle.kts +++ b/packages/react-native/ReactAndroid/build.gradle.kts @@ -127,14 +127,17 @@ val preparePrefab by )), PrefabPreprocessingEntry( "rrc_text", - Pair( - "../ReactCommon/react/renderer/components/text/", - "react/renderer/components/text/")), + listOf( + Pair( + "../ReactCommon/react/renderer/components/text/", + "react/renderer/components/text/"), + Pair( + "../ReactCommon/react/renderer/attributedstring", + "react/renderer/attributedstring"), + )), PrefabPreprocessingEntry( "rrc_textinput", - Pair( - "../ReactCommon/react/renderer/components/textinput/", - "react/renderer/components/androidtextinput/")), + Pair("../ReactCommon/react/renderer/components/textinput/androidtextinput", "")), PrefabPreprocessingEntry( "rrc_legacyviewmanagerinterop", Pair( @@ -799,4 +802,4 @@ apply(from = "./publish.gradle") // as they caused https://github.com/facebook/react-native/issues/35210 publishing { publications { getByName("release", MavenPublication::class) { artifactId = "react-android" } } -} +} \ No newline at end of file From 6a99314e68f60ef0b4b04351a33b8d15bdf91132 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 21 Mar 2024 11:57:33 +0100 Subject: [PATCH 2/4] New line --- packages/react-native/ReactAndroid/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts index 79398d38c141ae..21227e5ab10025 100644 --- a/packages/react-native/ReactAndroid/build.gradle.kts +++ b/packages/react-native/ReactAndroid/build.gradle.kts @@ -802,4 +802,4 @@ apply(from = "./publish.gradle") // as they caused https://github.com/facebook/react-native/issues/35210 publishing { publications { getByName("release", MavenPublication::class) { artifactId = "react-android" } } -} \ No newline at end of file +} From f8d353fcf89fbde663dbb74aa5e78bc3a9e4b15b Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 21 Mar 2024 12:47:46 +0100 Subject: [PATCH 3/4] Fix paths --- packages/react-native/ReactAndroid/build.gradle.kts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts index 21227e5ab10025..46a361da854cc9 100644 --- a/packages/react-native/ReactAndroid/build.gradle.kts +++ b/packages/react-native/ReactAndroid/build.gradle.kts @@ -137,7 +137,14 @@ val preparePrefab by )), PrefabPreprocessingEntry( "rrc_textinput", - Pair("../ReactCommon/react/renderer/components/textinput/androidtextinput", "")), + listOf( + Pair( + "../ReactCommon/react/renderer/components/textinput/", + "react/renderer/components/textinput/"), + Pair( + "../ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput", + "react/renderer/components/textinput/"), + )), PrefabPreprocessingEntry( "rrc_legacyviewmanagerinterop", Pair( From 9d3fe4e9692b8121c4e26874aa3d3f4b4de8a9a4 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 21 Mar 2024 12:52:31 +0100 Subject: [PATCH 4/4] Fix paths again --- packages/react-native/ReactAndroid/build.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts index 46a361da854cc9..43d242df5e0f48 100644 --- a/packages/react-native/ReactAndroid/build.gradle.kts +++ b/packages/react-native/ReactAndroid/build.gradle.kts @@ -141,9 +141,7 @@ val preparePrefab by Pair( "../ReactCommon/react/renderer/components/textinput/", "react/renderer/components/textinput/"), - Pair( - "../ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput", - "react/renderer/components/textinput/"), + Pair("../ReactCommon/react/renderer/components/textinput/platform/android/", ""), )), PrefabPreprocessingEntry( "rrc_legacyviewmanagerinterop",