Add justify-content: space-evenly

Summary: Adds new ```space-evenly``` for ```justify-content```. Also adds a typofix in one of the other justify-content tests. Fixes facebook#657 Closes facebook#658 Differential Revision: D6407996 Pulled By: emilsjolander fbshipit-source-id: cc837409e1345624b4bd72c31e25fe68dcb0f6a3
chbuxing1011 · Nov 27, 2017 · 7e3be21 · 7e3be21
1 parent 5e39f1a
commit 7e3be21
Show file tree

Hide file tree

Showing 17 changed files with 614 additions and 26 deletions.
diff --git a/csharp/Facebook.Yoga/YogaJustify.cs b/csharp/Facebook.Yoga/YogaJustify.cs
@@ -16,5 +16,6 @@ public enum YogaJustify
         FlexEnd,
         SpaceBetween,
         SpaceAround,
+        SpaceEvenly,
     }
 }
diff --git a/csharp/tests/Facebook.Yoga/YGJustifyContentTest.cs b/csharp/tests/Facebook.Yoga/YGJustifyContentTest.cs
@@ -375,6 +375,7 @@ public void Test_justify_content_column_flex_start()
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode(config);
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode(config);
@@ -396,10 +397,10 @@ public void Test_justify_content_column_flex_start()
             Assert.AreEqual(0f, root_child1.LayoutX);
             Assert.AreEqual(10f, root_child1.LayoutY);
             Assert.AreEqual(102f, root_child1.LayoutWidth);
-            Assert.AreEqual(0f, root_child1.LayoutHeight);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
 
             Assert.AreEqual(0f, root_child2.LayoutX);
-            Assert.AreEqual(10f, root_child2.LayoutY);
+            Assert.AreEqual(20f, root_child2.LayoutY);
             Assert.AreEqual(102f, root_child2.LayoutWidth);
             Assert.AreEqual(10f, root_child2.LayoutHeight);
 
@@ -419,10 +420,10 @@ public void Test_justify_content_column_flex_start()
             Assert.AreEqual(0f, root_child1.LayoutX);
             Assert.AreEqual(10f, root_child1.LayoutY);
             Assert.AreEqual(102f, root_child1.LayoutWidth);
-            Assert.AreEqual(0f, root_child1.LayoutHeight);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
 
             Assert.AreEqual(0f, root_child2.LayoutX);
-            Assert.AreEqual(10f, root_child2.LayoutY);
+            Assert.AreEqual(20f, root_child2.LayoutY);
             Assert.AreEqual(102f, root_child2.LayoutWidth);
             Assert.AreEqual(10f, root_child2.LayoutHeight);
         }
@@ -867,5 +868,142 @@ public void Test_justify_content_colunn_max_height_and_margin()
             Assert.AreEqual(20f, root_child0.LayoutHeight);
         }
 
