Fabric: ContextContainer was moved to utils module

Summary: That allows avoiding circular deps and unnecessary deps on uimanager module. Reviewed By: PeteTheHeat Differential Revision: D14917227 fbshipit-source-id: fe7962ee528aa659d8bd23e3e46627722551d995
facebook · Apr 12, 2019 · 792585f · 792585f
1 parent 108c419
commit 792585f
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 23 deletions.
diff --git a/RNTester/ComponentRegistry.cpp b/RNTester/ComponentRegistry.cpp
@@ -18,7 +18,7 @@
 #include <react/config/ReactNativeConfig.h>
 #include <react/uimanager/ComponentDescriptorFactory.h>
 #include <react/uimanager/ComponentDescriptorRegistry.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/React/Fabric/RCTScheduler.mm b/React/Fabric/RCTScheduler.mm
@@ -9,9 +9,9 @@
 
 #import <react/debug/SystraceSection.h>
 #import <react/uimanager/ComponentDescriptorFactory.h>
-#import <react/uimanager/ContextContainer.h>
 #import <react/uimanager/Scheduler.h>
 #import <react/uimanager/SchedulerDelegate.h>
+#import <react/utils/ContextContainer.h>
 
 #import <React/RCTFollyConvert.h>
 

diff --git a/React/Fabric/RCTSurfacePresenter.h b/React/Fabric/RCTSurfacePresenter.h
@@ -12,7 +12,7 @@
 #import <React/RCTComponentViewFactory.h>
 #import <React/RCTPrimitives.h>
 #import <react/config/ReactNativeConfig.h>
-#import <react/uimanager/ContextContainer.h>
+#import <react/utils/ContextContainer.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
@@ -29,7 +29,7 @@
 #import <react/core/LayoutConstraints.h>
 #import <react/core/LayoutContext.h>
 #import <react/imagemanager/ImageManager.h>
-#import <react/uimanager/ContextContainer.h>
+#import <react/utils/ContextContainer.h>
 
 #import "MainRunLoopEventBeat.h"
 #import "RuntimeEventBeat.h"

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp
@@ -16,7 +16,7 @@
 #include <react/core/EventBeat.h>
 #include <react/core/EventEmitter.h>
 #include <react/uimanager/ComponentDescriptorFactory.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 #include <react/uimanager/Scheduler.h>
 #include <react/uimanager/SchedulerDelegate.h>
 #include <react/uimanager/primitives.h>

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.h
@@ -7,7 +7,7 @@
 #include <fb/fbjni.h>
 #include <jsi/jsi.h>
 #include <react/uimanager/ComponentDescriptorRegistry.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 #include <react/uimanager/Scheduler.h>
 #include <mutex>
 #include <unordered_set>

diff --git a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
@@ -10,7 +10,7 @@
 #include <react/components/image/ImageShadowNode.h>
 #include <react/core/ConcreteComponentDescriptor.h>
 #include <react/imagemanager/ImageManager.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h b/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h
@@ -9,7 +9,7 @@
 
 #include <react/core/ConcreteComponentDescriptor.h>
 #include <react/core/LayoutConstraints.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h b/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h
@@ -9,7 +9,7 @@
 
 #include <react/core/ConcreteComponentDescriptor.h>
 #include <react/core/LayoutConstraints.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h b/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
@@ -11,10 +11,10 @@
 #include "ParagraphShadowNode.h"
 
 #include <folly/container/EvictingCacheMap.h>
+#include <react/config/ReactNativeConfig.h>
 #include <react/core/ConcreteComponentDescriptor.h>
 #include <react/textlayoutmanager/TextLayoutManager.h>
-#include <react/uimanager/ContextContainer.h>
-#include <react/config/ReactNativeConfig.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp b/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp
@@ -7,7 +7,7 @@
 
 #include <react/uimanager/ComponentDescriptorFactory.h>
 #include <react/uimanager/ComponentDescriptorRegistry.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h
@@ -12,7 +12,7 @@
 #include <react/attributedstring/AttributedString.h>
 #include <react/attributedstring/ParagraphAttributes.h>
 #include <react/core/LayoutConstraints.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h
@@ -12,7 +12,7 @@
 #include <react/attributedstring/AttributedString.h>
 #include <react/attributedstring/ParagraphAttributes.h>
 #include <react/core/LayoutConstraints.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h b/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h
@@ -11,7 +11,7 @@
 
 #include <react/core/ComponentDescriptor.h>
 #include <react/core/EventDispatcher.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 
 #include "ComponentDescriptorRegistry.h"
 

diff --git a/ReactCommon/fabric/uimanager/Scheduler.h b/ReactCommon/fabric/uimanager/Scheduler.h
@@ -17,11 +17,11 @@
 #include <react/mounting/ShadowTreeRegistry.h>
 #include <react/uimanager/ComponentDescriptorFactory.h>
 #include <react/uimanager/ComponentDescriptorRegistry.h>
-#include <react/uimanager/ContextContainer.h>
 #include <react/uimanager/SchedulerDelegate.h>
 #include <react/uimanager/UIManagerBinding.h>
 #include <react/uimanager/UIManagerDelegate.h>
 #include <react/uimanager/primitives.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp b/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp
@@ -23,7 +23,7 @@ using namespace facebook::react;
 #include <react/config/ReactNativeConfig.h>
 #include <react/uimanager/ComponentDescriptorFactory.h>
 #include <react/uimanager/ComponentDescriptorRegistry.h>
-#include <react/uimanager/ContextContainer.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

diff --git a/...ommon/fabric/uimanager/ContextContainer.h → ReactCommon/utils/ContextContainer.h b/...ommon/fabric/uimanager/ContextContainer.h → ReactCommon/utils/ContextContainer.h
@@ -8,10 +8,7 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <typeindex>
-#include <typeinfo>
 #include <unordered_map>
-#include <utility>
 
 #include <glog/logging.h>
 
@@ -28,6 +25,8 @@ using SharedContextContainer = std::shared_ptr<ContextContainer>;
  */
 class ContextContainer final {
  public:
+  using Shared = std::shared_ptr<ContextContainer>;
+
   /*
    * Registers an instance of the particular type `T` in the container
    * using the provided `key`. Only one instance can be registered per key.
@@ -39,10 +38,10 @@ class ContextContainer final {
    *`EmptyReactNativeConfig`.
    */
   template <typename T>
-  void registerInstance(const T &instance, const std::string &key) {
+  void registerInstance(T const &instance, std::string const &key) {
     std::lock_guard<std::mutex> lock(mutex_);
 
-    const auto res = instances_.insert({key, std::make_shared<T>(instance)});
+    auto res = instances_.insert({key, std::make_shared<T>(instance)});
     if (res.second == false) {
       LOG(FATAL) << "ContextContainer already had instance for key '" << key
                  << "'";
@@ -54,7 +53,7 @@ class ContextContainer final {
    * for `key`.
    */
   template <typename T>
-  T getInstance(const std::string &key) const {
+  T getInstance(std::string const &key) const {
     std::lock_guard<std::mutex> lock(mutex_);
 
     return *std::static_pointer_cast<T>(instances_.at(key));