From 4c35bd2dba84db247b51915e9d12066d75160c8a Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Thu, 31 Oct 2024 16:53:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(infite):=20loadingText=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/infiniteloading/demo.taro.tsx    |  5 +++-
 .../infiniteloading/infiniteloading.taro.tsx  | 26 +++++++------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/packages/infiniteloading/demo.taro.tsx b/src/packages/infiniteloading/demo.taro.tsx
index 8d30c4895f..95f102cad5 100644
--- a/src/packages/infiniteloading/demo.taro.tsx
+++ b/src/packages/infiniteloading/demo.taro.tsx
@@ -40,7 +40,10 @@ const InfiniteLoadingDemo = () => {
   return (
     <>
       <Header />
-      <ScrollView className={`demo ${Taro.getEnv() === 'WEB' ? 'web' : ''}`}>
+      <ScrollView
+        className={`demo ${Taro.getEnv() === 'WEB' ? 'web' : ''}`}
+        showScrollbar={false}
+      >
         <View className="h2">{translated['84aa6bce']}</View>
         <Demo1 />
         <View className="h2">{translated.eb4236fe}</View>
diff --git a/src/packages/infiniteloading/infiniteloading.taro.tsx b/src/packages/infiniteloading/infiniteloading.taro.tsx
index 19976be410..eb920ac622 100644
--- a/src/packages/infiniteloading/infiniteloading.taro.tsx
+++ b/src/packages/infiniteloading/infiniteloading.taro.tsx
@@ -12,7 +12,6 @@ import { useConfig } from '@/packages/configprovider/configprovider.taro'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { InfiniteLoadingType } from './types'
-import pxTransform from '@/utils/px-transform'
 
 export interface InfiniteLoadingProps
   extends BasicComponent,
@@ -73,16 +72,15 @@ export const InfiniteLoading: FunctionComponent<
   const y = useRef(0)
   const refreshMaxH = useRef(0)
   const distance = useRef(0)
-  const classPrefix = 'nut-infinite'
+
   const classes = classNames(classPrefix, className, `${classPrefix}-${type}`)
 
   useEffect(() => {
     refreshMaxH.current = threshold
-    const timer = setTimeout(() => {
+    setTimeout(() => {
       getScrollHeight()
     }, 200)
-    return () => clearTimeout(timer)
-  }, [hasMore, isInfiniting, threshold])
+  }, [hasMore, isInfiniting])
 
   /** 获取需要滚动的距离 */
   const getScrollHeight = () => {
@@ -96,7 +94,7 @@ export const InfiniteLoading: FunctionComponent<
 
   const getStyle = () => {
     return {
-      height: topDisScoll < 0 ? pxTransform(0) : pxTransform(topDisScoll),
+      height: topDisScoll < 0 ? `0px` : `${topDisScoll}px`,
       transition: `height 0.2s cubic-bezier(0.25,0.1,0.25,1)`,
     }
   }
@@ -189,20 +187,14 @@ export const InfiniteLoading: FunctionComponent<
       onTouchMove={touchMove}
       onTouchEnd={touchEnd}
     >
-      <View
-        className={`${classPrefix}-top`}
-        ref={refreshTop}
-        style={getStyle()}
-      >
-        <View className={`${classPrefix}-top-tips`}>
+      <View className="nut-infinite-top" ref={refreshTop} style={getStyle()}>
+        <View className="nut-infinite-top-tips">
           {pullingText || locale.infiniteloading.pullRefreshText}
         </View>
       </View>
-      <View className={`${classPrefix}-container`}>{children}</View>
-      <View className={`${classPrefix}-bottom`}>
-        <View className={`${classPrefix}-bottom-tips`}>
-          {getBottomTipsText()}
-        </View>
+      <View className="nut-infinite-container">{children}</View>
+      <View className="nut-infinite-bottom">
+        <View className="nut-infinite-bottom-tips">{getBottomTipsText()}</View>
       </View>
     </ScrollView>
   )

From 90a1866782a10fc8df0aee7a5dc222c57f215f1c Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Thu, 31 Oct 2024 16:56:11 +0800
Subject: [PATCH 2/3] chore: save

---
 src/packages/infiniteloading/infiniteloading.taro.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/packages/infiniteloading/infiniteloading.taro.tsx b/src/packages/infiniteloading/infiniteloading.taro.tsx
index eb920ac622..897a9995f0 100644
--- a/src/packages/infiniteloading/infiniteloading.taro.tsx
+++ b/src/packages/infiniteloading/infiniteloading.taro.tsx
@@ -12,6 +12,7 @@ import { useConfig } from '@/packages/configprovider/configprovider.taro'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { InfiniteLoadingType } from './types'
+import pxTransform from '@/utils/px-transform'
 
 export interface InfiniteLoadingProps
   extends BasicComponent,
@@ -94,7 +95,7 @@ export const InfiniteLoading: FunctionComponent<
 
   const getStyle = () => {
     return {
-      height: topDisScoll < 0 ? `0px` : `${topDisScoll}px`,
+      height: topDisScoll < 0 ? pxTransform(0) : pxTransform(topDisScoll),
       transition: `height 0.2s cubic-bezier(0.25,0.1,0.25,1)`,
     }
   }

From 10a92d3dd01430d44db00949d3d40947dd9164fe Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Thu, 31 Oct 2024 16:58:34 +0800
Subject: [PATCH 3/3] chore: save

---
 src/packages/infiniteloading/infiniteloading.taro.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/packages/infiniteloading/infiniteloading.taro.tsx b/src/packages/infiniteloading/infiniteloading.taro.tsx
index 897a9995f0..13a3547c8a 100644
--- a/src/packages/infiniteloading/infiniteloading.taro.tsx
+++ b/src/packages/infiniteloading/infiniteloading.taro.tsx
@@ -78,10 +78,11 @@ export const InfiniteLoading: FunctionComponent<
 
   useEffect(() => {
     refreshMaxH.current = threshold
-    setTimeout(() => {
+    const timer = setTimeout(() => {
       getScrollHeight()
     }, 200)
-  }, [hasMore, isInfiniting])
+    return () => clearTimeout(timer)
+  }, [hasMore, isInfiniting, threshold])
 
   /** 获取需要滚动的距离 */
   const getScrollHeight = () => {