Skip to content

Commit c97fd88

Browse files
committed
Apply FlexItemPercentMinMaxAgainstOwner errata to justifyMainAxis canSkipFlex path
1 parent f753213 commit c97fd88

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

yoga/algorithm/CalculateLayout.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1414,14 +1414,18 @@ static void justifyMainAxis(
14141414
// If we skipped the flex step, then we can't rely on the measuredDims
14151415
// because they weren't computed. This means we can't call
14161416
// dimensionWithMargin.
1417+
const float minMaxAxisSize =
1418+
child->hasErrata(Errata::FlexItemPercentMinMaxAgainstOwner)
1419+
? mainAxisOwnerSize
1420+
: availableInnerMainDim;
14171421
flexLine.layout.mainDim +=
14181422
child->style().computeMarginForAxis(mainAxis, availableInnerWidth) +
14191423
boundAxisWithinMinAndMax(
14201424
child,
14211425
direction,
14221426
mainAxis,
14231427
childLayout.computedFlexBasis,
1424-
mainAxisOwnerSize,
1428+
minMaxAxisSize,
14251429
ownerWidth)
14261430
.unwrap();
14271431
flexLine.layout.crossDim = availableInnerCrossDim;

0 commit comments

Comments
 (0)