From 029a6ca613578a3cc9d0c88d9aaaa2485298beb3 Mon Sep 17 00:00:00 2001
From: oasis-cloud <suanbanren@foxmail.com>
Date: Tue, 23 Jul 2024 15:38:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(infiniteLoading):=20rest=20=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E4=BA=8B=E4=BB=B6=E6=97=A0=E6=B3=95=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/infiniteloading/demos/taro/demo1.tsx     | 6 ++++++
 src/packages/infiniteloading/infiniteloading.taro.tsx | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/packages/infiniteloading/demos/taro/demo1.tsx b/src/packages/infiniteloading/demos/taro/demo1.tsx
index 1410558875..3eb9790450 100644
--- a/src/packages/infiniteloading/demos/taro/demo1.tsx
+++ b/src/packages/infiniteloading/demos/taro/demo1.tsx
@@ -66,6 +66,12 @@ const Demo1 = () => {
             target="scroll"
             hasMore={hasMore}
             onLoadMore={loadMore}
+            onScroll={() => {
+              console.log('onScroll')
+            }}
+            onScrollToUpper={() => {
+              console.log('onScrollToUpper')
+            }}
             loadingText={
               <>
                 {renderJoyImg}
diff --git a/src/packages/infiniteloading/infiniteloading.taro.tsx b/src/packages/infiniteloading/infiniteloading.taro.tsx
index f0807d2432..c892305a71 100644
--- a/src/packages/infiniteloading/infiniteloading.taro.tsx
+++ b/src/packages/infiniteloading/infiniteloading.taro.tsx
@@ -167,6 +167,7 @@ export const InfiniteLoading: FunctionComponent<
 
   return (
     <ScrollView
+      {...rest}
       className={classes}
       scrollY
       id="scroller"
@@ -177,7 +178,6 @@ export const InfiniteLoading: FunctionComponent<
       onTouchStart={touchStart}
       onTouchMove={touchMove}
       onTouchEnd={touchEnd}
-      {...rest}
     >
       <div className="nut-infinite-top" ref={refreshTop} style={getStyle()}>
         <div className="nut-infinite-top-tips">