From 4d90f84869b680d65a40dc52ff3c5c1e30c17fe0 Mon Sep 17 00:00:00 2001 From: Phillip Pan Date: Thu, 31 Oct 2024 00:56:21 -0700 Subject: [PATCH] clean up unused callsites to contextContainer->at (#47322) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/47322 Changelog: [Internal] these callsites were causing crashes in new bridgeless integrations, it appears they are not used, so cleaning up. after this, we can remove all callsites that insert ReactNativeConfig to the contextContainer. Reviewed By: javache Differential Revision: D65191733 fbshipit-source-id: 94e694ef27249773c2a39bd77f316f8f5cc2b1fb --- packages/react-native/React/Fabric/RCTScheduler.mm | 3 --- packages/react-native/React/Fabric/RCTSurfacePresenter.mm | 3 --- .../ReactCommon/react/renderer/scheduler/Scheduler.cpp | 4 ---- .../ReactCommon/react/renderer/scheduler/Scheduler.h | 2 -- 4 files changed, 12 deletions(-) diff --git a/packages/react-native/React/Fabric/RCTScheduler.mm b/packages/react-native/React/Fabric/RCTScheduler.mm index 016af6dd209..1f09f1a60b7 100644 --- a/packages/react-native/React/Fabric/RCTScheduler.mm +++ b/packages/react-native/React/Fabric/RCTScheduler.mm @@ -114,9 +114,6 @@ class LayoutAnimationDelegateProxy : public LayoutAnimationStatusDelegate, publi - (instancetype)initWithToolbox:(SchedulerToolbox)toolbox { if (self = [super init]) { - auto reactNativeConfig = - toolbox.contextContainer->at>("ReactNativeConfig"); - _delegateProxy = std::make_unique((__bridge void *)self); if (ReactNativeFeatureFlags::enableLayoutAnimationsOnIOS()) { diff --git a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm index a99e30be188..dbea5607fb9 100644 --- a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm +++ b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm @@ -26,7 +26,6 @@ #import #import -#import #import #import #import @@ -226,8 +225,6 @@ using namespace facebook::react; - (RCTScheduler *)_createScheduler { - auto reactNativeConfig = _contextContainer->at>("ReactNativeConfig"); - auto componentRegistryFactory = [factory = wrapManagedObject(_mountingManager.componentViewRegistry.componentViewFactory)]( const EventDispatcher::Weak &eventDispatcher, const ContextContainer::Shared &contextContainer) { diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp index 3519fa025d7..58e2805de36 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp @@ -31,10 +31,6 @@ Scheduler::Scheduler( runtimeExecutor_ = schedulerToolbox.runtimeExecutor; contextContainer_ = schedulerToolbox.contextContainer; - reactNativeConfig_ = - contextContainer_->at>( - "ReactNativeConfig"); - // Creating a container for future `EventDispatcher` instance. eventDispatcher_ = std::make_shared>(); diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h index 0fb2394f8e4..c75f98de523 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -120,7 +119,6 @@ class Scheduler final : public UIManagerDelegate { SharedComponentDescriptorRegistry componentDescriptorRegistry_; RuntimeExecutor runtimeExecutor_; std::shared_ptr uiManager_; - std::shared_ptr reactNativeConfig_; std::vector> commitHooks_;