react-native 0.0.0-16bb2ae4f → 0.0.0-18697adec

package/ReactCommon/react/renderer/scheduler/SurfaceHandler.h

@@ -12,6 +12,7 @@
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
 #include <react/renderer/core/ReactPrimitives.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {
@@ -33,7 +34,7 @@ class UIManager;
  * ensure the logical consistency of some methods (e.g. calling `stop` for
  * non-running surface will crash).
  */
-class SurfaceHandler final {
+class SurfaceHandler {
  public:
   /*
    * Represents a status of the `SurfaceHandler` instance.
@@ -61,7 +62,7 @@ class SurfaceHandler final {
    * Can be constructed anytime with a `moduleName` and a `surfaceId`.
    */
   SurfaceHandler(std::string const &moduleName, SurfaceId surfaceId) noexcept;
-  ~SurfaceHandler() noexcept;
+  virtual ~SurfaceHandler() noexcept;
 
   /*
    * Movable-only.
@@ -73,6 +74,12 @@ class SurfaceHandler final {
 
 #pragma mark - Surface Life-Cycle Management
 
+  /*
+   * Must be called before surface is started.
+   */
+  void setContextContainer(
+      ContextContainer::Shared contextContainer) const noexcept;
+
   /*
    * Returns a momentum value of the status.
    */
@@ -88,10 +95,10 @@ class SurfaceHandler final {
   void stop() const noexcept;
 
   /*
-   * Sets (and gets) the runnnig mode.
+   * Sets (and gets) the running mode.
    * The running mode can be changed anytime (even for `Unregistered` surface).
    */
-  void setDisplayMode(DisplayMode displayMode) const noexcept;
+  virtual void setDisplayMode(DisplayMode displayMode) const noexcept;
   DisplayMode getDisplayMode() const noexcept;
 
 #pragma mark - Accessors
@@ -171,6 +178,7 @@ class SurfaceHandler final {
     folly::dynamic props{};
     LayoutConstraints layoutConstraints{};
     LayoutContext layoutContext{};
+    ContextContainer::Shared contextContainer{};
   };
 
   /*

package/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp

@@ -24,6 +24,7 @@ void SurfaceManager::startSurface(
   {
     std::unique_lock<better::shared_mutex> lock(mutex_);
     auto surfaceHandler = SurfaceHandler{moduleName, surfaceId};
+    surfaceHandler.setContextContainer(scheduler_.getContextContainer());
     registry_.emplace(surfaceId, std::move(surfaceHandler));
   }
 

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h

@@ -35,6 +35,8 @@ NSAttributedString *RCTNSAttributedStringFromAttributedStringBox(
 facebook::react::AttributedStringBox RCTAttributedStringBoxFromNSAttributedString(
     NSAttributedString *nsAttributedString);
 
+NSString *RCTNSStringFromStringApplyingTextTransform(NSString *string, facebook::react::TextTransform textTransform);
+
 @interface RCTWeakEventEmitterWrapper : NSObject
 @property (nonatomic, assign) facebook::react::SharedEventEmitter eventEmitter;
 @end

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm

@@ -288,6 +288,9 @@ NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(T
       case AccessibilityRole::Tab:
         attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("tab");
         break;
+      case AccessibilityRole::TabBar:
+        attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("tabbar");
+        break;
       case AccessibilityRole::Tablist:
         attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("tablist");
         break;
@@ -332,6 +335,11 @@ NSAttributedString *RCTNSAttributedStringFromAttributedString(const AttributedSt
     } else {
       NSString *string = [NSString stringWithCString:fragment.string.c_str() encoding:NSUTF8StringEncoding];
 
+      if (fragment.textAttributes.textTransform.hasValue()) {
+        auto textTransform = fragment.textAttributes.textTransform.value();
+        string = RCTNSStringFromStringApplyingTextTransform(string, textTransform);
+      }
+
       nsAttributedStringFragment = [[NSMutableAttributedString alloc]
           initWithString:string
               attributes:RCTNSTextAttributesFromTextAttributes(fragment.textAttributes)];
@@ -370,3 +378,17 @@ AttributedStringBox RCTAttributedStringBoxFromNSAttributedString(NSAttributedStr
 {
   return nsAttributedString.length ? AttributedStringBox{wrapManagedObject(nsAttributedString)} : AttributedStringBox{};
 }
+
+NSString *RCTNSStringFromStringApplyingTextTransform(NSString *string, TextTransform textTransform)
+{
+  switch (textTransform) {
+    case TextTransform::Uppercase:
+      return [string uppercaseString];
+    case TextTransform::Lowercase:
+      return [string lowercaseString];
+    case TextTransform::Capitalize:
+      return [string capitalizedString];
+    default:
+      return string;
+  }
+}

package/ReactCommon/react/renderer/timeline/BUCK

@@ -50,11 +50,11 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        "fbsource//xplat/fbsystrace:fbsystrace",
-        "fbsource//xplat/folly:headers_only",
-        "fbsource//xplat/folly:memory",
-        "fbsource//xplat/folly:molly",
         "//third-party/glog:glog",
+        "//xplat/fbsystrace:fbsystrace",
+        "//xplat/folly:headers_only",
+        "//xplat/folly:memory",
+        "//xplat/folly:molly",
         react_native_xplat_target("react/utils:utils"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -77,8 +77,8 @@ fb_xplat_cxx_test(
     contacts = ["oncall+react_native@xmail.facebook.com"],
     platforms = (ANDROID, APPLE, CXX),
     deps = [
-        "fbsource//xplat/folly:molly",
-        "fbsource//xplat/third-party/gmock:gtest",
         ":timeline",
+        "//xplat/folly:molly",
+        "//xplat/third-party/gmock:gtest",
     ],
 )

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>
@@ -29,9 +30,11 @@ static std::unique_ptr<LeakChecker> constructLeakCheckerIfNeeded(
 
 UIManager::UIManager(
     RuntimeExecutor const &runtimeExecutor,
-    BackgroundExecutor const &backgroundExecutor)
+    BackgroundExecutor const &backgroundExecutor,
+    ContextContainer::Shared contextContainer)
     : runtimeExecutor_(runtimeExecutor),
       backgroundExecutor_(backgroundExecutor),
+      contextContainer_(contextContainer),
       leakChecker_(constructLeakCheckerIfNeeded(runtimeExecutor)) {}
 
 UIManager::~UIManager() {
@@ -51,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);
 
@@ -65,16 +71,17 @@ 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,
       },
       family);
 
-  auto delegate = delegate_.load();
-  if (delegate) {
-    delegate->uiManagerDidCreateShadowNode(*shadowNode.get());
+  if (delegate_) {
+    delegate_->uiManagerDidCreateShadowNode(*shadowNode.get());
   }
   if (leakChecker_) {
     leakChecker_->uiManagerDidCreateShadowNodeFamily(family);
@@ -89,20 +96,22 @@ 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,
       });
 
-  auto delegate = delegate_.load();
-  if (delegate) {
-    delegate->uiManagerDidCloneShadowNode(
+  if (delegate_) {
+    delegate_->uiManagerDidCloneShadowNode(
         *shadowNode.get(), *clonedShadowNode.get());
   }
 
@@ -142,9 +151,8 @@ void UIManager::setIsJSResponder(
     ShadowNode::Shared const &shadowNode,
     bool isJSResponder,
     bool blockNativeResponder) const {
-  auto delegate = delegate_.load();
-  if (delegate) {
-    delegate->uiManagerDidSetIsJSResponder(
+  if (delegate_) {
+    delegate_->uiManagerDidSetIsJSResponder(
         shadowNode, isJSResponder, blockNativeResponder);
   }
 }
@@ -160,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;
@@ -325,18 +334,16 @@ void UIManager::dispatchCommand(
     const ShadowNode::Shared &shadowNode,
     std::string const &commandName,
     folly::dynamic const args) const {
-  auto delegate = delegate_.load();
-  if (delegate) {
-    delegate->uiManagerDidDispatchCommand(shadowNode, commandName, args);
+  if (delegate_) {
+    delegate_->uiManagerDidDispatchCommand(shadowNode, commandName, args);
   }
 }
 
 void UIManager::sendAccessibilityEvent(
     const ShadowNode::Shared &shadowNode,
     std::string const &eventType) {
-  auto delegate = delegate_.load();
-  if (delegate) {
-    delegate->uiManagerDidSendAccessibilityEvent(shadowNode, eventType);
+  if (delegate_) {
+    delegate_->uiManagerDidSendAccessibilityEvent(shadowNode, eventType);
   }
 }
 
@@ -345,9 +352,8 @@ void UIManager::configureNextLayoutAnimation(
     RawValue const &config,
     jsi::Value const &successCallback,
     jsi::Value const &failureCallback) const {
-  auto animationDelegate = animationDelegate_.load();
-  if (animationDelegate) {
-    animationDelegate->uiManagerDidConfigureNextLayoutAnimation(
+  if (animationDelegate_) {
+    animationDelegate_->uiManagerDidConfigureNextLayoutAnimation(
         runtime,
         config,
         std::move(successCallback),
@@ -423,9 +429,8 @@ void UIManager::shadowTreeDidFinishTransaction(
     MountingCoordinator::Shared const &mountingCoordinator) const {
   SystraceSection s("UIManager::shadowTreeDidFinishTransaction");
 
-  auto delegate = delegate_.load();
-  if (delegate) {
-    delegate->uiManagerDidFinishTransaction(mountingCoordinator);
+  if (delegate_) {
+    delegate_->uiManagerDidFinishTransaction(mountingCoordinator);
   }
 }
 
@@ -436,15 +441,14 @@ void UIManager::setAnimationDelegate(UIManagerAnimationDelegate *delegate) {
 }
 
 void UIManager::stopSurfaceForAnimationDelegate(SurfaceId surfaceId) const {
-  auto animationDelegate = animationDelegate_.load();
-  if (animationDelegate) {
-    animationDelegate->stopSurface(surfaceId);
+  if (animationDelegate_ != nullptr) {
+    animationDelegate_->stopSurface(surfaceId);
   }
 }
 
 void UIManager::animationTick() {
-  auto animationDelegate = animationDelegate_.load();
-  if (animationDelegate && animationDelegate->shouldAnimateFrame()) {
+  if (animationDelegate_ != nullptr &&
+      animationDelegate_->shouldAnimateFrame()) {
     shadowTreeRegistry_.enumerate(
         [&](ShadowTree const &shadowTree, bool &stop) {
           shadowTree.notifyDelegatesOfUpdates();

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 {
 
@@ -33,7 +34,8 @@ class UIManager final : public ShadowTreeDelegate {
  public:
   UIManager(
       RuntimeExecutor const &runtimeExecutor,
-      BackgroundExecutor const &backgroundExecutor);
+      BackgroundExecutor const &backgroundExecutor,
+      ContextContainer::Shared contextContainer);
 
   ~UIManager();
 
@@ -184,11 +186,12 @@ class UIManager final : public ShadowTreeDelegate {
   ShadowTreeRegistry const &getShadowTreeRegistry() const;
 
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
-  std::atomic<UIManagerDelegate *> delegate_;
-  std::atomic<UIManagerAnimationDelegate *> animationDelegate_{nullptr};
+  UIManagerDelegate *delegate_;
+  UIManagerAnimationDelegate *animationDelegate_{nullptr};
   RuntimeExecutor const runtimeExecutor_{};
   ShadowTreeRegistry shadowTreeRegistry_{};
   BackgroundExecutor const backgroundExecutor_{};
+  ContextContainer::Shared contextContainer_;
 
   mutable better::shared_mutex commitHookMutex_;
   mutable std::vector<UIManagerCommitHook const *> commitHooks_;

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

@@ -106,10 +106,6 @@ void UIManagerBinding::attach(std::shared_ptr<UIManager> const &uiManager) {
   uiManager_ = uiManager;
 }
 
-void UIManagerBinding::setEnableAsyncMeasure(bool enable) {
-  enableAsyncMeasure_ = enable;
-}
-
 static jsi::Value callMethodOfModule(
     jsi::Runtime &runtime,
     std::string const &moduleName,
@@ -133,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;
@@ -172,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;
@@ -271,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:
@@ -639,44 +665,33 @@ jsi::Value UIManagerBinding::get(
         runtime,
         name,
         4,
-        [this, uiManager](
+        [uiManager](
             jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
             size_t count) noexcept -> jsi::Value {
-          auto shadowNode = shadowNodeFromValue(runtime, arguments[0]);
-          auto ancestorShadowNode = shadowNodeFromValue(runtime, arguments[1]);
-          auto onFail = std::make_shared<jsi::Function>(
-              arguments[2].getObject(runtime).getFunction(runtime));
-          auto onSuccess = std::make_shared<jsi::Function>(
-              arguments[3].getObject(runtime).getFunction(runtime));
-          executeMeasure(
+          auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
+              *shadowNodeFromValue(runtime, arguments[0]),
+              shadowNodeFromValue(runtime, arguments[1]).get(),
+              {/* .includeTransform = */ false});
+
+          if (layoutMetrics == EmptyLayoutMetrics) {
+            auto onFailFunction =
+                arguments[2].getObject(runtime).getFunction(runtime);
+            onFailFunction.call(runtime);
+            return jsi::Value::undefined();
+          }
+
+          auto onSuccessFunction =
+              arguments[3].getObject(runtime).getFunction(runtime);
+          auto frame = layoutMetrics.frame;
+
+          onSuccessFunction.call(
               runtime,
-              [uiManager,
-               shadowNode = std::move(shadowNode),
-               ancestorShadowNode = std::move(ancestorShadowNode),
-               onFail = std::move(onFail),
-               onSuccess =
-                   std::move(onSuccess)](jsi::Runtime &runtime) noexcept {
-                auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
-                    *shadowNode,
-                    ancestorShadowNode.get(),
-                    {/* .includeTransform = */ false});
-
-                if (layoutMetrics == EmptyLayoutMetrics) {
-                  onFail->call(runtime);
-                  return;
-                }
-
-                auto frame = layoutMetrics.frame;
-
-                onSuccess->call(
-                    runtime,
-                    {jsi::Value{runtime, (double)frame.origin.x},
-                     jsi::Value{runtime, (double)frame.origin.y},
-                     jsi::Value{runtime, (double)frame.size.width},
-                     jsi::Value{runtime, (double)frame.size.height}});
-              });
+              {jsi::Value{runtime, (double)frame.origin.x},
+               jsi::Value{runtime, (double)frame.origin.y},
+               jsi::Value{runtime, (double)frame.size.width},
+               jsi::Value{runtime, (double)frame.size.height}});
           return jsi::Value::undefined();
         });
   }
