From 4fdaf2de989c039a62681cc1f7a8407ec32b593e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= Date: Thu, 30 Nov 2017 07:47:38 -0800 Subject: [PATCH] Fix min/max percentage constraints on measured nodes Summary: Fix min/max percentage constraints on measured nodes. Currently we passed in the available size instead of the parent size. Fixes #611 Closes https://github.com/facebook/yoga/pull/649 Reviewed By: priteshrnandgaonkar Differential Revision: D6408019 Pulled By: emilsjolander fbshipit-source-id: 18be5056dbc0dc179970ec231ab8b4e2cdba65c5 --- ReactCommon/yoga/yoga/Yoga.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp index 8b0556d9e2298a..63c446e887c48a 100644 --- a/ReactCommon/yoga/yoga/Yoga.cpp +++ b/ReactCommon/yoga/yoga/Yoga.cpp @@ -1592,8 +1592,8 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(const YGNodeRef node, widthMeasureMode == YGMeasureModeAtMost) ? measuredSize.width + paddingAndBorderAxisRow : availableWidth - marginAxisRow, - availableWidth, - availableWidth); + parentWidth, + parentWidth); node->layout.measuredDimensions[YGDimensionHeight] = YGNodeBoundAxis(node, YGFlexDirectionColumn, @@ -1601,8 +1601,8 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(const YGNodeRef node, heightMeasureMode == YGMeasureModeAtMost) ? measuredSize.height + paddingAndBorderAxisColumn : availableHeight - marginAxisColumn, - availableHeight, - availableWidth); + parentHeight, + parentWidth); } }