+        [Test]
+        public void Test_justify_content_column_space_evenly()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.JustifyContent = YogaJustify.SpaceEvenly;
+            root.Width = 102;
+            root.Height = 102;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.Height = 10;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.Height = 10;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.Height = 10;
+            root.Insert(2, root_child2);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(102f, root.LayoutWidth);
+            Assert.AreEqual(102f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(18f, root_child0.LayoutY);
+            Assert.AreEqual(102f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(46f, root_child1.LayoutY);
+            Assert.AreEqual(102f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child2.LayoutX);
+            Assert.AreEqual(74f, root_child2.LayoutY);
+            Assert.AreEqual(102f, root_child2.LayoutWidth);
+            Assert.AreEqual(10f, root_child2.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(102f, root.LayoutWidth);
+            Assert.AreEqual(102f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(18f, root_child0.LayoutY);
+            Assert.AreEqual(102f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(46f, root_child1.LayoutY);
+            Assert.AreEqual(102f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child2.LayoutX);
+            Assert.AreEqual(74f, root_child2.LayoutY);
+            Assert.AreEqual(102f, root_child2.LayoutWidth);
+            Assert.AreEqual(10f, root_child2.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_justify_content_row_space_evenly()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.JustifyContent = YogaJustify.SpaceEvenly;
+            root.Width = 102;
+            root.Height = 102;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.Height = 10;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.Height = 10;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.Height = 10;
+            root.Insert(2, root_child2);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(102f, root.LayoutWidth);
+            Assert.AreEqual(102f, root.LayoutHeight);
+
+            Assert.AreEqual(26f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(51f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(0f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(77f, root_child2.LayoutX);
+            Assert.AreEqual(0f, root_child2.LayoutY);
+            Assert.AreEqual(0f, root_child2.LayoutWidth);
+            Assert.AreEqual(10f, root_child2.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(102f, root.LayoutWidth);
+            Assert.AreEqual(102f, root.LayoutHeight);
+
+            Assert.AreEqual(77f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(51f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(0f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(26f, root_child2.LayoutX);
+            Assert.AreEqual(0f, root_child2.LayoutY);
+            Assert.AreEqual(0f, root_child2.LayoutWidth);
+            Assert.AreEqual(10f, root_child2.LayoutHeight);
+        }
+
     }
 }
diff --git a/enums.py b/enums.py
@@ -35,6 +35,7 @@
         'FlexEnd',
         'SpaceBetween',
         'SpaceAround',
+        'SpaceEvenly',
     ],
     'Overflow': [
         'Visible',

diff --git a/gentest/fixtures/YGJustifyContentTest.html b/gentest/fixtures/YGJustifyContentTest.html
@@ -30,7 +30,7 @@
 
 <div id="justify_content_column_flex_start" style="width: 102px; height: 102px; justify-content: flex-start;">
   <div style="height: 10px;"></div>
-  <div style="heigth: 10px;"></div>
+  <div style="height: 10px;"></div>
   <div style="height: 10px;"></div>
 </div>
 
@@ -73,3 +73,16 @@
 <div id="justify_content_colunn_max_height_and_margin" style="height: 100px; max-height: 80px; margin-top: 100px; justify-content: center; flex-direction: column;">
   <div style="height: 20px; width: 20px;"></div>
 </div>
+
+<div id="justify_content_column_space_evenly" style="width: 102px; height: 102px; justify-content: space-evenly;">
+  <div style="height: 10px;"></div>
+  <div style="height: 10px;"></div>
+  <div style="height: 10px;"></div>
+</div>
+
+<div id="justify_content_row_space_evenly" style="width: 102px; height: 102px; justify-content: space-evenly; flex-direction: row; ">
+  <div style="height: 10px;"></div>
+  <div style="height: 10px;"></div>
+  <div style="height: 10px;"></div>
+</div>
+
diff --git a/gentest/gentest-cpp.js b/gentest/gentest-cpp.js
@@ -104,6 +104,7 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, {
   YGJustifyFlexStart:{value:'YGJustifyFlexStart'},
   YGJustifySpaceAround:{value:'YGJustifySpaceAround'},
   YGJustifySpaceBetween:{value:'YGJustifySpaceBetween'},
+  YGJustifySpaceEvenly:{value:'YGJustifySpaceEvenly'},
 
   YGOverflowHidden:{value:'YGOverflowHidden'},
   YGOverflowVisible:{value:'YGOverflowVisible'},

diff --git a/gentest/gentest-cs.js b/gentest/gentest-cs.js
@@ -117,6 +117,7 @@ CSEmitter.prototype = Object.create(Emitter.prototype, {
   YGJustifyFlexStart:{value:'YogaJustify.FlexStart'},
   YGJustifySpaceAround:{value:'YogaJustify.SpaceAround'},
   YGJustifySpaceBetween:{value:'YogaJustify.SpaceBetween'},
+  YGJustifySpaceEvenly:{value:'YogaJustify.SpaceEvenly'},
 
   YGOverflowHidden:{value:'YogaOverflow.Hidden'},
   YGOverflowVisible:{value:'YogaOverflow.Visible'},

diff --git a/gentest/gentest-java.js b/gentest/gentest-java.js
@@ -119,6 +119,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
   YGJustifyFlexStart:{value:'YogaJustify.FLEX_START'},
   YGJustifySpaceAround:{value:'YogaJustify.SPACE_AROUND'},
   YGJustifySpaceBetween:{value:'YogaJustify.SPACE_BETWEEN'},
+  YGJustifySpaceEvenly:{value:'YogaJustify.SPACE_EVENLY'},
 
   YGOverflowHidden:{value:'YogaOverflow.HIDDEN'},
   YGOverflowVisible:{value:'YogaOverflow.VISIBLE'},

diff --git a/gentest/gentest-javascript.js b/gentest/gentest-javascript.js
@@ -119,6 +119,7 @@ JavascriptEmitter.prototype = Object.create(Emitter.prototype, {
   YGJustifyFlexStart:{value:'Yoga.JUSTIFY_FLEX_START'},
   YGJustifySpaceAround:{value:'Yoga.JUSTIFY_SPACE_AROUND'},
   YGJustifySpaceBetween:{value:'Yoga.JUSTIFY_SPACE_BETWEEN'},
+  YGJustifySpaceEvenly:{value:'Yoga.JUSTIFY_SPACE_EVENLY'},
 
   YGOverflowHidden:{value:'Yoga.OVERFLOW_HIDDEN'},
   YGOverflowVisible:{value:'Yoga.OVERFLOW_VISIBLE'},

diff --git a/gentest/gentest.js b/gentest/gentest.js
@@ -355,6 +355,7 @@ function justifyValue(e, value) {
     case 'center': return e.YGJustifyCenter;
     case 'space-around': return e.YGJustifySpaceAround;
     case 'space-between': return e.YGJustifySpaceBetween;
+    case 'space-evenly': return e.YGJustifySpaceEvenly;
     case 'flex-start': return e.YGJustifyFlexStart;
     case 'flex-end': return e.YGJustifyFlexEnd;
   }

diff --git a/java/com/facebook/yoga/YogaJustify.java b/java/com/facebook/yoga/YogaJustify.java
@@ -17,7 +17,8 @@ public enum YogaJustify {
   CENTER(1),
   FLEX_END(2),
   SPACE_BETWEEN(3),
-  SPACE_AROUND(4);
+  SPACE_AROUND(4),
+  SPACE_EVENLY(5);
 
   private int mIntValue;
 
@@ -36,6 +37,8 @@ public static YogaJustify fromInt(int value) {
       case 2: return FLEX_END;
       case 3: return SPACE_BETWEEN;
       case 4: return SPACE_AROUND;
+      case 5:
+        return SPACE_EVENLY;
       default: throw new IllegalArgumentException("Unknown enum value: " + value);
     }
   }