From 2c32bfa7589aa13d8f50dacaf1aefd7f13936cd3 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Fri, 6 Jun 2025 20:13:08 -0700 Subject: [PATCH] ReactCxxPlatform > apply clang tidy settings (#51828) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/51828 changelog: [internal] Reviewed By: rshest Differential Revision: D75990891 fbshipit-source-id: ea86ebd90c7b44d26d2d0287eeca8b27aec0aff5 --- .../renderer/animated/AnimatedModule.cpp | 9 ++-- .../animated/NativeAnimatedNodesManager.cpp | 46 +++++++++++-------- .../tests/EventAnimationDriverTests.cpp | 8 ++-- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/AnimatedModule.cpp b/packages/react-native/ReactCxxPlatform/react/renderer/animated/AnimatedModule.cpp index 328c7d797ac..b2535bfd2a2 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/AnimatedModule.cpp +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/AnimatedModule.cpp @@ -117,7 +117,8 @@ void AnimatedModule::setAnimatedNodeValue( jsi::Runtime& /*rt*/, Tag nodeTag, double value) { - operations_.emplace_back(SetAnimatedNodeValueOp{nodeTag, value}); + operations_.emplace_back( + SetAnimatedNodeValueOp{.nodeTag = nodeTag, .value = value}); } void AnimatedModule::setAnimatedNodeOffset( @@ -143,14 +144,16 @@ void AnimatedModule::connectAnimatedNodeToView( jsi::Runtime& /*rt*/, Tag nodeTag, Tag viewTag) { - operations_.emplace_back(ConnectAnimatedNodeToViewOp{nodeTag, viewTag}); + operations_.emplace_back( + ConnectAnimatedNodeToViewOp{.nodeTag = nodeTag, .viewTag = viewTag}); } void AnimatedModule::disconnectAnimatedNodeFromView( jsi::Runtime& /*rt*/, Tag nodeTag, Tag viewTag) { - operations_.emplace_back(DisconnectAnimatedNodeFromViewOp{nodeTag, viewTag}); + operations_.emplace_back( + DisconnectAnimatedNodeFromViewOp{.nodeTag = nodeTag, .viewTag = viewTag}); } void AnimatedModule::restoreDefaultValues(jsi::Runtime& /*rt*/, Tag nodeTag) { diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp index e3f8cffa8c5..d3f8dc105a8 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp @@ -78,7 +78,7 @@ NativeAnimatedNodesManager::~NativeAnimatedNodesManager() noexcept { std::optional NativeAnimatedNodesManager::getValue(Tag tag) noexcept { auto node = getAnimatedNode(tag); - if (node) { + if (node != nullptr) { return node->getValue(); } else { LOG(WARNING) @@ -156,7 +156,7 @@ void NativeAnimatedNodesManager::connectAnimatedNodes( auto parentNode = getAnimatedNode(parentTag); auto childNode = getAnimatedNode(childTag); - if (parentNode && childNode) { + if ((parentNode != nullptr) && (childNode != nullptr)) { parentNode->addChild(childTag); updatedNodeTags_.insert(childTag); } else { @@ -173,7 +173,7 @@ void NativeAnimatedNodesManager::connectAnimatedNodeToView( react_native_assert(viewTag); auto node = getAnimatedNode(propsNodeTag); - if (node) { + if (node != nullptr) { node->connectToView(viewTag); { std::lock_guard lock(connectedAnimatedNodesMutex_); @@ -193,7 +193,7 @@ void NativeAnimatedNodesManager::disconnectAnimatedNodeFromView( react_native_assert(viewTag); auto node = getAnimatedNode(propsNodeTag); - if (node) { + if (node != nullptr) { node->disconnectFromView(viewTag); { std::lock_guard lock(connectedAnimatedNodesMutex_); @@ -215,7 +215,7 @@ void NativeAnimatedNodesManager::disconnectAnimatedNodes( auto parentNode = getAnimatedNode(parentTag); auto childNode = getAnimatedNode(childTag); - if (parentNode && childNode) { + if ((parentNode != nullptr) && (childNode != nullptr)) { parentNode->removeChild(childTag); } else { LOG(WARNING) << "Cannot DisconnectAnimatedNodes, parentTag = " << parentTag @@ -326,7 +326,8 @@ void NativeAnimatedNodesManager::addAnimatedEventToView( } const auto key = EventAnimationDriverKey{ - viewTag, EventEmitter::normalizeEventType(eventName)}; + .viewTag = viewTag, + .eventName = EventEmitter::normalizeEventType(eventName)}; if (auto driversIter = eventDrivers_.find(key); driversIter != eventDrivers_.end()) { auto& drivers = driversIter->second; @@ -345,7 +346,8 @@ void NativeAnimatedNodesManager::removeAnimatedEventFromView( const std::string& eventName, Tag animatedValueTag) noexcept { const auto key = EventAnimationDriverKey{ - viewTag, EventEmitter::normalizeEventType(eventName)}; + .viewTag = viewTag, + .eventName = EventEmitter::normalizeEventType(eventName)}; auto driversIter = eventDrivers_.find(key); if (driversIter != eventDrivers_.end()) { auto& drivers = driversIter->second; @@ -376,7 +378,8 @@ void NativeAnimatedNodesManager::handleAnimatedEvent( bool foundAtLeastOneDriver = false; const auto key = EventAnimationDriverKey{ - viewTag, EventEmitter::normalizeEventType(eventName)}; + .viewTag = viewTag, + .eventName = EventEmitter::normalizeEventType(eventName)}; if (auto driversIter = eventDrivers_.find(key); driversIter != eventDrivers_.end()) { auto& drivers = driversIter->second; @@ -484,14 +487,15 @@ void NativeAnimatedNodesManager::updateNodes( #endif const auto connectedToFinishedAnimation = is_node_connected_to_finished_animation(node, nodeTag, false); - nodesQueue.emplace_back( - NodesQueueItem{node, connectedToFinishedAnimation}); + nodesQueue.emplace_back(NodesQueueItem{ + .node = node, + .connectedToFinishedAnimation = connectedToFinishedAnimation}); } } } while (!nodesQueue.empty()) { - auto nextNode = std::move(nodesQueue.front()); + auto nextNode = nodesQueue.front(); nodesQueue.pop_front(); // in Animated, value nodes like RGBA are parents and Color node is child // (the opposite of tree structure) @@ -506,8 +510,9 @@ void NativeAnimatedNodesManager::updateNodes( const auto connectedToFinishedAnimation = is_node_connected_to_finished_animation( child, childTag, nextNode.connectedToFinishedAnimation); - nodesQueue.emplace_back( - NodesQueueItem{child, connectedToFinishedAnimation}); + nodesQueue.emplace_back(NodesQueueItem{ + .node = child, + .connectedToFinishedAnimation = connectedToFinishedAnimation}); } } } @@ -537,8 +542,9 @@ void NativeAnimatedNodesManager::updateNodes( #endif const auto connectedToFinishedAnimation = is_node_connected_to_finished_animation(node, nodeTag, false); - nodesQueue.emplace_back( - NodesQueueItem{node, connectedToFinishedAnimation}); + nodesQueue.emplace_back(NodesQueueItem{ + .node = node, + .connectedToFinishedAnimation = connectedToFinishedAnimation}); } } } @@ -548,7 +554,7 @@ void NativeAnimatedNodesManager::updateNodes( int cyclesDetected = 0; #endif while (!nodesQueue.empty()) { - auto nextNode = std::move(nodesQueue.front()); + auto nextNode = nodesQueue.front(); nodesQueue.pop_front(); if (nextNode.connectedToFinishedAnimation && nextNode.node->type() == AnimatedNodeType::Props) { @@ -570,8 +576,9 @@ void NativeAnimatedNodesManager::updateNodes( const auto connectedToFinishedAnimation = is_node_connected_to_finished_animation( child, childTag, nextNode.connectedToFinishedAnimation); - nodesQueue.emplace_back( - NodesQueueItem{child, connectedToFinishedAnimation}); + nodesQueue.emplace_back(NodesQueueItem{ + .node = child, + .connectedToFinishedAnimation = connectedToFinishedAnimation}); } #ifdef REACT_NATIVE_DEBUG else if (child->bfsColor == animatedGraphBFSColor_) { @@ -631,7 +638,8 @@ bool NativeAnimatedNodesManager::onAnimationFrame(double timestamp) { std::vector finishedAnimations; for (const auto& [animationId, driver] : activeAnimations_) { if (driver->getIsComplete()) { - if (getAnimatedNode(driver->getAnimatedValueTag())) { + if (getAnimatedNode(driver->getAnimatedValueTag()) != + nullptr) { driver->stopAnimation(); } finishedAnimations.emplace_back(animationId); diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/tests/EventAnimationDriverTests.cpp b/packages/react-native/ReactCxxPlatform/react/renderer/animated/tests/EventAnimationDriverTests.cpp index 2b30431a9c5..58c602b977e 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/tests/EventAnimationDriverTests.cpp +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/tests/EventAnimationDriverTests.cpp @@ -53,10 +53,10 @@ TEST_F(EventAnimationDriverTests, subscribeToViewEvent) { EXPECT_EQ(nodesManager_->getValue(animatedValueTag2), 0); auto scrollEvent = std::make_shared(); - scrollEvent->contentSize = {1, 2}; - scrollEvent->contentOffset = {3, 4}; - scrollEvent->contentInset = {5, 6, 7, 8}; - scrollEvent->containerSize = {9, 10}; + scrollEvent->contentSize = {.width = 1, .height = 2}; + scrollEvent->contentOffset = {.x = 3, .y = 4}; + scrollEvent->contentInset = {.left = 5, .top = 6, .right = 7, .bottom = 8}; + scrollEvent->containerSize = {.width = 9, .height = 10}; scrollEvent->zoomScale = 11.0f; const std::string eventType{eventName};