From 1a4b6f0b3dbe2bef1ddee0e81fb1fff784737420 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Tue, 10 Apr 2018 12:45:48 -0700 Subject: [PATCH] Fabric: Overriden equality operator for ViewShadowNode Summary: Computed `layoutMetrics` are also considered as part of ViewShadowNode's value. In the future we probably have to add something like `localData` and `imperativeCommands`. We need all this for diffing algorithm and mointing phase. Reviewed By: mdvacca Differential Revision: D7467800 fbshipit-source-id: 8a0dcf1fd2f97dc501d6969cb0b0f6a2c6a648b4 --- ReactCommon/fabric/view/ViewShadowNode.cpp | 8 ++++++++ ReactCommon/fabric/view/ViewShadowNode.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/ReactCommon/fabric/view/ViewShadowNode.cpp b/ReactCommon/fabric/view/ViewShadowNode.cpp index 2418279903e..b8f610c10d5 100644 --- a/ReactCommon/fabric/view/ViewShadowNode.cpp +++ b/ReactCommon/fabric/view/ViewShadowNode.cpp @@ -97,9 +97,17 @@ SharedLayoutableShadowNode ViewShadowNode::cloneAndReplaceChild(const SharedLayo auto viewShadowNodeChildClone = std::make_shared(viewShadowNodeChild); ShadowNode::replaceChild(viewShadowNodeChild, viewShadowNodeChildClone); return std::static_pointer_cast(viewShadowNodeChildClone); +} +#pragma mark - Equality +bool ViewShadowNode::operator==(const ShadowNode& rhs) const { + if (!ShadowNode::operator==(rhs)) { + return false; + } + auto &&other = static_cast(rhs); + return getLayoutMetrics() == other.getLayoutMetrics(); } #pragma mark - DebugStringConvertible diff --git a/ReactCommon/fabric/view/ViewShadowNode.h b/ReactCommon/fabric/view/ViewShadowNode.h index 4ac446556d7..b80a138fd44 100644 --- a/ReactCommon/fabric/view/ViewShadowNode.h +++ b/ReactCommon/fabric/view/ViewShadowNode.h @@ -48,6 +48,10 @@ public: void appendChild(const SharedShadowNode &child); +#pragma mark - Equality + + bool operator==(const ShadowNode& rhs) const override; + #pragma mark - DebugStringConvertible SharedDebugStringConvertibleList getDebugProps() const override;