diff --git a/ReactCommon/react/renderer/uimanager/UIManager.cpp b/ReactCommon/react/renderer/uimanager/UIManager.cpp index 8455efb45ed..0d2857b4941 100644 --- a/ReactCommon/react/renderer/uimanager/UIManager.cpp +++ b/ReactCommon/react/renderer/uimanager/UIManager.cpp @@ -94,28 +94,27 @@ SharedShadowNode UIManager::createNode( } SharedShadowNode UIManager::cloneNode( - const ShadowNode::Shared &shadowNode, - const SharedShadowNodeSharedList &children, - const RawProps *rawProps) const { + ShadowNode const &shadowNode, + SharedShadowNodeSharedList const &children, + RawProps const *rawProps) const { SystraceSection s("UIManager::cloneNode"); PropsParserContext propsParserContext{ - shadowNode->getFamily().getSurfaceId(), *contextContainer_.get()}; + shadowNode.getFamily().getSurfaceId(), *contextContainer_.get()}; - auto &componentDescriptor = shadowNode->getComponentDescriptor(); + auto &componentDescriptor = shadowNode.getComponentDescriptor(); auto clonedShadowNode = componentDescriptor.cloneShadowNode( - *shadowNode, + shadowNode, { /* .props = */ rawProps ? componentDescriptor.cloneProps( - propsParserContext, shadowNode->getProps(), *rawProps) + propsParserContext, shadowNode.getProps(), *rawProps) : ShadowNodeFragment::propsPlaceholder(), /* .children = */ children, }); if (delegate_) { - delegate_->uiManagerDidCloneShadowNode( - *shadowNode.get(), *clonedShadowNode); + delegate_->uiManagerDidCloneShadowNode(shadowNode, *clonedShadowNode); } return clonedShadowNode; diff --git a/ReactCommon/react/renderer/uimanager/UIManager.h b/ReactCommon/react/renderer/uimanager/UIManager.h index 16553adea45..93cd8994c2c 100644 --- a/ReactCommon/react/renderer/uimanager/UIManager.h +++ b/ReactCommon/react/renderer/uimanager/UIManager.h @@ -127,9 +127,9 @@ class UIManager final : public ShadowTreeDelegate { SharedEventTarget eventTarget) const; ShadowNode::Shared cloneNode( - const ShadowNode::Shared &shadowNode, - const SharedShadowNodeSharedList &children = nullptr, - const RawProps *rawProps = nullptr) const; + ShadowNode const &shadowNode, + SharedShadowNodeSharedList const &children = nullptr, + RawProps const *rawProps = nullptr) const; void appendChild( const ShadowNode::Shared &parentShadowNode, diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp index da6eeb68ffb..c201c7fe001 100644 --- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp +++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp @@ -220,7 +220,8 @@ jsi::Value UIManagerBinding::get( size_t count) noexcept -> jsi::Value { return valueFromShadowNode( runtime, - uiManager->cloneNode(shadowNodeFromValue(runtime, arguments[0]))); + uiManager->cloneNode( + *shadowNodeFromValue(runtime, arguments[0]))); }); } @@ -287,7 +288,7 @@ jsi::Value UIManagerBinding::get( return valueFromShadowNode( runtime, uiManager->cloneNode( - shadowNodeFromValue(runtime, arguments[0]), + *shadowNodeFromValue(runtime, arguments[0]), ShadowNode::emptySharedShadowNodeSharedList())); }); } @@ -307,7 +308,7 @@ jsi::Value UIManagerBinding::get( return valueFromShadowNode( runtime, uiManager->cloneNode( - shadowNodeFromValue(runtime, arguments[0]), + *shadowNodeFromValue(runtime, arguments[0]), nullptr, &rawProps)); }); @@ -328,7 +329,7 @@ jsi::Value UIManagerBinding::get( return valueFromShadowNode( runtime, uiManager->cloneNode( - shadowNodeFromValue(runtime, arguments[0]), + *shadowNodeFromValue(runtime, arguments[0]), ShadowNode::emptySharedShadowNodeSharedList(), &rawProps)); });