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

fix layout border bottom and flex end with an empty child

Browse Source
This commit is contained in:
Christopher Chedeau
2014-12-11 14:42:31 +00:00
parent 79286e6263
commit ba873aa3d7
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Layout.js
View File

@@ -363,13 +363,11 @@ var computeLayout = (function() {
var/*float*/ definedMainDim = fmaxf(mainContentDim, 0);
if (!isUndefined(node.layout[dim[mainAxis]])) {
definedMainDim = node.layout[dim[mainAxis]];
definedMainDim = node.layout[dim[mainAxis]] -
getPaddingAndBorderAxis(node, mainAxis);
}
// The remaining available space that needs to be allocated
var/*float*/ remainingMainDim = definedMainDim -
getPaddingAndBorderAxis(node, mainAxis) -
mainContentDim;
var/*float*/ remainingMainDim = definedMainDim - mainContentDim;
// If there are flexible children in the mix, they are going to fill the
// remaining space

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

@@ -1088,6 +1088,16 @@ describe('Layout', function() {
);
});
it('should layout border bottom and flex end with an empty child', function() {
testLayout(
{style: {borderBottomWidth: 5, justifyContent: 'flex-end'}, children: [
{style: {}}
]},
{width: 0, height: 5, top: 0, left: 0, children: [
{width: 0, height: 0, top: 0, left: 0}
]}
);
});
xit('should layout flex-wrap', function() {
testLayout(