From f75e21f1caf9117ae3eda31c23e286116ebf586c Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Wed, 7 Feb 2018 17:19:53 -0800 Subject: [PATCH] call margin method on child instead of node Reviewed By: emilsjolander Differential Revision: D6918367 fbshipit-source-id: cee90e015f9e45a717a7307f59fd3b9ef6f399b6 --- ReactCommon/yoga/yoga/Yoga.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp index 81de56f20..93767f3ed 100644 --- a/ReactCommon/yoga/yoga/Yoga.cpp +++ b/ReactCommon/yoga/yoga/Yoga.cpp @@ -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) {