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

package/ReactCommon/react/renderer/graphics/platform/ios/Color.h

@@ -10,6 +10,7 @@
 #include <better/optional.h>
 #include <cmath>
 
+#include <folly/Hash.h>
 #include <react/renderer/graphics/ColorComponents.h>
 #include <react/renderer/graphics/Float.h>
 
@@ -18,7 +19,40 @@ namespace react {
 
 using Color = int32_t;
 
-using SharedColor = better::optional<Color>;
+class SharedColor {
+ public:
+  static const Color UndefinedColor = std::numeric_limits<Color>::max();
+
+  SharedColor() : color_(UndefinedColor) {}
+
+  SharedColor(const SharedColor &sharedColor) : color_(sharedColor.color_) {}
+
+  SharedColor(Color color) : color_(color) {}
+
+  SharedColor &operator=(const SharedColor &sharedColor) {
+    color_ = sharedColor.color_;
+    return *this;
+  }
+
+  Color operator*() const {
+    return color_;
+  }
+
+  bool operator==(const SharedColor &otherColor) const {
+    return color_ == otherColor.color_;
+  }
+
+  bool operator!=(const SharedColor &otherColor) const {
+    return color_ != otherColor.color_;
+  }
+
+  operator bool() const {
+    return color_ != UndefinedColor;
+  }
+
+ private:
+  Color color_;
+};
 
 bool isColorMeaningful(SharedColor const &color) noexcept;
 SharedColor colorFromComponents(ColorComponents components);
@@ -30,3 +64,10 @@ SharedColor whiteColor();
 
 } // namespace react
 } // namespace facebook
+
+template <>
+struct std::hash<facebook::react::SharedColor> {
+  std::size_t operator()(facebook::react::SharedColor const &color) const {
+    return hash<int>()(*color);
+  }
+};

package/ReactCommon/react/renderer/graphics/platform/ios/PlatformColorParser.h

@@ -0,0 +1,34 @@
+/*
+ * 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 <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
+#include <react/renderer/graphics/ColorComponents.h>
+#include <react/renderer/graphics/RCTPlatformColorUtils.h>
+
+namespace facebook {
+namespace react {
+
+inline ColorComponents parsePlatformColor(
+    const PropsParserContext &context,
+    const RawValue &value) {
+  if (value.hasType<better::map<std::string, RawValue>>()) {
+    auto items = (better::map<std::string, RawValue>)value;
+    if (items.find("semantic") != items.end() &&
+        items.at("semantic").hasType<std::vector<std::string>>()) {
+      auto semanticItems = (std::vector<std::string>)items.at("semantic");
+      return RCTPlatformColorComponentsFromSemanticItems(semanticItems);
+    }
+  }
+
+  return {0, 0, 0, 0};
+}
+
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.h

@@ -0,0 +1,12 @@
+/*
+ * 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.
+ */
+
+#include <react/renderer/graphics/ColorComponents.h>
+#include <vector>
+
+facebook::react::ColorComponents RCTPlatformColorComponentsFromSemanticItems(
+    std::vector<std::string> &semanticItems);

package/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm

