kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-05-17 11:27:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Generate tests for flex properties

Browse Source 
Differential Revision: D3771513

fbshipit-source-id: 1b5edc7a28bb26217e8a6d10d1829d9031c3ae2e
This commit is contained in:
Emil Sjolander
2016-08-25 15:28:43 -07:00
committed by Facebook Github Bot 9
parent a282be9a18
commit 06ee832928
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
React/CSSLayout/CSSLayout.c
View File

@@ -1040,8 +1040,7 @@ static void layoutNodeImpl(const CSSNodeRef node,
child->layout.computedFlexBasis =
fmaxf(child->style.dimensions[CSSDimensionHeight],
getPaddingAndBorderAxis(child, CSSFlexDirectionColumn));
} else if (!CSSValueIsUndefined(child->style.flexBasis) &&
!CSSValueIsUndefined(availableInnerMainDim)) {
} else if (!CSSValueIsUndefined(child->style.flexBasis)) {
child->layout.computedFlexBasis =
fmaxf(child->style.flexBasis, getPaddingAndBorderAxis(child, mainAxis));
} else {