From 100bf9076af15d7d4b1a03cf36992a87bd61a91b Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Mon, 23 Mar 2020 13:28:46 -0700 Subject: [PATCH] Fabric: Changing signature of `ComponentDescriptor::createState` Summary: This is pure syntactic change. Often we don't have a shared pointer to ShadowNodeFamily and only have just a reference. At the same time, `ComponentDescriptor::createState` does not have to accept a shared pointer. So, it's better to accept just a reference. Changelog: [Internal] Fabric-specific internal change. Reviewed By: sammy-SC Differential Revision: D20578787 fbshipit-source-id: 905277001e096d41e75007575b59ea2ea15fbf4b --- .../fabric/core/componentdescriptor/ComponentDescriptor.h | 2 +- .../core/componentdescriptor/ConcreteComponentDescriptor.h | 4 ++-- ReactCommon/fabric/uimanager/UIManager.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h b/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h index 6dcd04bfa32..ea2952ce291 100644 --- a/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h +++ b/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h @@ -116,7 +116,7 @@ class ComponentDescriptor { * State's data. */ virtual State::Shared createState( - ShadowNodeFamily::Shared const &family, + ShadowNodeFamily const &family, const StateData::Shared &data) const = 0; /* diff --git a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h b/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h index 37b36da5e51..142e0dd2aad 100644 --- a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h +++ b/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h @@ -133,7 +133,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { } virtual State::Shared createState( - ShadowNodeFamily::Shared const &family, + ShadowNodeFamily const &family, StateData::Shared const &data) const override { if (std::is_same::value) { // Default case: Returning `null` for nodes that don't use `State`. @@ -144,7 +144,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { return std::make_shared( std::static_pointer_cast(data), - *family->getMostRecentState()); + *family.getMostRecentState()); } virtual ShadowNodeFamily::Shared createFamily( diff --git a/ReactCommon/fabric/uimanager/UIManager.cpp b/ReactCommon/fabric/uimanager/UIManager.cpp index 52ad7333fd3..a765a956ffd 100644 --- a/ReactCommon/fabric/uimanager/UIManager.cpp +++ b/ReactCommon/fabric/uimanager/UIManager.cpp @@ -234,7 +234,7 @@ void UIManager::updateState(StateUpdate const &stateUpdate) const { auto newData = callback(oldShadowNode.getState()->getDataPointer()); auto newState = - componentDescriptor.createState(family, newData); + componentDescriptor.createState(*family, newData); return oldShadowNode.clone({ /* .props = */ ShadowNodeFragment::propsPlaceholder(),