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

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 const &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(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(const 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;

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

@@ -11,9 +11,11 @@
 #include <memory>
 
 #include <react/debug/react_native_assert.h>
+#include <react/renderer/components/view/ViewPropsInterpolation.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/EventDispatcher.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 #include <react/renderer/core/State.h>
@@ -78,10 +80,6 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
   ShadowNode::Unshared cloneShadowNode(
       const ShadowNode &sourceShadowNode,
       const ShadowNodeFragment &fragment) const override {
-    react_native_assert(
-        dynamic_cast<ConcreteShadowNode const *>(&sourceShadowNode) &&
-        "Provided `sourceShadowNode` has an incompatible type.");
-
     auto shadowNode = std::make_shared<ShadowNodeT>(sourceShadowNode, fragment);
 
     adopt(shadowNode);
@@ -91,10 +89,6 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
   void appendChild(
       const ShadowNode::Shared &parentShadowNode,
       const ShadowNode::Shared &childShadowNode) const override {
-    react_native_assert(
-        dynamic_cast<ConcreteShadowNode const *>(parentShadowNode.get()) &&
-        "Provided `parentShadowNode` has an incompatible type.");
-
     auto concreteParentShadowNode =
         std::static_pointer_cast<const ShadowNodeT>(parentShadowNode);
     auto concreteNonConstParentShadowNode =
@@ -103,13 +97,9 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
   }
 
   virtual SharedProps cloneProps(
+      const PropsParserContext &context,
       const SharedProps &props,
       const RawProps &rawProps) const override {
-    react_native_assert(
-        !props ||
-        dynamic_cast<ConcreteProps const *>(props.get()) &&
-            "Provided `props` has an incompatible type.");
-
     // Optimization:
     // Quite often nodes are constructed with default/empty props: the base
     // `props` object is `null` (there no base because it's not cloning) and the
@@ -119,25 +109,33 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
       return ShadowNodeT::defaultSharedProps();
     }
 
-    rawProps.parse(rawPropsParser_);
+    rawProps.parse(rawPropsParser_, context);
 
-    return ShadowNodeT::Props(rawProps, props);
+    return ShadowNodeT::Props(context, rawProps, props);
   };
 
-  virtual SharedProps interpolateProps(
+  SharedProps interpolateProps(
+      const PropsParserContext &context,
       float animationProgress,
       const SharedProps &props,
       const SharedProps &newProps) const override {
-    // By default, this does nothing.
 #ifdef ANDROID
     // On Android only, the merged props should have the same RawProps as the
     // final props struct
-    if (newProps != nullptr) {
-      return cloneProps(newProps, newProps->rawProps);
-    }
+    SharedProps interpolatedPropsShared =
+        (newProps != nullptr ? cloneProps(context, newProps, newProps->rawProps)
+                             : cloneProps(context, newProps, {}));
+#else
+    SharedProps interpolatedPropsShared = cloneProps(context, newProps, {});
 #endif
 
-    return cloneProps(newProps, {});
+    if (ConcreteShadowNode::BaseTraits().check(
+            ShadowNodeTraits::Trait::ViewKind)) {
+      interpolateViewProps(
+          animationProgress, props, newProps, interpolatedPropsShared);
+    }
+
+    return interpolatedPropsShared;
   };
 
   virtual State::Shared createInitialState(

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

@@ -10,6 +10,8 @@
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteState.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/StateData.h>
 
@@ -68,9 +70,11 @@ class ConcreteShadowNode : public BaseShadowNodeT {
   }
 
   static SharedConcreteProps Props(
+      const PropsParserContext &context,
       RawProps const &rawProps,
       SharedProps const &baseProps = nullptr) {
     return std::make_shared<PropsT const>(
+        context,
         baseProps ? static_cast<PropsT const &>(*baseProps) : PropsT(),
         rawProps);
   }

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

@@ -17,31 +17,25 @@ namespace facebook {
 namespace react {
 
 EventDispatcher::EventDispatcher(
-    EventPipe const &eventPipe,
-    StatePipe const &statePipe,
+    EventQueueProcessor eventProcessor,
     EventBeat::Factory const &synchonousEventBeatFactory,
     EventBeat::Factory const &asynchonousEventBeatFactory,
     EventBeat::SharedOwnerBox const &ownerBox)
     : synchronousUnbatchedQueue_(std::make_unique<UnbatchedEventQueue>(
-          eventPipe,
-          statePipe,
+          eventProcessor,
           synchonousEventBeatFactory(ownerBox))),
       synchronousBatchedQueue_(std::make_unique<BatchedEventQueue>(
-          eventPipe,
-          statePipe,
+          eventProcessor,
           synchonousEventBeatFactory(ownerBox))),
       asynchronousUnbatchedQueue_(std::make_unique<UnbatchedEventQueue>(
-          eventPipe,
-          statePipe,
+          eventProcessor,
           asynchonousEventBeatFactory(ownerBox))),
       asynchronousBatchedQueue_(std::make_unique<BatchedEventQueue>(
-          eventPipe,
-          statePipe,
+          eventProcessor,
           asynchonousEventBeatFactory(ownerBox))) {}
 
-void EventDispatcher::dispatchEvent(
-    RawEvent const &rawEvent,
-    EventPriority priority) const {
+void EventDispatcher::dispatchEvent(RawEvent &&rawEvent, EventPriority priority)
+    const {
   getEventQueue(priority).enqueueEvent(std::move(rawEvent));
 }
 
@@ -51,8 +45,8 @@ void EventDispatcher::dispatchStateUpdate(
   getEventQueue(priority).enqueueStateUpdate(std::move(stateUpdate));
 }
 
-void EventDispatcher::dispatchUniqueEvent(RawEvent const &rawEvent) const {
-  asynchronousBatchedQueue_->enqueueUniqueEvent(rawEvent);
+void EventDispatcher::dispatchUniqueEvent(RawEvent &&rawEvent) const {
+  asynchronousBatchedQueue_->enqueueUniqueEvent(std::move(rawEvent));
 }
 
 const EventQueue &EventDispatcher::getEventQueue(EventPriority priority) const {

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

@@ -7,21 +7,17 @@
 
 #pragma once
 
-#include <array>
-#include <memory>
-
 #include <react/renderer/core/BatchedEventQueue.h>
 #include <react/renderer/core/EventBeat.h>
-#include <react/renderer/core/EventPipe.h>
 #include <react/renderer/core/EventPriority.h>
-#include <react/renderer/core/StatePipe.h>
+#include <react/renderer/core/EventQueueProcessor.h>
 #include <react/renderer/core/StateUpdate.h>
 #include <react/renderer/core/UnbatchedEventQueue.h>
 
 namespace facebook {
 namespace react {
 
-class RawEvent;
+struct RawEvent;
 
 /*
  * Represents event-delivery infrastructure.
@@ -33,8 +29,7 @@ class EventDispatcher {
   using Weak = std::weak_ptr<EventDispatcher const>;
 
   EventDispatcher(
-      EventPipe const &eventPipe,
-      StatePipe const &statePipe,
+      EventQueueProcessor eventProcessor,
       EventBeat::Factory const &synchonousEventBeatFactory,
       EventBeat::Factory const &asynchonousEventBeatFactory,
       EventBeat::SharedOwnerBox const &ownerBox);
@@ -42,14 +37,14 @@ class EventDispatcher {
   /*
    * Dispatches a raw event with given priority using event-delivery pipe.
    */
-  void dispatchEvent(RawEvent const &rawEvent, EventPriority priority) const;
+  void dispatchEvent(RawEvent &&rawEvent, EventPriority priority) const;
 
   /*
    * Dispatches a raw event with asynchronous batched priority. Before the
    * dispatch we make sure that no other RawEvent of same type and same target
    * is on the queue.
    */
-  void dispatchUniqueEvent(RawEvent const &rawEvent) const;
+  void dispatchUniqueEvent(RawEvent &&rawEvent) const;
 
   /*
    * Dispatches a state update with given priority.

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

@@ -26,7 +26,7 @@ static std::string normalizeEventType(const std::string &type) {
   auto prefixedType = type;
   if (type.find("top", 0) != 0) {
     prefixedType.insert(0, "top");
-    prefixedType[3] = toupper(prefixedType[3]);
+    prefixedType[3] = static_cast<char>(toupper(prefixedType[3]));
   }
   return prefixedType;
 }
@@ -52,19 +52,25 @@ EventEmitter::EventEmitter(
 void EventEmitter::dispatchEvent(
     const std::string &type,
     const folly::dynamic &payload,
-    const EventPriority &priority) const {
-  dispatchEvent(
-      type,
-      [payload](jsi::Runtime &runtime) {
-        return valueFromDynamic(runtime, payload);
-      },
-      priority);
+    EventPriority priority) const {
+  dispatchEvent(type, [payload](jsi::Runtime &runtime) {
+    return valueFromDynamic(runtime, payload);
+  });
+}
+
+void EventEmitter::dispatchUniqueEvent(
+    const std::string &type,
+    const folly::dynamic &payload) const {
+  dispatchUniqueEvent(type, [payload](jsi::Runtime &runtime) {
+    return valueFromDynamic(runtime, payload);
+  });
 }
 
 void EventEmitter::dispatchEvent(
     const std::string &type,
     const ValueFactory &payloadFactory,
-    const EventPriority &priority) const {
+    EventPriority priority,
+    RawEvent::Category category) const {
   SystraceSection s("EventEmitter::dispatchEvent");
 
   auto eventDispatcher = eventDispatcher_.lock();
@@ -73,7 +79,8 @@ void EventEmitter::dispatchEvent(
   }
 
   eventDispatcher->dispatchEvent(
-      RawEvent(normalizeEventType(type), payloadFactory, eventTarget_),
+      RawEvent(
+          normalizeEventType(type), payloadFactory, eventTarget_, category),
       priority);
 }
 
@@ -87,8 +94,11 @@ void EventEmitter::dispatchUniqueEvent(
     return;
   }
 
-  eventDispatcher->dispatchUniqueEvent(
-      RawEvent(normalizeEventType(type), payloadFactory, eventTarget_));
+  eventDispatcher->dispatchUniqueEvent(RawEvent(
+      normalizeEventType(type),
+      payloadFactory,
+      eventTarget_,
+      RawEvent::Category::Continuous));
 }
 
 void EventEmitter::setEnabled(bool enabled) const {

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

@@ -71,12 +71,17 @@ class EventEmitter {
       const std::string &type,
       const ValueFactory &payloadFactory =
           EventEmitter::defaultPayloadFactory(),
-      const EventPriority &priority = EventPriority::AsynchronousBatched) const;
+      EventPriority priority = EventPriority::AsynchronousBatched,
+      RawEvent::Category category = RawEvent::Category::Unspecified) const;
 
   void dispatchEvent(
       const std::string &type,
       const folly::dynamic &payload,
-      const EventPriority &priority = EventPriority::AsynchronousBatched) const;
+      EventPriority priority = EventPriority::AsynchronousBatched) const;
+
+  void dispatchUniqueEvent(
+      const std::string &type,
+      const folly::dynamic &payload) const;
 
   void dispatchUniqueEvent(
       const std::string &type,

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

@@ -12,6 +12,7 @@
 
 #include <jsi/jsi.h>
 #include <react/renderer/core/EventTarget.h>
+#include <react/renderer/core/ReactEventPriority.h>
 #include <react/renderer/core/ValueFactory.h>
 
 namespace facebook {
@@ -21,6 +22,7 @@ using EventPipe = std::function<void(
     jsi::Runtime &runtime,
     const EventTarget *eventTarget,
     const std::string &type,
+    ReactEventPriority priority,
     const ValueFactory &payloadFactory)>;
 
 } // namespace react

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

@@ -10,7 +10,7 @@
 namespace facebook {
 namespace react {
 
-enum class EventPriority : int {
+enum class EventPriority {
   SynchronousUnbatched,
   SynchronousBatched,
   AsynchronousUnbatched,

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

@@ -14,26 +14,54 @@ namespace facebook {
 namespace react {
 
 EventQueue::EventQueue(
-    EventPipe eventPipe,
-    StatePipe statePipe,
+    EventQueueProcessor eventProcessor,
     std::unique_ptr<EventBeat> eventBeat)
-    : eventPipe_(std::move(eventPipe)),
-      statePipe_(std::move(statePipe)),
+    : eventProcessor_(std::move(eventProcessor)),
       eventBeat_(std::move(eventBeat)) {
   eventBeat_->setBeatCallback(
       std::bind(&EventQueue::onBeat, this, std::placeholders::_1));
 }
 
-void EventQueue::enqueueEvent(const RawEvent &rawEvent) const {
+void EventQueue::enqueueEvent(RawEvent &&rawEvent) const {
   {
     std::lock_guard<std::mutex> lock(queueMutex_);
-    eventQueue_.push_back(rawEvent);
+    eventQueue_.push_back(std::move(rawEvent));
   }
 
   onEnqueue();
 }
 
-void EventQueue::enqueueStateUpdate(const StateUpdate &stateUpdate) const {
+void EventQueue::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();
+}
+
+void EventQueue::enqueueStateUpdate(StateUpdate &&stateUpdate) const {
   {
     std::lock_guard<std::mutex> lock(queueMutex_);
     if (!stateUpdateQueue_.empty()) {
@@ -42,15 +70,15 @@ void EventQueue::enqueueStateUpdate(const StateUpdate &stateUpdate) const {
         stateUpdateQueue_.pop_back();
       }
     }
-    stateUpdateQueue_.push_back(stateUpdate);
+    stateUpdateQueue_.push_back(std::move(stateUpdate));
   }
 
   onEnqueue();
 }
 
 void EventQueue::onBeat(jsi::Runtime &runtime) const {
-  flushEvents(runtime);
   flushStateUpdates();
+  flushEvents(runtime);
 }
 
 void EventQueue::flushEvents(jsi::Runtime &runtime) const {
@@ -67,30 +95,7 @@ void EventQueue::flushEvents(jsi::Runtime &runtime) const {
     eventQueue_.clear();
   }
 
-  {
-    std::lock_guard<std::mutex> lock(EventEmitter::DispatchMutex());
-
-    for (const auto &event : queue) {
-      if (event.eventTarget) {
-        event.eventTarget->retain(runtime);
-      }
-    }
-  }
-
-  for (const auto &event : queue) {
-    eventPipe_(
-        runtime, event.eventTarget.get(), event.type, event.payloadFactory);
-  }
-
-  // No need to lock `EventEmitter::DispatchMutex()` here.
-  // The mutex protects from a situation when the `instanceHandle` can be
-  // deallocated during accessing, but that's impossible at this point because
-  // we have a strong pointer to it.
-  for (const auto &event : queue) {
-    if (event.eventTarget) {
-      event.eventTarget->release(runtime);
-    }
-  }
+  eventProcessor_.flushEvents(runtime, std::move(queue));
 }
 
 void EventQueue::flushStateUpdates() const {
@@ -107,9 +112,7 @@ void EventQueue::flushStateUpdates() const {
     stateUpdateQueue_.clear();
   }
 
-  for (const auto &stateUpdate : stateUpdateQueue) {
-    statePipe_(stateUpdate);
-  }
+  eventProcessor_.flushStateUpdates(std::move(stateUpdateQueue));
 }
 
 } // namespace react

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

@@ -13,9 +13,8 @@
 
 #include <jsi/jsi.h>
 #include <react/renderer/core/EventBeat.h>
-#include <react/renderer/core/EventPipe.h>
+#include <react/renderer/core/EventQueueProcessor.h>
 #include <react/renderer/core/RawEvent.h>
-#include <react/renderer/core/StatePipe.h>
 #include <react/renderer/core/StateUpdate.h>
 
 namespace facebook {
@@ -28,8 +27,7 @@ namespace react {
 class EventQueue {
  public:
   EventQueue(
-      EventPipe eventPipe,
-      StatePipe statePipe,
+      EventQueueProcessor eventProcessor,
       std::unique_ptr<EventBeat> eventBeat);
   virtual ~EventQueue() = default;
 
@@ -37,13 +35,20 @@ class EventQueue {
    * Enqueues and (probably later) dispatch a given event.
    * Can be called on any thread.
    */
-  void enqueueEvent(const RawEvent &rawEvent) const;
+  void enqueueEvent(RawEvent &&rawEvent) const;
+
+  /*
+   * 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;
 
   /*
    * Enqueues and (probably later) dispatch a given state update.
    * Can be called on any thread.
    */
-  void enqueueStateUpdate(const StateUpdate &stateUpdate) const;
+  void enqueueStateUpdate(StateUpdate &&stateUpdate) const;
 
  protected:
   /*
@@ -57,13 +62,14 @@ class EventQueue {
   void flushEvents(jsi::Runtime &runtime) const;
   void flushStateUpdates() const;
 
-  const EventPipe eventPipe_;
-  const StatePipe statePipe_;
+  EventQueueProcessor eventProcessor_;
+
   const std::unique_ptr<EventBeat> eventBeat_;
   // Thread-safe, protected by `queueMutex_`.
   mutable std::vector<RawEvent> eventQueue_;
   mutable std::vector<StateUpdate> stateUpdateQueue_;
   mutable std::mutex queueMutex_;
+  mutable bool hasContinuousEventStarted_{false};
 };
 
 } // namespace react