Skip to content

Commit ea07e09

Browse files
committed
Apply FlexItemPercentMinMaxAgainstOwner errata to justifyMainAxis canSkipFlex path
1 parent b9d7b8a commit ea07e09

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
@@ -1167,14 +1167,18 @@ static void justifyMainAxis(
11671167
// If we skipped the flex step, then we can't rely on the measuredDims
11681168
// because they weren't computed. This means we can't call
11691169
// dimensionWithMargin.
1170+
const float minMaxAxisSize =
1171+
child->hasErrata(Errata::FlexItemPercentMinMaxAgainstOwner)
1172+
? mainAxisOwnerSize
1173+
: availableInnerMainDim;
11701174
flexLine.layout.mainDim +=
11711175
child->style().computeMarginForAxis(mainAxis, availableInnerWidth) +
11721176
boundAxisWithinMinAndMax(
11731177
child,
11741178
direction,
11751179
mainAxis,
11761180
childLayout.computedFlexBasis,
1177-
mainAxisOwnerSize,
1181+
minMaxAxisSize,
11781182
ownerWidth)
11791183
.unwrap();
11801184
flexLine.layout.crossDim = availableInnerCrossDim;

0 commit comments

Comments
 (0)