From 04fffa556deb634e16411c84be1bc6498127f7ae 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 [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 ea6f935974d..40ac83f7fd2 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 @@ -136,10 +136,10 @@ public data class BorderRadiusStyle( (startStart ?: topStart ?: topLeft ?: uniform)?.resolve(width, height) ?: zeroRadii, bottomLeft = - (endEnd ?: bottomStart ?: bottomRight ?: uniform)?.resolve(width, height) + (endEnd ?: bottomEnd ?: bottomRight ?: uniform)?.resolve(width, height) ?: zeroRadii, bottomRight = - (startEnd ?: bottomEnd ?: bottomLeft ?: uniform)?.resolve(width, height) + (startEnd ?: bottomStart ?: bottomLeft ?: uniform)?.resolve(width, height) ?: zeroRadii, width = width, height = height, 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 12708fa571e..b1fc225e5dc 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 @@ -88,13 +88,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), )