fix(web): 修复scroll-view/list-view 动态设置 refresher-triggered 为 true 时没有…

…触发 refresherpulling 事件的Bug#2359
dcloudio · Jul 24, 2024 · 7fa4665 · 7fa4665
1 parent de57580
commit 7fa4665
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 0 deletions.
diff --git a/packages/uni-components/src/vue/list-view/index.tsx b/packages/uni-components/src/vue/list-view/index.tsx
@@ -627,6 +627,10 @@ function handleTouchEvent(
         // 之前是刷新状态则不再触发刷新
         if (!beforeRefreshing) {
           beforeRefreshing = true
+          trigger('refresherpulling', {} as Event, {
+            deltaY: state.refresherHeight,
+            dy: state.refresherHeight,
+          })
           trigger('refresherrefresh', {} as Event, {
             dy: touchEnd.y - touchStart.y,
           })

diff --git a/packages/uni-components/src/vue/scroll-view/index.tsx b/packages/uni-components/src/vue/scroll-view/index.tsx
@@ -518,6 +518,10 @@ function useScrollViewLoader(
         // 之前是刷新状态则不再触发刷新
         if (!beforeRefreshing) {
           beforeRefreshing = true
+          trigger('refresherpulling', {} as Event, {
+            deltaY: state.refresherHeight,
+            dy: state.refresherHeight,
+          })
           trigger('refresherrefresh', {} as Event, {
             dy: touchEnd.y - touchStart.y,
           })

diff --git a/packages/uni-h5/dist-x/uni-h5.cjs.js b/packages/uni-h5/dist-x/uni-h5.cjs.js
@@ -6386,6 +6386,10 @@ function useScrollViewLoader(props2, state, scrollTopNumber, scrollLeftNumber, t
         state.refresherHeight = props2.refresherThreshold;
         if (!beforeRefreshing) {
           beforeRefreshing = true;
+          trigger("refresherpulling", {}, {
+            deltaY: state.refresherHeight,
+            dy: state.refresherHeight
+          });
           trigger("refresherrefresh", {}, {
             dy: touchEnd.y - touchStart.y
           });
@@ -8080,6 +8084,10 @@ function handleTouchEvent(isVertical, containerRef, props2, state, trigger, emit
         state.refresherHeight = props2.refresherThreshold;
         if (!beforeRefreshing) {
           beforeRefreshing = true;
+          trigger("refresherpulling", {}, {
+            deltaY: state.refresherHeight,
+            dy: state.refresherHeight
+          });
           trigger("refresherrefresh", {}, {
             dy: touchEnd.y - touchStart.y
           });

diff --git a/packages/uni-h5/dist-x/uni-h5.es.js b/packages/uni-h5/dist-x/uni-h5.es.js
@@ -14234,6 +14234,10 @@ function useScrollViewLoader(props2, state2, scrollTopNumber, scrollLeftNumber,
         state2.refresherHeight = props2.refresherThreshold;
         if (!beforeRefreshing) {
           beforeRefreshing = true;
+          trigger("refresherpulling", {}, {
+            deltaY: state2.refresherHeight,
+            dy: state2.refresherHeight
+          });
           trigger("refresherrefresh", {}, {
             dy: touchEnd.y - touchStart.y
           });
@@ -16420,6 +16424,10 @@ function handleTouchEvent(isVertical, containerRef, props2, state2, trigger, emi
         state2.refresherHeight = props2.refresherThreshold;
         if (!beforeRefreshing) {
           beforeRefreshing = true;
+          trigger("refresherpulling", {}, {
+            deltaY: state2.refresherHeight,
+            dy: state2.refresherHeight
+          });
           trigger("refresherrefresh", {}, {
             dy: touchEnd.y - touchStart.y
           });

diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js
@@ -6308,6 +6308,10 @@ function useScrollViewLoader(props2, state, scrollTopNumber, scrollLeftNumber, t
         state.refresherHeight = props2.refresherThreshold;
         if (!beforeRefreshing) {
           beforeRefreshing = true;
+          trigger("refresherpulling", {}, {
+            deltaY: state.refresherHeight,
+            dy: state.refresherHeight
+          });
           trigger("refresherrefresh", {}, {
             dy: touchEnd.y - touchStart.y
           });

diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js
@@ -13722,6 +13722,10 @@ function useScrollViewLoader(props2, state2, scrollTopNumber, scrollLeftNumber,
         state2.refresherHeight = props2.refresherThreshold;
         if (!beforeRefreshing) {
           beforeRefreshing = true;
+          trigger("refresherpulling", {}, {
+            deltaY: state2.refresherHeight,
+            dy: state2.refresherHeight
+          });
           trigger("refresherrefresh", {}, {
             dy: touchEnd.y - touchStart.y
           });