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

Ensure that flex children adopt their parent's cross-axis min dimension.

Browse Source
This commit is contained in:
Russell Keith-Magee
2015-04-07 10:52:15 +08:00
parent b912acf8e3
commit b8316413b3
6 changed files with 162 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Layout.js
View File

@@ -392,9 +392,9 @@ var computeLayout = (function() {
child = node.children[i];
var/*float*/ nextContentDim = 0;
// It only makes sense to consider a child flexible if we have a computed
// dimension for the node.
if (!isUndefined(node.layout[dim[mainAxis]]) && isFlex(child)) {
// If it's a flexible child, accumulate the size that the child potentially
// contributes to the row
if (isFlex(child)) {
flexibleChildrenCount++;
totalFlexible += getFlex(child);
@@ -460,7 +460,7 @@ var computeLayout = (function() {
if (!isUndefined(node.layout[dim[mainAxis]])) {
remainingMainDim = definedMainDim - mainContentDim;
} else {
remainingMainDim = fmaxf(mainContentDim, 0) - mainContentDim;
remainingMainDim = boundAxis(node, mainAxis, fmaxf(mainContentDim, 0)) - mainContentDim;
}
// If there are flexible children in the mix, they are going to fill the