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

Fix NaN value with just justifyContent: 'center'

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-14 10:57:16 -07:00
parent 73346dd1ef
commit 57dd9e3e28
2 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spec/LayoutSpec.js
View File

@@ -485,6 +485,14 @@ describe('Layout', function() {
}); });
}); });
it('should layout for center', function() {
testLayout({
style: {justifyContent: 'center'}
}, {
width: 0, height: 0, top: 0, left: 0,
});
});
it('should layout randomly', function() { it('should layout randomly', function() {
function RNG(seed) { function RNG(seed) {
this.state = seed; this.state = seed;
@@ -501,6 +509,11 @@ describe('Layout', function() {
node.style[attribute] = Math.floor(rng.nextFloat() * (max - min)) + min; node.style[attribute] = Math.floor(rng.nextFloat() * (max - min)) + min;
} }
} }
function randEnum(node, chance, attribute, enumValues) {
if (rng.nextFloat() < chance) {
node.style[attribute] = enumValues[Math.floor(rng.nextFloat() * enumValues.length)];
}
}
function randChildren(node, chance) { function randChildren(node, chance) {
while (rng.nextFloat() < chance) { while (rng.nextFloat() < chance) {
if (!node.children) { if (!node.children) {
@@ -518,6 +531,8 @@ describe('Layout', function() {
randMinMax(node, 0.1, 'marginTop', -5, 20); randMinMax(node, 0.1, 'marginTop', -5, 20);
randMinMax(node, 0.1, 'marginRight', -5, 20); randMinMax(node, 0.1, 'marginRight', -5, 20);
randMinMax(node, 0.1, 'marginBottom', -5, 20); randMinMax(node, 0.1, 'marginBottom', -5, 20);
randEnum(node, 0.1, 'flexDirection', ['row', 'column']);
randEnum(node, 0.1, 'justifyContent', ['flex-start', 'center', 'flex-end', 'space-between', 'space-around']);
randChildren(node, 0.2); randChildren(node, 0.2);
return node; return node;
} }

44
src/Layout.js
View File

@@ -117,30 +117,32 @@ function computeLayout(node) {
} }
}); });
var remainingMainDim = node.layout[dim[mainAxis]] - mainContentDim;
var leadingMainDim = 0; var leadingMainDim = 0;
var betweenMainDim = 0; var betweenMainDim = 0;
if (flexibleChildrenCount) { if (node.layout[dim[mainAxis]] !== undefined) {
var flexibleMainDim = remainingMainDim / flexibleChildrenCount; var remainingMainDim = node.layout[dim[mainAxis]] - mainContentDim;
children.forEach(function(child) { if (flexibleChildrenCount) {
if (child.style.flex) { var flexibleMainDim = remainingMainDim / flexibleChildrenCount;
child.layout[dim[mainAxis]] = flexibleMainDim; children.forEach(function(child) {
layoutNode(child); if (child.style.flex) {
child.layout[dim[mainAxis]] = flexibleMainDim;
layoutNode(child);
}
});
} else {
var justifyContent = getJustifyContent(node);
if (justifyContent == 'flex-start') {
// Do nothing
} else if (justifyContent === 'flex-end') {
leadingMainDim = remainingMainDim;
} else if (justifyContent === 'center') {
leadingMainDim = remainingMainDim / 2;
} else if (justifyContent === 'space-between') {
betweenMainDim = remainingMainDim / (children.length - 1);
} else if (justifyContent === 'space-around') {
betweenMainDim = remainingMainDim / children.length;
leadingMainDim = betweenMainDim / 2;
} }
});
} else {
var justifyContent = getJustifyContent(node);
if (justifyContent == 'flex-start') {
// Do nothing
} else if (justifyContent === 'flex-end') {
leadingMainDim = remainingMainDim;
} else if (justifyContent === 'center') {
leadingMainDim = remainingMainDim / 2;
} else if (justifyContent === 'space-between') {
betweenMainDim = remainingMainDim / (children.length - 1);
} else if (justifyContent === 'space-around') {
betweenMainDim = remainingMainDim / children.length;
leadingMainDim = betweenMainDim / 2;
} }
} }