Skip to content

Commit c9d0a00

Browse files
NickGerlemanfacebook-github-bot
authored andcommitted
Bindings for alignContent: "space-evenly" (#41020)
Summary: Pull Request resolved: #41020 This adds Fabric and Paper bindings to support `alignContent: "space-evenly"` as implemented in facebook/yoga#1422 Changelog: [General][Added] - Bindings for `alignContent: "space-evenly"` Reviewed By: yungsters Differential Revision: D50347978 fbshipit-source-id: 44df3b8ddc7171cddf56957c11ac7d975f706f9d
1 parent 9a03e99 commit c9d0a00

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

packages/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export interface FlexStyle {
4040
| 'stretch'
4141
| 'space-between'
4242
| 'space-around'
43+
| 'space-evenly'
4344
| undefined;
4445
alignItems?: FlexAlignType | undefined;
4546
alignSelf?: 'auto' | FlexAlignType | undefined;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,8 @@ type ____LayoutStyle_Internal = $ReadOnly<{
552552
| 'center'
553553
| 'stretch'
554554
| 'space-between'
555-
| 'space-around',
555+
| 'space-around'
556+
| 'space-evenly',
556557

557558
/** `overflow` controls how children are measured and displayed.
558559
* `overflow: hidden` causes views to be clipped while `overflow: scroll`

packages/react-native/React/Base/RCTConvert.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,8 @@ + (NSPropertyList)NSPropertyList:(id)json
11721172
@"stretch" : @(YGAlignStretch),
11731173
@"baseline" : @(YGAlignBaseline),
11741174
@"space-between" : @(YGAlignSpaceBetween),
1175-
@"space-around" : @(YGAlignSpaceAround)
1175+
@"space-around" : @(YGAlignSpaceAround),
1176+
@"space-evenly" : @(YGAlignSpaceEvenly)
11761177
}),
11771178
YGAlignFlexStart,
11781179
intValue)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,11 @@ public void setAlignContent(@Nullable String alignContent) {
541541
setAlignContent(YogaAlign.SPACE_AROUND);
542542
return;
543543
}
544+
case "space-evenly":
545+
{
546+
setAlignContent(YogaAlign.SPACE_EVENLY);
547+
return;
548+
}
544549
default:
545550
{
546551
FLog.w(ReactConstants.TAG, "invalid value for alignContent: " + alignContent);

packages/react-native/ReactCommon/react/renderer/components/view/conversions.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ inline void fromRawValue(
284284
result = yoga::Align::SpaceAround;
285285
return;
286286
}
287+
if (stringValue == "space-evenly") {
288+
result = yoga::Align::SpaceEvenly;
289+
return;
290+
}
287291
LOG(ERROR) << "Could not parse yoga::Align:" << stringValue;
288292
react_native_expect(false);
289293
}

0 commit comments

Comments
 (0)