Skip to content

Commit c3c1526

Browse files
committed
Add logical border width and inline border color props
# Conflicts: # packages/react-native/ReactNativeApi.d.ts
1 parent 16424c2 commit c3c1526

35 files changed

Lines changed: 523 additions & 114 deletions

‎packages/react-native/Libraries/Components/View/ReactNativeStyleAttributes.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,14 @@ const ReactNativeStyleAttributes: {[key: string]: AnyAttributeType, ...} = {
8888
alignItems: true,
8989
alignSelf: true,
9090
aspectRatio: aspectRatioAttribute,
91+
borderBlockEndWidth: true,
92+
borderBlockStartWidth: true,
93+
borderBlockWidth: true,
9194
borderBottomWidth: true,
9295
borderEndWidth: true,
96+
borderInlineEndWidth: true,
97+
borderInlineStartWidth: true,
98+
borderInlineWidth: true,
9399
borderLeftWidth: true,
94100
borderRightWidth: true,
95101
borderStartWidth: true,
@@ -241,6 +247,9 @@ const ReactNativeStyleAttributes: {[key: string]: AnyAttributeType, ...} = {
241247
borderEndColor: colorAttribute,
242248
borderEndEndRadius: true,
243249
borderEndStartRadius: true,
250+
borderInlineColor: colorAttribute,
251+
borderInlineEndColor: colorAttribute,
252+
borderInlineStartColor: colorAttribute,
244253
borderLeftColor: colorAttribute,
245254
borderRadius: true,
246255
borderRightColor: colorAttribute,

‎packages/react-native/Libraries/NativeComponent/BaseViewConfig.android.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,12 @@ const validAttributesForNonEventProps = {
333333
borderBottomWidth: true,
334334
borderLeftWidth: true,
335335
borderRightWidth: true,
336+
borderBlockWidth: true,
337+
borderBlockEndWidth: true,
338+
borderBlockStartWidth: true,
339+
borderInlineWidth: true,
340+
borderInlineEndWidth: true,
341+
borderInlineStartWidth: true,
336342

337343
outlineColor: colorAttribute,
338344
outlineOffset: true,
@@ -399,6 +405,9 @@ const validAttributesForNonEventProps = {
399405
borderBlockColor: colorAttribute,
400406
borderBlockEndColor: colorAttribute,
401407
borderBlockStartColor: colorAttribute,
408+
borderInlineColor: colorAttribute,
409+
borderInlineEndColor: colorAttribute,
410+
borderInlineStartColor: colorAttribute,
402411
focusable: true,
403412
tabIndex: true,
404413
backfaceVisibility: true,

‎packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,11 @@ const validAttributesForNonEventProps = {
243243
borderRadius: true,
244244
borderColor: colorAttribute,
245245
borderBlockColor: colorAttribute,
246+
borderInlineColor: colorAttribute,
246247
borderCurve: true,
247248
borderWidth: true,
248249
borderBlockWidth: true,
250+
borderInlineWidth: true,
249251
borderStyle: true,
250252
hitSlop: {diff: require('../Utilities/differ/insetsDiffer').default},
251253
collapsable: true,
@@ -267,10 +269,14 @@ const validAttributesForNonEventProps = {
267269
borderBlockStartWidth: true,
268270
borderStartColor: colorAttribute,
269271
borderBlockStartColor: colorAttribute,
272+
borderInlineStartWidth: true,
273+
borderInlineStartColor: colorAttribute,
270274
borderEndWidth: true,
271275
borderBlockEndWidth: true,
272276
borderEndColor: colorAttribute,
273277
borderBlockEndColor: colorAttribute,
278+
borderInlineEndWidth: true,
279+
borderInlineEndColor: colorAttribute,
274280

275281
borderTopLeftRadius: true,
276282
borderTopRightRadius: true,

‎packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,24 @@ type ____LayoutStyle_Internal = Readonly<{
437437
*/
438438
borderWidth?: number,
439439

440+
/** `borderBlockEndWidth` works like `border-block-end-width` in CSS.
441+
* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-block-end-width
442+
* for more details.
443+
*/
444+
borderBlockEndWidth?: number,
445+
446+
/** `borderBlockStartWidth` works like `border-block-start-width` in CSS.
447+
* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-block-start-width
448+
* for more details.
449+
*/
450+
borderBlockStartWidth?: number,
451+
452+
/** `borderBlockWidth` works like `border-block-width` in CSS.
453+
* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-block-width
454+
* for more details.
455+
*/
456+
borderBlockWidth?: number,
457+
440458
/** `borderBottomWidth` works like `border-bottom-width` in CSS.
441459
* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-width
442460
* for more details.
@@ -449,6 +467,24 @@ type ____LayoutStyle_Internal = Readonly<{
449467
*/
450468
borderEndWidth?: number,
451469

470+
/** `borderInlineEndWidth` works like `border-inline-end-width` in CSS.
471+
* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-inline-end-width
472+
* for more details.
473+
*/
474+
borderInlineEndWidth?: number,
475+
476+
/** `borderInlineStartWidth` works like `border-inline-start-width` in CSS.
477+
* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-inline-start-width
478+
* for more details.
479+
*/
480+
borderInlineStartWidth?: number,
481+
482+
/** `borderInlineWidth` works like `border-inline-width` in CSS.
483+
* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-inline-width
484+
* for more details.
485+
*/
486+
borderInlineWidth?: number,
487+
452488
/** `borderLeftWidth` works like `border-left-width` in CSS.
453489
* See https://developer.mozilla.org/en-US/docs/Web/CSS/border-left-width
454490
* for more details.
@@ -848,6 +884,9 @@ export type ____ViewStyle_InternalBase = Readonly<{
848884
borderBlockColor?: ____ColorValue_Internal,
849885
borderBlockEndColor?: ____ColorValue_Internal,
850886
borderBlockStartColor?: ____ColorValue_Internal,
887+
borderInlineColor?: ____ColorValue_Internal,
888+
borderInlineEndColor?: ____ColorValue_Internal,
889+
borderInlineStartColor?: ____ColorValue_Internal,
851890
borderRadius?: number | string,
852891
borderBottomEndRadius?: number | string,
853892
borderBottomLeftRadius?: number | string,
@@ -869,6 +908,12 @@ export type ____ViewStyle_InternalBase = Readonly<{
869908
borderRightWidth?: number,
870909
borderStartWidth?: number,
871910
borderTopWidth?: number,
911+
borderBlockWidth?: number,
912+
borderBlockEndWidth?: number,
913+
borderBlockStartWidth?: number,
914+
borderInlineWidth?: number,
915+
borderInlineEndWidth?: number,
916+
borderInlineStartWidth?: number,
872917
opacity?: number,
873918
outlineColor?: ____ColorValue_Internal,
874919
outlineOffset?: number,

‎packages/react-native/ReactAndroid/api/ReactAndroid.api‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4127,6 +4127,9 @@ public final class com/facebook/react/uimanager/Spacing {
41274127
public static final field Companion Lcom/facebook/react/uimanager/Spacing$Companion;
41284128
public static final field END I
41294129
public static final field HORIZONTAL I
4130+
public static final field INLINE I
4131+
public static final field INLINE_END I
4132+
public static final field INLINE_START I
41304133
public static final field LEFT I
41314134
public static final field RIGHT I
41324135
public static final field START I
@@ -4476,7 +4479,10 @@ public final class com/facebook/react/uimanager/ViewProps {
44764479
public static final field BACKGROUND_SIZE Ljava/lang/String;
44774480
public static final field BORDER_BLOCK_COLOR Ljava/lang/String;
44784481
public static final field BORDER_BLOCK_END_COLOR Ljava/lang/String;
4482+
public static final field BORDER_BLOCK_END_WIDTH Ljava/lang/String;
44794483
public static final field BORDER_BLOCK_START_COLOR Ljava/lang/String;
4484+
public static final field BORDER_BLOCK_START_WIDTH Ljava/lang/String;
4485+
public static final field BORDER_BLOCK_WIDTH Ljava/lang/String;
44804486
public static final field BORDER_BOTTOM_COLOR Ljava/lang/String;
44814487
public static final field BORDER_BOTTOM_END_RADIUS Ljava/lang/String;
44824488
public static final field BORDER_BOTTOM_LEFT_RADIUS Ljava/lang/String;
@@ -4488,6 +4494,12 @@ public final class com/facebook/react/uimanager/ViewProps {
44884494
public static final field BORDER_END_END_RADIUS Ljava/lang/String;
44894495
public static final field BORDER_END_START_RADIUS Ljava/lang/String;
44904496
public static final field BORDER_END_WIDTH Ljava/lang/String;
4497+
public static final field BORDER_INLINE_COLOR Ljava/lang/String;
4498+
public static final field BORDER_INLINE_END_COLOR Ljava/lang/String;
4499+
public static final field BORDER_INLINE_END_WIDTH Ljava/lang/String;
4500+
public static final field BORDER_INLINE_START_COLOR Ljava/lang/String;
4501+
public static final field BORDER_INLINE_START_WIDTH Ljava/lang/String;
4502+
public static final field BORDER_INLINE_WIDTH Ljava/lang/String;
44914503
public static final field BORDER_LEFT_COLOR Ljava/lang/String;
44924504
public static final field BORDER_LEFT_WIDTH Ljava/lang/String;
44934505
public static final field BORDER_RADIUS Ljava/lang/String;
@@ -4934,6 +4946,9 @@ public abstract class com/facebook/react/uimanager/style/LogicalEdge : java/lang
49344946
public static final field Companion Lcom/facebook/react/uimanager/style/LogicalEdge$Companion;
49354947
public static final field END Lcom/facebook/react/uimanager/style/LogicalEdge;
49364948
public static final field HORIZONTAL Lcom/facebook/react/uimanager/style/LogicalEdge;
4949+
public static final field INLINE Lcom/facebook/react/uimanager/style/LogicalEdge;
4950+
public static final field INLINE_END Lcom/facebook/react/uimanager/style/LogicalEdge;
4951+
public static final field INLINE_START Lcom/facebook/react/uimanager/style/LogicalEdge;
49374952
public static final field LEFT Lcom/facebook/react/uimanager/style/LogicalEdge;
49384953
public static final field RIGHT Lcom/facebook/react/uimanager/style/LogicalEdge;
49394954
public static final field START Lcom/facebook/react/uimanager/style/LogicalEdge;

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ public class Spacing(private val defaultValue: Float, private val spacing: Float
7171
spacingType == END ||
7272
spacingType == BLOCK ||
7373
spacingType == BLOCK_END ||
74-
spacingType == BLOCK_START
74+
spacingType == BLOCK_START ||
75+
spacingType == INLINE ||
76+
spacingType == INLINE_END ||
77+
spacingType == INLINE_START
7578
) {
7679
YogaConstants.UNDEFINED
7780
} else {
@@ -169,6 +172,15 @@ public class Spacing(private val defaultValue: Float, private val spacing: Float
169172
/** Spacing type that represents the block start direction (top). E.g. `marginBlockStart`. */
170173
public const val BLOCK_START: Int = 11
171174

175+
/** Spacing type that represents inline directions (start, end). E.g. `marginInline`. */
176+
public const val INLINE: Int = 12
177+
178+
/** Spacing type that represents the inline end direction. E.g. `marginInlineEnd`. */
179+
public const val INLINE_END: Int = 13
180+
181+
/** Spacing type that represents the inline start direction. E.g. `marginInlineStart`. */
182+
public const val INLINE_START: Int = 14
183+
172184
private val flagsMap =
173185
intArrayOf(
174186
1, /*LEFT*/
@@ -183,6 +195,9 @@ public class Spacing(private val defaultValue: Float, private val spacing: Float
183195
512, /*BLOCK*/
184196
1024, /*BLOCK_END*/
185197
2048,
198+
4096, /*INLINE*/
199+
8192, /*INLINE_END*/
200+
16384, /*INLINE_START*/
186201
)
187202

188203
private fun newFullSpacingArray(): FloatArray {
@@ -199,6 +214,9 @@ public class Spacing(private val defaultValue: Float, private val spacing: Float
199214
YogaConstants.UNDEFINED,
200215
YogaConstants.UNDEFINED,
201216
YogaConstants.UNDEFINED,
217+
YogaConstants.UNDEFINED,
218+
YogaConstants.UNDEFINED,
219+
YogaConstants.UNDEFINED,
202220
)
203221
}
204222
}

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,12 @@ public object ViewProps {
122122
public const val BORDER_TOP_WIDTH: String = "borderTopWidth"
123123
public const val BORDER_RIGHT_WIDTH: String = "borderRightWidth"
124124
public const val BORDER_BOTTOM_WIDTH: String = "borderBottomWidth"
125+
public const val BORDER_BLOCK_WIDTH: String = "borderBlockWidth"
126+
public const val BORDER_BLOCK_END_WIDTH: String = "borderBlockEndWidth"
127+
public const val BORDER_BLOCK_START_WIDTH: String = "borderBlockStartWidth"
128+
public const val BORDER_INLINE_WIDTH: String = "borderInlineWidth"
129+
public const val BORDER_INLINE_END_WIDTH: String = "borderInlineEndWidth"
130+
public const val BORDER_INLINE_START_WIDTH: String = "borderInlineStartWidth"
125131
public const val BORDER_RADIUS: String = "borderRadius"
126132
public const val BORDER_TOP_LEFT_RADIUS: String = "borderTopLeftRadius"
127133
public const val BORDER_TOP_RIGHT_RADIUS: String = "borderTopRightRadius"
@@ -135,6 +141,9 @@ public object ViewProps {
135141
public const val BORDER_BLOCK_COLOR: String = "borderBlockColor"
136142
public const val BORDER_BLOCK_END_COLOR: String = "borderBlockEndColor"
137143
public const val BORDER_BLOCK_START_COLOR: String = "borderBlockStartColor"
144+
public const val BORDER_INLINE_COLOR: String = "borderInlineColor"
145+
public const val BORDER_INLINE_END_COLOR: String = "borderInlineEndColor"
146+
public const val BORDER_INLINE_START_COLOR: String = "borderInlineStartColor"
138147
public const val BORDER_TOP_START_RADIUS: String = "borderTopStartRadius"
139148
public const val BORDER_TOP_END_RADIUS: String = "borderTopEndRadius"
140149
public const val BORDER_BOTTOM_START_RADIUS: String = "borderBottomStartRadius"

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ internal value class BorderColors(
6262
return when (layoutDirection) {
6363
LayoutDirection.LTR ->
6464
ColorEdges(
65-
edgeColors[LogicalEdge.START.ordinal]
65+
edgeColors[LogicalEdge.INLINE_START.ordinal]
66+
?: edgeColors[LogicalEdge.START.ordinal]
6667
?: edgeColors[LogicalEdge.LEFT.ordinal]
68+
?: edgeColors[LogicalEdge.INLINE.ordinal]
6769
?: edgeColors[LogicalEdge.HORIZONTAL.ordinal]
6870
?: edgeColors[LogicalEdge.ALL.ordinal]
6971
?: Color.BLACK,
@@ -73,8 +75,10 @@ internal value class BorderColors(
7375
?: edgeColors[LogicalEdge.VERTICAL.ordinal]
7476
?: edgeColors[LogicalEdge.ALL.ordinal]
7577
?: Color.BLACK,
76-
edgeColors[LogicalEdge.END.ordinal]
78+
edgeColors[LogicalEdge.INLINE_END.ordinal]
79+
?: edgeColors[LogicalEdge.END.ordinal]
7780
?: edgeColors[LogicalEdge.RIGHT.ordinal]
81+
?: edgeColors[LogicalEdge.INLINE.ordinal]
7882
?: edgeColors[LogicalEdge.HORIZONTAL.ordinal]
7983
?: edgeColors[LogicalEdge.ALL.ordinal]
8084
?: Color.BLACK,
@@ -88,8 +92,10 @@ internal value class BorderColors(
8892
LayoutDirection.RTL ->
8993
if (I18nUtil.instance.doLeftAndRightSwapInRTL(context)) {
9094
ColorEdges(
91-
edgeColors[LogicalEdge.END.ordinal]
95+
edgeColors[LogicalEdge.INLINE_END.ordinal]
96+
?: edgeColors[LogicalEdge.END.ordinal]
9297
?: edgeColors[LogicalEdge.RIGHT.ordinal]
98+
?: edgeColors[LogicalEdge.INLINE.ordinal]
9399
?: edgeColors[LogicalEdge.HORIZONTAL.ordinal]
94100
?: edgeColors[LogicalEdge.ALL.ordinal]
95101
?: Color.BLACK,
@@ -99,8 +105,10 @@ internal value class BorderColors(
99105
?: edgeColors[LogicalEdge.VERTICAL.ordinal]
100106
?: edgeColors[LogicalEdge.ALL.ordinal]
101107
?: Color.BLACK,
102-
edgeColors[LogicalEdge.START.ordinal]
108+
edgeColors[LogicalEdge.INLINE_START.ordinal]
109+
?: edgeColors[LogicalEdge.START.ordinal]
103110
?: edgeColors[LogicalEdge.LEFT.ordinal]
111+
?: edgeColors[LogicalEdge.INLINE.ordinal]
104112
?: edgeColors[LogicalEdge.HORIZONTAL.ordinal]
105113
?: edgeColors[LogicalEdge.ALL.ordinal]
106114
?: Color.BLACK,
@@ -113,8 +121,10 @@ internal value class BorderColors(
113121
)
114122
} else {
115123
ColorEdges(
116-
edgeColors[LogicalEdge.END.ordinal]
124+
edgeColors[LogicalEdge.INLINE_END.ordinal]
125+
?: edgeColors[LogicalEdge.END.ordinal]
117126
?: edgeColors[LogicalEdge.LEFT.ordinal]
127+
?: edgeColors[LogicalEdge.INLINE.ordinal]
118128
?: edgeColors[LogicalEdge.HORIZONTAL.ordinal]
119129
?: edgeColors[LogicalEdge.ALL.ordinal]
120130
?: Color.BLACK,
@@ -124,8 +134,10 @@ internal value class BorderColors(
124134
?: edgeColors[LogicalEdge.VERTICAL.ordinal]
125135
?: edgeColors[LogicalEdge.ALL.ordinal]
126136
?: Color.BLACK,
127-
edgeColors[LogicalEdge.START.ordinal]
137+
edgeColors[LogicalEdge.INLINE_START.ordinal]
138+
?: edgeColors[LogicalEdge.START.ordinal]
128139
?: edgeColors[LogicalEdge.RIGHT.ordinal]
140+
?: edgeColors[LogicalEdge.INLINE.ordinal]
129141
?: edgeColors[LogicalEdge.HORIZONTAL.ordinal]
130142
?: edgeColors[LogicalEdge.ALL.ordinal]
131143
?: Color.BLACK,

0 commit comments

Comments
 (0)