DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Revert D4875343: Correct fix for flexing grandchildren

Browse Source 
Summary: This reverts commit 634e961f9798dff43eae2c6564b28c6629b816e0

Differential Revision: D4875343

fbshipit-source-id: 2949762bf47e151c8c0ff923d501859b3e0a567a
This commit is contained in:
George Xu
2017-04-13 18:01:35 -07:00
committed by Facebook Github Bot
parent eb4af86e3c
commit 3292337754
13 changed files with 480 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gentest/fixtures/YGMinMaxDimensionTest.html
View File

@@ -30,21 +30,17 @@
<div style="width: 50px; height: 50px;"></div>
</div>
<div id="flex_grow_to_min" style="min-height: 100px; max-height: 500px; width: 100px;">
<div id="flex_grow_to_min" experiments="MinFlexFix" style="min-height: 100px; max-height: 500px; width: 100px;">
<div style="flex-grow: 1; flex-shrink: 1;"></div>
<div style="height: 50px;"></div>
</div>
<div id="flex_grow_skip_child" style="width: 100px; height: 100px; background-color: white; flex-direction: row; align-items: flex-start;">
<div id="flex_grow_in_at_most_container" experiments="MinFlexFix" style="width: 100px; height: 100px; background-color: white; flex-direction: row; align-items: flex-start;">
<div style="flex-direction: row;">
<div style="height: 100px; flex-grow: 1; flex-basis: 0px;"></div>
<div style="flex-grow: 1; flex-basis: 0px;"></div>
</div>
</div>
<div id="flex_grow_child" style="flex-direction: row;">
<div style="height: 100px; flex-grow: 1; flex-basis: 0px;"></div>
</div>
<div id="flex_grow_within_max_width" style="width: 200px; height: 100px;">
<div style="flex-direction: row; max-width: 100px;">
<div style="height: 20px; flex-grow: 1;"></div>
@@ -67,11 +63,6 @@
<div style="height: 50px;"></div>
</div>
<div id="flex_grow_within_constrained_min_max_column" style="min-height: 100px; max-height: 200px">
<div style="flex-grow:1;"></div>
<div style="height: 50px;"></div>
</div>
<div id="flex_grow_within_constrained_max_row" style="width: 200px;">
<div style="height: 100px; max-width: 100px; flex-direction: row;">
<div style="flex-shrink:1; flex-basis:100px"></div>

2
gentest/fixtures/YGPercentageTest.html
View File

@@ -92,7 +92,7 @@
<div style="width: 100px;"></div>
</div>
<div id="percentage_container_in_wrapping_container" style="align-items: center; width: 200px; height: 200px; justify-content: center;">
<div id="percentage_container_in_wrapping_container" experiments="MinFlexFix" style="align-items: center; width: 200px; height: 200px; justify-content: center;">
<div>
<div style="alignItems: center; flex-direction: row; justify-content: center; width: 100%;">
<div style="width: 50px; height: 50px;"></div>