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

absolute, left, marginLeft

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-21 18:45:57 -07:00
parent 6da9e221d6
commit 78315b5bbf
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Layout.js
View File

@@ -287,7 +287,8 @@ var computeLayout = (function() {
child.layout[pos[crossAxis]] += leadingCrossDim; child.layout[pos[crossAxis]] += leadingCrossDim;
} else { } else {
if (isPosDefined(child, leading[crossAxis])) { if (isPosDefined(child, leading[crossAxis])) {
child.layout[pos[crossAxis]] = getPosition(child, leading[crossAxis]); child.layout[pos[crossAxis]] = getPosition(child, leading[crossAxis]) +
getMargin(child, leading[crossAxis]);
} else { } else {
child.layout[pos[crossAxis]] += getPadding(node, leading[crossAxis]); child.layout[pos[crossAxis]] += getPadding(node, leading[crossAxis]);
} }

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

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