Skip to content

Commit bf7f8a5

Browse files
fix js tests
1 parent 5e119af commit bf7f8a5

5 files changed

Lines changed: 55 additions & 21 deletions

File tree

enums.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@
1919
],
2020
"FlexDirection": ["Column", "ColumnReverse", "Row", "RowReverse"],
2121
"Justify": [
22+
"Auto",
2223
"FlexStart",
2324
"Center",
2425
"FlexEnd",
2526
"SpaceBetween",
2627
"SpaceAround",
2728
"SpaceEvenly",
29+
"Stretch",
30+
"Start",
31+
"End",
2832
],
2933
"Overflow": ["Visible", "Hidden", "Scroll"],
3034
"Align": [
@@ -37,9 +41,11 @@
3741
"SpaceBetween",
3842
"SpaceAround",
3943
"SpaceEvenly",
44+
"Start",
45+
"End",
4046
],
4147
"PositionType": ["Static", "Relative", "Absolute"],
42-
"Display": ["Flex", "None", "Contents"],
48+
"Display": ["Flex", "None", "Contents", "Grid"],
4349
"Wrap": ["NoWrap", "Wrap", "WrapReverse"],
4450
"BoxSizing": ["BorderBox", "ContentBox"],
4551
"MeasureMode": ["Undefined", "Exactly", "AtMost"],

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
BASELINE(5),
1919
SPACE_BETWEEN(6),
2020
SPACE_AROUND(7),
21-
SPACE_EVENLY(8);
21+
SPACE_EVENLY(8),
22+
START(9),
23+
END(10);
2224

2325
private final int mIntValue;
2426

@@ -41,6 +43,8 @@ public static YogaAlign fromInt(int value) {
4143
case 6: return SPACE_BETWEEN;
4244
case 7: return SPACE_AROUND;
4345
case 8: return SPACE_EVENLY;
46+
case 9: return START;
47+
case 10: return END;
4448
default: throw new IllegalArgumentException("Unknown enum value: " + value);
4549
}
4650
}

java/com/facebook/yoga/YogaDisplay.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
public enum YogaDisplay {
1313
FLEX(0),
1414
NONE(1),
15-
CONTENTS(2);
15+
CONTENTS(2),
16+
GRID(3);
1617

1718
private final int mIntValue;
1819

@@ -29,6 +30,7 @@ public static YogaDisplay fromInt(int value) {
2930
case 0: return FLEX;
3031
case 1: return NONE;
3132
case 2: return CONTENTS;
33+
case 3: return GRID;
3234
default: throw new IllegalArgumentException("Unknown enum value: " + value);
3335
}
3436
}

java/com/facebook/yoga/YogaJustify.java

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@
1010
package com.facebook.yoga;
1111

1212
public enum YogaJustify {
13-
FLEX_START(0),
14-
CENTER(1),
15-
FLEX_END(2),
16-
SPACE_BETWEEN(3),
17-
SPACE_AROUND(4),
18-
SPACE_EVENLY(5);
13+
AUTO(0),
14+
FLEX_START(1),
15+
CENTER(2),
16+
FLEX_END(3),
17+
SPACE_BETWEEN(4),
18+
SPACE_AROUND(5),
19+
SPACE_EVENLY(6),
20+
STRETCH(7),
21+
START(8),
22+
END(9);
1923

2024
private final int mIntValue;
2125

@@ -29,12 +33,16 @@ public int intValue() {
2933

3034
public static YogaJustify fromInt(int value) {
3135
switch (value) {
32-
case 0: return FLEX_START;
33-
case 1: return CENTER;
34-
case 2: return FLEX_END;
35-
case 3: return SPACE_BETWEEN;
36-
case 4: return SPACE_AROUND;
37-
case 5: return SPACE_EVENLY;
36+
case 0: return AUTO;
37+
case 1: return FLEX_START;
38+
case 2: return CENTER;
39+
case 3: return FLEX_END;
40+
case 4: return SPACE_BETWEEN;
41+
case 5: return SPACE_AROUND;
42+
case 6: return SPACE_EVENLY;
43+
case 7: return STRETCH;
44+
case 8: return START;
45+
case 9: return END;
3846
default: throw new IllegalArgumentException("Unknown enum value: " + value);
3947
}
4048
}

javascript/src/generated/YGEnums.ts

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ export enum Align {
1717
SpaceBetween = 6,
1818
SpaceAround = 7,
1919
SpaceEvenly = 8,
20+
Start = 9,
21+
End = 10,
2022
}
2123

2224
export enum BoxSizing {
@@ -39,6 +41,7 @@ export enum Display {
3941
Flex = 0,
4042
None = 1,
4143
Contents = 2,
44+
Grid = 3,
4245
}
4346

4447
export enum Edge {
@@ -80,12 +83,16 @@ export enum Gutter {
8083
}
8184

8285
export enum Justify {
83-
FlexStart = 0,
84-
Center = 1,
85-
FlexEnd = 2,
86-
SpaceBetween = 3,
87-
SpaceAround = 4,
88-
SpaceEvenly = 5,
86+
Auto = 0,
87+
FlexStart = 1,
88+
Center = 2,
89+
FlexEnd = 3,
90+
SpaceBetween = 4,
91+
SpaceAround = 5,
92+
SpaceEvenly = 6,
93+
Stretch = 7,
94+
Start = 8,
95+
End = 9,
8996
}
9097

9198
export enum LogLevel {
@@ -146,6 +153,8 @@ const constants = {
146153
ALIGN_SPACE_BETWEEN: Align.SpaceBetween,
147154
ALIGN_SPACE_AROUND: Align.SpaceAround,
148155
ALIGN_SPACE_EVENLY: Align.SpaceEvenly,
156+
ALIGN_START: Align.Start,
157+
ALIGN_END: Align.End,
149158
BOX_SIZING_BORDER_BOX: BoxSizing.BorderBox,
150159
BOX_SIZING_CONTENT_BOX: BoxSizing.ContentBox,
151160
DIMENSION_WIDTH: Dimension.Width,
@@ -156,6 +165,7 @@ const constants = {
156165
DISPLAY_FLEX: Display.Flex,
157166
DISPLAY_NONE: Display.None,
158167
DISPLAY_CONTENTS: Display.Contents,
168+
DISPLAY_GRID: Display.Grid,
159169
EDGE_LEFT: Edge.Left,
160170
EDGE_TOP: Edge.Top,
161171
EDGE_RIGHT: Edge.Right,
@@ -179,12 +189,16 @@ const constants = {
179189
GUTTER_COLUMN: Gutter.Column,
180190
GUTTER_ROW: Gutter.Row,
181191
GUTTER_ALL: Gutter.All,
192+
JUSTIFY_AUTO: Justify.Auto,
182193
JUSTIFY_FLEX_START: Justify.FlexStart,
183194
JUSTIFY_CENTER: Justify.Center,
184195
JUSTIFY_FLEX_END: Justify.FlexEnd,
185196
JUSTIFY_SPACE_BETWEEN: Justify.SpaceBetween,
186197
JUSTIFY_SPACE_AROUND: Justify.SpaceAround,
187198
JUSTIFY_SPACE_EVENLY: Justify.SpaceEvenly,
199+
JUSTIFY_STRETCH: Justify.Stretch,
200+
JUSTIFY_START: Justify.Start,
201+
JUSTIFY_END: Justify.End,
188202
LOG_LEVEL_ERROR: LogLevel.Error,
189203
LOG_LEVEL_WARN: LogLevel.Warn,
190204
LOG_LEVEL_INFO: LogLevel.Info,

0 commit comments

Comments
 (0)