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

support position: absolute without top/left/bottom/right set

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-21 14:29:17 -07:00
parent 901db3c3a6
commit ddcca9107b
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Layout.js
View File

@@ -81,6 +81,13 @@ var computeLayout = (function() {
return 'column'; return 'column';
} }
function getPositionType(node) {
if ('position' in node.style) {
return node.style.position;
}
return 'relative';
}
function getFlex(node) { function getFlex(node) {
return node.style.flex == 1; return node.style.flex == 1;
} }
@@ -165,7 +172,9 @@ var computeLayout = (function() {
var/*css_node_t**/ child = node.children[i]; var/*css_node_t**/ child = node.children[i];
if (isUndefined(node.layout[dim[mainAxis]]) || !getFlex(child)) { if (isUndefined(node.layout[dim[mainAxis]]) || !getFlex(child)) {
layoutNode(child); layoutNode(child);
if (getPositionType(child) === 'relative') {
mainContentDim += getDimWithMargin(child, mainAxis); mainContentDim += getDimWithMargin(child, mainAxis);
}
} else { } else {
flexibleChildrenCount++; flexibleChildrenCount++;
} }
@@ -210,7 +219,9 @@ 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];
child.layout[pos[mainAxis]] += mainPos; child.layout[pos[mainAxis]] += mainPos;
if (getPositionType(child) === 'relative') {
mainPos += getDimWithMargin(child, mainAxis) + betweenMainDim; mainPos += getDimWithMargin(child, mainAxis) + betweenMainDim;
}
if (!isUndefined(child.layout[dim[crossAxis]])) { if (!isUndefined(child.layout[dim[crossAxis]])) {
var/*float*/ childCrossDim = getDimWithMargin(child, crossAxis); var/*float*/ childCrossDim = getDimWithMargin(child, crossAxis);

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

@@ -467,6 +467,21 @@ describe('Layout', function() {
); );
}); });
it('should layout node with position: absolute', function() {
testLayout(
{style: {width: 500, flexDirection: 'row'}, children: [
{style: {flex: 1}},
{style: {position: 'absolute', width: 50}},
{style: {flex: 1}},
]},
{width: 500, height: 0, top: 0, left: 0, children: [
{width: 250, height: 0, top: 0, left: 0},
{width: 50, height: 0, top: 0, left: 250},
{width: 250, height: 0, top: 0, left: 250}
]}
);
});
it('should layout randomly', function() { it('should layout randomly', function() {
function RNG(seed) { function RNG(seed) {
this.state = seed; this.state = seed;
@@ -518,7 +533,7 @@ describe('Layout', function() {
randEnum(node, 0.1, 'alignItems', ['flex-start', 'center', 'flex-end', 'stretch']); randEnum(node, 0.1, 'alignItems', ['flex-start', 'center', 'flex-end', 'stretch']);
randEnum(node, 0.1, 'alignSelf', ['flex-start', 'center', 'flex-end', 'stretch']); randEnum(node, 0.1, 'alignSelf', ['flex-start', 'center', 'flex-end', 'stretch']);
randEnum(node, 0.1, 'flex', ['none', 1]); randEnum(node, 0.1, 'flex', ['none', 1]);
// randEnum(node, 0.1, 'position', ['relative', 'absolute']); randEnum(node, 0.1, 'position', ['relative', 'absolute']);
randChildren(node, 0.2); randChildren(node, 0.2);
return node; return node;
} }