@@ -686,45 +701,39 @@ jsi::Value UIManagerBinding::get(
         runtime,
         name,
         2,
-        [this, uiManager](
+        [uiManager](
             jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
             size_t count) noexcept -> jsi::Value {
-          auto onSuccess = std::make_shared<jsi::Function>(
-              arguments[1].getObject(runtime).getFunction(runtime));
-          executeMeasure(
+          auto shadowNode = shadowNodeFromValue(runtime, arguments[0]);
+          auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
+              *shadowNode, nullptr, {/* .includeTransform = */ true});
+          auto onSuccessFunction =
+              arguments[1].getObject(runtime).getFunction(runtime);
+
+          if (layoutMetrics == EmptyLayoutMetrics) {
+            onSuccessFunction.call(runtime, {0, 0, 0, 0, 0, 0});
+            return jsi::Value::undefined();
+          }
+          auto newestCloneOfShadowNode =
+              uiManager->getNewestCloneOfShadowNode(*shadowNode);
+
+          auto layoutableShadowNode = traitCast<LayoutableShadowNode const *>(
+              newestCloneOfShadowNode.get());
+          Point originRelativeToParent = layoutableShadowNode
+              ? layoutableShadowNode->getLayoutMetrics().frame.origin
+              : Point();
+
+          auto frame = layoutMetrics.frame;
+          onSuccessFunction.call(
               runtime,
-              [uiManager,
-               shadowNode = shadowNodeFromValue(runtime, arguments[0]),
-               onSuccess = std::move(onSuccess)](jsi::Runtime &runtime) {
-                auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
-                    *shadowNode, nullptr, {/* .includeTransform = */ true});
-
-                if (layoutMetrics == EmptyLayoutMetrics) {
-                  onSuccess->call(runtime, {0, 0, 0, 0, 0, 0});
-                  return;
-                }
-                auto newestCloneOfShadowNode =
-                    uiManager->getNewestCloneOfShadowNode(*shadowNode);
-
-                auto layoutableShadowNode =
-                    traitCast<LayoutableShadowNode const *>(
-                        newestCloneOfShadowNode.get());
-                Point originRelativeToParent = layoutableShadowNode
-                    ? layoutableShadowNode->getLayoutMetrics().frame.origin
-                    : Point();
-
-                auto frame = layoutMetrics.frame;
-                onSuccess->call(
-                    runtime,
-                    {jsi::Value{runtime, (double)originRelativeToParent.x},
-                     jsi::Value{runtime, (double)originRelativeToParent.y},
-                     jsi::Value{runtime, (double)frame.size.width},
-                     jsi::Value{runtime, (double)frame.size.height},
-                     jsi::Value{runtime, (double)frame.origin.x},
-                     jsi::Value{runtime, (double)frame.origin.y}});
-              });
+              {jsi::Value{runtime, (double)originRelativeToParent.x},
+               jsi::Value{runtime, (double)originRelativeToParent.y},
+               jsi::Value{runtime, (double)frame.size.width},
+               jsi::Value{runtime, (double)frame.size.height},
+               jsi::Value{runtime, (double)frame.origin.x},
+               jsi::Value{runtime, (double)frame.origin.y}});
           return jsi::Value::undefined();
         });
   }