@@ -0,0 +1,206 @@
+/*
+ * 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.
+ */
+
+#import "RCTPlatformColorUtils.h"
+
+#import <Foundation/Foundation.h>
+#import <React/RCTUtils.h>
+#import <UIKit/UIKit.h>
+
+#include <string>
+
+NS_ASSUME_NONNULL_BEGIN
+
+static NSString *const kColorSuffix = @"Color";
+static NSString *const kFallbackARGBKey = @"fallback-argb";
+
+static NSDictionary<NSString *, NSDictionary *> *_PlatformColorSelectorsDict()
+{
+  static NSDictionary<NSString *, NSDictionary *> *dict;
+  static dispatch_once_t once_token;
+  dispatch_once(&once_token, ^(void) {
+    dict = @{
+      // https://developer.apple.com/documentation/uikit/uicolor/ui_element_colors
+      // Label Colors
+      @"label" : @{
+        kFallbackARGBKey : @(0xFF000000) // iOS 13.0
+      },
+      @"secondaryLabel" : @{
+        kFallbackARGBKey : @(0x993c3c43) // iOS 13.0
+      },
+      @"tertiaryLabel" : @{
+        kFallbackARGBKey : @(0x4c3c3c43) // iOS 13.0
+      },
+      @"quaternaryLabel" : @{
+        kFallbackARGBKey : @(0x2d3c3c43) // iOS 13.0
+      },
+      // Fill Colors
+      @"systemFill" : @{
+        kFallbackARGBKey : @(0x33787880) // iOS 13.0
+      },
+      @"secondarySystemFill" : @{
+        kFallbackARGBKey : @(0x28787880) // iOS 13.0
+      },
+      @"tertiarySystemFill" : @{
+        kFallbackARGBKey : @(0x1e767680) // iOS 13.0
+      },
+      @"quaternarySystemFill" : @{
+        kFallbackARGBKey : @(0x14747480) // iOS 13.0
+      },
+      // Text Colors
+      @"placeholderText" : @{
+        kFallbackARGBKey : @(0x4c3c3c43) // iOS 13.0
+      },
+      // Standard Content Background Colors
+      @"systemBackground" : @{
+        kFallbackARGBKey : @(0xFFffffff) // iOS 13.0
+      },
+      @"secondarySystemBackground" : @{
+        kFallbackARGBKey : @(0xFFf2f2f7) // iOS 13.0
+      },
+      @"tertiarySystemBackground" : @{
+        kFallbackARGBKey : @(0xFFffffff) // iOS 13.0
+      },
+      // Grouped Content Background Colors
+      @"systemGroupedBackground" : @{
+        kFallbackARGBKey : @(0xFFf2f2f7) // iOS 13.0
+      },
+      @"secondarySystemGroupedBackground" : @{
+        kFallbackARGBKey : @(0xFFffffff) // iOS 13.0
+      },
+      @"tertiarySystemGroupedBackground" : @{
+        kFallbackARGBKey : @(0xFFf2f2f7) // iOS 13.0
+      },
+      // Separator Colors
+      @"separator" : @{
+        kFallbackARGBKey : @(0x493c3c43) // iOS 13.0
+      },
+      @"opaqueSeparator" : @{
+        kFallbackARGBKey : @(0xFFc6c6c8) // iOS 13.0
+      },
+      // Link Color
+      @"link" : @{
+        kFallbackARGBKey : @(0xFF007aff) // iOS 13.0
+      },
+      // Nonadaptable Colors
+      @"darkText" : @{},
+      @"lightText" : @{},
+      // https://developer.apple.com/documentation/uikit/uicolor/standard_colors
+      // Adaptable Colors
+      @"systemBlue" : @{},
+      @"systemBrown" : @{
+        kFallbackARGBKey : @(0xFFa2845e) // iOS 13.0
+      },
+      @"systemGreen" : @{},
+      @"systemIndigo" : @{
+        kFallbackARGBKey : @(0xFF5856d6) // iOS 13.0
+      },
+      @"systemOrange" : @{},
+      @"systemPink" : @{},
+      @"systemPurple" : @{},
+      @"systemRed" : @{},
+      @"systemTeal" : @{},
+      @"systemYellow" : @{},
+      // Adaptable Gray Colors
+      @"systemGray" : @{},
+      @"systemGray2" : @{
+        kFallbackARGBKey : @(0xFFaeaeb2) // iOS 13.0
+      },
+      @"systemGray3" : @{
+        kFallbackARGBKey : @(0xFFc7c7cc) // iOS 13.0
+      },
+      @"systemGray4" : @{
+        kFallbackARGBKey : @(0xFFd1d1d6) // iOS 13.0
+      },
+      @"systemGray5" : @{
+        kFallbackARGBKey : @(0xFFe5e5ea) // iOS 13.0
+      },
+      @"systemGray6" : @{
+        kFallbackARGBKey : @(0xFFf2f2f7) // iOS 13.0
+      },
+      // Transparent Color
+      @"clear" : @{
+        kFallbackARGBKey : @(0x00000000) // iOS 13.0
+      },
+    };
+  });
+  return dict;
+}
+
+static UIColor *_UIColorFromHexValue(NSNumber *hexValue)
+{
+  NSUInteger hexIntValue = [hexValue unsignedIntegerValue];
+
+  CGFloat red = ((CGFloat)((hexIntValue & 0xFF000000) >> 24)) / 255.0;
+  CGFloat green = ((CGFloat)((hexIntValue & 0xFF0000) >> 16)) / 255.0;
+  CGFloat blue = ((CGFloat)((hexIntValue & 0xFF00) >> 8)) / 255.0;
+  CGFloat alpha = ((CGFloat)(hexIntValue & 0xFF)) / 255.0;
+
+  return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
+}
+
+static UIColor *_Nullable _UIColorFromSemanticString(NSString *semanticString)
+{
+  NSString *platformColorString = [semanticString hasSuffix:kColorSuffix]
+      ? [semanticString substringToIndex:[semanticString length] - [kColorSuffix length]]
+      : semanticString;
+  NSDictionary<NSString *, NSDictionary *> *platformColorSelectorsDict = _PlatformColorSelectorsDict();
+  NSDictionary<NSString *, id> *colorInfo = platformColorSelectorsDict[platformColorString];
+  if (colorInfo) {
+    SEL objcColorSelector = NSSelectorFromString([platformColorString stringByAppendingString:kColorSuffix]);
+    if (![UIColor respondsToSelector:objcColorSelector]) {
+      NSNumber *fallbackRGB = colorInfo[kFallbackARGBKey];
+      if (fallbackRGB) {
+        return _UIColorFromHexValue(fallbackRGB);
+      }
+    } else {
+      Class uiColorClass = [UIColor class];
+      IMP imp = [uiColorClass methodForSelector:objcColorSelector];
+      id (*getUIColor)(id, SEL) = ((id(*)(id, SEL))imp);
+      id colorObject = getUIColor(uiColorClass, objcColorSelector);
+      if ([colorObject isKindOfClass:[UIColor class]]) {
+        return colorObject;
+      }
+    }
+  }
+  return nil;
+}
+
+static inline NSString *_NSStringFromCString(
+    const std::string &string,
+    const NSStringEncoding &encoding = NSUTF8StringEncoding)
+{
+  return [NSString stringWithCString:string.c_str() encoding:encoding];
+}
+
+static inline facebook::react::ColorComponents _ColorComponentsFromUIColor(UIColor *color)
+{
+  CGFloat rgba[4];
+  RCTGetRGBAColorComponents(color.CGColor, rgba);
+  return {(float)rgba[0], (float)rgba[1], (float)rgba[2], (float)rgba[3]};
+}
+
+facebook::react::ColorComponents RCTPlatformColorComponentsFromSemanticItems(std::vector<std::string> &semanticItems)
+{
+  for (const auto &semanticCString : semanticItems) {
+    if (@available(iOS 11.0, *)) {
+      NSString *semanticNSString = _NSStringFromCString(semanticCString);
+      UIColor *uiColor = [UIColor colorNamed:semanticNSString];
+      if (uiColor != nil) {
+        return _ColorComponentsFromUIColor(uiColor);
+      }
+      uiColor = _UIColorFromSemanticString(semanticNSString);
+      if (uiColor != nil) {
+        return _ColorComponentsFromUIColor(uiColor);
+      }
+    }
+  }
+
+  return {0, 0, 0, 0};
+}
+
+NS_ASSUME_NONNULL_END

