From af85c4c810cf09f5dfb7bea2c54015bd95045dc3 Mon Sep 17 00:00:00 2001 From: Ritesh Shukla <75062358+riteshshukla04@users.noreply.github.com> Date: Wed, 14 May 2025 03:54:04 -0700 Subject: [PATCH] Fixed borderBottomEndRadius on RTL (#51229) Summary: Fixes https://github.com/facebook/react-native/issues/51193 ## Changelog: [ANDROID][FIXED] Wrong borderBottomEndRadius on RTL Pull Request resolved: https://github.com/facebook/react-native/pull/51229 Test Plan: Tested with Arabic (RTL) and English(LTR) English Arabic Reviewed By: cortinico Differential Revision: D74709219 Pulled By: NickGerleman fbshipit-source-id: 885bb84d97d73324983d044fd2874a457b40f646 --- .../com/facebook/react/uimanager/style/BorderRadiusStyle.kt | 4 ++-- .../com/facebook/react/uimanager/BorderRadiusStyleTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderRadiusStyle.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderRadiusStyle.kt index 7b94063309d..e7fb361dc88 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderRadiusStyle.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderRadiusStyle.kt @@ -143,11 +143,11 @@ internal data class BorderRadiusStyle( CornerRadii(it, width, height) } ?: zeroRadii, bottomLeft = - (endEnd ?: bottomStart ?: bottomRight ?: uniform)?.let { + (endEnd ?: bottomEnd ?: bottomRight ?: uniform)?.let { CornerRadii(it, width, height) } ?: zeroRadii, bottomRight = - (startEnd ?: bottomEnd ?: bottomLeft ?: uniform)?.let { + (startEnd ?: bottomStart ?: bottomLeft ?: uniform)?.let { CornerRadii(it, width, height) } ?: zeroRadii, width = width, diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BorderRadiusStyleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BorderRadiusStyleTest.kt index 4d26ec18c06..3dd569f1b26 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BorderRadiusStyleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BorderRadiusStyleTest.kt @@ -95,13 +95,13 @@ class BorderRadiusStyleTest { arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_BOTTOM_RIGHT_RADIUS, - BorderRadiusProp.BORDER_BOTTOM_START_RADIUS, + BorderRadiusProp.BORDER_BOTTOM_END_RADIUS, BorderRadiusProp.BORDER_END_END_RADIUS), ComputedBorderRadiusProp.COMPUTED_BORDER_BOTTOM_RIGHT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_BOTTOM_LEFT_RADIUS, - BorderRadiusProp.BORDER_BOTTOM_END_RADIUS, + BorderRadiusProp.BORDER_BOTTOM_START_RADIUS, BorderRadiusProp.BORDER_START_END_RADIUS), )