Skip to content

Fixed issue with first line element gap handling. #39777

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
NickGerleman wants to merge 1 commit into from
Closed

Fixed issue with first line element gap handling. #39777

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
8 changes: 7 additions & 1 deletion packages/react-native/ReactCommon/yoga/yoga/algorithm/FlexLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ FlexLine calculateFlexLine(
float totalFlexGrowFactors = 0.0f;
float totalFlexShrinkScaledFactors = 0.0f;
size_t endOfLineIndex = startOfLineIndex;
size_t firstElementInLineIndex = startOfLineIndex;

float sizeConsumedIncludingMinConstraint = 0;
const FlexDirection mainAxis = resolveDirection(
Expand All @@ -40,10 +41,15 @@ FlexLine calculateFlexLine(
auto child = node->getChild(endOfLineIndex);
if (child->getStyle().display() == Display::None ||
child->getStyle().positionType() == PositionType::Absolute) {
if (firstElementInLineIndex == endOfLineIndex) {
// We haven't found the first contributing element in the line yet.
firstElementInLineIndex++;
}
continue;
}

const bool isFirstElementInLine = (endOfLineIndex - startOfLineIndex) == 0;
const bool isFirstElementInLine =
(endOfLineIndex - firstElementInLineIndex) == 0;

child->setLineIndex(lineCount);
const float childMarginMainAxis =
Expand Down