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

double flex and position absolute

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-22 10:21:17 -07:00
parent a18bc27c6b
commit 5922c88f84
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Layout.js
View File

@@ -216,7 +216,7 @@ var computeLayout = (function() {
} }
for (var/*int*/ i = 0; i < node.children.length; ++i) { for (var/*int*/ i = 0; i < node.children.length; ++i) {
var/*css_node_t**/ child = node.children[i]; var/*css_node_t**/ child = node.children[i];
if (getFlex(child)) { if (getPositionType(child) === 'relative' && getFlex(child)) {
child.layout[dim[mainAxis]] = flexibleMainDim + child.layout[dim[mainAxis]] = flexibleMainDim +
getPadding(child, leading[mainAxis]) + getPadding(child, leading[mainAxis]) +
getPadding(child, trailing[mainAxis]); getPadding(child, trailing[mainAxis]);

13
src/__tests__/Layout-test.js
View File

@@ -669,7 +669,18 @@ describe('Layout', function() {
); );
}); });
it('should layout node with double flex and position absolute', function() {
testLayout(
{style: {height: 500}, children: [
{style: {flex: 1}},
{style: {flex: 1, position: 'absolute'}}
]},
{width: 0, height: 500, top: 0, left: 0, children: [
{width: 0, height: 500, top: 0, left: 0},
{width: 0, height: 0, top: 500, left: 0},
]}
)
});
it('should layout randomly', function() { it('should layout randomly', function() {