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

cross axis left and padding

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-21 18:40:00 -07:00
parent 756babcdb7
commit b11c04ed0f
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Layout.js
View File

@@ -284,10 +284,14 @@ var computeLayout = (function() {
} }
} }
child.layout[pos[crossAxis]] += leadingCrossDim; child.layout[pos[crossAxis]] += leadingCrossDim;
} else {
if (isPosDefined(child, leading[crossAxis])) {
child.layout[pos[crossAxis]] = getPosition(child, leading[crossAxis]);
} else { } else {
child.layout[pos[crossAxis]] += getPadding(node, leading[crossAxis]); child.layout[pos[crossAxis]] += getPadding(node, leading[crossAxis]);
} }
} }
}
node.layout[leading[mainAxis]] += getMargin(node, leading[mainAxis]) + node.layout[leading[mainAxis]] += getMargin(node, leading[mainAxis]) +
getRelativePosition(node, mainAxis); getRelativePosition(node, mainAxis);

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

@@ -559,6 +559,17 @@ describe('Layout', function() {
); );
}); });
it('should layout node with padding and child position absolute, left', function() {
testLayout(
{style: {padding: 20}, children: [
{style: {left: 5, position: 'absolute'}}
]},
{width: 40, height: 40, top: 0, left: 0, children: [
{width: 0, height: 0, top: 20, left: 5}
]}
);
});
it('should layout randomly', function() { it('should layout randomly', function() {
function RNG(seed) { function RNG(seed) {
this.state = seed; this.state = seed;
@@ -602,8 +613,8 @@ describe('Layout', function() {
var node = {style: {}}; var node = {style: {}};
randMinMax(node, 0.1, 'width', 0, 1000); randMinMax(node, 0.1, 'width', 0, 1000);
randMinMax(node, 0.1, 'height', 0, 1000); randMinMax(node, 0.1, 'height', 0, 1000);
randMinMax(node, 0.1, 'top', -10, 10); randMinMax(node, 0.5, 'top', -10, 10);
randMinMax(node, 0.1, 'left', -10, 10); randMinMax(node, 0.5, 'left', -10, 10);
randMinMax(node, 0.1, 'right', -10, 10); randMinMax(node, 0.1, 'right', -10, 10);
randMinMax(node, 0.1, 'bottom', -10, 10); randMinMax(node, 0.1, 'bottom', -10, 10);
randSpacing(node, 0.1, 'margin', 0, 20); randSpacing(node, 0.1, 'margin', 0, 20);
@@ -613,7 +624,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.5, 'position', ['relative', 'absolute']);
randChildren(node, 0.2); randChildren(node, 0.2);
return node; return node;
} }