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

handle position: absolute margin as child correctly

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-21 14:53:02 -07:00
parent ddcca9107b
commit 72e2d959f2
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Layout.js
View File

@@ -221,12 +221,12 @@ var computeLayout = (function() {
child.layout[pos[mainAxis]] += mainPos;
if (getPositionType(child) === 'relative') {
mainPos += getDimWithMargin(child, mainAxis) + betweenMainDim;
}
if (!isUndefined(child.layout[dim[crossAxis]])) {
var/*float*/ childCrossDim = getDimWithMargin(child, crossAxis);
if (childCrossDim > crossDim) {
crossDim = childCrossDim;
if (!isUndefined(child.layout[dim[crossAxis]])) {
var/*float*/ childCrossDim = getDimWithMargin(child, crossAxis);
if (childCrossDim > crossDim) {
crossDim = childCrossDim;
}
}
}
}

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

@@ -482,6 +482,17 @@ describe('Layout', function() {
);
});
it('should layout node with child with position: absolute and margin', function() {
testLayout(
{style: {}, children: [
{style: {marginRight: 15, position: 'absolute'}}
]},
{width: 0, height: 0, top: 0, left: 0, children: [
{width: 0, height: 0, top: 0, left: 0}
]}
);
});
it('should layout randomly', function() {
function RNG(seed) {
this.state = seed;