microsoft
/
react-native-macos
зеркало из https://github.com/microsoft/react-native-macos.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fabric: `ShadowNodeFragment::rootTag` was renamed to `surfaceId` 

Summary:
Trivial.
We are replacing rootTag with surfaceId according to the plan describing here: https://fb.workplace.com/groups/rn.fabric/permalink/1374002366064519/

Reviewed By: JoshuaGross, mdvacca

Differential Revision: D15039134

fbshipit-source-id: ec8c3044f9f3f23939488bc01c66e9b653e651dd
This commit is contained in:
Valentin Shergin 2019-04-29 21:17:38 -07:00 коммит произвёл Facebook Github Bot
Родитель 81d0f9a690
Коммит 035e0403bb
10 изменённых файлов: 39 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
ReactCommon/fabric/components/root/RootShadowNode.cpp
Просмотреть файл

@ -37,7 +37,7 @@ UnsharedRootShadowNode RootShadowNode::clone(
*this, *this,
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
}); });
return newRootShadowNode; return newRootShadowNode;

4
ReactCommon/fabric/core/shadownode/ShadowNode.cpp
Просмотреть файл

@ -42,7 +42,7 @@ ShadowNode::ShadowNode(
state_(fragment.state), state_(fragment.state),
family_(std::make_shared<ShadowNodeFamily const>( family_(std::make_shared<ShadowNodeFamily const>(
fragment.tag, fragment.tag,
fragment.rootTag, fragment.surfaceId,
fragment.eventEmitter, fragment.eventEmitter,
componentDescriptor)), componentDescriptor)),
childrenAreShared_(true), childrenAreShared_(true),
@ -72,7 +72,7 @@ ShadowNode::ShadowNode(
revision_(sourceShadowNode.revision_ + 1) { revision_(sourceShadowNode.revision_ + 1) {
// `tag`, `surfaceId`, and `eventEmitter` cannot be changed with cloning. // `tag`, `surfaceId`, and `eventEmitter` cannot be changed with cloning.
assert(fragment.tag == ShadowNodeFragment::tagPlaceholder()); assert(fragment.tag == ShadowNodeFragment::tagPlaceholder());
assert(fragment.rootTag == ShadowNodeFragment::surfaceIdPlaceholder()); assert(fragment.surfaceId == ShadowNodeFragment::surfaceIdPlaceholder());
assert( assert(
fragment.eventEmitter == ShadowNodeFragment::eventEmitterPlaceholder()); fragment.eventEmitter == ShadowNodeFragment::eventEmitterPlaceholder());

2
ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h
Просмотреть файл

@ -26,7 +26,7 @@ namespace react {
*/ */
struct ShadowNodeFragment { struct ShadowNodeFragment {
Tag const tag = tagPlaceholder(); Tag const tag = tagPlaceholder();
SurfaceId const rootTag = surfaceIdPlaceholder(); SurfaceId const surfaceId = surfaceIdPlaceholder();
Props::Shared const &props = propsPlaceholder(); Props::Shared const &props = propsPlaceholder();
EventEmitter::Shared const &eventEmitter = eventEmitterPlaceholder(); EventEmitter::Shared const &eventEmitter = eventEmitterPlaceholder();
ShadowNode::SharedListOfShared const &children = childrenPlaceholder(); ShadowNode::SharedListOfShared const &children = childrenPlaceholder();

10
ReactCommon/fabric/core/tests/ComponentDescriptorTest.cpp
Просмотреть файл

@ -24,7 +24,7 @@ TEST(ComponentDescriptorTest, createShadowNode) {
SharedProps props = descriptor->cloneProps(nullptr, raw); SharedProps props = descriptor->cloneProps(nullptr, raw);
SharedShadowNode node = descriptor->createShadowNode(ShadowNodeFragment{ SharedShadowNode node = descriptor->createShadowNode(ShadowNodeFragment{
/* .tag = */ 9, /* .tag = */ 9,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ descriptor->createEventEmitter(0, 9), /* .eventEmitter = */ descriptor->createEventEmitter(0, 9),
}); });
@ -46,7 +46,7 @@ TEST(ComponentDescriptorTest, cloneShadowNode) {
SharedProps props = descriptor->cloneProps(nullptr, raw); SharedProps props = descriptor->cloneProps(nullptr, raw);
SharedShadowNode node = descriptor->createShadowNode(ShadowNodeFragment{ SharedShadowNode node = descriptor->createShadowNode(ShadowNodeFragment{
/* .tag = */ 9, /* .tag = */ 9,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ descriptor->createEventEmitter(0, 9), /* .eventEmitter = */ descriptor->createEventEmitter(0, 9),
}); });
@ -66,19 +66,19 @@ TEST(ComponentDescriptorTest, appendChild) {
SharedProps props = descriptor->cloneProps(nullptr, raw); SharedProps props = descriptor->cloneProps(nullptr, raw);
SharedShadowNode node1 = descriptor->createShadowNode(ShadowNodeFragment{ SharedShadowNode node1 = descriptor->createShadowNode(ShadowNodeFragment{
/* .tag = */ 1, /* .tag = */ 1,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ descriptor->createEventEmitter(0, 1), /* .eventEmitter = */ descriptor->createEventEmitter(0, 1),
}); });
SharedShadowNode node2 = descriptor->createShadowNode(ShadowNodeFragment{ SharedShadowNode node2 = descriptor->createShadowNode(ShadowNodeFragment{
/* .tag = */ 2, /* .tag = */ 2,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ descriptor->createEventEmitter(0, 2), /* .eventEmitter = */ descriptor->createEventEmitter(0, 2),
}); });
SharedShadowNode node3 = descriptor->createShadowNode(ShadowNodeFragment{ SharedShadowNode node3 = descriptor->createShadowNode(ShadowNodeFragment{
/* .tag = */ 3, /* .tag = */ 3,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ descriptor->createEventEmitter(0, 3), /* .eventEmitter = */ descriptor->createEventEmitter(0, 3),
}); });

34
ReactCommon/fabric/core/tests/ShadowNodeTest.cpp
Просмотреть файл

@ -31,7 +31,7 @@ TEST(ShadowNodeTest, handleShadowNodeCreation) {
auto node = std::make_shared<TestShadowNode>( auto node = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ 9, /* .tag = */ 9,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ std::make_shared<const TestProps>(), /* .props = */ std::make_shared<const TestProps>(),
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -57,7 +57,7 @@ TEST(ShadowNodeTest, handleShadowNodeSimpleCloning) {
auto node = std::make_shared<TestShadowNode>( auto node = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ 9, /* .tag = */ 9,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ std::make_shared<const TestProps>(), /* .props = */ std::make_shared<const TestProps>(),
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -77,7 +77,7 @@ TEST(ShadowNodeTest, handleShadowNodeMutation) {
auto node1 = std::make_shared<TestShadowNode>( auto node1 = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ 1, /* .tag = */ 1,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ std::make_shared<const TestProps>(), /* .props = */ std::make_shared<const TestProps>(),
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -86,7 +86,7 @@ TEST(ShadowNodeTest, handleShadowNodeMutation) {
auto node2 = std::make_shared<TestShadowNode>( auto node2 = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ 2, /* .tag = */ 2,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ std::make_shared<const TestProps>(), /* .props = */ std::make_shared<const TestProps>(),
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -95,7 +95,7 @@ TEST(ShadowNodeTest, handleShadowNodeMutation) {
auto node3 = std::make_shared<TestShadowNode>( auto node3 = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ 3, /* .tag = */ 3,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ std::make_shared<const TestProps>(), /* .props = */ std::make_shared<const TestProps>(),
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -136,7 +136,7 @@ TEST(ShadowNodeTest, handleCloneFunction) {
auto firstNode = std::make_shared<TestShadowNode>( auto firstNode = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ 9, /* .tag = */ 9,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ std::make_shared<const TestProps>(), /* .props = */ std::make_shared<const TestProps>(),
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -172,7 +172,7 @@ TEST(ShadowNodeTest, handleLocalData) {
auto firstNode = std::make_shared<TestShadowNode>( auto firstNode = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ 9, /* .tag = */ 9,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -181,7 +181,7 @@ TEST(ShadowNodeTest, handleLocalData) {
auto secondNode = std::make_shared<TestShadowNode>( auto secondNode = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ 9, /* .tag = */ 9,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -190,7 +190,7 @@ TEST(ShadowNodeTest, handleLocalData) {
auto thirdNode = std::make_shared<TestShadowNode>( auto thirdNode = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ 9, /* .tag = */ 9,
/* .rootTag = */ 1, /* .surfaceId = */ 1,
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -232,7 +232,7 @@ TEST(ShadowNodeTest, handleBacktracking) {
auto nodeAA = std::make_shared<TestShadowNode>( auto nodeAA = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -242,7 +242,7 @@ TEST(ShadowNodeTest, handleBacktracking) {
auto nodeABA = std::make_shared<TestShadowNode>( auto nodeABA = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -251,7 +251,7 @@ TEST(ShadowNodeTest, handleBacktracking) {
auto nodeABB = std::make_shared<TestShadowNode>( auto nodeABB = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -260,7 +260,7 @@ TEST(ShadowNodeTest, handleBacktracking) {
auto nodeABC = std::make_shared<TestShadowNode>( auto nodeABC = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -272,7 +272,7 @@ TEST(ShadowNodeTest, handleBacktracking) {
auto nodeAB = std::make_shared<TestShadowNode>( auto nodeAB = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ nodeABChildren, /* .children = */ nodeABChildren,
@ -282,7 +282,7 @@ TEST(ShadowNodeTest, handleBacktracking) {
auto nodeAC = std::make_shared<TestShadowNode>( auto nodeAC = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
@ -294,7 +294,7 @@ TEST(ShadowNodeTest, handleBacktracking) {
auto nodeA = std::make_shared<TestShadowNode>( auto nodeA = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ nodeAChildren, /* .children = */ nodeAChildren,
@ -304,7 +304,7 @@ TEST(ShadowNodeTest, handleBacktracking) {
auto nodeZ = std::make_shared<TestShadowNode>( auto nodeZ = std::make_shared<TestShadowNode>(
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNode::emptySharedShadowNodeSharedList(), /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),

4
ReactCommon/fabric/mounting/ShadowTree.cpp
Просмотреть файл

@ -94,7 +94,7 @@ ShadowTree::ShadowTree(
rootShadowNode_ = std::static_pointer_cast<const RootShadowNode>( rootShadowNode_ = std::static_pointer_cast<const RootShadowNode>(
rootComponentDescriptor.createShadowNode(ShadowNodeFragment{ rootComponentDescriptor.createShadowNode(ShadowNodeFragment{
/* .tag = */ surfaceId, /* .tag = */ surfaceId,
/* .rootTag = */ surfaceId, /* .surfaceId = */ surfaceId,
/* .props = */ props, /* .props = */ props,
/* .eventEmitter = */ noopEventEmitter, /* .eventEmitter = */ noopEventEmitter,
})); }));
@ -111,7 +111,7 @@ ShadowTree::~ShadowTree() {
*oldRootShadowNode, *oldRootShadowNode,
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ ShadowNodeFragment::propsPlaceholder(), /* .props = */ ShadowNodeFragment::propsPlaceholder(),
/* .eventEmitter = */ /* .eventEmitter = */
ShadowNodeFragment::eventEmitterPlaceholder(), ShadowNodeFragment::eventEmitterPlaceholder(),

4
ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
Просмотреть файл

@ -142,14 +142,14 @@ ComponentDescriptor const &ComponentDescriptorRegistry::at(
SharedShadowNode ComponentDescriptorRegistry::createNode( SharedShadowNode ComponentDescriptorRegistry::createNode(
Tag tag, Tag tag,
ComponentName const &viewName, ComponentName const &viewName,
Tag rootTag, SurfaceId surfaceId,
folly::dynamic const &props, folly::dynamic const &props,
SharedEventTarget const &eventTarget) const { SharedEventTarget const &eventTarget) const {
auto unifiedComponentName = componentNameByReactViewName(viewName); auto unifiedComponentName = componentNameByReactViewName(viewName);
auto const &componentDescriptor = this->at(unifiedComponentName); auto const &componentDescriptor = this->at(unifiedComponentName);
return componentDescriptor.createShadowNode({ return componentDescriptor.createShadowNode({
/* .tag = */ tag, /* .tag = */ tag,
/* .rootTag = */ rootTag, /* .surfaceId = */ surfaceId,
/* .props = */ componentDescriptor.cloneProps(nullptr, RawProps(props)), /* .props = */ componentDescriptor.cloneProps(nullptr, RawProps(props)),
/* .eventEmitter = */ /* .eventEmitter = */
componentDescriptor.createEventEmitter(std::move(eventTarget), tag), componentDescriptor.createEventEmitter(std::move(eventTarget), tag),

2
ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
Просмотреть файл

@ -51,7 +51,7 @@ class ComponentDescriptorRegistry {
SharedShadowNode createNode( SharedShadowNode createNode(
Tag tag, Tag tag,
ComponentName const &viewName, ComponentName const &viewName,
Tag rootTag, SurfaceId surfaceId,
folly::dynamic const &props, folly::dynamic const &props,
SharedEventTarget const &eventTarget) const; SharedEventTarget const &eventTarget) const;

7
ReactCommon/fabric/uimanager/Scheduler.cpp
Просмотреть файл

@ -131,7 +131,8 @@ void Scheduler::renderTemplateToSurface(
*oldRootShadowNode, *oldRootShadowNode,
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */
ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ ShadowNodeFragment::propsPlaceholder(), /* .props = */ ShadowNodeFragment::propsPlaceholder(),
/* .eventEmitter = */ /* .eventEmitter = */
ShadowNodeFragment::eventEmitterPlaceholder(), ShadowNodeFragment::eventEmitterPlaceholder(),
@ -161,7 +162,7 @@ void Scheduler::stopSurface(SurfaceId surfaceId) const {
*oldRootShadowNode, *oldRootShadowNode,
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ /* .surfaceId = */
ShadowNodeFragment::surfaceIdPlaceholder(), ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ ShadowNodeFragment::propsPlaceholder(), /* .props = */ ShadowNodeFragment::propsPlaceholder(),
/* .eventEmitter = */ /* .eventEmitter = */
@ -265,7 +266,7 @@ void Scheduler::uiManagerDidFinishTransaction(
*oldRootShadowNode, *oldRootShadowNode,
ShadowNodeFragment{ ShadowNodeFragment{
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ ShadowNodeFragment::propsPlaceholder(), /* .props = */ ShadowNodeFragment::propsPlaceholder(),
/* .eventEmitter = */ /* .eventEmitter = */
ShadowNodeFragment::eventEmitterPlaceholder(), ShadowNodeFragment::eventEmitterPlaceholder(),

8
ReactCommon/fabric/uimanager/UIManager.cpp
Просмотреть файл

@ -26,7 +26,7 @@ SharedShadowNode UIManager::createNode(
auto shadowNode = componentDescriptor.createShadowNode({ auto shadowNode = componentDescriptor.createShadowNode({
/* .tag = */ tag, /* .tag = */ tag,
/* .rootTag = */ surfaceId, /* .surfaceId = */ surfaceId,
/* .props = */ /* .props = */
fallbackDescriptor != nullptr && fallbackDescriptor != nullptr &&
fallbackDescriptor->getComponentHandle() == fallbackDescriptor->getComponentHandle() ==
@ -59,7 +59,7 @@ SharedShadowNode UIManager::cloneNode(
*shadowNode, *shadowNode,
{ {
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ /* .props = */
rawProps ? componentDescriptor.cloneProps( rawProps ? componentDescriptor.cloneProps(
shadowNode->getProps(), *rawProps) shadowNode->getProps(), *rawProps)
@ -102,7 +102,7 @@ void UIManager::setNativeProps(
auto props = componentDescriptor.cloneProps(shadowNode->getProps(), rawProps); auto props = componentDescriptor.cloneProps(shadowNode->getProps(), rawProps);
auto newShadowNode = shadowNode->clone({ auto newShadowNode = shadowNode->clone({
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ props, /* .props = */ props,
}); });
@ -158,7 +158,7 @@ void UIManager::updateState(
componentDescriptor.createState(shadowNode->getState(), rawStateData); componentDescriptor.createState(shadowNode->getState(), rawStateData);
auto newShadowNode = shadowNode->clone({ auto newShadowNode = shadowNode->clone({
/* .tag = */ ShadowNodeFragment::tagPlaceholder(), /* .tag = */ ShadowNodeFragment::tagPlaceholder(),
/* .rootTag = */ ShadowNodeFragment::surfaceIdPlaceholder(), /* .surfaceId = */ ShadowNodeFragment::surfaceIdPlaceholder(),
/* .props = */ ShadowNodeFragment::propsPlaceholder(), /* .props = */ ShadowNodeFragment::propsPlaceholder(),
/* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(), /* .eventEmitter = */ ShadowNodeFragment::eventEmitterPlaceholder(),
/* .children = */ ShadowNodeFragment::childrenPlaceholder(), /* .children = */ ShadowNodeFragment::childrenPlaceholder(),