Skip to content

fix a regression introduced by fixYogaFlexBasisFitContentInMainAxis feature flag #1962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sammy-SC wants to merge 1 commit into from
+14 −4
Closed

fix a regression introduced by fixYogaFlexBasisFitContentInMainAxis feature flag #1962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions yoga/algorithm/CalculateLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,11 @@ static void computeFlexBasisForChild(

// For height in the main axis (column direction): when the
// FixFlexBasisFitContent feature is enabled, skip FitContent for
// non-measure container children. This makes the flex basis independent
// of the parent's content-determined height, preventing unnecessary
// re-measurement cascades when a sibling changes size in a ScrollView.
// non-measure container children inside scroll subtrees. This makes the
// flex basis independent of content-determined heights, preventing
// unnecessary re-measurement cascades when a sibling changes size in a
// ScrollView, while preserving viewport bounds for wrappers outside the
// scroll subtree.
//
// We only optimize the height (column) axis because text wrapping depends
// on width constraints propagating through container nodes. Removing
Expand All @@ -188,8 +190,16 @@ static void computeFlexBasisForChild(
bool applyHeightFitContent =
isMainAxisRow || node->style().overflow() != Overflow::Scroll;
if (fixFlexBasisFitContent) {
bool nodeHasScrollAncestor = false;
for (auto owner = node->getOwner(); owner != nullptr;
owner = owner->getOwner()) {
if (owner->style().overflow() == Overflow::Scroll) {
nodeHasScrollAncestor = true;
break;
}
}
applyHeightFitContent = isMainAxisRow ||
(child->hasMeasureFunc() &&
((child->hasMeasureFunc() || !nodeHasScrollAncestor) &&
node->style().overflow() != Overflow::Scroll);
}
if (applyHeightFitContent && yoga::isUndefined(childHeight) &&
Expand Down
Loading