Bindings for alignContent: "space-evenly"

Summary: 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"` Differential Revision: D50347978 fbshipit-source-id: 99a3ac3a4bd4c006586653a8f2de339411528aaa
NickGerleman · Oct 16, 2023 · 68ea9e7 · 68ea9e7
1 parent dd3d5bc
commit 68ea9e7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/packages/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts b/packages/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts
@@ -40,6 +40,7 @@ export interface FlexStyle {
     | 'stretch'
     | 'space-between'
     | 'space-around'
+    | 'space-evenly'
     | undefined;
   alignItems?: FlexAlignType | undefined;
   alignSelf?: 'auto' | FlexAlignType | undefined;

diff --git a/packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js b/packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js
@@ -552,7 +552,8 @@ type ____LayoutStyle_Internal = $ReadOnly<{
     | 'center'
     | 'stretch'
     | 'space-between'
-    | 'space-around',
+    | 'space-around'
+    | 'space-evenly',
 
   /** `overflow` controls how children are measured and displayed.
    *  `overflow: hidden` causes views to be clipped while `overflow: scroll`

diff --git a/packages/react-native/React/Base/RCTConvert.m b/packages/react-native/React/Base/RCTConvert.m
@@ -1172,7 +1172,8 @@ + (NSPropertyList)NSPropertyList:(id)json
       @"stretch" : @(YGAlignStretch),
       @"baseline" : @(YGAlignBaseline),
       @"space-between" : @(YGAlignSpaceBetween),
-      @"space-around" : @(YGAlignSpaceAround)
+      @"space-around" : @(YGAlignSpaceAround),
+      @"space-evenly" : @(YGAlignSpaceEvenly)
     }),
     YGAlignFlexStart,
     intValue)

diff --git a/...eact-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/...eact-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -541,6 +541,11 @@ public void setAlignContent(@Nullable String alignContent) {
           setAlignContent(YogaAlign.SPACE_AROUND);
           return;
         }
+      case "space-evenly":
+        {
+          setAlignContent(YogaAlign.SPACE_EVENLY);
+          return;
+        }
       default:
         {
           FLog.w(ReactConstants.TAG, "invalid value for alignContent: " + alignContent);

diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h
@@ -284,6 +284,10 @@ inline void fromRawValue(
     result = yoga::Align::SpaceAround;
     return;
   }
+  if (stringValue == "space-evenly") {
+    result = yoga::Align::SpaceEvenly;
+    return;
+  }
   LOG(ERROR) << "Could not parse yoga::Align:" << stringValue;
   react_native_expect(false);
 }