fix(infiniteLoading): rest 导致事件无法触发 (#2474)

jdf2e · Jul 23, 2024 · f40fb4d · f40fb4d
1 parent 56302dc
commit f40fb4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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">