react-native 0.0.0-17be3a003 → 0.0.0-18697adec

package/ReactCommon/react/renderer/uimanager/UIManager.cpp

@@ -8,6 +8,7 @@
 #include "UIManager.h"
 
 #include <react/debug/react_native_assert.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <react/renderer/graphics/Geometry.h>
@@ -18,25 +19,23 @@
 
 namespace facebook::react {
 
-static std::unique_ptr<LeakChecker> constructLeakChecker(
-    RuntimeExecutor const &runtimeExecutor,
-    GarbageCollectionTrigger const &garbageCollectionTrigger) {
-  if (garbageCollectionTrigger) {
-    return std::make_unique<LeakChecker>(
-        runtimeExecutor, garbageCollectionTrigger);
-  } else {
-    return {};
-  }
+static std::unique_ptr<LeakChecker> constructLeakCheckerIfNeeded(
+    RuntimeExecutor const &runtimeExecutor) {
+#ifdef REACT_NATIVE_DEBUG
+  return std::make_unique<LeakChecker>(runtimeExecutor);
+#else
+  return {};
+#endif
 }
 
 UIManager::UIManager(
     RuntimeExecutor const &runtimeExecutor,
     BackgroundExecutor const &backgroundExecutor,
-    GarbageCollectionTrigger const &garbageCollectionTrigger)
+    ContextContainer::Shared contextContainer)
     : runtimeExecutor_(runtimeExecutor),
       backgroundExecutor_(backgroundExecutor),
-      leakChecker_(
-          constructLeakChecker(runtimeExecutor, garbageCollectionTrigger)) {}
+      contextContainer_(contextContainer),
+      leakChecker_(constructLeakCheckerIfNeeded(runtimeExecutor)) {}
 
 UIManager::~UIManager() {
   LOG(WARNING) << "UIManager::~UIManager() was called (address: " << this
@@ -55,10 +54,13 @@ SharedShadowNode UIManager::createNode(
   auto fallbackDescriptor =
       componentDescriptorRegistry_->getFallbackComponentDescriptor();
 
+  PropsParserContext propsParserContext{surfaceId, *contextContainer_.get()};
+
   auto const fragment = ShadowNodeFamilyFragment{tag, surfaceId, nullptr};
   auto family =
       componentDescriptor.createFamily(fragment, std::move(eventTarget));
-  auto const props = componentDescriptor.cloneProps(nullptr, rawProps);
+  auto const props =
+      componentDescriptor.cloneProps(propsParserContext, nullptr, rawProps);
   auto const state =
       componentDescriptor.createInitialState(ShadowNodeFragment{props}, family);
 
@@ -69,7 +71,9 @@ SharedShadowNode UIManager::createNode(
                   fallbackDescriptor->getComponentHandle() ==
                       componentDescriptor.getComponentHandle()
               ? componentDescriptor.cloneProps(
-                    props, RawProps(folly::dynamic::object("name", name)))
+                    propsParserContext,
+                    props,
+                    RawProps(folly::dynamic::object("name", name)))
               : props,
           /* .children = */ ShadowNodeFragment::childrenPlaceholder(),
           /* .state = */ state,
@@ -77,7 +81,7 @@ SharedShadowNode UIManager::createNode(
       family);
 
   if (delegate_) {
-    delegate_->uiManagerDidCreateShadowNode(shadowNode);
+    delegate_->uiManagerDidCreateShadowNode(*shadowNode.get());
   }
   if (leakChecker_) {
     leakChecker_->uiManagerDidCreateShadowNodeFamily(family);
@@ -92,17 +96,25 @@ SharedShadowNode UIManager::cloneNode(
     const RawProps *rawProps) const {
   SystraceSection s("UIManager::cloneNode");
 
+  PropsParserContext propsParserContext{
+      shadowNode->getFamily().getSurfaceId(), *contextContainer_.get()};
+
   auto &componentDescriptor = shadowNode->getComponentDescriptor();
   auto clonedShadowNode = componentDescriptor.cloneShadowNode(
       *shadowNode,
       {
           /* .props = */
           rawProps ? componentDescriptor.cloneProps(
-                         shadowNode->getProps(), *rawProps)
+                         propsParserContext, shadowNode->getProps(), *rawProps)
                    : ShadowNodeFragment::propsPlaceholder(),
           /* .children = */ children,
       });
 
+  if (delegate_) {
+    delegate_->uiManagerDidCloneShadowNode(
+        *shadowNode.get(), *clonedShadowNode.get());
+  }
+
   return clonedShadowNode;
 }
 
@@ -156,6 +168,7 @@ void UIManager::startSurface(
   shadowTreeRegistry_.add(std::move(shadowTree));
 
   runtimeExecutor_([=](jsi::Runtime &runtime) {
+    SystraceSection s("UIManager::startSurface::onRuntime");
     auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
     if (!uiManagerBinding) {
       return;
@@ -364,19 +377,10 @@ UIManagerDelegate *UIManager::getDelegate() {
 void UIManager::visitBinding(
     std::function<void(UIManagerBinding const &uiManagerBinding)> callback,
     jsi::Runtime &runtime) const {
-  if (extractUIManagerBindingOnDemand_) {
-    auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
-    if (uiManagerBinding) {
-      callback(*uiManagerBinding_);
-    }
-    return;
+  auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
+  if (uiManagerBinding) {
+    callback(*uiManagerBinding);
   }
-
-  if (!uiManagerBinding_) {
-    return;
-  }
-
-  callback(*uiManagerBinding_);
 }
 
 ShadowTreeRegistry const &UIManager::getShadowTreeRegistry() const {

package/ReactCommon/react/renderer/uimanager/UIManager.h

@@ -23,6 +23,7 @@
 #include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
 #include <react/renderer/uimanager/UIManagerDelegate.h>
 #include <react/renderer/uimanager/primitives.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook::react {
 
@@ -34,7 +35,7 @@ class UIManager final : public ShadowTreeDelegate {
   UIManager(
       RuntimeExecutor const &runtimeExecutor,
       BackgroundExecutor const &backgroundExecutor,
-      GarbageCollectionTrigger const &garbageCollectionTrigger);
+      ContextContainer::Shared contextContainer);
 
   ~UIManager();
 
@@ -187,16 +188,14 @@ class UIManager final : public ShadowTreeDelegate {
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
   UIManagerDelegate *delegate_;
   UIManagerAnimationDelegate *animationDelegate_{nullptr};
-  UIManagerBinding *uiManagerBinding_;
   RuntimeExecutor const runtimeExecutor_{};
   ShadowTreeRegistry shadowTreeRegistry_{};
   BackgroundExecutor const backgroundExecutor_{};
+  ContextContainer::Shared contextContainer_;
 
   mutable better::shared_mutex commitHookMutex_;
   mutable std::vector<UIManagerCommitHook const *> commitHooks_;
 
-  bool extractUIManagerBindingOnDemand_{};
-
   std::unique_ptr<LeakChecker> leakChecker_;
 };
 

package/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h

@@ -16,7 +16,7 @@ namespace facebook::react {
 
 class UIManagerAnimationDelegate {
  public:
-  virtual ~UIManagerAnimationDelegate(){};
+  virtual ~UIManagerAnimationDelegate() = default;
 
   /*
    * Configure a LayoutAnimation.

package/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

@@ -58,7 +58,8 @@ static bool checkGetCallableModuleIsActive(jsi::Runtime &runtime) {
 }
 
 std::shared_ptr<UIManagerBinding> UIManagerBinding::createAndInstallIfNeeded(
-    jsi::Runtime &runtime) {
+    jsi::Runtime &runtime,
+    RuntimeExecutor const &runtimeExecutor) {
   auto uiManagerModuleName = "nativeFabricUIManager";
 
   auto uiManagerValue =
@@ -66,7 +67,7 @@ std::shared_ptr<UIManagerBinding> UIManagerBinding::createAndInstallIfNeeded(
   if (uiManagerValue.isUndefined()) {
     // The global namespace does not have an instance of the binding;
     // we need to create, install and return it.
-    auto uiManagerBinding = std::make_shared<UIManagerBinding>();
+    auto uiManagerBinding = std::make_shared<UIManagerBinding>(runtimeExecutor);
     auto object = jsi::Object::createFromHostObject(runtime, uiManagerBinding);
     runtime.global().setProperty(
         runtime, uiManagerModuleName, std::move(object));
@@ -93,28 +94,16 @@ std::shared_ptr<UIManagerBinding> UIManagerBinding::getBinding(
   return uiManagerObject.getHostObject<UIManagerBinding>(runtime);
 }
 
+UIManagerBinding::UIManagerBinding(RuntimeExecutor const &runtimeExecutor)
+    : runtimeExecutor_(runtimeExecutor) {}
+
 UIManagerBinding::~UIManagerBinding() {
   LOG(WARNING) << "UIManagerBinding::~UIManagerBinding() was called (address: "
                << this << ").";
-
-  // We must detach the `UIBinding` on deallocation to prevent accessing
-  // deallocated `UIManagerBinding`.
-  // Since `UIManagerBinding` retains `UIManager`, `UIManager` always overlive
-  // `UIManagerBinding`, therefore we don't need similar logic in `UIManager`'s
-  // destructor.
-  attach(nullptr);
 }
 
 void UIManagerBinding::attach(std::shared_ptr<UIManager> const &uiManager) {
-  if (uiManager_) {
-    uiManager_->uiManagerBinding_ = nullptr;
-  }
-
   uiManager_ = uiManager;
-
-  if (uiManager_) {
-    uiManager_->uiManagerBinding_ = this;
-  }
 }
 
 static jsi::Value callMethodOfModule(
@@ -140,12 +129,40 @@ static jsi::Value callMethodOfModule(
   return jsi::Value::undefined();
 }
 
+jsi::Value UIManagerBinding::getInspectorDataForInstance(
+    jsi::Runtime &runtime,
+    SharedEventEmitter eventEmitter) const {
+  auto eventTarget = eventEmitter->eventTarget_;
+  EventEmitter::DispatchMutex().lock();
+
+  if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
+      !eventTarget) {
+    return jsi::Value::undefined();
+  }
+
+  eventTarget->retain(runtime);
+  auto instanceHandle = eventTarget->getInstanceHandle(runtime);
+  eventTarget->release(runtime);
+  EventEmitter::DispatchMutex().unlock();
+
+  if (instanceHandle.isUndefined()) {
+    return jsi::Value::undefined();
+  }
+
+  return callMethodOfModule(
+      runtime,
+      "ReactFabric",
+      "getInspectorDataForInstance",
+      {std::move(instanceHandle)});
+}
+
 void UIManagerBinding::startSurface(
     jsi::Runtime &runtime,
     SurfaceId surfaceId,
     std::string const &moduleName,
     folly::dynamic const &initalProps,
     DisplayMode displayMode) const {
+  SystraceSection s("UIManagerBinding::startSurface");
   folly::dynamic parameters = folly::dynamic::object();
   parameters["rootTag"] = surfaceId;
   parameters["initialProps"] = initalProps;
@@ -179,6 +196,7 @@ void UIManagerBinding::setSurfaceProps(
     std::string const &moduleName,
     folly::dynamic const &initalProps,
     DisplayMode displayMode) const {
+  SystraceSection s("UIManagerBinding::setSurfaceProps");
   folly::dynamic parameters = folly::dynamic::object();
   parameters["rootTag"] = surfaceId;
   parameters["initialProps"] = initalProps;
@@ -230,6 +248,7 @@ void UIManagerBinding::dispatchEvent(
     jsi::Runtime &runtime,
     EventTarget const *eventTarget,
     std::string const &type,
+    ReactEventPriority priority,
     ValueFactory const &payloadFactory) const {
   SystraceSection s("UIManagerBinding::dispatchEvent");
 
@@ -260,11 +279,13 @@ void UIManagerBinding::dispatchEvent(
   auto &eventHandlerWrapper =
       static_cast<EventHandlerWrapper const &>(*eventHandler_);
 
+  currentEventPriority_ = priority;
   eventHandlerWrapper.callback.call(
       runtime,
       {std::move(instanceHandle),
        jsi::String::createFromUtf8(runtime, type),
        std::move(payload)});
+  currentEventPriority_ = ReactEventPriority::Default;
 }
 
 void UIManagerBinding::invalidate() const {
@@ -275,6 +296,7 @@ jsi::Value UIManagerBinding::get(
     jsi::Runtime &runtime,
     jsi::PropNameID const &name) {
   auto methodName = name.utf8(runtime);
+  SystraceSection s("UIManagerBinding::get", "name", methodName);
 
   // Convert shared_ptr<UIManager> to a raw ptr
   // Why? Because:
@@ -789,6 +811,28 @@ jsi::Value UIManagerBinding::get(
         });
   }
 
+  if (methodName == "unstable_getCurrentEventPriority") {
+    return jsi::Function::createFromHostFunction(
+        runtime,
+        name,
+        0,
+        [this](
+            jsi::Runtime &,
+            jsi::Value const &,
+            jsi::Value const *,
+            size_t) noexcept -> jsi::Value {
+          return jsi::Value(serialize(currentEventPriority_));
+        });
+  }
+
+  if (methodName == "unstable_DefaultEventPriority") {
+    return jsi::Value(serialize(ReactEventPriority::Default));
+  }
+
+  if (methodName == "unstable_DiscreteEventPriority") {
+    return jsi::Value(serialize(ReactEventPriority::Discrete));
+  }
+
   return jsi::Value::undefined();
 }
 

package/ReactCommon/react/renderer/uimanager/UIManagerBinding.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <ReactCommon/RuntimeExecutor.h>
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
 #include <react/renderer/core/RawValue.h>
@@ -28,7 +29,8 @@ class UIManagerBinding : public jsi::HostObject {
    * Thread synchronization must be enforced externally.
    */
   static std::shared_ptr<UIManagerBinding> createAndInstallIfNeeded(
-      jsi::Runtime &runtime);
+      jsi::Runtime &runtime,
+      RuntimeExecutor const &runtimeExecutor);
 
   /*
    * Returns a pointer to UIManagerBinding previously installed into a runtime.
@@ -36,6 +38,8 @@ class UIManagerBinding : public jsi::HostObject {
    */
   static std::shared_ptr<UIManagerBinding> getBinding(jsi::Runtime &runtime);
 
+  UIManagerBinding(RuntimeExecutor const &runtimeExecutor);
+
   ~UIManagerBinding();
 
   /*
@@ -68,6 +72,10 @@ class UIManagerBinding : public jsi::HostObject {
       folly::dynamic const &props,
       DisplayMode displayMode) const;
 
+  jsi::Value getInspectorDataForInstance(
+      jsi::Runtime &runtime,
+      SharedEventEmitter eventEmitter) const;
+
   /*
    * Stops React Native Surface with given id.
    * Thread synchronization must be enforced externally.
@@ -82,6 +90,7 @@ class UIManagerBinding : public jsi::HostObject {
       jsi::Runtime &runtime,
       EventTarget const *eventTarget,
       std::string const &type,
+      ReactEventPriority priority,
       ValueFactory const &payloadFactory) const;
 
   /*
@@ -101,6 +110,9 @@ class UIManagerBinding : public jsi::HostObject {
  private:
   std::shared_ptr<UIManager> uiManager_;
   std::unique_ptr<EventHandler const> eventHandler_;
+  mutable ReactEventPriority currentEventPriority_;
+
+  RuntimeExecutor runtimeExecutor_;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h

@@ -30,8 +30,16 @@ class UIManagerDelegate {
    * might use this to optimistically allocate a new native view
    * instances.
    */
-  virtual void uiManagerDidCreateShadowNode(
-      const ShadowNode::Shared &shadowNode) = 0;
+  virtual void uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) = 0;
+
+  /*
+   * Called each time when UIManager clones a Shadow Node. Receiver
+   * might use this to optimistically allocate a new native view
+   * instances.
+   */
+  virtual void uiManagerDidCloneShadowNode(
+      const ShadowNode &oldShadowNode,
+      const ShadowNode &newShadowNode) = 0;
 
   /*
    * Called when UIManager wants to dispatch a command to the mounting layer.

package/ReactCommon/react/{renderer/components/picker/iospicker → test_utils}/BUCK

@@ -3,7 +3,6 @@ load(
     "ANDROID",
     "APPLE",
     "CXX",
-    "YOGA_CXX_TARGET",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
     "get_preprocessor_flags_for_build_mode",
@@ -15,19 +14,18 @@ load(
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
-    name = "iospicker",
-    srcs = glob(
-        ["**/*.cpp"],
-    ),
+    name = "test_utils",
+    srcs = [],
     headers = glob(
         ["**/*.h"],
+        exclude = glob(["tests/**/*.h"]),
     ),
     header_namespace = "",
     exported_headers = subdir_glob(
         [
             ("", "*.h"),
         ],
-        prefix = "react/renderer/components/iospicker",
+        prefix = "react/test_utils",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -36,24 +34,24 @@ rn_xplat_cxx_library(
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_frameworks = ["Foundation"],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
+    macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
+    tests = [],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only",
-        YOGA_CXX_TARGET,
+        "//xplat/jsi:jsi",
+        react_native_xplat_target("better:better"),
         react_native_xplat_target("react/debug:debug"),
-        react_native_xplat_target("react/utils:utils"),
-        react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
-        react_native_xplat_target("react/renderer/core:core"),
-        react_native_xplat_target("react/renderer/graphics:graphics"),
-        react_native_xplat_target("react/renderer/components/text:text"),
-        react_native_xplat_target("react/renderer/components/view:view"),
+    ],
+    exported_deps = [
+        "//xplat/third-party/gmock:gmock",
     ],
 )

package/ReactCommon/react/test_utils/MockClock.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <chrono>
+
+class MockClock {
+ public:
+  typedef std::chrono::
+      time_point<std::chrono::steady_clock, std::chrono::nanoseconds>
+          time_point;
+
+  static time_point now() noexcept {
+    return time_;
+  }
+
+  template <typename TDuration>
+  static void advance_by(const TDuration duration) {
+    time_ += duration;
+  }
+
+ private:
+  static time_point time_;
+};

package/ReactCommon/react/{renderer/core/Constants.h → test_utils/MockSurfaceHandler.h}

@@ -7,16 +7,18 @@
 
 #pragma once
 
+#include <gmock/gmock.h>
+
+#include <react/renderer/scheduler/SurfaceHandler.h>
+
 namespace facebook {
 namespace react {
 
-struct Constants {
-  /*
-      Flag controling props forwarding when shadow node is cloned on Android.
-      Has no effect on iOS.
-  */
-  static void setPropsForwardingEnabled(bool propsForwardingEnabled);
-  static bool getPropsForwardingEnabled();
+class MockSurfaceHandler : public SurfaceHandler {
+ public:
+  MockSurfaceHandler() : SurfaceHandler("moduleName", 0){};
+
+  MOCK_QUALIFIED_METHOD1(setDisplayMode, const noexcept, void(DisplayMode));
 };
 
 } // namespace react

package/ReactCommon/react/{renderer/mounting/tests → test_utils}/shadowTreeGeneration.h

@@ -13,6 +13,7 @@
 #include <memory>
 #include <random>
 
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/stubs.h>
 
@@ -120,8 +121,12 @@ static inline ShadowNode::Unshared messWithLayoutableOnlyFlag(
     Entropy const &entropy,
     ShadowNode const &shadowNode) {
   auto oldProps = shadowNode.getProps();
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   auto newProps = shadowNode.getComponentDescriptor().cloneProps(
-      oldProps, RawProps(folly::dynamic::object()));
+      parserContext, oldProps, RawProps(folly::dynamic::object()));
 
   auto &viewProps =
       const_cast<ViewProps &>(static_cast<ViewProps const &>(*newProps));
@@ -175,9 +180,12 @@ static inline ShadowNode::Unshared messWithLayoutableOnlyFlag(
 static inline ShadowNode::Unshared messWithNodeFlattenednessFlags(
     Entropy const &entropy,
     ShadowNode const &shadowNode) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   auto oldProps = shadowNode.getProps();
   auto newProps = shadowNode.getComponentDescriptor().cloneProps(
-      oldProps, RawProps(folly::dynamic::object()));
+      parserContext, oldProps, RawProps(folly::dynamic::object()));
 
   auto &viewProps =
       const_cast<ViewProps &>(static_cast<ViewProps const &>(*newProps));
@@ -231,9 +239,12 @@ static inline ShadowNode::Unshared messWithYogaStyles(
     }
   }
 
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   auto oldProps = shadowNode.getProps();
   auto newProps = shadowNode.getComponentDescriptor().cloneProps(
-      oldProps, RawProps(dynamic));
+      parserContext, oldProps, RawProps(dynamic));
   return shadowNode.clone({newProps});
 }
 
@@ -263,8 +274,11 @@ static inline void alterShadowTree(
 
 static SharedViewProps generateDefaultProps(
     ComponentDescriptor const &componentDescriptor) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   return std::static_pointer_cast<ViewProps const>(
-      componentDescriptor.cloneProps(nullptr, RawProps{}));
+      componentDescriptor.cloneProps(parserContext, nullptr, RawProps{}));
 }
 
 static inline ShadowNode::Shared generateShadowNodeTree(

package/ReactCommon/react/utils/Android.mk

@@ -20,9 +20,11 @@ LOCAL_CFLAGS := \
 LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES := libreact_debug libreact_render_mapbuffer
+LOCAL_SHARED_LIBRARIES := libreact_debug libreact_render_mapbuffer libglog libglog_init
 
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,react/debug)
+$(call import-module,fbgloginit)
+$(call import-module,glog)
 $(call import-module,react/renderer/mapbuffer)

package/ReactCommon/react/utils/BUCK

@@ -58,6 +58,7 @@ rn_xplat_cxx_library(
     tests = [],
     visibility = ["PUBLIC"],
     deps = [
+        "//third-party/glog:glog",
         "//xplat/folly:container_evicting_cache_map",
         "//xplat/folly:headers_only",
         "//xplat/folly:memory",

package/ReactCommon/react/utils/ContextContainer.h

@@ -45,10 +45,6 @@ class ContextContainer final {
     std::unique_lock<better::shared_mutex> lock(mutex_);
 
     instances_.insert({key, std::make_shared<T>(instance)});
-
-#ifdef REACT_NATIVE_DEBUG
-    typeNames_.insert({key, typeid(T).name()});
-#endif
   }
 
   /*
@@ -59,10 +55,6 @@ class ContextContainer final {
     std::unique_lock<better::shared_mutex> lock(mutex_);
 
     instances_.erase(key);
-
-#ifdef REACT_NATIVE_DEBUG
-    typeNames_.erase(key);
-#endif
   }
 
   /*
@@ -76,11 +68,6 @@ class ContextContainer final {
     for (auto const &pair : contextContainer.instances_) {
       instances_.erase(pair.first);
       instances_.insert(pair);
-#ifdef REACT_NATIVE_DEBUG
-      typeNames_.erase(pair.first);
-      typeNames_.insert(
-          {pair.first, contextContainer.typeNames_.at(pair.first)});
-#endif
     }
   }
 
@@ -96,11 +83,6 @@ class ContextContainer final {
     react_native_assert(
         instances_.find(key) != instances_.end() &&
         "ContextContainer doesn't have an instance for given key.");
-#ifdef REACT_NATIVE_DEBUG
-    react_native_assert(
-        typeNames_.at(key) == typeid(T).name() &&
-        "ContextContainer stores an instance of different type for given key.");
-#endif
     return *std::static_pointer_cast<T>(instances_.at(key));
   }
 
@@ -118,12 +100,6 @@ class ContextContainer final {
       return {};
     }
 
-#ifdef REACT_NATIVE_DEBUG
-    react_native_assert(
-        typeNames_.at(key) == typeid(T).name() &&
-        "ContextContainer stores an instance of different type for given key.");
-#endif
-
     return *std::static_pointer_cast<T>(iterator->second);
   }
 
@@ -131,9 +107,6 @@ class ContextContainer final {
   mutable better::shared_mutex mutex_;
   // Protected by mutex_`.
   mutable better::map<std::string, std::shared_ptr<void>> instances_;
-#ifdef REACT_NATIVE_DEBUG
-  mutable better::map<std::string, std::string> typeNames_;
-#endif
 };
 
 } // namespace react