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

call margin method on child instead of node 

Reviewed By: emilsjolander

Differential Revision: D6918367

fbshipit-source-id: cee90e015f9e45a717a7307f59fd3b9ef6f399b6
This commit is contained in:
Pritesh Nandgaonkar 2018-02-07 17:19:53 -08:00 committed by Facebook Github Bot
parent 09b43e479e
commit f75e21f1ca
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ReactCommon/yoga/yoga/Yoga.cpp
View File

@ -1037,9 +1037,9 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
childHeightMeasureMode = YGMeasureModeUndefined;
const float marginRow =
node->getMarginForAxis(YGFlexDirectionRow, parentWidth);
child->getMarginForAxis(YGFlexDirectionRow, parentWidth);
const float marginColumn =
node->getMarginForAxis(YGFlexDirectionColumn, parentWidth);
child->getMarginForAxis(YGFlexDirectionColumn, parentWidth);
if (isRowStyleDimDefined) {
childWidth =
@ -2624,9 +2624,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
}
if (child->getStyle().positionType == YGPositionTypeAbsolute) {
// If the child is absolutely positioned and has a
// top/left/bottom/right
// set, override all the previously computed positions to set it
// correctly.
// top/left/bottom/right set, override
// all the previously computed positions to set it correctly.
const bool isChildLeadingPosDefined =
child->isLeadingPositionDefined(crossAxis);
if (isChildLeadingPosDefined) {