Skip to content

Commit 2c32bfa

Browse files
ReactCxxPlatform > apply clang tidy settings (#51828)
Summary: Pull Request resolved: #51828 changelog: [internal] Reviewed By: rshest Differential Revision: D75990891 fbshipit-source-id: ea86ebd90c7b44d26d2d0287eeca8b27aec0aff5
1 parent c7cc125 commit 2c32bfa

3 files changed

Lines changed: 37 additions & 26 deletions

File tree

packages/react-native/ReactCxxPlatform/react/renderer/animated/AnimatedModule.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ void AnimatedModule::setAnimatedNodeValue(
117117
jsi::Runtime& /*rt*/,
118118
Tag nodeTag,
119119
double value) {
120-
operations_.emplace_back(SetAnimatedNodeValueOp{nodeTag, value});
120+
operations_.emplace_back(
121+
SetAnimatedNodeValueOp{.nodeTag = nodeTag, .value = value});
121122
}
122123

123124
void AnimatedModule::setAnimatedNodeOffset(
@@ -143,14 +144,16 @@ void AnimatedModule::connectAnimatedNodeToView(
143144
jsi::Runtime& /*rt*/,
144145
Tag nodeTag,
145146
Tag viewTag) {
146-
operations_.emplace_back(ConnectAnimatedNodeToViewOp{nodeTag, viewTag});
147+
operations_.emplace_back(
148+
ConnectAnimatedNodeToViewOp{.nodeTag = nodeTag, .viewTag = viewTag});
147149
}
148150

149151
void AnimatedModule::disconnectAnimatedNodeFromView(
150152
jsi::Runtime& /*rt*/,
151153
Tag nodeTag,
152154
Tag viewTag) {
153-
operations_.emplace_back(DisconnectAnimatedNodeFromViewOp{nodeTag, viewTag});
155+
operations_.emplace_back(
156+
DisconnectAnimatedNodeFromViewOp{.nodeTag = nodeTag, .viewTag = viewTag});
154157
}
155158

156159
void AnimatedModule::restoreDefaultValues(jsi::Runtime& /*rt*/, Tag nodeTag) {

packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ NativeAnimatedNodesManager::~NativeAnimatedNodesManager() noexcept {
7878

7979
std::optional<double> NativeAnimatedNodesManager::getValue(Tag tag) noexcept {
8080
auto node = getAnimatedNode<ValueAnimatedNode>(tag);
81-
if (node) {
81+
if (node != nullptr) {
8282
return node->getValue();
8383
} else {
8484
LOG(WARNING)
@@ -156,7 +156,7 @@ void NativeAnimatedNodesManager::connectAnimatedNodes(
156156
auto parentNode = getAnimatedNode<AnimatedNode>(parentTag);
157157
auto childNode = getAnimatedNode<AnimatedNode>(childTag);
158158

159-
if (parentNode && childNode) {
159+
if ((parentNode != nullptr) && (childNode != nullptr)) {
160160
parentNode->addChild(childTag);
161161
updatedNodeTags_.insert(childTag);
162162
} else {
@@ -173,7 +173,7 @@ void NativeAnimatedNodesManager::connectAnimatedNodeToView(
173173
react_native_assert(viewTag);
174174

175175
auto node = getAnimatedNode<PropsAnimatedNode>(propsNodeTag);
176-
if (node) {
176+
if (node != nullptr) {
177177
node->connectToView(viewTag);
178178
{
179179
std::lock_guard<std::mutex> lock(connectedAnimatedNodesMutex_);
@@ -193,7 +193,7 @@ void NativeAnimatedNodesManager::disconnectAnimatedNodeFromView(
193193
react_native_assert(viewTag);
194194

195195
auto node = getAnimatedNode<PropsAnimatedNode>(propsNodeTag);
196-
if (node) {
196+
if (node != nullptr) {
197197
node->disconnectFromView(viewTag);
198198
{
199199
std::lock_guard<std::mutex> lock(connectedAnimatedNodesMutex_);
@@ -215,7 +215,7 @@ void NativeAnimatedNodesManager::disconnectAnimatedNodes(
215215
auto parentNode = getAnimatedNode<AnimatedNode>(parentTag);
216216
auto childNode = getAnimatedNode<AnimatedNode>(childTag);
217217

218-
if (parentNode && childNode) {
218+
if ((parentNode != nullptr) && (childNode != nullptr)) {
219219
parentNode->removeChild(childTag);
220220
} else {
221221
LOG(WARNING) << "Cannot DisconnectAnimatedNodes, parentTag = " << parentTag
@@ -326,7 +326,8 @@ void NativeAnimatedNodesManager::addAnimatedEventToView(
326326
}
327327

328328
const auto key = EventAnimationDriverKey{
329-
viewTag, EventEmitter::normalizeEventType(eventName)};
329+
.viewTag = viewTag,
330+
.eventName = EventEmitter::normalizeEventType(eventName)};
330331
if (auto driversIter = eventDrivers_.find(key);
331332
driversIter != eventDrivers_.end()) {
332333
auto& drivers = driversIter->second;
@@ -345,7 +346,8 @@ void NativeAnimatedNodesManager::removeAnimatedEventFromView(
345346
const std::string& eventName,
346347
Tag animatedValueTag) noexcept {
347348
const auto key = EventAnimationDriverKey{
348-
viewTag, EventEmitter::normalizeEventType(eventName)};
349+
.viewTag = viewTag,
350+
.eventName = EventEmitter::normalizeEventType(eventName)};
349351
auto driversIter = eventDrivers_.find(key);
350352
if (driversIter != eventDrivers_.end()) {
351353
auto& drivers = driversIter->second;
@@ -376,7 +378,8 @@ void NativeAnimatedNodesManager::handleAnimatedEvent(
376378
bool foundAtLeastOneDriver = false;
377379

378380
const auto key = EventAnimationDriverKey{
379-
viewTag, EventEmitter::normalizeEventType(eventName)};
381+
.viewTag = viewTag,
382+
.eventName = EventEmitter::normalizeEventType(eventName)};
380383
if (auto driversIter = eventDrivers_.find(key);
381384
driversIter != eventDrivers_.end()) {
382385
auto& drivers = driversIter->second;
@@ -484,14 +487,15 @@ void NativeAnimatedNodesManager::updateNodes(
484487
#endif
485488
const auto connectedToFinishedAnimation =
486489
is_node_connected_to_finished_animation(node, nodeTag, false);
487-
nodesQueue.emplace_back(
488-
NodesQueueItem{node, connectedToFinishedAnimation});
490+
nodesQueue.emplace_back(NodesQueueItem{
491+
.node = node,
492+
.connectedToFinishedAnimation = connectedToFinishedAnimation});
489493
}
490494
}
491495
}
492496

493497
while (!nodesQueue.empty()) {
494-
auto nextNode = std::move(nodesQueue.front());
498+
auto nextNode = nodesQueue.front();
495499
nodesQueue.pop_front();
496500
// in Animated, value nodes like RGBA are parents and Color node is child
497501
// (the opposite of tree structure)
@@ -506,8 +510,9 @@ void NativeAnimatedNodesManager::updateNodes(
506510
const auto connectedToFinishedAnimation =
507511
is_node_connected_to_finished_animation(
508512
child, childTag, nextNode.connectedToFinishedAnimation);
509-
nodesQueue.emplace_back(
510-
NodesQueueItem{child, connectedToFinishedAnimation});
513+
nodesQueue.emplace_back(NodesQueueItem{
514+
.node = child,
515+
.connectedToFinishedAnimation = connectedToFinishedAnimation});
511516
}
512517
}
513518
}
@@ -537,8 +542,9 @@ void NativeAnimatedNodesManager::updateNodes(
537542
#endif
538543
const auto connectedToFinishedAnimation =
539544
is_node_connected_to_finished_animation(node, nodeTag, false);
540-
nodesQueue.emplace_back(
541-
NodesQueueItem{node, connectedToFinishedAnimation});
545+
nodesQueue.emplace_back(NodesQueueItem{
546+
.node = node,
547+
.connectedToFinishedAnimation = connectedToFinishedAnimation});
542548
}
543549
}
544550
}
@@ -548,7 +554,7 @@ void NativeAnimatedNodesManager::updateNodes(
548554
int cyclesDetected = 0;
549555
#endif
550556
while (!nodesQueue.empty()) {
551-
auto nextNode = std::move(nodesQueue.front());
557+
auto nextNode = nodesQueue.front();
552558
nodesQueue.pop_front();
553559
if (nextNode.connectedToFinishedAnimation &&
554560
nextNode.node->type() == AnimatedNodeType::Props) {
@@ -570,8 +576,9 @@ void NativeAnimatedNodesManager::updateNodes(
570576
const auto connectedToFinishedAnimation =
571577
is_node_connected_to_finished_animation(
572578
child, childTag, nextNode.connectedToFinishedAnimation);
573-
nodesQueue.emplace_back(
574-
NodesQueueItem{child, connectedToFinishedAnimation});
579+
nodesQueue.emplace_back(NodesQueueItem{
580+
.node = child,
581+
.connectedToFinishedAnimation = connectedToFinishedAnimation});
575582
}
576583
#ifdef REACT_NATIVE_DEBUG
577584
else if (child->bfsColor == animatedGraphBFSColor_) {
@@ -631,7 +638,8 @@ bool NativeAnimatedNodesManager::onAnimationFrame(double timestamp) {
631638
std::vector<int> finishedAnimations;
632639
for (const auto& [animationId, driver] : activeAnimations_) {
633640
if (driver->getIsComplete()) {
634-
if (getAnimatedNode<ValueAnimatedNode>(driver->getAnimatedValueTag())) {
641+
if (getAnimatedNode<ValueAnimatedNode>(driver->getAnimatedValueTag()) !=
642+
nullptr) {
635643
driver->stopAnimation();
636644
}
637645
finishedAnimations.emplace_back(animationId);

packages/react-native/ReactCxxPlatform/react/renderer/animated/tests/EventAnimationDriverTests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ TEST_F(EventAnimationDriverTests, subscribeToViewEvent) {
5353
EXPECT_EQ(nodesManager_->getValue(animatedValueTag2), 0);
5454

5555
auto scrollEvent = std::make_shared<ScrollEvent>();
56-
scrollEvent->contentSize = {1, 2};
57-
scrollEvent->contentOffset = {3, 4};
58-
scrollEvent->contentInset = {5, 6, 7, 8};
59-
scrollEvent->containerSize = {9, 10};
56+
scrollEvent->contentSize = {.width = 1, .height = 2};
57+
scrollEvent->contentOffset = {.x = 3, .y = 4};
58+
scrollEvent->contentInset = {.left = 5, .top = 6, .right = 7, .bottom = 8};
59+
scrollEvent->containerSize = {.width = 9, .height = 10};
6060
scrollEvent->zoomScale = 11.0f;
6161

6262
const std::string eventType{eventName};

0 commit comments

Comments
 (0)