diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/PropsAnimatedNode.cpp b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/PropsAnimatedNode.cpp index 05ccc4ebf4e..cc7cb1d878a 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/PropsAnimatedNode.cpp +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/PropsAnimatedNode.cpp @@ -123,11 +123,7 @@ void PropsAnimatedNode::update(bool forceFabricCommit) { case AnimatedNodeType::Style: { if (const auto& styleNode = manager_->getAnimatedNode(nodeTag)) { - styleNode->update(); - auto& styleNodeProps = styleNode->getProps(); - for (const auto& styleNodeProp : styleNodeProps.items()) { - props_.insert(styleNodeProp.first.c_str(), styleNodeProp.second); - } + styleNode->collectViewUpdates(props_); } } break; case AnimatedNodeType::Props: diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/StyleAnimatedNode.cpp b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/StyleAnimatedNode.cpp index a54378ca7a1..a52c448d947 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/StyleAnimatedNode.cpp +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/StyleAnimatedNode.cpp @@ -38,10 +38,9 @@ StyleAnimatedNode::StyleAnimatedNode( Tag tag, const folly::dynamic& config, NativeAnimatedNodesManager& manager) - : AnimatedNode(tag, config, manager, AnimatedNodeType::Style), - props_(folly::dynamic::object()) {} + : AnimatedNode(tag, config, manager, AnimatedNodeType::Style) {} -void StyleAnimatedNode::update() { +void StyleAnimatedNode::collectViewUpdates(folly::dynamic& props) { const auto& style = getConfig()["style"]; for (const auto& styleProp : style.items()) { auto propName = styleProp.first.asString(); @@ -51,11 +50,7 @@ void StyleAnimatedNode::update() { case AnimatedNodeType::Transform: { if (const auto transformNode = manager_->getAnimatedNode(nodeTag)) { - transformNode->update(); - auto& transformNodeProps = transformNode->getProps(); - for (const auto& styleNodeProp : transformNodeProps.items()) { - props_.insert(styleNodeProp.first.c_str(), styleNodeProp.second); - } + transformNode->collectViewUpdates(props); } } break; case AnimatedNodeType::Value: @@ -71,18 +66,18 @@ void StyleAnimatedNode::update() { if (const auto valueNode = manager_->getAnimatedNode(nodeTag)) { if (valueNode->getIsColorValue()) { - props_.insert( + props.insert( propName.c_str(), static_cast(valueNode->getValue())); } else { - props_.insert(propName.c_str(), valueNode->getValue()); + props.insert(propName.c_str(), valueNode->getValue()); } } } break; case AnimatedNodeType::Color: { if (const auto colorAnimNode = manager_->getAnimatedNode(nodeTag)) { - props_.insert( + props.insert( propName.c_str(), static_cast(colorAnimNode->getColor())); } @@ -95,7 +90,7 @@ void StyleAnimatedNode::update() { } } - layoutStyleUpdated_ = isLayoutPropsUpdated(props_); + layoutStyleUpdated_ = isLayoutPropsUpdated(props); } } // namespace facebook::react diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/StyleAnimatedNode.h b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/StyleAnimatedNode.h index 53ddd3346a5..7e658ca87b3 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/StyleAnimatedNode.h +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/StyleAnimatedNode.h @@ -22,18 +22,13 @@ class StyleAnimatedNode final : public AnimatedNode { Tag tag, const folly::dynamic& config, NativeAnimatedNodesManager& manager); - void update() override; - - const folly::dynamic& getProps() const noexcept { - return props_; - } + void collectViewUpdates(folly::dynamic& props); bool isLayoutStyleUpdated() const noexcept { return layoutStyleUpdated_; } private: - folly::dynamic props_; bool layoutStyleUpdated_; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/TransformAnimatedNode.cpp b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/TransformAnimatedNode.cpp index a18f32ec65c..c4fa356efbd 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/TransformAnimatedNode.cpp +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/TransformAnimatedNode.cpp @@ -30,10 +30,9 @@ TransformAnimatedNode::TransformAnimatedNode( Tag tag, const folly::dynamic& config, NativeAnimatedNodesManager& manager) - : AnimatedNode(tag, config, manager, AnimatedNodeType::Transform), - props_(folly::dynamic::object()) {} + : AnimatedNode(tag, config, manager, AnimatedNodeType::Transform) {} -void TransformAnimatedNode::update() { +void TransformAnimatedNode::collectViewUpdates(folly::dynamic& props) { folly::dynamic transforms = folly::dynamic::array(); auto transformsArray = getConfig()[sTransformsName]; react_native_assert(transformsArray.type() == folly::dynamic::ARRAY); @@ -53,11 +52,7 @@ void TransformAnimatedNode::update() { transforms.push_back(folly::dynamic::object(property, value.value())); } } - props_[sTransformPropName] = std::move(transforms); -} - -const folly::dynamic& TransformAnimatedNode::getProps() { - return props_; + props[sTransformPropName] = std::move(transforms); } } // namespace facebook::react diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/TransformAnimatedNode.h b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/TransformAnimatedNode.h index 654203c119b..dc587df1d05 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/TransformAnimatedNode.h +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/nodes/TransformAnimatedNode.h @@ -29,11 +29,6 @@ class TransformAnimatedNode final : public AnimatedNode { const folly::dynamic& config, NativeAnimatedNodesManager& manager); - void update() override; - - const folly::dynamic& getProps(); - - private: - folly::dynamic props_; + void collectViewUpdates(folly::dynamic& props); }; } // namespace facebook::react