Skip to content

Commit 573132d

Browse files
committed
fix: correct Android logical border radius mapping
1 parent dcbd860 commit 573132d

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

  • packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderRadiusStyle.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ internal data class BorderRadiusStyle(
161161
CornerRadii(it, width, height)
162162
} ?: zeroRadii,
163163
topRight =
164-
(endStart ?: topEnd ?: topRight ?: uniform)?.let {
164+
(startEnd ?: topEnd ?: topRight ?: uniform)?.let {
165165
CornerRadii(it, width, height)
166166
} ?: zeroRadii,
167167
bottomLeft =
168-
(startEnd ?: bottomStart ?: bottomLeft ?: uniform)?.let {
168+
(endStart ?: bottomStart ?: bottomLeft ?: uniform)?.let {
169169
CornerRadii(it, width, height)
170170
} ?: zeroRadii,
171171
bottomRight =
@@ -179,7 +179,7 @@ internal data class BorderRadiusStyle(
179179
if (I18nUtil.instance.doLeftAndRightSwapInRTL(context)) {
180180
ensureNoOverlap(
181181
topLeft =
182-
(endStart ?: topEnd ?: topRight ?: uniform)?.let {
182+
(startEnd ?: topEnd ?: topRight ?: uniform)?.let {
183183
CornerRadii(it, width, height)
184184
} ?: zeroRadii,
185185
topRight =
@@ -191,7 +191,7 @@ internal data class BorderRadiusStyle(
191191
CornerRadii(it, width, height)
192192
} ?: zeroRadii,
193193
bottomRight =
194-
(startEnd ?: bottomStart ?: bottomLeft ?: uniform)?.let {
194+
(endStart ?: bottomStart ?: bottomLeft ?: uniform)?.let {
195195
CornerRadii(it, width, height)
196196
} ?: zeroRadii,
197197
width = width,
@@ -200,7 +200,7 @@ internal data class BorderRadiusStyle(
200200
} else {
201201
ensureNoOverlap(
202202
topLeft =
203-
(endStart ?: topEnd ?: topLeft ?: uniform)?.let {
203+
(startEnd ?: topEnd ?: topLeft ?: uniform)?.let {
204204
CornerRadii(it, width, height)
205205
} ?: zeroRadii,
206206
topRight =
@@ -212,7 +212,7 @@ internal data class BorderRadiusStyle(
212212
CornerRadii(it, width, height)
213213
} ?: zeroRadii,
214214
bottomRight =
215-
(startEnd ?: bottomEnd ?: bottomRight ?: uniform)?.let {
215+
(endStart ?: bottomEnd ?: bottomRight ?: uniform)?.let {
216216
CornerRadii(it, width, height)
217217
} ?: zeroRadii,
218218
width = width,

0 commit comments

Comments
 (0)