From 7c980c5ba540f8c3d385ac64bc355b7939c5b337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= Date: Thu, 1 Jun 2017 05:30:17 -0700 Subject: [PATCH] Fix absolute position if wrap-reverse and align-items: flex-end Summary: This is a fix on top of 56b10fc. It takes the case into account were you have `wrap-reverse` and `align-items: flex-end` set. Closes https://github.com/facebook/yoga/pull/568 Differential Revision: D5155521 Pulled By: emilsjolander fbshipit-source-id: 7e5fcfa2fbb48b6c6279da46cc648a071ff2b079 --- ReactCommon/yoga/yoga/Yoga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c index eb2e2137a74cd2..5ed9e1af02d4ea 100644 --- a/ReactCommon/yoga/yoga/Yoga.c +++ b/ReactCommon/yoga/yoga/Yoga.c @@ -1714,7 +1714,7 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node, child->layout.measuredDimensions[dim[crossAxis]]) / 2.0f; } else if (!YGNodeIsLeadingPosDefined(child, crossAxis) && - (YGNodeAlignItem(node, child) == YGAlignFlexEnd || node->style.flexWrap == YGWrapWrapReverse)) { + ((YGNodeAlignItem(node, child) == YGAlignFlexEnd) ^ (node->style.flexWrap == YGWrapWrapReverse))) { child->layout.position[leading[crossAxis]] = (node->layout.measuredDimensions[dim[crossAxis]] - child->layout.measuredDimensions[dim[crossAxis]]); }