Skip to content

Commit 66073b8

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
Fix for nodes with display: contents not being cleaned in some cases
Summary: X-link: facebook/react-native#47194 Fixes a case where a node with `display: contents` would not be cleaned up in some cases. This was caused by it being called after some early returns handling different quick paths. This PR moves the call to `cleanupContentsNodesRecursively` earlier so that it's always called. The problem here wasn't mutating before cloning, but leaving a node marked as dirty after the layout has finished. The exact case in which I found this was a node with a single `display: contents` child which needs to be a leaf. Then in the parent node [this](https://github.com/facebook/yoga/blob/b0b842d5e75d041e3af7e0ac55abfb8929fbbf21/yoga/algorithm/CalculateLayout.cpp#L1339) condition is true, so `cleanupContentsNodesRecursively` doesn't get called and the child node is never visited and cleaned. I assume the same will happen in the other paths with an early return here. Changelog: [General][Fixed] - Fix for nodes with `display: contents` not being cleaned in some cases X-link: facebook/yoga#1729 Reviewed By: rozele Differential Revision: D64910099 Pulled By: NickGerleman fbshipit-source-id: 6d56f8fbf687b7ee5af889c0b868406213c9cee8
1 parent 42ac7af commit 66073b8

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lib/yoga/src/main/cpp/yoga/algorithm/CalculateLayout.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,6 +1316,10 @@ static void calculateLayoutImpl(
13161316
flexColumnDirection, direction, ownerWidth),
13171317
PhysicalEdge::Bottom);
13181318

1319+
// Clean and update all display: contents nodes with a direct path to the
1320+
// current node as they will not be traversed
1321+
cleanupContentsNodesRecursively(node);
1322+
13191323
if (node->hasMeasureFunc()) {
13201324
measureNodeWithMeasureFunc(
13211325
node,
@@ -1366,9 +1370,6 @@ static void calculateLayoutImpl(
13661370
// Reset layout flags, as they could have changed.
13671371
node->setLayoutHadOverflow(false);
13681372

1369-
// Clean and update all display: contents nodes with a direct path to the
1370-
// current node as they will not be traversed
1371-
cleanupContentsNodesRecursively(node);
13721373
// STEP 1: CALCULATE VALUES FOR REMAINDER OF ALGORITHM
13731374
const FlexDirection mainAxis =
13741375
resolveDirection(node->style().flexDirection(), direction);

0 commit comments

Comments
 (0)