status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix justify content + min dimension usage in root 

Reviewed By: gkassabli, lucasr

Differential Revision: D4021443

fbshipit-source-id: 00f58c6078ac3076221e1148aacc34712786deb5
This commit is contained in:
Emil Sjolander 2016-10-17 04:07:54 -07:00 committed by Facebook Github Bot
parent c84157a8ad
commit d376155e2c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
React/CSSLayout/CSSLayout.c
View File

@ -1514,10 +1514,14 @@ static void layoutNodeImpl(const CSSNodeRef node,
// that are aligned "stretch". We need to compute these stretch values and // that are aligned "stretch". We need to compute these stretch values and
// set the final positions. // set the final positions.
// If we are using "at most" rules in the main axis, we won't distribute // If we are using "at most" rules in the main axis. Calculate the remaining space when
// any remaining space at this point. // constraint by the min size defined for the main axis.
if (measureModeMainDim == CSSMeasureModeAtMost) { if (measureModeMainDim == CSSMeasureModeAtMost) {
remainingFreeSpace = 0; if (!CSSValueIsUndefined(node->style.minDimensions[dim[mainAxis]]) && node->style.minDimensions[dim[mainAxis]] >= 0) {
remainingFreeSpace = fmaxf(0, node->style.minDimensions[dim[mainAxis]] - (availableInnerMainDim - remainingFreeSpace));
} else {
remainingFreeSpace = 0;
}
} }
switch (justifyContent) { switch (justifyContent) {