package/ReactCommon/react/renderer/imagemanager/BUCK

@@ -64,8 +64,8 @@ rn_xplat_cxx_library(
     ],
     force_static = True,
     ios_deps = [
-        "//xplat/js:RCTImage",
         "//xplat/js/react-native-github:RCTCxxBridge",
+        "//xplat/js/react-native-github:RCTImage",
     ],
     ios_exported_headers = subdir_glob(
         [

package/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm

@@ -92,7 +92,7 @@ using namespace facebook::react;
 
   auto result = dispatch_group_wait(imageWaitGroup, dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC));
   if (result != 0) {
-    RCTLogError(@"Getting an image timed out");
+    RCTLogError(@"Image timed out in test environment for url: %@", loaderRequest.imageURL);
   }
   return imageRequest;
 }

package/ReactCommon/react/renderer/mapbuffer/BUCK

@@ -40,7 +40,7 @@ rn_xplat_cxx_library(
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     macosx_tests_override = [],
-    platforms = (ANDROID),
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
@@ -67,7 +67,7 @@ fb_xplat_cxx_test(
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = (ANDROID),
+    platforms = ANDROID,
     deps = [
         "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",

package/ReactCommon/react/renderer/mounting/Android.mk

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_telemetry
+LOCAL_SHARED_LIBRARIES := libjsi libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_graphics libreact_render_telemetry
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -36,4 +36,5 @@ $(call import-module,react/renderer/debug)
 $(call import-module,react/utils)
 $(call import-module,react/debug)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/graphics)
 $(call import-module,react/renderer/telemetry)

package/ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h

@@ -22,7 +22,7 @@ class MountingCoordinator;
 class MountingOverrideDelegate {
  public:
   virtual bool shouldOverridePullTransaction() const = 0;
-  virtual ~MountingOverrideDelegate(){};
+  virtual ~MountingOverrideDelegate() = default;
 
   /**
    * Delegates that override this method are responsible for:

package/ReactCommon/react/renderer/mounting/ShadowTree.cpp

@@ -223,7 +223,8 @@ ShadowTree::ShadowTree(
     SurfaceId surfaceId,
     LayoutConstraints const &layoutConstraints,
     LayoutContext const &layoutContext,
-    ShadowTreeDelegate const &delegate)
+    ShadowTreeDelegate const &delegate,
+    ContextContainer const &contextContainer)
     : surfaceId_(surfaceId), delegate_(delegate) {
   const auto noopEventEmitter = std::make_shared<const ViewEventEmitter>(
       nullptr, -1, std::shared_ptr<const EventDispatcher>());
@@ -234,7 +235,10 @@ ShadowTree::ShadowTree(
               EventDispatcher::Shared{}, nullptr, nullptr});
 
   const auto props = std::make_shared<const RootProps>(
-      *RootShadowNode::defaultSharedProps(), layoutConstraints, layoutContext);
+      PropsParserContext{surfaceId, contextContainer},
+      *RootShadowNode::defaultSharedProps(),
+      layoutConstraints,
+      layoutContext);
 
   auto const fragment =
       ShadowNodeFamilyFragment{surfaceId, surfaceId, noopEventEmitter};

package/ReactCommon/react/renderer/mounting/ShadowTree.h

@@ -18,6 +18,7 @@
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowTreeDelegate.h>
 #include <react/renderer/mounting/ShadowTreeRevision.h>
+#include <react/utils/ContextContainer.h>
 #include "MountingOverrideDelegate.h"
 
 namespace facebook {
@@ -70,7 +71,8 @@ class ShadowTree final {
       SurfaceId surfaceId,
       LayoutConstraints const &layoutConstraints,
       LayoutContext const &layoutContext,
-      ShadowTreeDelegate const &delegate);
+      ShadowTreeDelegate const &delegate,
+      ContextContainer const &contextContainer);
 
   ~ShadowTree();
 

package/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp

@@ -84,6 +84,18 @@ bool ShadowViewMutation::mutatedViewIsVirtual() const {
   return viewIsVirtual;
 }
 
+ShadowViewMutation::ShadowViewMutation(
+    Type type,
+    ShadowView parentShadowView,
+    ShadowView oldChildShadowView,
+    ShadowView newChildShadowView,
+    int index)
+    : type(type),
+      parentShadowView(parentShadowView),
+      oldChildShadowView(oldChildShadowView),
+      newChildShadowView(newChildShadowView),
+      index(index) {}
+
 #if RN_DEBUG_STRING_CONVERTIBLE
 
 std::string getDebugName(ShadowViewMutation const &mutation) {

package/ReactCommon/react/renderer/mounting/ShadowViewMutation.h

@@ -23,6 +23,8 @@ namespace react {
 struct ShadowViewMutation final {
   using List = std::vector<ShadowViewMutation>;
 
+  ShadowViewMutation() = delete;
+
 #pragma mark - Designated Initializers
 
   /*
@@ -70,13 +72,20 @@ struct ShadowViewMutation final {
   ShadowView newChildShadowView = {};
   int index = -1;
 
- public:
   // Some platforms can have the notion of virtual views - views that are in the
   // ShadowTree hierarchy but never are on the platform. Generally this is used
   // so notify the platform that a view exists so that we can keep EventEmitters
   // around, to notify JS of something. This mechanism is DEPRECATED and it is
   // highly recommended that you NOT make use of this in your platform!
   bool mutatedViewIsVirtual() const;
+
+ private:
+  ShadowViewMutation(
+      Type type,
+      ShadowView parentShadowView,
+      ShadowView oldChildShadowView,
+      ShadowView newChildShadowView,
+      int index);
 };
 
 using ShadowViewMutationList = std::vector<ShadowViewMutation>;

package/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp

@@ -9,6 +9,7 @@
 
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/stubs.h>
 
@@ -31,8 +32,12 @@ static SharedViewProps nonFlattenedDefaultProps(
   dynamic["nativeId"] = "NativeId";
   dynamic["accessible"] = true;
 
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   return std::static_pointer_cast<ViewProps const>(
-      componentDescriptor.cloneProps(nullptr, RawProps{dynamic}));
+      componentDescriptor.cloneProps(
+          parserContext, nullptr, RawProps{dynamic}));
 }
 
 static ShadowNode::Shared makeNode(
@@ -78,8 +83,11 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
               ShadowNodeFragment{RootShadowNode::defaultSharedProps()},
               rootFamily)));
 
+  PropsParserContext parserContext{-1, *contextContainer};
+
   // Applying size constraints.
   emptyRootNode = emptyRootNode->clone(
+      parserContext,
       LayoutConstraints{
           Size{512, 0}, Size{512, std::numeric_limits<Float>::infinity()}},
       LayoutContext{});
@@ -383,8 +391,11 @@ TEST(MountingTest, testViewReparentingInstructionGeneration) {
               ShadowNodeFragment{RootShadowNode::defaultSharedProps()},
               rootFamily)));
 
+  PropsParserContext parserContext{-1, *contextContainer};
+
   // Applying size constraints.
   emptyRootNode = emptyRootNode->clone(
+      parserContext,
       LayoutConstraints{
           Size{512, 0}, Size{512, std::numeric_limits<Float>::infinity()}},
       LayoutContext{});

package/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp

@@ -12,10 +12,11 @@
 
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
-#include <react/renderer/mounting/stubs.h>
 
+#include <react/renderer/mounting/stubs.h>
 #include <react/test_utils/Entropy.h>
 #include <react/test_utils/shadowTreeGeneration.h>
 
@@ -44,6 +45,8 @@ static void testShadowNodeTreeLifeCycle(
   auto noopEventEmitter =
       std::make_shared<ViewEventEmitter const>(nullptr, -1, eventDispatcher);
 
+  PropsParserContext parserContext{-1, *contextContainer};
+
   auto allNodes = std::vector<ShadowNode::Shared>{};
 
   for (int i = 0; i < repeats; i++) {
@@ -61,6 +64,7 @@ static void testShadowNodeTreeLifeCycle(
 
     // Applying size constraints.
     emptyRootNode = emptyRootNode->clone(
+        parserContext,
         LayoutConstraints{
             Size{512, 0}, Size{512, std::numeric_limits<Float>::infinity()}},
         LayoutContext{});
@@ -191,6 +195,8 @@ static void testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
   auto noopEventEmitter =
       std::make_shared<ViewEventEmitter const>(nullptr, -1, eventDispatcher);
 
+  PropsParserContext parserContext{-1, *contextContainer};
+
   auto allNodes = std::vector<ShadowNode::Shared>{};
 
   for (int i = 0; i < repeats; i++) {
@@ -208,6 +214,7 @@ static void testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
 
     // Applying size constraints.
     emptyRootNode = emptyRootNode->clone(
+        parserContext,
         LayoutConstraints{
             Size{512, 0}, Size{512, std::numeric_limits<Float>::infinity()}},
         LayoutContext{});

package/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp

@@ -11,14 +11,15 @@
 
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/element/ComponentBuilder.h>
 #include <react/renderer/element/Element.h>
-#include <react/renderer/element/testUtils.h>
-
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowTree.h>
 #include <react/renderer/mounting/ShadowTreeDelegate.h>
 
+#include <react/renderer/element/testUtils.h>
+
 using namespace facebook::react;
 
 class DummyShadowTreeDelegate : public ShadowTreeDelegate {
@@ -89,6 +90,8 @@ TEST(StateReconciliationTest, testStateReconciliation) {
         });
   // clang-format on
 
+  ContextContainer contextContainer{};
+
   auto shadowNode = builder.build(element);
 
   auto rootShadowNodeState1 = shadowNode->ShadowNode::clone({});
@@ -98,7 +101,11 @@ TEST(StateReconciliationTest, testStateReconciliation) {
   auto state1 = shadowNodeAB->getState();
   auto shadowTreeDelegate = DummyShadowTreeDelegate{};
   ShadowTree shadowTree{
-      SurfaceId{11}, LayoutConstraints{}, LayoutContext{}, shadowTreeDelegate};
+      SurfaceId{11},
+      LayoutConstraints{},
+      LayoutContext{},
+      shadowTreeDelegate,
+      contextContainer};
 
   shadowTree.commit(
       [&](RootShadowNode const &oldRootShadowNode) {

package/ReactCommon/react/renderer/runtimescheduler/Android.mk

@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core
+LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug libjsi callinvoker
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
@@ -25,3 +25,4 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,runtimeexecutor)
+$(call import-module,callinvoker)

package/ReactCommon/react/renderer/runtimescheduler/BUCK

@@ -53,6 +53,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("better:better"),
+        react_native_xplat_target("callinvoker:callinvoker"),
     ],
 )
 

package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp

@@ -7,7 +7,8 @@
 
 #include "RuntimeScheduler.h"
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 #pragma mark - Public
 
@@ -41,7 +42,7 @@ std::shared_ptr<Task> RuntimeScheduler::scheduleTask(
       std::make_shared<Task>(priority, std::move(callback), expirationTime);
   taskQueue_.push(task);
 
-  if (!isCallbackScheduled_) {
+  if (!isCallbackScheduled_ && !isPerformingWork_) {
     isCallbackScheduled_ = true;
     runtimeExecutor_([this](jsi::Runtime &runtime) {
       isCallbackScheduled_ = false;
@@ -87,6 +88,7 @@ void RuntimeScheduler::executeNowOnTheSameThread(
 
 void RuntimeScheduler::startWorkLoop(jsi::Runtime &runtime) const {
   auto previousPriority = currentPriority_;
+  isPerformingWork_ = true;
   while (!taskQueue_.empty()) {
     auto topPriorityTask = taskQueue_.top();
     auto now = now_();
@@ -103,10 +105,14 @@ void RuntimeScheduler::startWorkLoop(jsi::Runtime &runtime) const {
       topPriorityTask->callback =
           result.getObject(runtime).getFunction(runtime);
     } else {
-      taskQueue_.pop();
+      if (taskQueue_.top() == topPriorityTask) {
+        taskQueue_.pop();
+      }
     }
   }
   currentPriority_ = previousPriority;
+  isPerformingWork_ = false;
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook