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

fix test case not passing because of div by 0

Browse Source
This commit is contained in:
Christopher Chedeau
2014-12-11 14:22:04 +00:00
parent 5a3303ac5e
commit 570f7bf98a
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Layout.js
View File

@@ -353,7 +353,6 @@ var computeLayout = (function() {
} }
} }
// <Loop B> Layout flexible children and allocate empty space // <Loop B> Layout flexible children and allocate empty space
// In order to position the elements in the main axis, we have two // In order to position the elements in the main axis, we have two
@@ -422,8 +421,12 @@ var computeLayout = (function() {
leadingMainDim = remainingMainDim; leadingMainDim = remainingMainDim;
} else if (justifyContent === CSS_JUSTIFY_SPACE_BETWEEN) { } else if (justifyContent === CSS_JUSTIFY_SPACE_BETWEEN) {
remainingMainDim = fmaxf(remainingMainDim, 0); remainingMainDim = fmaxf(remainingMainDim, 0);
betweenMainDim = remainingMainDim / if (flexibleChildrenCount + nonFlexibleChildrenCount - 1 !== 0) {
(flexibleChildrenCount + nonFlexibleChildrenCount - 1); betweenMainDim = remainingMainDim /
(flexibleChildrenCount + nonFlexibleChildrenCount - 1);
} else {
betweenMainDim = 0;
}
} else if (justifyContent === CSS_JUSTIFY_SPACE_AROUND) { } else if (justifyContent === CSS_JUSTIFY_SPACE_AROUND) {
// Space on the edges is half of the space between elements // Space on the edges is half of the space between elements
betweenMainDim = remainingMainDim / betweenMainDim = remainingMainDim /

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

@@ -1000,7 +1000,7 @@ describe('Layout', function() {
); );
}); });
it('should calcluate left properly with position: absolute right', function() { it('should calculate left properly with position: absolute right', function() {
testLayout( testLayout(
{style: {width: 100}, children: [ {style: {width: 100}, children: [
{style: {position: 'absolute', right: 0}} {style: {position: 'absolute', right: 0}}
@@ -1022,7 +1022,7 @@ describe('Layout', function() {
); );
}); });
it('should calcluate left properly with position: absolute right and width', function() { it('should calculate left properly with position: absolute right and width', function() {
testLayout( testLayout(
{style: {width: 100}, children: [ {style: {width: 100}, children: [
{style: {width: 10, position: 'absolute', right: 0}} {style: {width: 10, position: 'absolute', right: 0}}
@@ -1033,7 +1033,7 @@ describe('Layout', function() {
); );
}); });
it('should calcluate top properly with position: absolute right, width, and no parent dimensions', function() { it('should calculate top properly with position: absolute right, width, and no parent dimensions', function() {
testLayout( testLayout(
{style: {}, children: [ {style: {}, children: [
{style: {height: 10, position: 'absolute', bottom: 0}} {style: {height: 10, position: 'absolute', bottom: 0}}
@@ -1066,6 +1066,17 @@ describe('Layout', function() {
); );
}); });
it('should layout border bottom inside of justify content space between container', function() {
testLayout(
{style: {justifyContent: 'space-between'}, children: [
{style: {borderBottomWidth: 1}}
]},
{width: 0, height: 1, top: 0, left: 0, children: [
{width: 0, height: 1, top: 0, left: 0}
]}
);
});
xit('should layout flex-wrap', function() { xit('should layout flex-wrap', function() {
testLayout( testLayout(
{style: {flexWrap: 'wrap', flexDirection: 'row', width: 100}, children: [ {style: {flexWrap: 'wrap', flexDirection: 'row', width: 100}, children: [