diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp index fc591f13ff3..e366682ebe4 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp @@ -167,10 +167,9 @@ ShadowTree::ShadowTree( const ShadowTreeDelegate& delegate, const ContextContainer& contextContainer) : surfaceId_(surfaceId), delegate_(delegate) { - static auto globalRootComponentDescriptor = - std::make_unique( - ComponentDescriptorParameters{ - EventDispatcher::Shared{}, nullptr, nullptr}); + static RootComponentDescriptor globalRootComponentDescriptor( + ComponentDescriptorParameters{ + EventDispatcher::Shared{}, nullptr, nullptr}); const auto props = std::make_shared( PropsParserContext{surfaceId, contextContainer}, @@ -178,11 +177,11 @@ ShadowTree::ShadowTree( layoutConstraints, layoutContext); - auto family = globalRootComponentDescriptor->createFamily( + auto family = globalRootComponentDescriptor.createFamily( {surfaceId, surfaceId, nullptr}); auto rootShadowNode = std::static_pointer_cast( - globalRootComponentDescriptor->createShadowNode( + globalRootComponentDescriptor.createShadowNode( ShadowNodeFragment{ /* .props = */ props, }, diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h index d33dbe3b40c..87b6a7afa47 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h @@ -9,7 +9,6 @@ #include -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h index 6972502b4f5..4e7c63284f1 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h b/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h index 9c5ec2e3fe7..18e2bad9cfd 100644 --- a/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h +++ b/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h @@ -18,9 +18,6 @@ #include #include -#include -#include - #include "Entropy.h" namespace facebook::react {