@@ -734,38 +743,32 @@ jsi::Value UIManagerBinding::get(
         runtime,
         name,
         2,
-        [this, uiManager](
+        [uiManager](
             jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
             size_t count) noexcept -> jsi::Value {
-          auto onSuccess = std::make_shared<jsi::Function>(
-              arguments[1].getObject(runtime).getFunction(runtime));
-          executeMeasure(
+          auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
+              *shadowNodeFromValue(runtime, arguments[0]),
+              nullptr,
+              {/* .includeTransform = */ true,
+               /* includeViewportOffset = */ true});
+
+          auto onSuccessFunction =
+              arguments[1].getObject(runtime).getFunction(runtime);
+
+          if (layoutMetrics == EmptyLayoutMetrics) {
+            onSuccessFunction.call(runtime, {0, 0, 0, 0});
+            return jsi::Value::undefined();
+          }
+
+          auto frame = layoutMetrics.frame;
+          onSuccessFunction.call(
               runtime,
-              [uiManager,
-               shadowNode = shadowNodeFromValue(runtime, arguments[0]),
-               onSuccess =
-                   std::move(onSuccess)](jsi::Runtime &runtime) noexcept {
-                auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
-                    *shadowNode,
-                    nullptr,
-                    {/* .includeTransform = */ true,
-                     /* includeViewportOffset = */ true});
-
-                if (layoutMetrics == EmptyLayoutMetrics) {
-                  onSuccess->call(runtime, {0, 0, 0, 0});
-                  return;
-                }
-
-                auto frame = layoutMetrics.frame;
-                onSuccess->call(
-                    runtime,
-                    {jsi::Value{runtime, (double)frame.origin.x},
-                     jsi::Value{runtime, (double)frame.origin.y},
-                     jsi::Value{runtime, (double)frame.size.width},
-                     jsi::Value{runtime, (double)frame.size.height}});
-              });
+              {jsi::Value{runtime, (double)frame.origin.x},
+               jsi::Value{runtime, (double)frame.origin.y},
+               jsi::Value{runtime, (double)frame.size.width},
+               jsi::Value{runtime, (double)frame.size.height}});
           return jsi::Value::undefined();
         });
   }
