Skip to content

Commit ed3e709

Browse files
KurtGokhanKurtGokhan
authored
Merge branch 'facebook:main' into extended_main
2 parents 89b37ba + 5009f5c commit ed3e709

File tree

150 files changed

+13078
-4407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+13078
-4407
lines changed

‎.github/actions/setup-js/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runs:
66
- name: Setup Node environment
77
uses: actions/setup-node@v3
88
with:
9-
node-version: 18.x
9+
node-version: 20.x
1010
cache: yarn
1111
cache-dependency-path: yarn.lock
1212
env:

‎.github/workflows/validate-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
push:
66
branches:
77
- main
8-
- 'release-*'
98
workflow_dispatch:
109

1110
jobs:

‎gentest/fixtures/YGAbsolutePositionTest.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,22 @@
132132
<div style="position:absolute; width:50px; height:50px;"></div>
133133
</div>
134134

135+
<div id="absolute_layout_padding">
136+
<div style="width:200px; height:200px; margin:10px; position: relative">
137+
<div style="position:static; width:200px; height:200px; padding: 50px;">
138+
<div style="position:absolute; width:50px; height:50px;"></div>
139+
</div>
140+
</div>
141+
</div>
142+
143+
<div id="absolute_layout_border">
144+
<div style="width:200px; height:200px; margin:10px; position: relative">
145+
<div style="position:static; width:200px; height:200px; border: 10px solid black;">
146+
<div style="position:absolute; width:50px; height:50px;"></div>
147+
</div>
148+
</div>
149+
</div>
150+
135151
<div id="absolute_layout_column_reverse_margin_border"
136152
style="width:200px; height:200px; flex-direction: column-reverse;">
137153
<div

‎gentest/fixtures/YGFlexDirectionTest.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,3 +400,8 @@
400400
<div style="width: 10px;"></div>
401401
</div>
402402
</div>
403+
404+
<div id="flex_direction_alternating_with_percent" style="height: 300px; width: 200px; flex-direction: column;">
405+
<div style="height: 50%; width: 50%; left: 10%; top: 10%; flex-direction: row;">
406+
</div>
407+
</div>

‎gentest/fixtures/YGGapTest.html

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,3 +171,72 @@
171171
<div style="height: 20px"></div>
172172
<div style="height: 30px"></div>
173173
</div>
174+
175+
<div id="row_gap_percent_wrapping" style="flex-direction: row; width: 300px; height: 700px; padding: 10px; gap: 10%; flex-wrap: wrap;">
176+
<div style="width: 100px; height: 100px;"></div>
177+
<div style="width: 100px; height: 100px;"></div>
178+
<div style="width: 100px; height: 100px;"></div>
179+
<div style="width: 100px; height: 100px;"></div>
180+
<div style="width: 100px; height: 100px;"></div>
181+
</div>
182+
183+
<div id="row_gap_percent_determines_parent_height" style="flex-direction: row; width: 300px; gap: 10%; flex-wrap: wrap;">
184+
<div style="width: 100px; height: 100px;"></div>
185+
<div style="width: 100px; height: 100px;"></div>
186+
<div style="width: 100px; height: 100px;"></div>
187+
<div style="width: 100px; height: 100px;"></div>
188+
<div style="width: 100px; height: 100px;"></div>
189+
</div>
190+
191+
<div id="row_gap_percent_wrapping_with_both_content_padding_and_item_padding" style="flex-direction: row; width: 300px; height: 700px; padding: 10px; gap: 10%; flex-wrap: wrap;">
192+
<div style="width: 100px; height: 100px; padding: 10px;"></div>
193+
<div style="width: 100px; height: 100px; padding: 10px;"></div>
194+
<div style="width: 100px; height: 100px; padding: 10px;"></div>
195+
<div style="width: 100px; height: 100px; padding: 10px;"></div>
196+
<div style="width: 100px; height: 100px; padding: 10px;"></div>
197+
</div>
198+
199+
<div id="row_gap_percent_wrapping_with_both_content_padding" style="flex-direction: row; width: 300px; height: 700px; padding: 10px; gap: 10%; flex-wrap: wrap;">
200+
<div style="width: 100px; height: 100px;"></div>
201+
<div style="width: 100px; height: 100px;"></div>
202+
<div style="width: 100px; height: 100px;"></div>
203+
<div style="width: 100px; height: 100px;"></div>
204+
<div style="width: 100px; height: 100px;"></div>
205+
</div>
206+
207+
<div id="row_gap_percent_wrapping_with_content_margin" style="flex-direction: row; width: 300px; height: 700px; margin: 10px; gap: 10%; flex-wrap: wrap;">
208+
<div style="width: 100px; height: 100px;"></div>
209+
<div style="width: 100px; height: 100px;"></div>
210+
<div style="width: 100px; height: 100px;"></div>
211+
<div style="width: 100px; height: 100px;"></div>
212+
<div style="width: 100px; height: 100px;"></div>
213+
</div>
214+
215+
<div id="row_gap_percent_wrapping_with_content_margin_and_padding" style="flex-direction: row; width: 300px; height: 700px; margin: 10px; padding: 10px; gap: 10%; flex-wrap: wrap;">
216+
<div style="width: 100px; height: 100px;"></div>
217+
<div style="width: 100px; height: 100px;"></div>
218+
<div style="width: 100px; height: 100px;"></div>
219+
<div style="width: 100px; height: 100px;"></div>
220+
<div style="width: 100px; height: 100px;"></div>
221+
</div>
222+
223+
<div id="row_gap_percent_wrapping_with_flexible_content" style="flex-direction: row; width: 300px; height: 300px; gap: 10%;">
224+
<div style="flex: 1;"></div>
225+
<div style="flex: 1;"></div>
226+
<div style="flex: 1;"></div>
227+
</div>
228+
229+
<div id="row_gap_percent_wrapping_with_mixed_flexible_content" style="flex-direction: row; width: 300px; height: 300px; gap: 10%;">
230+
<div style="width: 10px;"></div>
231+
<div style="flex: 1;"></div>
232+
<div style="width: 10%;"></div>
233+
</div>
234+
235+
<!-- TODO: Existing bug that Yoga is not inline with Chromium for calculation with min-width -->
236+
<div id="row_gap_percent_wrapping_with_min_width" data-disabled="true" style="flex-direction: row; min-width: 300px; gap: 10%; flex-wrap: wrap;">
237+
<div style="width: 100px; height: 100px;"></div>
238+
<div style="width: 100px; height: 100px;"></div>
239+
<div style="width: 100px; height: 100px;"></div>
240+
<div style="width: 100px; height: 100px;"></div>
241+
<div style="width: 100px; height: 100px;"></div>
242+
</div>

