Modify children position instead of passing it from above

This commit is contained in:
Christopher Chedeau
2014-04-05 12:33:12 -07:00
parent d0ae1ea690
commit 34f994ae56

View File

@@ -36,7 +36,7 @@ function computeLayout(node) {
column: 'height'
};
function layoutNode(node, parent) {
function layoutNode(node) {
var mainAxis = node.style.flexDirection === 'row' ? 'row' : 'column';
var crossAxis = mainAxis === 'row' ? 'column' : 'row';
@@ -48,10 +48,9 @@ function computeLayout(node) {
var mainPos = 0;
var children = [];
(node.children || []).forEach(function(child) {
var offset = {};
offset[pos[mainAxis]] = mainPos;
offset[pos[crossAxis]] = 0;
layoutNode(child, offset);
child.layout[pos[mainAxis]] = mainPos;
child.layout[pos[crossAxis]] = 0;
layoutNode(child);
mainPos += child.layout[dim[mainAxis]] + 2 * getMargin(child);
});
@@ -60,12 +59,15 @@ function computeLayout(node) {
node.layout[dim[mainAxis]] = mainPos;
}
node.layout[dim[crossAxis]] = node.style[dim[crossAxis]];
node.layout.top = getMargin(node) + parent.top;
node.layout.left = getMargin(node) + parent.left;
node.layout.top += getMargin(node);
node.layout.left += getMargin(node);
}
fillNodes(node);
layoutNode(node, {top: 0, left: 0});
node.layout.top = 0;
node.layout.left = 0;
layoutNode(node);
return extractNodes(node);
}