diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp index d2fb2b34033..9d165105786 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp @@ -164,7 +164,8 @@ class StackingContextTest : public ::testing::Test { node->getFamily(), [&](const ShadowNode& oldShadowNode) { auto viewProps = std::make_shared(); callback(*viewProps); - return oldShadowNode.clone(ShadowNodeFragment{viewProps}); + return oldShadowNode.clone( + ShadowNodeFragment{.props = viewProps}); })); } @@ -260,7 +261,7 @@ TEST_F(StackingContextTest, mostPropsDoNotForceViewsToMaterialize) { yogaStyle.setMargin(yoga::Edge::All, yoga::StyleLength::points(42)); yogaStyle.setPositionType(yoga::PositionType::Absolute); props.shadowRadius = 42; - props.shadowOffset = Size{42, 42}; + props.shadowOffset = Size{.width = 42, .height = 42}; props.backgroundColor = clearColor(); }); diff --git a/packages/react-native/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.cpp b/packages/react-native/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.cpp index dc66c28a796..a5c1a62bd40 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.cpp @@ -128,7 +128,9 @@ EventTag EventPerformanceLogger::onEventStart( { std::lock_guard lock(eventsInFlightMutex_); eventsInFlight_.emplace( - eventTag, EventEntry{reportedName, target, timeStamp}); + eventTag, + EventEntry{ + .name = reportedName, .target = target, .startTime = timeStamp}); } return eventTag; } diff --git a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp index 57f362c1127..d7ee1b49ae2 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp @@ -65,8 +65,8 @@ static Rect getRootNodeBoundingRect(const RootShadowNode& rootShadowNode) { static Rect getBoundingRect(const ShadowNodeFamily::AncestorList& ancestors) { auto layoutMetrics = LayoutableShadowNode::computeRelativeLayoutMetrics( ancestors, - {/* .includeTransform = */ true, - /* .includeViewportOffset = */ true}); + {/* .includeTransform = */ .includeTransform = true, + /* .includeViewportOffset = */ .includeViewportOffset = true}); return layoutMetrics == EmptyLayoutMetrics ? Rect{} : layoutMetrics.frame; } @@ -74,9 +74,9 @@ static Rect getClippedTargetBoundingRect( const ShadowNodeFamily::AncestorList& targetAncestors) { auto layoutMetrics = LayoutableShadowNode::computeRelativeLayoutMetrics( targetAncestors, - {/* .includeTransform = */ true, - /* .includeViewportOffset = */ true, - /* .applyParentClipping = */ true}); + {/* .includeTransform = */ .includeTransform = true, + /* .includeViewportOffset = */ .includeViewportOffset = true, + /* .applyParentClipping = */ .enableOverflowClipping = true}); return layoutMetrics == EmptyLayoutMetrics ? Rect{} : layoutMetrics.frame; } @@ -110,8 +110,8 @@ static Rect computeIntersection( getClippedTargetBoundingRect(targetToRootAncestors); auto clippedTargetBoundingRect = hasCustomRoot ? Rect{ - rootBoundingRect.origin + clippedTargetFromRoot.origin, - clippedTargetFromRoot.size} + .origin=rootBoundingRect.origin + clippedTargetFromRoot.origin, + .size=clippedTargetFromRoot.size} : clippedTargetFromRoot; return Rect::intersect(rootBoundingRect, clippedTargetBoundingRect); @@ -231,13 +231,13 @@ IntersectionObserver::setIntersectingState( if (state_ != newState) { state_ = newState; IntersectionObserverEntry entry{ - intersectionObserverId_, - targetShadowNodeFamily_, - targetBoundingRect, - rootBoundingRect, - intersectionRect, - true, - time, + .intersectionObserverId = intersectionObserverId_, + .shadowNodeFamily = targetShadowNodeFamily_, + .targetRect = targetBoundingRect, + .rootRect = rootBoundingRect, + .intersectionRect = intersectionRect, + .isIntersectingAboveThresholds = true, + .time = time, }; return std::optional{std::move(entry)}; } @@ -254,13 +254,13 @@ IntersectionObserver::setNotIntersectingState( if (state_ != IntersectionObserverState::NotIntersecting()) { state_ = IntersectionObserverState::NotIntersecting(); IntersectionObserverEntry entry{ - intersectionObserverId_, - targetShadowNodeFamily_, - targetBoundingRect, - rootBoundingRect, - intersectionRect, - false, - time, + .intersectionObserverId = intersectionObserverId_, + .shadowNodeFamily = targetShadowNodeFamily_, + .targetRect = targetBoundingRect, + .rootRect = rootBoundingRect, + .intersectionRect = intersectionRect, + .isIntersectingAboveThresholds = false, + .time = time, }; return std::optional(std::move(entry)); } diff --git a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.cpp b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.cpp index 61cc66d334f..7d98dcc7628 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.cpp @@ -176,10 +176,10 @@ void MutationObserver::recordMutationsInSubtrees( if (!addedNodes.empty() || !removedNodes.empty()) { recordedMutations.emplace_back(MutationRecord{ - mutationObserverId_, - oldNode, - std::move(addedNodes), - std::move(removedNodes)}); + .mutationObserverId = mutationObserverId_, + .targetShadowNode = oldNode, + .addedShadowNodes = std::move(addedNodes), + .removedShadowNodes = std::move(removedNodes)}); } } diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp index 2f8a69cf892..014dadd86eb 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp @@ -215,7 +215,7 @@ Size SurfaceHandler::measure( std::shared_lock lock(linkMutex_); if (link_.status != Status::Running) { - return layoutConstraints.clamp({0, 0}); + return layoutConstraints.clamp({.width = 0, .height = 0}); } react_native_assert( diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp index 81f7d67f3ea..52e11a7c5fa 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp @@ -95,11 +95,11 @@ std::optional SurfaceManager::getSurfaceProps( visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) { surfaceProps = SurfaceManager::SurfaceProps{ - surfaceId, - surfaceHandler.getModuleName(), - surfaceHandler.getProps(), - surfaceHandler.getLayoutConstraints(), - surfaceHandler.getLayoutContext()}; + .surfaceId = surfaceId, + .moduleName = surfaceHandler.getModuleName(), + .props = surfaceHandler.getProps(), + .layoutConstraints = surfaceHandler.getLayoutConstraints(), + .layoutContext = surfaceHandler.getLayoutContext()}; }); return surfaceProps; diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.cpp b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.cpp index 2e791aa63ad..8806384bc57 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.cpp @@ -21,14 +21,17 @@ TextMeasurement TextLayoutManager::measure( TextMeasurement::Attachments attachments; for (const auto& fragment : attributedStringBox.getValue().getFragments()) { if (fragment.isAttachment()) { - attachments.push_back( - TextMeasurement::Attachment{{{0, 0}, {0, 0}}, false}); + attachments.push_back(TextMeasurement::Attachment{ + .frame = + {.origin = {.x = 0, .y = 0}, .size = {.width = 0, .height = 0}}, + .isClipped = false}); } } return TextMeasurement{ - {layoutConstraints.minimumSize.width, - layoutConstraints.minimumSize.height}, - attachments}; + .size = + {.width = layoutConstraints.minimumSize.width, + .height = layoutConstraints.minimumSize.height}, + .attachments = attachments}; } } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp index f21d91d3c80..ea46a1a3a5e 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp @@ -104,10 +104,12 @@ static PointerEventTarget retargetPointerEvent( // More work will be needed to properly take non-trival transforms into // account. auto layoutMetrics = uiManager.getRelativeLayoutMetrics( - *latestNodeToTarget, nullptr, {/* .includeTransform */ true}); + *latestNodeToTarget, + nullptr, + {/* .includeTransform */ .includeTransform = true}); retargetedEvent.offsetPoint = { - event.clientPoint.x - layoutMetrics.frame.origin.x, - event.clientPoint.y - layoutMetrics.frame.origin.y, + .x = event.clientPoint.x - layoutMetrics.frame.origin.x, + .y = event.clientPoint.y - layoutMetrics.frame.origin.y, }; PointerEventTarget result = {}; diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp index 4855071d9ab..33070056f55 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp @@ -73,7 +73,9 @@ std::shared_ptr UIManager::createNode( PropsParserContext propsParserContext{surfaceId, *contextContainer_.get()}; auto family = componentDescriptor.createFamily( - {tag, surfaceId, std::move(instanceHandle)}); + {.tag = tag, + .surfaceId = surfaceId, + .instanceHandle = std::move(instanceHandle)}); const auto props = componentDescriptor.cloneProps( propsParserContext, nullptr, std::move(rawProps)); const auto state = componentDescriptor.createInitialState(props, family); @@ -462,7 +464,7 @@ void UIManager::setNativeProps_DEPRECATED( ->getProps(), RawProps(rawProps)); - return oldShadowNode.clone({/* .props = */ props}); + return oldShadowNode.clone({/* .props = */ .props = props}); }); return std::static_pointer_cast(rootNode); diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp index 9ab7416ffee..5f661273a67 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp @@ -277,8 +277,8 @@ jsi::Value UIManagerBinding::get( auto locationY = (Float)arguments[2].getNumber(); auto onSuccessFunction = arguments[3].getObject(runtime).getFunction(runtime); - auto targetNode = - uiManager->findNodeAtPoint(node, Point{locationX, locationY}); + auto targetNode = uiManager->findNodeAtPoint( + node, Point{.x = locationX, .y = locationY}); if (!targetNode) { onSuccessFunction.call(runtime, jsi::Value::null()); @@ -511,7 +511,7 @@ jsi::Value UIManagerBinding::get( Bridging>::fromJs( runtime, arguments[1]) .get(), - {/* .includeTransform = */ false}); + {/* .includeTransform = */ .includeTransform = false}); auto frame = layoutMetrics.frame; auto result = jsi::Object(runtime); result.setProperty(runtime, "left", frame.origin.x); diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/tests/PointerEventsProcessorTest.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/tests/PointerEventsProcessorTest.cpp index 09cb2c170a9..79f90dc15b9 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/tests/PointerEventsProcessorTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/tests/PointerEventsProcessorTest.cpp @@ -43,7 +43,9 @@ class PointerEventsProcessorTest : public ::testing::Test { auto componentDescriptorRegistry = componentDescriptorProviderRegistry.createComponentDescriptorRegistry( ComponentDescriptorParameters{ - eventDispatcher, std::move(contextContainer), nullptr}); + .eventDispatcher = eventDispatcher, + .contextContainer = std::move(contextContainer), + .flavor = nullptr}); componentDescriptorProviderRegistry.add( concreteComponentDescriptorProvider()); @@ -83,7 +85,7 @@ class PointerEventsProcessorTest : public ::testing::Test { auto sharedProps = std::make_shared(); auto &props = *sharedProps; listenToAllPointerEvents(props); - props.layoutConstraints = LayoutConstraints{{0,0}, {500, 500}}; + props.layoutConstraints = LayoutConstraints{.minimumSize={.width=0,.height=0}, .maximumSize={.width=500, .height=500}}; auto &yogaStyle = props.yogaStyle; yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(400)); yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleSizeLength::points(400)); diff --git a/packages/react-native/ReactCommon/react/utils/tests/hash_combineTests.cpp b/packages/react-native/ReactCommon/react/utils/tests/hash_combineTests.cpp index 7b5fd583ff9..79bbde74994 100644 --- a/packages/react-native/ReactCommon/react/utils/tests/hash_combineTests.cpp +++ b/packages/react-native/ReactCommon/react/utils/tests/hash_combineTests.cpp @@ -67,8 +67,8 @@ TEST(hash_combineTests, testStrings) { } TEST(hash_combineTests, testCustomTypes) { - auto person1 = Person{"John", "Doe"}; - auto person2 = Person{"Jane", "Doe"}; + auto person1 = Person{.firstName = "John", .lastName = "Doe"}; + auto person2 = Person{.firstName = "Jane", .lastName = "Doe"}; std::size_t seed = 0; hash_combine(seed, person1); diff --git a/packages/react-native/ReactCommon/reactperflogger/fusebox/FuseboxTracer.cpp b/packages/react-native/ReactCommon/reactperflogger/fusebox/FuseboxTracer.cpp index b08572ddc37..848b164b1b9 100644 --- a/packages/react-native/ReactCommon/reactperflogger/fusebox/FuseboxTracer.cpp +++ b/packages/react-native/ReactCommon/reactperflogger/fusebox/FuseboxTracer.cpp @@ -110,7 +110,10 @@ void FuseboxTracer::addEvent( return; } buffer_.push_back(BufferEvent{ - start, end, std::string(name), std::string(track.value_or(""))}); + .start = start, + .end = end, + .name = std::string(name), + .track = std::string(track.value_or(""))}); } bool FuseboxTracer::stopTracingAndWriteToFile(const std::string& path) {