Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

add option to set traits when cloning up to the root (#44017)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/44017

changelog: [internal]

Add an option to mark all nodes clone indirectly by `ShadowNode::cloneTree`.

This is a pre-requisite for new state reconciliation algorithm. It will be used to mark part of shadow tree that was affected by native state update.

Reviewed By: rubennorte

Differential Revision: D55745323

fbshipit-source-id: 5e2a2e8a572cc5077d907608f83992a43625d58e
This commit is contained in:
Samuel Susla
2024-04-12 02:47:01 -07:00
committed by Facebook GitHub Bot
parent 49f7ec30d6
commit 3b49db3bfe
3 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp
+4 -2
View File
@@ -304,7 +304,8 @@ const ShadowNodeFamily& ShadowNode::getFamily() const {
ShadowNode::Unshared ShadowNode::cloneTree(
const ShadowNodeFamily& shadowNodeFamily,
const std::function<ShadowNode::Unshared(ShadowNode const& oldShadowNode)>&
callback) const {
callback,
ShadowNodeTraits traits) const {
auto ancestors = shadowNodeFamily.getAncestors(*this);
if (ancestors.empty()) {
@@ -332,7 +333,8 @@ ShadowNode::Unshared ShadowNode::cloneTree(
children[childIndex] = childNode;
childNode = parentNode.clone(
{.children = std::make_shared<ShadowNode::ListOfShared>(children)});
{.children = std::make_shared<ShadowNode::ListOfShared>(children),
.traits = traits});
}
return std::const_pointer_cast<ShadowNode>(childNode);
packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h
+2 -2
View File
@@ -100,8 +100,8 @@ class ShadowNode : public Sealable,
*/
Unshared cloneTree(
const ShadowNodeFamily& shadowNodeFamily,
const std::function<Unshared(ShadowNode const& oldShadowNode)>& callback)
const;
const std::function<Unshared(ShadowNode const& oldShadowNode)>& callback,
ShadowNodeTraits traits = {}) const;
#pragma mark - Getters
packages/react-native/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp
+30
View File
@@ -281,3 +281,33 @@ TEST_F(ShadowNodeTest, handleState) {
{ secondNode->setStateData(TestState()); },
"Attempt to mutate a sealed object.");
}
TEST_F(ShadowNodeTest, testCloneTree) {
auto& family = nodeABA_->getFamily();
auto newTraits = ShadowNodeTraits();
newTraits.set(ShadowNodeTraits::Trait::Reserved);
auto rootNode = nodeA_->cloneTree(
family,
[newTraits](ShadowNode const& oldShadowNode) {
return oldShadowNode.clone({.traits = newTraits});
},
newTraits);
EXPECT_TRUE(rootNode->getTraits().check(ShadowNodeTraits::Trait::Reserved));
EXPECT_FALSE(rootNode->getChildren()[0]->getTraits().check(
ShadowNodeTraits::Trait::Reserved));
auto const& firstLevelChild = *rootNode->getChildren()[1];
EXPECT_TRUE(
firstLevelChild.getTraits().check(ShadowNodeTraits::Trait::Reserved));
EXPECT_FALSE(firstLevelChild.getChildren()[1]->getTraits().check(
ShadowNodeTraits::Trait::Reserved));
auto const& secondLevelchild = *firstLevelChild.getChildren()[0];
EXPECT_TRUE(
secondLevelchild.getTraits().check(ShadowNodeTraits::Trait::Reserved));
}