kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-19 23:40:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixup recent fix to flex basis and put it behind an experimental flag

Browse Source 
Reviewed By: gkassabli

Differential Revision: D4222910

fbshipit-source-id: d693482441fcc4d37a288e2e3529057a04f60541
This commit is contained in:
Emil Sjolander
2016-11-23 05:25:50 -08:00
committed by Facebook Github Bot
parent 68c6d71cea
commit dad520476e
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReactCommon/CSSLayout/CSSLayout/CSSEnums.h
View File

@@ -68,6 +68,7 @@ typedef enum CSSDirection {
typedef enum CSSExperimentalFeature {
CSSExperimentalFeatureRounding,
CSSExperimentalFeatureWebFlexBasis,
CSSExperimentalFeatureCount,
} CSSExperimentalFeature;

3
ReactCommon/CSSLayout/CSSLayout/CSSLayout.c
View File

@@ -977,7 +977,8 @@ static void computeChildFlexBasis(const CSSNodeRef node,
if (!CSSValueIsUndefined(CSSNodeStyleGetFlexBasis(child)) &&
!CSSValueIsUndefined(isMainAxisRow ? width : height)) {
if (CSSValueIsUndefined(child->layout.computedFlexBasis) ||
child->layout.computedFlexBasisGeneration != gCurrentGenerationCount) {
(CSSLayoutIsExperimentalFeatureEnabled(CSSExperimentalFeatureWebFlexBasis) &&
child->layout.computedFlexBasisGeneration != gCurrentGenerationCount)) {
child->layout.computedFlexBasis =
fmaxf(CSSNodeStyleGetFlexBasis(child), getPaddingAndBorderAxis(child, mainAxis));
}