status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fabric: Removing default arguments from ShadowNode's constructors 

Summary: We don't use them at all; moreover they complicate adding/changing signatures of those methods (because arguments with defaults must be grouped at the end and some arguments cannot have defaults).

Reviewed By: fkgozali

Differential Revision: D7981456

fbshipit-source-id: d7dd098e83630d1ab3342d2ca52ade9c4e27b2c3
This commit is contained in:
Valentin Shergin 2018-05-17 20:03:42 -07:00 committed by Facebook Github Bot
parent 15cb6540c1
commit 8f507280ac
5 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h
View File

@ -41,9 +41,9 @@ public:
const Tag &tag,
const Tag &rootTag,
const InstanceHandle &instanceHandle,
const SharedConcreteProps &props = ConcreteShadowNode::defaultSharedProps(),
const SharedShadowNodeSharedList &children = ShadowNode::emptySharedShadowNodeSharedList(),
const ShadowNodeCloneFunction &cloneFunction = nullptr
const SharedConcreteProps &props,
const SharedShadowNodeSharedList &children,
const ShadowNodeCloneFunction &cloneFunction
):
ShadowNode(
tag,
@ -56,8 +56,8 @@ public:
ConcreteShadowNode(
const SharedConcreteShadowNode &shadowNode,
const SharedProps &props = nullptr,
const SharedShadowNodeSharedList &children = nullptr
const SharedProps &props,
const SharedShadowNodeSharedList &children
):
ShadowNode(
shadowNode,
@ -73,7 +73,6 @@ public:
assert(std::dynamic_pointer_cast<const PropsT>(props_));
return std::static_pointer_cast<const PropsT>(props_);
}
};
} // namespace react

10
ReactCommon/fabric/core/shadownode/ShadowNode.h
View File

