update

zhongwuzw · Dec 19, 2024 · 2161e7e · 2161e7e
1 parent fa5802d
commit 2161e7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.../react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp b/.../react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp
@@ -25,9 +25,16 @@ void ScrollViewEventEmitter::onScrollBeginDrag(
 }
 
 void ScrollViewEventEmitter::onScrollEndDrag(
-    const ScrollEndDragEvent& scrollEvent) const {
-  dispatchEvent(
-      "scrollEndDrag", std::make_shared<ScrollEndDragEvent>(scrollEvent));
+    const ScrollEvent& scrollEvent) const {
+  const auto* endDragScrollEvent =
+      dynamic_cast<const ScrollEndDragEvent*>(&scrollEvent);
+  if (endDragScrollEvent) {
+    dispatchEvent(
+        "scrollEndDrag",
+        std::make_shared<ScrollEndDragEvent>(*endDragScrollEvent));
+  } else {
+    dispatchScrollViewEvent("scrollEndDrag", scrollEvent);
+  }
 }
 
 void ScrollViewEventEmitter::onMomentumScrollBegin(

diff --git a/...es/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h b/...es/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h
@@ -25,7 +25,7 @@ class ScrollViewEventEmitter : public ViewEventEmitter {
 
   void onScroll(const ScrollEvent& scrollEvent) const;
   void onScrollBeginDrag(const ScrollEvent& scrollEvent) const;
-  void onScrollEndDrag(const ScrollEndDragEvent& scrollEvent) const;
+  void onScrollEndDrag(const ScrollEvent& scrollEvent) const;
   void onMomentumScrollBegin(const ScrollEvent& scrollEvent) const;
   void onMomentumScrollEnd(const ScrollEvent& scrollEvent) const;
   void onScrollToTop(const ScrollEvent& scrollEvent) const;