From a4ed2fad9e05f857b849faa21202aeaae430c0b8 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Fri, 20 Nov 2026 17:13:23 +0000 Subject: [PATCH 1/3] Preserve selective cloning of hidden Yoga children --- .../ReactCommon/yoga/test/BaselineTest.cpp | 35 +++++++++++++++++++ .../yoga/yoga/algorithm/CalculateLayout.cpp | 8 ++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/packages/react-native/ReactCommon/yoga/test/BaselineTest.cpp b/packages/react-native/ReactCommon/yoga/test/BaselineTest.cpp index be93bd6cfdeb..cbafcd73047c 100644 --- a/packages/react-native/ReactCommon/yoga/test/BaselineTest.cpp +++ b/packages/react-native/ReactCommon/yoga/test/BaselineTest.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -185,6 +186,40 @@ void freeTreesSharingNodes(std::initializer_list roots) { } } +TEST(ZeroOutLayoutTest, clonesOnlyChildrenWhoseLayoutNeedsZeroing) { + // Exercise both orders: an already-zeroed sibling must stay shared whether + // it comes before or after the child whose layout needs changing. + for (const size_t nonzeroIndex : {size_t{0}, size_t{1}}) { + YGNodeRef root = YGNodeNew(); + YGNodeStyleSetWidth(root, 100); + YGNodeStyleSetHeight(root, 100); + YGNodeRef nonzero = YGNodeNew(); + YGNodeStyleSetWidth(nonzero, 20); + YGNodeStyleSetHeight(nonzero, 10); + YGNodeRef zeroed = YGNodeNew(); + YGNodeStyleSetDisplay(zeroed, YGDisplayNone); + YGNodeInsertChild(root, nonzeroIndex == 0 ? nonzero : zeroed, 0); + YGNodeInsertChild(root, nonzeroIndex == 0 ? zeroed : nonzero, 1); + YGNodeCalculateLayout(root, 100, 100, YGDirectionLTR); + + YGNodeRef copy = YGNodeClone(root); + zeroOutLayoutRecursively(resolveRef(copy)); + + YGNodeRef changed = YGNodeGetChild(copy, nonzeroIndex); + YGNodeRef unchanged = YGNodeGetChild(copy, 1 - nonzeroIndex); + EXPECT_NE(nonzero, changed); + EXPECT_EQ(zeroed, unchanged); + EXPECT_EQ(resolveRef(copy), resolveRef(changed)->getOwner()); + EXPECT_EQ(resolveRef(root), resolveRef(unchanged)->getOwner()); + EXPECT_FLOAT_EQ(0.0f, YGNodeLayoutGetWidth(changed)); + EXPECT_FLOAT_EQ(0.0f, YGNodeLayoutGetHeight(changed)); + EXPECT_FLOAT_EQ(20.0f, YGNodeLayoutGetWidth(nonzero)); + EXPECT_FLOAT_EQ(10.0f, YGNodeLayoutGetHeight(nonzero)); + + freeTreesSharingNodes({copy, root}); + } +} + // Only an item that grows or shrinks gets an automatic minimum size. TEST(MinContentTest, testWalkClonesChildrenOfAnotherTree) { diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp index f82a789afd1d..4822e13955e1 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp @@ -694,19 +694,15 @@ void zeroOutLayoutRecursively(yoga::Node* const node) { // A display: none subtree is zeroed out on every layout pass of its parent. // Most of it is usually still zeroed out from an earlier pass, but owned by // an earlier tree, so cloning it to zero it out again changes nothing. Only - // clone the children, and recurse, when part of the subtree needs it. + // clone and recurse into the children whose subtree needs it. // // This relies on the embedder leaving `hasNewLayout` set under display: none // nodes. Children that are skipped keep their owner from the earlier tree. - bool didCloneChildren = false; for (size_t i = 0; i < node->getChildCount(); i++) { if (isLayoutZeroedOutRecursively(node->getChild(i))) { continue; } - if (!didCloneChildren) { - node->cloneChildrenIfNeeded(); - didCloneChildren = true; - } + node->cloneChildIfNeeded(i); zeroOutLayoutRecursively(node->getChild(i)); } } From f9c67b29729b8c21d7ea626768cc6fdce3a71df4 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Fri, 20 Nov 2026 17:30:03 +0000 Subject: [PATCH 2/3] Trigger CI for Yoga reconciliation From 134fe78cd069b678f1523b082eaf5c0514f3b4dd Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Fri, 20 Nov 2026 17:33:52 +0000 Subject: [PATCH 3/3] Restore BaselineTest.cpp to its pre-PR version --- .../ReactCommon/yoga/test/BaselineTest.cpp | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/packages/react-native/ReactCommon/yoga/test/BaselineTest.cpp b/packages/react-native/ReactCommon/yoga/test/BaselineTest.cpp index cbafcd73047c..be93bd6cfdeb 100644 --- a/packages/react-native/ReactCommon/yoga/test/BaselineTest.cpp +++ b/packages/react-native/ReactCommon/yoga/test/BaselineTest.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include #include @@ -186,40 +185,6 @@ void freeTreesSharingNodes(std::initializer_list roots) { } } -TEST(ZeroOutLayoutTest, clonesOnlyChildrenWhoseLayoutNeedsZeroing) { - // Exercise both orders: an already-zeroed sibling must stay shared whether - // it comes before or after the child whose layout needs changing. - for (const size_t nonzeroIndex : {size_t{0}, size_t{1}}) { - YGNodeRef root = YGNodeNew(); - YGNodeStyleSetWidth(root, 100); - YGNodeStyleSetHeight(root, 100); - YGNodeRef nonzero = YGNodeNew(); - YGNodeStyleSetWidth(nonzero, 20); - YGNodeStyleSetHeight(nonzero, 10); - YGNodeRef zeroed = YGNodeNew(); - YGNodeStyleSetDisplay(zeroed, YGDisplayNone); - YGNodeInsertChild(root, nonzeroIndex == 0 ? nonzero : zeroed, 0); - YGNodeInsertChild(root, nonzeroIndex == 0 ? zeroed : nonzero, 1); - YGNodeCalculateLayout(root, 100, 100, YGDirectionLTR); - - YGNodeRef copy = YGNodeClone(root); - zeroOutLayoutRecursively(resolveRef(copy)); - - YGNodeRef changed = YGNodeGetChild(copy, nonzeroIndex); - YGNodeRef unchanged = YGNodeGetChild(copy, 1 - nonzeroIndex); - EXPECT_NE(nonzero, changed); - EXPECT_EQ(zeroed, unchanged); - EXPECT_EQ(resolveRef(copy), resolveRef(changed)->getOwner()); - EXPECT_EQ(resolveRef(root), resolveRef(unchanged)->getOwner()); - EXPECT_FLOAT_EQ(0.0f, YGNodeLayoutGetWidth(changed)); - EXPECT_FLOAT_EQ(0.0f, YGNodeLayoutGetHeight(changed)); - EXPECT_FLOAT_EQ(20.0f, YGNodeLayoutGetWidth(nonzero)); - EXPECT_FLOAT_EQ(10.0f, YGNodeLayoutGetHeight(nonzero)); - - freeTreesSharingNodes({copy, root}); - } -} - // Only an item that grows or shrinks gets an automatic minimum size. TEST(MinContentTest, testWalkClonesChildrenOfAnotherTree) {