mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Fix for nodes with display: contents not being cleaned in some cases (#47194)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/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: https://github.com/facebook/yoga/pull/1729 Reviewed By: rozele Differential Revision: D64910099 Pulled By: NickGerleman fbshipit-source-id: 6d56f8fbf687b7ee5af889c0b868406213c9cee8
This commit is contained in:
committed by
Facebook GitHub Bot
parent
4f47439a02
commit
a88ddcecc9
@@ -1316,6 +1316,10 @@ static void calculateLayoutImpl(
|
||||
flexColumnDirection, direction, ownerWidth),
|
||||
PhysicalEdge::Bottom);
|
||||
|
||||
// Clean and update all display: contents nodes with a direct path to the
|
||||
// current node as they will not be traversed
|
||||
cleanupContentsNodesRecursively(node);
|
||||
|
||||
if (node->hasMeasureFunc()) {
|
||||
measureNodeWithMeasureFunc(
|
||||
node,
|
||||
@@ -1366,9 +1370,6 @@ static void calculateLayoutImpl(
|
||||
// Reset layout flags, as they could have changed.
|
||||
node->setLayoutHadOverflow(false);
|
||||
|
||||
// Clean and update all display: contents nodes with a direct path to the
|
||||
// current node as they will not be traversed
|
||||
cleanupContentsNodesRecursively(node);
|
||||
// STEP 1: CALCULATE VALUES FOR REMAINDER OF ALGORITHM
|
||||
const FlexDirection mainAxis =
|
||||
resolveDirection(node->style().flexDirection(), direction);
|
||||
|
||||
Reference in New Issue
Block a user