react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/ReactCommon/react/renderer/components/view/propsConversions.h

@@ -8,12 +8,14 @@
 #pragma once
 
 #include <react/renderer/components/view/conversions.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 static inline YGStyle::Dimensions convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *widthName,
     char const *heightName,
@@ -21,11 +23,13 @@ static inline YGStyle::Dimensions convertRawProp(
     YGStyle::Dimensions const &defaultValue) {
   auto dimensions = defaultValue;
   dimensions[YGDimensionWidth] = convertRawProp(
+      context,
       rawProps,
       widthName,
       sourceValue[YGDimensionWidth],
       defaultValue[YGDimensionWidth]);
   dimensions[YGDimensionHeight] = convertRawProp(
+      context,
       rawProps,
       heightName,
       sourceValue[YGDimensionHeight],
@@ -34,6 +38,7 @@ static inline YGStyle::Dimensions convertRawProp(
 }
 
 static inline YGStyle::Edges convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *prefix,
     char const *suffix,
@@ -41,6 +46,7 @@ static inline YGStyle::Edges convertRawProp(
     YGStyle::Edges const &defaultValue) {
   auto result = defaultValue;
   result[YGEdgeLeft] = convertRawProp(
+      context,
       rawProps,
       "Left",
       sourceValue[YGEdgeLeft],
@@ -48,6 +54,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeTop] = convertRawProp(
+      context,
       rawProps,
       "Top",
       sourceValue[YGEdgeTop],
@@ -55,6 +62,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeRight] = convertRawProp(
+      context,
       rawProps,
       "Right",
       sourceValue[YGEdgeRight],
@@ -62,6 +70,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeBottom] = convertRawProp(
+      context,
       rawProps,
       "Bottom",
       sourceValue[YGEdgeBottom],
@@ -69,6 +78,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeStart] = convertRawProp(
+      context,
       rawProps,
       "Start",
       sourceValue[YGEdgeStart],
@@ -76,6 +86,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeEnd] = convertRawProp(
+      context,
       rawProps,
       "End",
       sourceValue[YGEdgeEnd],
@@ -83,6 +94,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeHorizontal] = convertRawProp(
+      context,
       rawProps,
       "Horizontal",
       sourceValue[YGEdgeHorizontal],
@@ -90,6 +102,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeVertical] = convertRawProp(
+      context,
       rawProps,
       "Vertical",
       sourceValue[YGEdgeVertical],
@@ -97,6 +110,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeAll] = convertRawProp(
+      context,
       rawProps,
       "",
       sourceValue[YGEdgeAll],
@@ -107,99 +121,177 @@ static inline YGStyle::Edges convertRawProp(
 }
 
 static inline YGStyle::Edges convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     YGStyle::Edges const &sourceValue,
     YGStyle::Edges const &defaultValue) {
   auto result = defaultValue;
   result[YGEdgeLeft] = convertRawProp(
-      rawProps, "left", sourceValue[YGEdgeLeft], defaultValue[YGEdgeLeft]);
+      context,
+      rawProps,
+      "left",
+      sourceValue[YGEdgeLeft],
+      defaultValue[YGEdgeLeft]);
   result[YGEdgeTop] = convertRawProp(
-      rawProps, "top", sourceValue[YGEdgeTop], defaultValue[YGEdgeTop]);
+      context,
+      rawProps,
+      "top",
+      sourceValue[YGEdgeTop],
+      defaultValue[YGEdgeTop]);
   result[YGEdgeRight] = convertRawProp(
-      rawProps, "right", sourceValue[YGEdgeRight], defaultValue[YGEdgeRight]);
+      context,
+      rawProps,
+      "right",
+      sourceValue[YGEdgeRight],
+      defaultValue[YGEdgeRight]);
   result[YGEdgeBottom] = convertRawProp(
+      context,
       rawProps,
       "bottom",
       sourceValue[YGEdgeBottom],
       defaultValue[YGEdgeBottom]);
   result[YGEdgeStart] = convertRawProp(
-      rawProps, "start", sourceValue[YGEdgeStart], defaultValue[YGEdgeStart]);
+      context,
+      rawProps,
+      "start",
+      sourceValue[YGEdgeStart],
+      defaultValue[YGEdgeStart]);
   result[YGEdgeEnd] = convertRawProp(
-      rawProps, "end", sourceValue[YGEdgeEnd], defaultValue[YGEdgeEnd]);
+      context,
+      rawProps,
+      "end",
+      sourceValue[YGEdgeEnd],
+      defaultValue[YGEdgeEnd]);
   return result;
 }
 
 static inline YGStyle convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     YGStyle const &sourceValue) {
   auto yogaStyle = YGStyle{};
   yogaStyle.direction() = convertRawProp(
-      rawProps, "direction", sourceValue.direction(), yogaStyle.direction());
+      context,
+      rawProps,
+      "direction",
+      sourceValue.direction(),
+      yogaStyle.direction());
   yogaStyle.flexDirection() = convertRawProp(
+      context,
       rawProps,
       "flexDirection",
       sourceValue.flexDirection(),
       yogaStyle.flexDirection());
   yogaStyle.justifyContent() = convertRawProp(
+      context,
       rawProps,
       "justifyContent",
       sourceValue.justifyContent(),
       yogaStyle.justifyContent());
   yogaStyle.alignContent() = convertRawProp(
+      context,
       rawProps,
       "alignContent",
       sourceValue.alignContent(),
       yogaStyle.alignContent());
   yogaStyle.alignItems() = convertRawProp(
-      rawProps, "alignItems", sourceValue.alignItems(), yogaStyle.alignItems());
+      context,
+      rawProps,
+      "alignItems",
+      sourceValue.alignItems(),
+      yogaStyle.alignItems());
   yogaStyle.alignSelf() = convertRawProp(
-      rawProps, "alignSelf", sourceValue.alignSelf(), yogaStyle.alignSelf());
+      context,
+      rawProps,
+      "alignSelf",
+      sourceValue.alignSelf(),
+      yogaStyle.alignSelf());
   yogaStyle.positionType() = convertRawProp(
+      context,
       rawProps,
       "position",
       sourceValue.positionType(),
       yogaStyle.positionType());
   yogaStyle.flexWrap() = convertRawProp(
-      rawProps, "flexWrap", sourceValue.flexWrap(), yogaStyle.flexWrap());
+      context,
+      rawProps,
+      "flexWrap",
+      sourceValue.flexWrap(),
+      yogaStyle.flexWrap());
   yogaStyle.overflow() = convertRawProp(
-      rawProps, "overflow", sourceValue.overflow(), yogaStyle.overflow());
+      context,
+      rawProps,
+      "overflow",
+      sourceValue.overflow(),
+      yogaStyle.overflow());
   yogaStyle.display() = convertRawProp(
-      rawProps, "display", sourceValue.display(), yogaStyle.display());
-  yogaStyle.flex() =
-      convertRawProp(rawProps, "flex", sourceValue.flex(), yogaStyle.flex());
+      context, rawProps, "display", sourceValue.display(), yogaStyle.display());
+  yogaStyle.flex() = convertRawProp(
+      context, rawProps, "flex", sourceValue.flex(), yogaStyle.flex());
   yogaStyle.flexGrow() = convertRawProp(
-      rawProps, "flexGrow", sourceValue.flexGrow(), yogaStyle.flexGrow());
+      context,
+      rawProps,
+      "flexGrow",
+      sourceValue.flexGrow(),
+      yogaStyle.flexGrow());
   yogaStyle.flexShrink() = convertRawProp(
-      rawProps, "flexShrink", sourceValue.flexShrink(), yogaStyle.flexShrink());
+      context,
+      rawProps,
+      "flexShrink",
+      sourceValue.flexShrink(),
+      yogaStyle.flexShrink());
   yogaStyle.flexBasis() = convertRawProp(
-      rawProps, "flexBasis", sourceValue.flexBasis(), yogaStyle.flexBasis());
+      context,
+      rawProps,
+      "flexBasis",
+      sourceValue.flexBasis(),
+      yogaStyle.flexBasis());
   yogaStyle.margin() = convertRawProp(
-      rawProps, "margin", "", sourceValue.margin(), yogaStyle.margin());
-  yogaStyle.position() =
-      convertRawProp(rawProps, sourceValue.position(), yogaStyle.position());
+      context,
+      rawProps,
+      "margin",
+      "",
+      sourceValue.margin(),
+      yogaStyle.margin());
+  yogaStyle.position() = convertRawProp(
+      context, rawProps, sourceValue.position(), yogaStyle.position());
   yogaStyle.padding() = convertRawProp(
-      rawProps, "padding", "", sourceValue.padding(), yogaStyle.padding());
+      context,
+      rawProps,
+      "padding",
+      "",
+      sourceValue.padding(),
+      yogaStyle.padding());
   yogaStyle.border() = convertRawProp(
-      rawProps, "border", "Width", sourceValue.border(), yogaStyle.border());
+      context,
+      rawProps,
+      "border",
+      "Width",
+      sourceValue.border(),
+      yogaStyle.border());
   yogaStyle.dimensions() = convertRawProp(
+      context,
       rawProps,
       "width",
       "height",
       sourceValue.dimensions(),
       yogaStyle.dimensions());
   yogaStyle.minDimensions() = convertRawProp(
+      context,
       rawProps,
       "minWidth",
       "minHeight",
       sourceValue.minDimensions(),
       yogaStyle.minDimensions());
   yogaStyle.maxDimensions() = convertRawProp(
+      context,
       rawProps,
       "maxWidth",
       "maxHeight",
       sourceValue.maxDimensions(),
       yogaStyle.maxDimensions());
   yogaStyle.aspectRatio() = convertRawProp(
+      context,
       rawProps,
       "aspectRatio",
       sourceValue.aspectRatio(),
@@ -209,6 +301,7 @@ static inline YGStyle convertRawProp(
 
 template <typename T>
 static inline CascadedRectangleCorners<T> convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *prefix,
     char const *suffix,
@@ -217,6 +310,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
   CascadedRectangleCorners<T> result;
 
   result.topLeft = convertRawProp(
+      context,
       rawProps,
       "TopLeft",
       sourceValue.topLeft,
@@ -224,6 +318,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.topRight = convertRawProp(
+      context,
       rawProps,
       "TopRight",
       sourceValue.topRight,
@@ -231,6 +326,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.bottomLeft = convertRawProp(
+      context,
       rawProps,
       "BottomLeft",
       sourceValue.bottomLeft,
@@ -238,6 +334,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.bottomRight = convertRawProp(
+      context,
       rawProps,
       "BottomRight",
       sourceValue.bottomRight,
@@ -246,6 +343,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       suffix);
 
   result.topStart = convertRawProp(
+      context,
       rawProps,
       "TopStart",
       sourceValue.topStart,
@@ -253,6 +351,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.topEnd = convertRawProp(
+      context,
       rawProps,
       "TopEnd",
       sourceValue.topEnd,
@@ -260,6 +359,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.bottomStart = convertRawProp(
+      context,
       rawProps,
       "BottomStart",
       sourceValue.bottomStart,
@@ -267,6 +367,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.bottomEnd = convertRawProp(
+      context,
       rawProps,
       "BottomEnd",
       sourceValue.bottomEnd,
@@ -275,13 +376,14 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       suffix);
 
   result.all = convertRawProp(
-      rawProps, "", sourceValue.all, defaultValue.all, prefix, suffix);
+      context, rawProps, "", sourceValue.all, defaultValue.all, prefix, suffix);
 
   return result;
 }
 
 template <typename T>
 static inline CascadedRectangleEdges<T> convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *prefix,
     char const *suffix,
@@ -290,12 +392,31 @@ static inline CascadedRectangleEdges<T> convertRawProp(
   CascadedRectangleEdges<T> result;
 
   result.left = convertRawProp(
-      rawProps, "Left", sourceValue.left, defaultValue.left, prefix, suffix);
+      context,
+      rawProps,
+      "Left",
+      sourceValue.left,
+      defaultValue.left,
+      prefix,
+      suffix);
   result.right = convertRawProp(
-      rawProps, "Right", sourceValue.right, defaultValue.right, prefix, suffix);
+      context,
+      rawProps,
+      "Right",
+      sourceValue.right,
+      defaultValue.right,
+      prefix,
+      suffix);
   result.top = convertRawProp(
-      rawProps, "Top", sourceValue.top, defaultValue.top, prefix, suffix);
+      context,
+      rawProps,
+      "Top",
+      sourceValue.top,
+      defaultValue.top,
+      prefix,
+      suffix);
   result.bottom = convertRawProp(
+      context,
       rawProps,
       "Bottom",
       sourceValue.bottom,
@@ -304,10 +425,23 @@ static inline CascadedRectangleEdges<T> convertRawProp(
       suffix);
 
   result.start = convertRawProp(
-      rawProps, "Start", sourceValue.start, defaultValue.start, prefix, suffix);
+      context,
+      rawProps,
+      "Start",
+      sourceValue.start,
+      defaultValue.start,
+      prefix,
+      suffix);
   result.end = convertRawProp(
-      rawProps, "End", sourceValue.end, defaultValue.end, prefix, suffix);
+      context,
+      rawProps,
+      "End",
+      sourceValue.end,
+      defaultValue.end,
+      prefix,
+      suffix);
   result.horizontal = convertRawProp(
+      context,
       rawProps,
       "Horizontal",
       sourceValue.horizontal,
@@ -315,6 +449,7 @@ static inline CascadedRectangleEdges<T> convertRawProp(
       prefix,
       suffix);
   result.vertical = convertRawProp(
+      context,
       rawProps,
       "Vertical",
       sourceValue.vertical,
@@ -323,7 +458,7 @@ static inline CascadedRectangleEdges<T> convertRawProp(
       suffix);
 
   result.all = convertRawProp(
-      rawProps, "", sourceValue.all, defaultValue.all, prefix, suffix);
+      context, rawProps, "", sourceValue.all, defaultValue.all, prefix, suffix);
 
   return result;
 }

package/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp

@@ -14,7 +14,9 @@
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/scrollview/ScrollViewComponentDescriptor.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>
 
@@ -85,14 +87,17 @@ class YogaDirtyFlagTest : public ::testing::Test {
 };
 
 TEST_F(YogaDirtyFlagTest, cloningPropsWithoutChangingThem) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   /*
    * Cloning props without changing them must *not* dirty a Yoga node.
    */
   auto newRootShadowNode = rootShadowNode_->cloneTree(
-      innerShadowNode_->getFamily(), [](ShadowNode const &oldShadowNode) {
+      innerShadowNode_->getFamily(), [&](ShadowNode const &oldShadowNode) {
         auto &componentDescriptor = oldShadowNode.getComponentDescriptor();
         auto props = componentDescriptor.cloneProps(
-            oldShadowNode.getProps(), RawProps());
+            parserContext, oldShadowNode.getProps(), RawProps());
         return oldShadowNode.clone(ShadowNodeFragment{props});
       });
 

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

@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libfolly_json libjsi libfolly_futures libreact_utils libreact_debug libreact_render_debug libreact_render_graphics
+LOCAL_SHARED_LIBRARIES := libfolly_json libjsi libfolly_futures libreact_utils libreact_debug libreact_render_debug libreact_render_graphics libglog
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"

package/ReactCommon/react/renderer/core/BUCK

@@ -87,6 +87,7 @@ fb_xplat_cxx_test(
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/renderer/components/view:view"),
         ":core",
+        "//xplat/hermes/API:HermesAPI",
     ],
 )
 

package/ReactCommon/react/renderer/core/BatchedEventQueue.cpp

@@ -11,44 +11,12 @@ namespace facebook {
 namespace react {
 
 BatchedEventQueue::BatchedEventQueue(
-    EventPipe eventPipe,
-    StatePipe statePipe,
+    EventQueueProcessor eventProcessor,
     std::unique_ptr<EventBeat> eventBeat)
-    : EventQueue(eventPipe, statePipe, std::move(eventBeat)) {}
+    : EventQueue(std::move(eventProcessor), std::move(eventBeat)) {}
 
 void BatchedEventQueue::onEnqueue() const {
   eventBeat_->request();
 }
-
-void BatchedEventQueue::enqueueUniqueEvent(RawEvent &&rawEvent) const {
-  {
-    std::lock_guard<std::mutex> lock(queueMutex_);
-
-    auto repeatedEvent = eventQueue_.rend();
-
-    for (auto it = eventQueue_.rbegin(); it != eventQueue_.rend(); ++it) {
-      if (it->type == rawEvent.type &&
-          it->eventTarget == rawEvent.eventTarget) {
-        repeatedEvent = it;
-        break;
-      } else if (it->eventTarget == rawEvent.eventTarget) {
-        // It is necessary to maintain order of different event types
-        // for the same target. If the same target has event types A1, B1
-        // in the event queue and event A2 occurs. A1 has to stay in the
-        // queue.
-        break;
-      }
-    }
-
-    if (repeatedEvent == eventQueue_.rend()) {
-      eventQueue_.push_back(std::move(rawEvent));
-    } else {
-      *repeatedEvent = std::move(rawEvent);
-    }
-  }
-
-  onEnqueue();
-}
-
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/renderer/core/BatchedEventQueue.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <react/renderer/core/EventQueue.h>
+#include <react/renderer/core/EventQueueProcessor.h>
 
 namespace facebook {
 namespace react {
@@ -19,18 +20,10 @@ namespace react {
 class BatchedEventQueue final : public EventQueue {
  public:
   BatchedEventQueue(
-      EventPipe eventPipe,
-      StatePipe statePipe,
+      EventQueueProcessor eventProcessor,
       std::unique_ptr<EventBeat> eventBeat);
 
   void onEnqueue() const override;
-
-  /*
-   * Enqueues and (probably later) dispatches a given event.
-   * Deletes last RawEvent from the queue if it has the same type and target.
-   * Can be called on any thread.
-   */
-  void enqueueUniqueEvent(RawEvent &&rawEvent) const;
 };
 
 } // namespace react

package/ReactCommon/react/renderer/core/ComponentDescriptor.h

@@ -9,6 +9,7 @@
 
 #include <react/renderer/core/EventDispatcher.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/State.h>
@@ -40,8 +41,8 @@ class ComponentDescriptor {
    * and `ComponentHandle` (the particular custom implementation might use
    * stored `flavor` to return different values from those virtual methods).
    * Since it's a very niche requirement (e.g. we plan to use it for
-   * an interoperability layer with Paper), we are thinking about removing this
-   * feature completely after it's no longer needed.
+   * an interoperability layer with old renderer), we are thinking about
+   * removing this feature completely after it's no longer needed.
    */
   using Flavor = std::shared_ptr<void const>;
 
@@ -101,6 +102,7 @@ class ComponentDescriptor {
    * Must return an object which is NOT pointer equal to `props`.
    */
   virtual SharedProps cloneProps(
+      const PropsParserContext &context,
       const SharedProps &props,
       const RawProps &rawProps) const = 0;
 
@@ -109,6 +111,7 @@ class ComponentDescriptor {
    * between `props` and `newProps`.
    */
   virtual SharedProps interpolateProps(
+      const PropsParserContext &context,
       float animationProgress,
       const SharedProps &props,
       const SharedProps &newProps) const = 0;