‎gentest/fixtures/YGIntrinsicSizeTest.html

Lines changed: 221 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
<div id="contains_inner_text_long_word" style="width:2000px;height:2000px;align-items: flex-start;">
2+
<div style="flex-direction:row;">
3+
LoremipsumdolorsitametconsecteturadipiscingelitSedeleifasdfettortoracauctorFuscerhoncusipsumtemporerosaliquamconsequatPraesentsoda
4+
</div>
5+
</div>
6+
7+
<div id="contains_inner_text_no_width_no_height" style="width:2000px;height:2000px;align-items: flex-start;">
8+
<div style="flex-direction:row;">
9+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifasd et tortor ac auctor. Integer at
10+
volutpat
11+
libero, sed elementum dui interdum id. Aliquam consectetur massa vel neque aliquet, quis consequat risus
12+
fringilla. Fusce rhoncus ipsum tempor eros aliquam, vel tempus metus ullamcorper. Nam at nulla sed tellus
13+
vestibulum fringilla vel sit amet ligula. Proin velit lectus, euismod sit amet quam vel ultricies dolor,
14+
vitae
15+
finibus lorem ipsum. Pellentesque molestie at mi sit amet dictum. Donec vehicula lacinia felis sit amet
16+
consectetur. Praesent sodales enim sapien, sed varius ipsum pellentesque vel. Aenean eu mi eu justo
17+
tincidunt
18+
finibus vel sit amet ipsum. Sed bibasdum purus vel ipsum sagittis, quis fermentum dolor lobortis. Etiam
19+
vulputate eleifasd lectus vel varius.
20+
Phasellus imperdiet lectus sit amet ipsum egestas, ut bibasdum ipsum malesuada. Vestibulum ante ipsum primis
21+
in
22+
faucibus orci luctus et ultrices posuere cubilia Curae; Sed mollis eros sit amet elit porttitor, vel
23+
venenatis
24+
turpis venenatis. Nulla tempus tortor at eros efficitur, sit amet dapibus ipsum malesuada. Ut at mauris sed
25+
nunc
26+
malesuada convallis. Duis id sem vel magna varius eleifasd vel at est. Donec eget orci a ipsum tempor
27+
lobortis.
28+
Sed at consectetur ipsum.
29+
</div>
30+
</div>
31+
32+
<div id="contains_inner_text_no_width_no_height_long_word_in_paragraph"
33+
style="width:2000px;height:2000px;align-items: flex-start;">
34+
<div style="flex-direction:row;">
35+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifasd et tortor ac auctor. Integer at
36+
volutpat
37+
libero, sed elementum dui interdum id. Aliquam consectetur massa vel neque aliquet, quis consequat risus
38+
fringilla. Fusce rhoncus ipsum tempor eros aliquam, vel tempus metus ullamcorper. Nam at nulla sed tellus
39+
vestibulum fringilla vel sit amet ligula. Proin velit lectus, euismod sit amet quam vel ultricies dolor,
40+
vitae
41+
finibus
42+
loremipsumloremipsumloremipsumloremipsumloremipsumloremipsumloremipsumloremipsumloremipsumloremipsumloremipsumloremipsumloremipsumlorem
43+
Pellentesque molestie at mi sit amet dictum. Donec vehicula lacinia felis sit amet
44+
consectetur. Praesent sodales enim sapien, sed varius ipsum pellentesque vel. Aenean eu mi eu justo
45+
tincidunt
46+
finibus vel sit amet ipsum. Sed bibasdum purus vel ipsum sagittis, quis fermentum dolor lobortis. Etiam
47+
vulputate eleifasd lectus vel varius.
48+
Phasellus imperdiet lectus sit amet ipsum egestas, ut bibasdum ipsum malesuada. Vestibulum ante ipsum primis
49+
in
50+
faucibus orci luctus et ultrices posuere cubilia Curae; Sed mollis eros sit amet elit porttitor, vel
51+
venenatis
52+
turpis venenatis. Nulla tempus tortor at eros efficitur, sit amet dapibus ipsum malesuada. Ut at mauris sed
53+
nunc
54+
malesuada convallis. Duis id sem vel magna varius eleifasd vel at est. Donec eget orci a ipsum tempor
55+
lobortis.
56+
Sed at consectetur ipsum.
57+
</div>
58+
</div>
59+
60+
<div id="contains_inner_text_fixed_width" style="width:2000px;height:2000px;align-items: flex-start;">
61+
<div style="flex-direction:row;width:100px">
62+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifasd et tortor ac auctor. Integer at
63+
volutpat
64+
libero, sed elementum dui interdum id. Aliquam consectetur massa vel neque aliquet, quis consequat risus
65+
fringilla. Fusce rhoncus ipsum tempor eros aliquam, vel tempus metus ullamcorper. Nam at nulla sed tellus
66+
vestibulum fringilla vel sit amet ligula. Proin velit lectus, euismod sit amet quam vel ultricies dolor,
67+
vitae
68+
finibus lorem ipsum. Pellentesque molestie at mi sit amet dictum. Donec vehicula lacinia felis sit amet
69+
consectetur. Praesent sodales enim sapien, sed varius ipsum pellentesque vel. Aenean eu mi eu justo
70+
tincidunt
71+
finibus vel sit amet ipsum. Sed bibasdum purus vel ipsum sagittis, quis fermentum dolor lobortis. Etiam
72+
vulputate eleifasd lectus vel varius.
73+
Phasellus imperdiet lectus sit amet ipsum egestas, ut bibasdum ipsum malesuada. Vestibulum ante ipsum primis
74+
in
75+
faucibus orci luctus et ultrices posuere cubilia Curae; Sed mollis eros sit amet elit porttitor, vel
76+
venenatis
77+
turpis venenatis. Nulla tempus tortor at eros efficitur, sit amet dapibus ipsum malesuada. Ut at mauris sed
78+
nunc
79+
malesuada convallis. Duis id sem vel magna varius eleifasd vel at est. Donec eget orci a ipsum tempor
80+
lobortis.
81+
Sed at consectetur ipsum.
82+
</div>
83+
</div>
84+
85+
<div id="contains_inner_text_no_width_fixed_height" style="width:2000px;height:2000px;align-items: flex-start;">
86+
<div style="flex-direction:row;height:20px">
87+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifasd et tortor ac auctor. Integer at
88+
volutpat
89+
libero, sed elementum dui interdum id. Aliquam consectetur massa vel neque aliquet, quis consequat risus
90+
fringilla. Fusce rhoncus ipsum tempor eros aliquam, vel tempus metus ullamcorper. Nam at nulla sed tellus
91+
vestibulum fringilla vel sit amet ligula. Proin velit lectus, euismod sit amet quam vel ultricies dolor,
92+
vitae
93+
finibus lorem ipsum. Pellentesque molestie at mi sit amet dictum. Donec vehicula lacinia felis sit amet
94+
consectetur. Praesent sodales enim sapien, sed varius ipsum pellentesque vel. Aenean eu mi eu justo
95+
tincidunt
96+
finibus vel sit amet ipsum. Sed bibasdum purus vel ipsum sagittis, quis fermentum dolor lobortis. Etiam
97+
vulputate eleifasd lectus vel varius.
98+
Phasellus imperdiet lectus sit amet ipsum egestas, ut bibasdum ipsum malesuada. Vestibulum ante ipsum primis
99+
in
100+
faucibus orci luctus et ultrices posuere cubilia Curae; Sed mollis eros sit amet elit porttitor, vel
101+
venenatis
102+
turpis venenatis. Nulla tempus tortor at eros efficitur, sit amet dapibus ipsum malesuada. Ut at mauris sed
103+
nunc
104+
malesuada convallis. Duis id sem vel magna varius eleifasd vel at est. Donec eget orci a ipsum tempor
105+
lobortis.
106+
Sed at consectetur ipsum.
107+
</div>
108+
</div>
109+
110+
<div id="contains_inner_text_fixed_width_fixed_height" style="width:2000px;height:2000px;align-items: flex-start;">
111+
<div style="flex-direction:row;width: 50px; height:20px">
112+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifasd et tortor ac auctor. Integer at
113+
volutpat
114+
libero, sed elementum dui interdum id. Aliquam consectetur massa vel neque aliquet, quis consequat risus
115+
fringilla. Fusce rhoncus ipsum tempor eros aliquam, vel tempus metus ullamcorper. Nam at nulla sed tellus
116+
vestibulum fringilla vel sit amet ligula. Proin velit lectus, euismod sit amet quam vel ultricies dolor,
117+
vitae
118+
finibus lorem ipsum. Pellentesque molestie at mi sit amet dictum. Donec vehicula lacinia felis sit amet
119+
consectetur. Praesent sodales enim sapien, sed varius ipsum pellentesque vel. Aenean eu mi eu justo
120+
tincidunt
121+
finibus vel sit amet ipsum. Sed bibasdum purus vel ipsum sagittis, quis fermentum dolor lobortis. Etiam
122+
vulputate eleifasd lectus vel varius.
123+
Phasellus imperdiet lectus sit amet ipsum egestas, ut bibasdum ipsum malesuada. Vestibulum ante ipsum primis
124+
in
125+
faucibus orci luctus et ultrices posuere cubilia Curae; Sed mollis eros sit amet elit porttitor, vel
126+
venenatis
127+
turpis venenatis. Nulla tempus tortor at eros efficitur, sit amet dapibus ipsum malesuada. Ut at mauris sed
128+
nunc
129+
malesuada convallis. Duis id sem vel magna varius eleifasd vel at est. Donec eget orci a ipsum tempor
130+
lobortis.
131+
Sed at consectetur ipsum.
132+
</div>
133+
</div>
134+
135+
<div id="contains_inner_text_max_width_max_height" style="width:2000px;height:2000px;align-items: flex-start;">
136+
<div style="flex-direction:row;max-width: 50px; max-height:20px">
137+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifasd et tortor ac auctor. Integer at
138+
volutpat
139+
libero, sed elementum dui interdum id. Aliquam consectetur massa vel neque aliquet, quis consequat risus
140+
fringilla. Fusce rhoncus ipsum tempor eros aliquam, vel tempus metus ullamcorper. Nam at nulla sed tellus
141+
vestibulum fringilla vel sit amet ligula. Proin velit lectus, euismod sit amet quam vel ultricies dolor,
142+
vitae
143+
finibus lorem ipsum. Pellentesque molestie at mi sit amet dictum. Donec vehicula lacinia felis sit amet
144+
consectetur. Praesent sodales enim sapien, sed varius ipsum pellentesque vel. Aenean eu mi eu justo
145+
tincidunt
146+
finibus vel sit amet ipsum. Sed bibasdum purus vel ipsum sagittis, quis fermentum dolor lobortis. Etiam
147+
vulputate eleifasd lectus vel varius.
148+
Phasellus imperdiet lectus sit amet ipsum egestas, ut bibasdum ipsum malesuada. Vestibulum ante ipsum primis
149+
in
150+
faucibus orci luctus et ultrices posuere cubilia Curae; Sed mollis eros sit amet elit porttitor, vel
151+
venenatis
152+
turpis venenatis. Nulla tempus tortor at eros efficitur, sit amet dapibus ipsum malesuada. Ut at mauris sed
153+
nunc
154+
malesuada convallis. Duis id sem vel magna varius eleifasd vel at est. Donec eget orci a ipsum tempor
155+
lobortis.
156+
Sed at consectetur ipsum.
157+
</div>
158+
</div>
159+
160+
161+
<div id="contains_inner_text_max_width" style="width:2000px;height:2000px;align-items: flex-start;">
162+
<div style="flex-direction:row;max-width:100px">
163+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifasd et tortor ac auctor. Integer at
164+
volutpat
165+
libero, sed elementum dui interdum id. Aliquam consectetur massa vel neque aliquet, quis consequat risus
166+
fringilla. Fusce rhoncus ipsum tempor eros aliquam, vel tempus metus ullamcorper. Nam at nulla sed tellus
167+
vestibulum fringilla vel sit amet ligula. Proin velit lectus, euismod sit amet quam vel ultricies dolor,
168+
vitae
169+
finibus lorem ipsum. Pellentesque molestie at mi sit amet dictum. Donec vehicula lacinia felis sit amet
170+
consectetur. Praesent sodales enim sapien, sed varius ipsum pellentesque vel. Aenean eu mi eu justo
171+
tincidunt
172+
finibus vel sit amet ipsum. Sed bibasdum purus vel ipsum sagittis, quis fermentum dolor lobortis. Etiam
173+
vulputate eleifasd lectus vel varius.
174+
Phasellus imperdiet lectus sit amet ipsum egestas, ut bibasdum ipsum malesuada. Vestibulum ante ipsum primis
175+
in
176+
faucibus orci luctus et ultrices posuere cubilia Curae; Sed mollis eros sit amet elit porttitor, vel
177+
venenatis
178+
turpis venenatis. Nulla tempus tortor at eros efficitur, sit amet dapibus ipsum malesuada. Ut at mauris sed
179+
nunc
180+
malesuada convallis. Duis id sem vel magna varius eleifasd vel at est. Donec eget orci a ipsum tempor
181+
lobortis.
182+
Sed at consectetur ipsum.
183+
</div>
184+
</div>
185+
186+
<div id="contains_inner_text_fixed_width_shorter_text" style="width:2000px;height:2000px;align-items: flex-start;">
187+
<div style="flex-direction:row;width:100px">
188+
Lorem ipsum
189+
</div>
190+
</div>
191+
192+
<div id="contains_inner_text_fixed_height_shorter_text" style="width:2000px;height:2000px;align-items: flex-start;">
193+
<div style="flex-direction:row;height:100px">
194+
Lorem ipsum
195+
</div>
196+
</div>
197+
198+
<div id="contains_inner_text_max_height" style="width:2000px;height:2000px;align-items: flex-start;">
199+
<div style="flex-direction:row;max-height:20px">
200+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifasd et tortor ac auctor. Integer at
201+
volutpat
202+
libero, sed elementum dui interdum id. Aliquam consectetur massa vel neque aliquet, quis consequat risus
203+
fringilla. Fusce rhoncus ipsum tempor eros aliquam, vel tempus metus ullamcorper. Nam at nulla sed tellus
204+
vestibulum fringilla vel sit amet ligula. Proin velit lectus, euismod sit amet quam vel ultricies dolor,
205+
vitae
206+
finibus lorem ipsum. Pellentesque molestie at mi sit amet dictum. Donec vehicula lacinia felis sit amet
207+
consectetur. Praesent sodales enim sapien, sed varius ipsum pellentesque vel. Aenean eu mi eu justo
208+
tincidunt
209+
finibus vel sit amet ipsum. Sed bibasdum purus vel ipsum sagittis, quis fermentum dolor lobortis. Etiam
210+
vulputate eleifasd lectus vel varius.
211+
Phasellus imperdiet lectus sit amet ipsum egestas, ut bibasdum ipsum malesuada. Vestibulum ante ipsum primis
212+
in
213+
faucibus orci luctus et ultrices posuere cubilia Curae; Sed mollis eros sit amet elit porttitor, vel
214+
venenatis
215+
turpis venenatis. Nulla tempus tortor at eros efficitur, sit amet dapibus ipsum malesuada. Ut at mauris sed
216+
nunc
217+
malesuada convallis. Duis id sem vel magna varius eleifasd vel at est. Donec eget orci a ipsum tempor
218+
lobortis.
219+
Sed at consectetur ipsum.
220+
</div>
221+
</div>

0 commit comments

Comments
 (0)