Skip to content

Commit 6a7ad21

Browse files
woehrl01facebook-github-bot
authored andcommitted
Add support for space-between and space-around on align-content
Summary: Adds the two missing alignments ```space-between``` and ```space-around``` for ```align-content``` . Those values are a noop on ```align-items``` in order to prevent a breaking changes for an additional enum. Fix #229 Closes #364 Reviewed By: gkassabli Differential Revision: D4528561 Pulled By: emilsjolander fbshipit-source-id: ea6291b6dd22cef05d9eec03893250d50371236e
1 parent 247aa26 commit 6a7ad21

File tree

16 files changed

+1143
-273
lines changed

16 files changed

+1143
-273
lines changed

csharp/Facebook.Yoga/YogaAlign.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@ public enum YogaAlign
1717
FlexEnd,
1818
Stretch,
1919
Baseline,
20+
SpaceBetween,
21+
SpaceAround,
2022
}
2123
}

csharp/tests/Facebook.Yoga/YGAlignContentTest.cs

Lines changed: 271 additions & 66 deletions
Large diffs are not rendered by default.

enums.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
'FlexEnd',
4848
'Stretch',
4949
'Baseline',
50+
'SpaceBetween',
51+
'SpaceAround',
5052
],
5153
'PositionType': [
5254
'Relative',
Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,47 @@
1-
<div id="align_content_flex_start" style="width: 100px; height: 100px; flex-wrap: wrap; flex-direction: column; align-content: flex-start;">
1+
<div id="align_content_flex_start" style="width: 130px; height: 100px; flex-wrap: wrap; flex-direction: row; align-content: flex-start;">
22
<div style="width: 50px; height: 10px;"></div>
33
<div style="width: 50px; height: 10px;"></div>
44
<div style="width: 50px; height: 10px;"></div>
55
<div style="width: 50px; height: 10px;"></div>
66
<div style="width: 50px; height: 10px;"></div>
77
</div>
88

9-
<div id="align_content_flex_end" style="width: 100px; height: 100px; flex-wrap: wrap; flex-direction: column; align-content: flex-end;">
9+
<div id="align_content_flex_end" style="width: 130px; height: 100px; flex-wrap: wrap; flex-direction: row; align-content: flex-end;">
1010
<div style="width: 50px; height: 10px;"></div>
1111
<div style="width: 50px; height: 10px;"></div>
1212
<div style="width: 50px; height: 10px;"></div>
1313
<div style="width: 50px; height: 10px;"></div>
1414
<div style="width: 50px; height: 10px;"></div>
1515
</div>
1616

17-
<div id="align_content_center" style="width: 100px; height: 100px; flex-wrap: wrap; flex-direction: column; align-content: center;">
17+
<div id="align_content_center" style="width: 130px; height: 100px; flex-wrap: wrap; flex-direction: row; align-content: center;">
1818
<div style="width: 50px; height: 10px;"></div>
1919
<div style="width: 50px; height: 10px;"></div>
2020
<div style="width: 50px; height: 10px;"></div>
2121
<div style="width: 50px; height: 10px;"></div>
2222
<div style="width: 50px; height: 10px;"></div>
2323
</div>
2424

25-
<div id="align_content_stretch" style="width: 100px; height: 100px; flex-wrap: wrap; flex-direction: column; align-content: stretch;">
25+
<div id="align_content_stretch" style="width: 150px; height: 100px; flex-wrap: wrap; flex-direction: column; align-content: stretch;">
2626
<div style="width: 50px;"></div>
2727
<div style="width: 50px;"></div>
2828
<div style="width: 50px;"></div>
2929
<div style="width: 50px;"></div>
3030
<div style="width: 50px;"></div>
3131
</div>
32+
33+
<div id="align_content_spacebetween" style="width: 130px; height: 100px; flex-wrap: wrap; flex-direction: row; align-content: space-between;">
34+
<div style="width: 50px; height: 10px;"></div>
35+
<div style="width: 50px; height: 10px;"></div>
36+
<div style="width: 50px; height: 10px;"></div>
37+
<div style="width: 50px; height: 10px;"></div>
38+
<div style="width: 50px; height: 10px;"></div>
39+
</div>
40+
41+
<div id="align_content_spacearound" style="width: 140px; height: 120px; flex-wrap: wrap; flex-direction: row; align-content: space-around;">
42+
<div style="width: 50px; height: 10px;"></div>
43+
<div style="width: 50px; height: 10px;"></div>
44+
<div style="width: 50px; height: 10px;"></div>
45+
<div style="width: 50px; height: 10px;"></div>
46+
<div style="width: 50px; height: 10px;"></div>
47+
</div>

gentest/gentest-cpp.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, {
8282
YGAlignFlexEnd:{value:'YGAlignFlexEnd'},
8383
YGAlignFlexStart:{value:'YGAlignFlexStart'},
8484
YGAlignStretch:{value:'YGAlignStretch'},
85-
85+
YGAlignSpaceBetween:{value:'YGAlignSpaceBetween'},
86+
YGAlignSpaceAround:{value:'YGAlignSpaceAround'},
8687
YGAlignBaseline:{value:'YGAlignBaseline'},
8788

8889
YGDirectionInherit:{value:'YGDirectionInherit'},

gentest/gentest-cs.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ CSEmitter.prototype = Object.create(Emitter.prototype, {
9696
YGAlignFlexEnd:{value:'YogaAlign.FlexEnd'},
9797
YGAlignFlexStart:{value:'YogaAlign.FlexStart'},
9898
YGAlignStretch:{value:'YogaAlign.Stretch'},
99+
YGAlignSpaceBetween:{value:'YogaAlign.SpaceBetween'},
100+
YGAlignSpaceAround:{value:'YogaAlign.SpaceAround'},
99101
YGAlignBaseline:{value:'YogaAlign.Baseline'},
100102

101103
YGDirectionInherit:{value:'YogaDirection.Inherit'},

gentest/gentest-java.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
100100
YGAlignFlexEnd:{value:'YogaAlign.FLEX_END'},
101101
YGAlignFlexStart:{value:'YogaAlign.FLEX_START'},
102102
YGAlignStretch:{value:'YogaAlign.STRETCH'},
103+
YGAlignSpaceBetween:{value:'YogaAlign.SPACE_BETWEEN'},
104+
YGAlignSpaceAround:{value:'YogaAlign.SPACE_AROUND'},
103105
YGAlignBaseline:{value:'YogaAlign.BASELINE'},
104106

105107
YGDirectionInherit:{value:'YogaDirection.INHERIT'},

gentest/gentest-javascript.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ JavascriptEmitter.prototype = Object.create(Emitter.prototype, {
9090
YGAlignFlexEnd:{value:'Yoga.ALIGN_FLEX_END'},
9191
YGAlignFlexStart:{value:'Yoga.ALIGN_FLEX_START'},
9292
YGAlignStretch:{value:'Yoga.ALIGN_STRETCH'},
93+
YGAlignSpaceBetween:{value:'Yoga.ALIGN_SPACE_BETWEEN'},
94+
YGAlignSpaceAround:{value:'Yoga.ALIGN_SPACE_AROUND'},
9395
YGAlignBaseline:{value:'Yoga.ALIGN_BASELINE'},
9496

9597
YGDirectionInherit:{value:'Yoga.DIRECTION_INHERIT'},

gentest/gentest.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,8 @@ function alignValue(e, value) {
381381
case 'stretch': return e.YGAlignStretch;
382382
case 'flex-start': return e.YGAlignFlexStart;
383383
case 'flex-end': return e.YGAlignFlexEnd;
384+
case 'space-between': return e.YGAlignSpaceBetween;
385+
case 'space-around': return e.YGAlignSpaceAround;
384386
case 'baseline': return e.YGAlignBaseline;
385387
}
386388
}

java/com/facebook/yoga/YogaAlign.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ public enum YogaAlign {
1818
CENTER(2),
1919
FLEX_END(3),
2020
STRETCH(4),
21-
BASELINE(5);
21+
BASELINE(5),
22+
SPACE_BETWEEN(6),
23+
SPACE_AROUND(7);
2224

2325
private int mIntValue;
2426

@@ -38,6 +40,8 @@ public static YogaAlign fromInt(int value) {
3840
case 3: return FLEX_END;
3941
case 4: return STRETCH;
4042
case 5: return BASELINE;
43+
case 6: return SPACE_BETWEEN;
44+
case 7: return SPACE_AROUND;
4145
default: throw new IllegalArgumentException("Unknown enum value: " + value);
4246
}
4347
}

0 commit comments

Comments
 (0)