@ -44,15 +44,15 @@ public:
const Tag &tag,
const Tag &rootTag,
const InstanceHandle &instanceHandle,
const SharedProps &props = SharedProps(),
const SharedShadowNodeSharedList &children = SharedShadowNodeSharedList(),
const ShadowNodeCloneFunction &cloneFunction = nullptr
const SharedProps &props,
const SharedShadowNodeSharedList &children,
const ShadowNodeCloneFunction &cloneFunction
);
ShadowNode(
const SharedShadowNode &shadowNode,
const SharedProps &props = nullptr,
const SharedShadowNodeSharedList &children = nullptr
const SharedProps &props,
const SharedShadowNodeSharedList &children
);
/*

35
ReactCommon/fabric/core/tests/ShadowNodeTest.cpp
View File

@ -28,7 +28,7 @@ TEST(ShadowNodeTest, handleProps) {
}
TEST(ShadowNodeTest, handleShadowNodeCreation) {
auto node = std::make_shared<TestShadowNode>(9, 1, (void *)NULL);
auto node = std::make_shared<TestShadowNode>(9, 1, (void *)NULL, std::make_shared<const TestProps>(), ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
ASSERT_FALSE(node->getSealed());
ASSERT_STREQ(node->getComponentName().c_str(), "Test");
@ -48,8 +48,8 @@ TEST(ShadowNodeTest, handleShadowNodeCreation) {
}
TEST(ShadowNodeTest, handleShadowNodeSimpleCloning) {
auto node = std::make_shared<TestShadowNode>(9, 1, (void *)NULL);
auto node2 = std::make_shared<TestShadowNode>(node);
auto node = std::make_shared<TestShadowNode>(9, 1, (void *)NULL, std::make_shared<const TestProps>(), ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
auto node2 = std::make_shared<TestShadowNode>(node, nullptr, nullptr);
ASSERT_STREQ(node->getComponentName().c_str(), "Test");
ASSERT_EQ(node->getTag(), 9);
@ -59,9 +59,10 @@ TEST(ShadowNodeTest, handleShadowNodeSimpleCloning) {
}
TEST(ShadowNodeTest, handleShadowNodeMutation) {
auto node1 = std::make_shared<TestShadowNode>(1, 1, (void *)NULL);
auto node2 = std::make_shared<TestShadowNode>(2, 1, (void *)NULL);
auto node3 = std::make_shared<TestShadowNode>(3, 1, (void *)NULL);
auto props = std::make_shared<const TestProps>();
auto node1 = std::make_shared<TestShadowNode>(1, 1, (void *)NULL, props, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
auto node2 = std::make_shared<TestShadowNode>(2, 1, (void *)NULL, props, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
auto node3 = std::make_shared<TestShadowNode>(3, 1, (void *)NULL, props, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
node1->appendChild(node2);
node1->appendChild(node3);
@ -70,7 +71,7 @@ TEST(ShadowNodeTest, handleShadowNodeMutation) {
ASSERT_EQ(node1Children->at(0), node2);
ASSERT_EQ(node1Children->at(1), node3);
auto node4 = std::make_shared<TestShadowNode>(node2);
auto node4 = std::make_shared<TestShadowNode>(node2, nullptr, nullptr);
node1->replaceChild(node2, node4);
node1Children = node1->getChildren();
ASSERT_EQ(node1Children->size(), 2);
@ -86,16 +87,16 @@ TEST(ShadowNodeTest, handleShadowNodeMutation) {
// No more mutation after sealing.
EXPECT_THROW(node4->clearSourceNode(), std::runtime_error);
auto node5 = std::make_shared<TestShadowNode>(node4);
auto node5 = std::make_shared<TestShadowNode>(node4, nullptr, nullptr);
node5->clearSourceNode();
ASSERT_EQ(node5->getSourceNode(), nullptr);
}
TEST(ShadowNodeTest, handleSourceNode) {
auto nodeFirstGeneration = std::make_shared<TestShadowNode>(9, 1, (void *)NULL);
auto nodeSecondGeneration = std::make_shared<TestShadowNode>(nodeFirstGeneration);
auto nodeThirdGeneration = std::make_shared<TestShadowNode>(nodeSecondGeneration);
auto nodeForthGeneration = std::make_shared<TestShadowNode>(nodeThirdGeneration);
auto nodeFirstGeneration = std::make_shared<TestShadowNode>(9, 1, (void *)NULL, std::make_shared<const TestProps>(), ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
auto nodeSecondGeneration = std::make_shared<TestShadowNode>(nodeFirstGeneration, nullptr, nullptr);
auto nodeThirdGeneration = std::make_shared<TestShadowNode>(nodeSecondGeneration, nullptr, nullptr);
auto nodeForthGeneration = std::make_shared<TestShadowNode>(nodeThirdGeneration, nullptr, nullptr);
// Ensure established shource nodes structure.
ASSERT_EQ(nodeForthGeneration->getSourceNode(), nodeThirdGeneration);
@ -116,7 +117,7 @@ TEST(ShadowNodeTest, handleSourceNode) {
}
TEST(ShadowNodeTest, handleCloneFunction) {
auto firstNode = std::make_shared<TestShadowNode>(9, 1, (void *)NULL);
auto firstNode = std::make_shared<TestShadowNode>(9, 1, (void *)NULL, std::make_shared<const TestProps>(), ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
// The shadow node is not clonable if `cloneFunction` is not provided,
ASSERT_DEATH_IF_SUPPORTED(firstNode->clone(), "cloneFunction_");
@ -159,10 +160,10 @@ TEST(ShadowNodeTest, handleLocalData) {
auto localDataOver9000 = std::make_shared<TestLocalData>();
localDataOver9000->setNumber(9001);
auto firstNode = std::make_shared<TestShadowNode>(9, 1, (void *)NULL);
auto secondNode = std::make_shared<TestShadowNode>(9, 1, (void *)NULL);
auto thirdNode = std::make_shared<TestShadowNode>(9, 1, (void *)NULL);
auto props = std::make_shared<const TestProps>();
auto firstNode = std::make_shared<TestShadowNode>(9, 1, (void *)NULL, props, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
auto secondNode = std::make_shared<TestShadowNode>(9, 1, (void *)NULL, props, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
auto thirdNode = std::make_shared<TestShadowNode>(9, 1, (void *)NULL, props, ShadowNode::emptySharedShadowNodeSharedList(), nullptr);
firstNode->setLocalData(localData42);
secondNode->setLocalData(localData42);

4
ReactCommon/fabric/uimanager/ShadowTree.cpp
View File

@ -19,7 +19,9 @@ ShadowTree::ShadowTree(Tag rootTag):
rootTag,
rootTag,
nullptr,
RootShadowNode::defaultSharedProps()
RootShadowNode::defaultSharedProps(),
ShadowNode::emptySharedShadowNodeSharedList(),
nullptr
);
}

10
ReactCommon/fabric/view/ConcreteViewShadowNode.h
View File

@ -43,9 +43,9 @@ public:
const Tag &tag,
const Tag &rootTag,
const InstanceHandle &instanceHandle,
const SharedConcreteViewProps &props = ConcreteViewShadowNode::defaultSharedProps(),
const SharedShadowNodeSharedList &children = ShadowNode::emptySharedShadowNodeSharedList(),
const ShadowNodeCloneFunction &cloneFunction = nullptr
const SharedConcreteViewProps &props,
const SharedShadowNodeSharedList &children,
const ShadowNodeCloneFunction &cloneFunction
):
ConcreteShadowNode<ViewPropsT>(
tag,
@ -65,8 +65,8 @@ public:
ConcreteViewShadowNode(
const SharedConcreteViewShadowNode &shadowNode,
const SharedConcreteViewProps &props = nullptr,
const SharedShadowNodeSharedList &children = nullptr
const SharedConcreteViewProps &props,
const SharedShadowNodeSharedList &children
):
ConcreteShadowNode<ViewPropsT>(
shadowNode,