From 847e6fdd9912c53383a27eec0eda718703139095 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 27 Nov 2018 20:58:29 -0800
Subject: [PATCH] Fabric: Migrating ScrollViewEventEmitter to JSI-based payload

Summary: Pretty straight-forward migration to using `JSI` instead of `folly::dynamic` in `ScrollViewEventEmitter`.

Reviewed By: sahrens

Differential Revision: D13123049

fbshipit-source-id: 2839976d0119c48fa2538dbaa53afbc24982c598
---
 .../scrollview/ScrollViewEventEmitter.cpp     | 83 ++++++++++++-------
 .../scrollview/ScrollViewEventEmitter.h       |  2 +-
 2 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp
index 2db1b61aec..ee80049100 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp
@@ -10,6 +10,54 @@
 namespace facebook {
 namespace react {
 
+static jsi::Value scrollViewMetricsPayload(
+    jsi::Runtime &runtime,
+    const ScrollViewMetrics &scrollViewMetrics) {
+  auto payload = jsi::Object(runtime);
+
+  {
+    auto contentOffset = jsi::Object(runtime);
+    contentOffset.setProperty(runtime, "x", scrollViewMetrics.contentOffset.x);
+    contentOffset.setProperty(runtime, "y", scrollViewMetrics.contentOffset.y);
+    payload.setProperty(runtime, "contentOffset", contentOffset);
+  }
+
+  {
+    auto contentInset = jsi::Object(runtime);
+    contentInset.setProperty(
+        runtime, "top", scrollViewMetrics.contentInset.top);
+    contentInset.setProperty(
+        runtime, "left", scrollViewMetrics.contentInset.left);
+    contentInset.setProperty(
+        runtime, "bottom", scrollViewMetrics.contentInset.bottom);
+    contentInset.setProperty(
+        runtime, "right", scrollViewMetrics.contentInset.right);
+    payload.setProperty(runtime, "contentInset", contentInset);
+  }
+
+  {
+    auto contentSize = jsi::Object(runtime);
+    contentSize.setProperty(
+        runtime, "width", scrollViewMetrics.contentSize.width);
+    contentSize.setProperty(
+        runtime, "height", scrollViewMetrics.contentSize.height);
+    payload.setProperty(runtime, "contentSize", contentSize);
+  }
+
+  {
+    auto containerSize = jsi::Object(runtime);
+    containerSize.setProperty(
+        runtime, "width", scrollViewMetrics.containerSize.width);
+    containerSize.setProperty(
+        runtime, "height", scrollViewMetrics.containerSize.height);
+    payload.setProperty(runtime, "layoutMeasurement", containerSize);
+  }
+
+  payload.setProperty(runtime, "zoomScale", scrollViewMetrics.zoomScale);
+
+  return payload;
+}
+
 void ScrollViewEventEmitter::onScroll(
     const ScrollViewMetrics &scrollViewMetrics) const {
   dispatchScrollViewEvent("scroll", scrollViewMetrics);
@@ -38,34 +86,13 @@ void ScrollViewEventEmitter::onMomentumScrollEnd(
 void ScrollViewEventEmitter::dispatchScrollViewEvent(
     const std::string &name,
     const ScrollViewMetrics &scrollViewMetrics,
-    const folly::dynamic &payload) const {
-  folly::dynamic compoundPayload = folly::dynamic::object();
-
-  compoundPayload["contentOffset"] =
-      folly::dynamic::object("x", scrollViewMetrics.contentOffset.x)(
-          "y", scrollViewMetrics.contentOffset.y);
-
-  compoundPayload["contentInset"] =
-      folly::dynamic::object("top", scrollViewMetrics.contentInset.top)(
-          "left", scrollViewMetrics.contentInset.left)(
-          "bottom", scrollViewMetrics.contentInset.bottom)(
-          "right", scrollViewMetrics.contentInset.right);
-
-  compoundPayload["contentSize"] =
-      folly::dynamic::object("width", scrollViewMetrics.contentSize.width)(
-          "height", scrollViewMetrics.contentSize.height);
-
-  compoundPayload["layoutMeasurement"] =
-      folly::dynamic::object("width", scrollViewMetrics.containerSize.width)(
-          "height", scrollViewMetrics.containerSize.height);
-
-  compoundPayload["zoomScale"] = scrollViewMetrics.zoomScale;
-
-  if (!payload.isNull()) {
-    compoundPayload.merge_patch(payload);
-  }
-
-  dispatchEvent(name, compoundPayload);
+    EventPriority priority) const {
+  dispatchEvent(
+      name,
+      [scrollViewMetrics](jsi::Runtime &runtime) {
+        return scrollViewMetricsPayload(runtime, scrollViewMetrics);
+      },
+      priority);
 }
 
 } // namespace react
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
index 161b5d1f2d..91d419a0b6 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
@@ -44,7 +44,7 @@ class ScrollViewEventEmitter : public ViewEventEmitter {
   void dispatchScrollViewEvent(
       const std::string &name,
       const ScrollViewMetrics &scrollViewMetrics,
-      const folly::dynamic &payload = {}) const;
+      EventPriority priority = EventPriority::AsynchronousBatched) const;
 };
 
 } // namespace react