Skip to content

Avoid copying the children list twice when cloning a path to the root #58690

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
shubh73 wants to merge 3 commits into from
+38 −3
Closed

Avoid copying the children list twice when cloning a path to the root #58690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e2e5f1
Avoid copying the children list twice when cloning a path to the root
shubh73 Sep 26, 2026
d97c664
Apply clang-format
shubh73 Sep 26, 2026
96dfd1b
Drop unrelated cloneTree test
shubh73 Sep 26, 2026
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
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ std::shared_ptr<ShadowNode> ShadowNode::cloneTree(
childNode = parentNode.clone(
{.children =
std::make_shared<std::vector<std::shared_ptr<const ShadowNode>>>(
children)});
std::move(children))});
}

return std::const_pointer_cast<ShadowNode>(childNode);
Expand Down
34 changes: 34 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,3 +429,37 @@ TEST_F(ShadowNodeTest, cloneMultipleWithEmptyFamilySet) {

EXPECT_EQ(result, nullptr);
}

TEST_F(ShadowNodeTest, cloneTree) {
auto newProps = std::make_shared<const TestProps>();
auto newRoot = nodeA_->cloneTree(
nodeABB_->getFamily(), [&](const ShadowNode& oldShadowNode) {
return oldShadowNode.clone({.props = newProps});
});

EXPECT_EQ(newRoot->getTag(), nodeA_->getTag());
EXPECT_NE(newRoot.get(), nodeA_.get());
EXPECT_EQ(newRoot->getChildren().size(), 3);
EXPECT_EQ(newRoot->getChildren()[0]->getTag(), nodeAA_->getTag());
EXPECT_EQ(newRoot->getChildren()[0]->getProps(), nodeAA_->getProps());
EXPECT_EQ(newRoot->getChildren()[2]->getTag(), nodeAC_->getTag());
EXPECT_EQ(newRoot->getChildren()[2]->getProps(), nodeAC_->getProps());

auto newNodeAB = newRoot->getChildren()[1];
EXPECT_EQ(newNodeAB->getTag(), nodeAB_->getTag());
EXPECT_NE(newNodeAB.get(), nodeAB_.get());
EXPECT_EQ(newNodeAB->getChildren().size(), 2);
EXPECT_EQ(newNodeAB->getChildren()[0]->getTag(), nodeABA_->getTag());
EXPECT_EQ(newNodeAB->getChildren()[0]->getProps(), nodeABA_->getProps());

auto newNodeABB = newNodeAB->getChildren()[1];
EXPECT_EQ(newNodeABB->getTag(), nodeABB_->getTag());
EXPECT_NE(newNodeABB.get(), nodeABB_.get());
EXPECT_EQ(newNodeABB->getProps(), newProps);

// The original tree is left untouched.
EXPECT_EQ(nodeA_->getChildren().size(), 3);
EXPECT_EQ(nodeA_->getChildren()[1].get(), nodeAB_.get());
EXPECT_EQ(nodeAB_->getChildren().size(), 2);
EXPECT_EQ(nodeAB_->getChildren()[1].get(), nodeABB_.get());
}
5 changes: 3 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerUpdateShadowTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void addAncestorsToUpdateList(
while (!currentShadowNode->getChildren().empty() &&
currentShadowNode->getTag() != shadowNode->getTag()) {
ancestorShadowNodesShared[ancestorIndex] = currentShadowNode;
auto children = currentShadowNode->getChildren();
const auto& children = currentShadowNode->getChildren();
auto childIndex = ancestors[ancestorIndex].second;
currentShadowNode = children[childIndex];
ancestorIndex++;
Expand Down Expand Up @@ -201,7 +201,8 @@ void UIManager::updateShadowTree(
auto cloned = oldShadowNode->clone(
{.props = newProps,
.children = std::make_shared<
std::vector<std::shared_ptr<const ShadowNode>>>(children)});
std::vector<std::shared_ptr<const ShadowNode>>>(
std::move(children))});
clonedShadowNodes.insert({oldShadowNode->getTag(), std::move(cloned)});
} else {
LOG(ERROR) << "oldShadowNode is null";
Expand Down
Loading