@@ -833,14 +836,4 @@ jsi::Value UIManagerBinding::get(
   return jsi::Value::undefined();
 }
 
-void UIManagerBinding::executeMeasure(
-    jsi::Runtime &runtime,
-    std::function<void(jsi::Runtime &)> &&callback) const noexcept {
-  if (enableAsyncMeasure_) {
-    runtimeExecutor_(std::move(callback));
-  } else {
-    callback(runtime);
-  }
-}
-
 } // namespace facebook::react

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

@@ -49,8 +49,6 @@ class UIManagerBinding : public jsi::HostObject {
    */
   void attach(std::shared_ptr<UIManager> const &uiManager);
 
-  void setEnableAsyncMeasure(bool enable);
-
   /*
    * Starts React Native Surface with given id, moduleName, and props.
    * Thread synchronization must be enforced externally.
@@ -74,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.
@@ -106,15 +108,10 @@ class UIManagerBinding : public jsi::HostObject {
   jsi::Value get(jsi::Runtime &runtime, jsi::PropNameID const &name) override;
 
  private:
-  void executeMeasure(
-      jsi::Runtime &runtime,
-      std::function<void(jsi::Runtime &)> &&callback) const noexcept;
-
   std::shared_ptr<UIManager> uiManager_;
   std::unique_ptr<EventHandler const> eventHandler_;
   mutable ReactEventPriority currentEventPriority_;
 
-  bool enableAsyncMeasure_;
   RuntimeExecutor runtimeExecutor_;
 };