Skip to content

add option to set traits with ShadowNodeFragment #44016

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
sammy-SC wants to merge 1 commit into from
Closed

add option to set traits with ShadowNodeFragment #44016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions 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 @@ -77,6 +77,7 @@ ShadowNode::ShadowNode(
react_native_assert(children_);

traits_.set(ShadowNodeTraits::Trait::ChildrenAreShared);
traits_.set(fragment.traits.get());

for (const auto& child : *children_) {
child->family_->setParent(family_);
Expand Down Expand Up @@ -107,6 +108,7 @@ ShadowNode::ShadowNode(
react_native_assert(children_);

traits_.set(ShadowNodeTraits::Trait::ChildrenAreShared);
traits_.set(fragment.traits.get());

if (fragment.children) {
for (const auto& child : *children_) {
Expand All @@ -128,11 +130,10 @@ ShadowNode::Unshared ShadowNode::clone(
propsParserContext, props_, RawProps(*family.nativeProps_DEPRECATED));
auto clonedNode = componentDescriptor.cloneShadowNode(
*this,
{
props,
fragment.children,
fragment.state,
});
{.props = props,
.children = fragment.children,
.state = fragment.state,
.traits = fragment.traits});
return clonedNode;
} else {
// TODO: We might need to merge fragment.priops with
Expand Down Expand Up @@ -330,10 +331,8 @@ ShadowNode::Unshared ShadowNode::cloneTree(
ShadowNode::sameFamily(*children.at(childIndex), *childNode));
children[childIndex] = childNode;

childNode = parentNode.clone({
ShadowNodeFragment::propsPlaceholder(),
std::make_shared<ShadowNode::ListOfShared>(children),
});
childNode = parentNode.clone(
{.children = std::make_shared<ShadowNode::ListOfShared>(children)});
}

return std::const_pointer_cast<ShadowNode>(childNode);
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFragment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ struct ShadowNodeFragment {
const Props::Shared& props = propsPlaceholder();
const ShadowNode::SharedListOfShared& children = childrenPlaceholder();
const State::Shared& state = statePlaceholder();
const ShadowNodeTraits traits = {};

/*
* Placeholders.
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/core/ShadowNodeTraits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class ShadowNodeTraits {
// to be cloned before the first mutation.
ChildrenAreShared = 1 << 8,

Reserved = 1 << 31,
};

/*
Expand Down
15 changes: 15 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 @@ -212,6 +212,21 @@ TEST_F(ShadowNodeTest, handleCloneFunction) {
EXPECT_EQ(nodeAB_->getProps(), nodeABClone->getProps());
}

TEST_F(ShadowNodeTest, handleCloningWithTraits) {
auto clonedWithoutTraits = nodeAB_->clone({});

EXPECT_FALSE(clonedWithoutTraits->getTraits().check(
ShadowNodeTraits::Trait::Reserved));

auto newTraits = ShadowNodeTraits();
newTraits.set(ShadowNodeTraits::Trait::Reserved);

auto clonedWithTraits = clonedWithoutTraits->clone({.traits = newTraits});

EXPECT_TRUE(
clonedWithTraits->getTraits().check(ShadowNodeTraits::Trait::Reserved));
}

TEST_F(ShadowNodeTest, handleState) {
auto family = componentDescriptor_.createFamily(ShadowNodeFamilyFragment{
/* .tag = */ 9,
Expand Down