@xhsreds/reds-rn-next 0.11.1-beta202601131935 → 0.11.1-beta202601151410

package/lib/esm/components/PullRefresh/RefreshControl.js

@@ -1,7 +1,7 @@
+import { a as _objectSpread2 } from '../../_chunks/BcGvf0Pc.js';
 import React from 'react';
 import { RefreshControl, View } from 'react-native';
 import ProgressIndicator from '../ProgressIndicator/ProgressIndicator.js';
-import '../../_chunks/BcGvf0Pc.js';
 import '../../_chunks/B_AP2PTq.js';
 import '../ProgressIndicator/lottie/getLottieSource.js';
 import '../ProgressIndicator/lottie/index.js';
@@ -31,7 +31,7 @@ var IOSRefreshControl = function IOSRefreshControl(_ref) {
   var onRefresh = _ref.onRefresh,
     refreshing = _ref.refreshing,
     progressViewOffset = _ref.progressViewOffset,
-    colors = _ref.colors;
+    style = _ref.style;
   return /* @__PURE__ */React.createElement(RefreshControl, {
     refreshing: refreshing,
     onRefresh: onRefresh,
@@ -39,10 +39,9 @@ var IOSRefreshControl = function IOSRefreshControl(_ref) {
     style: {
       backgroundColor: "transparent"
     },
-    colors: colors,
     tintColor: "transparent"
   }, refreshing && /* @__PURE__ */React.createElement(View, {
-    style: {
+    style: _objectSpread2({
       position: "absolute",
       top: 0,
       left: 0,
@@ -50,9 +49,8 @@ var IOSRefreshControl = function IOSRefreshControl(_ref) {
       zIndex: 1e3,
       alignItems: "center",
       width: "100%",
-      backgroundColor: "transparent",
       justifyContent: "center"
-    }
+    }, style)
   }, /* @__PURE__ */React.createElement(ProgressIndicator, {
     type: "refresh",
     size: 36

package/lib/esm/components/PullRefresh/RefreshControl.js.map

@@ -1 +1 @@
-{"version":3,"file":"RefreshControl.js","sources":["../../../../src/components/PullRefresh/RefreshControl.tsx"],"sourcesContent":["import React from \"react\";\nimport { View, RefreshControl as RNRefreshControl } from \"react-native\";\nimport { ProgressIndicator } from \"../ProgressIndicator\";\n\ninterface IOSRefreshControlProps {\n  onRefresh: () => void;\n  refreshing: boolean;\n  progressViewOffset?: number;\n  height?: number;\n  colors?: string[];\n}\nconst IOSRefreshControl = ({ onRefresh, refreshing, progressViewOffset, colors }: IOSRefreshControlProps) => {\n  return (\n    <RNRefreshControl\n      refreshing={refreshing}\n      onRefresh={onRefresh}\n      progressViewOffset={progressViewOffset}\n      style={{ backgroundColor: \"transparent\" }}\n      colors={colors}\n      tintColor=\"transparent\" // 隐藏原生指示器\n    >\n      {refreshing && (\n        <View\n          style={{\n            position: \"absolute\",\n            top: 0,\n            left: 0,\n            right: 0,\n            zIndex: 1000,\n            alignItems: \"center\",\n            width: \"100%\",\n            backgroundColor: \"transparent\",\n            justifyContent: \"center\",\n          }}\n        >\n          <ProgressIndicator type={\"refresh\"} size={36} />\n        </View>\n      )}\n    </RNRefreshControl>\n  );\n};\n\nexport default IOSRefreshControl;\n"],"names":["IOSRefreshControl","onRefresh","refreshing","_ref","progressViewOffset","colors","React","createElement","RNRefreshControl","style","backgroundColor","tintColor","View","position","top","left","right","zIndex","alignItems","width","justifyContent","ProgressIndicator","type","size"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,IAAMA,oBAAoB,SAApBA,wBAAuG;AAAA,EAAA,IAAhFC,iBAAAA;IAAWC,UAAY,GAAAC,IAAA,CAAZD,UAAY;IAAAE,kBAAA,GAAAD,IAAA,CAAAC,kBAAA;IAAoBC,cAAAA;AAEpE,EAAA,sBAAAC,KAAA,CAAAC,aAAA,CAACC,cAAA,EAAA;AACCN,IAAAA,UAAA,EAAAA,UAAA;AACAD,IAAAA,SAAA,EAAAA,SAAA;AACAG,IAAAA,kBAAA,EAAAA,kBAAA;AACAK,IAAAA,KAAA,EAAO;AAAEC,MAAAA,eAAA,EAAiB,aAAA;KAAc;AACxCL,IAAAA,MAAA,EAAAA,MAAA;AACAM,IAAAA,SAAU,EAAA,aAAA;GAAA,EAETT,UACC,mBAAAI,KAAA,CAAAC,aAAA,CAACK,IAAA,EAAA;AACCH,IAAAA,KAAO,EAAA;AACLI,MAAAA,QAAU,EAAA,UAAA;AACVC,MAAAA,GAAK,EAAA,CAAA;AACLC,MAAAA,IAAM,EAAA,CAAA;AACNC,MAAAA,KAAO,EAAA,CAAA;AACPC,MAAAA,MAAQ,EAAA,GAAA;AACRC,MAAAA,UAAY,EAAA,QAAA;AACZC,MAAAA,KAAO,EAAA,MAAA;AACPT,MAAAA,eAAiB,EAAA,aAAA;AACjBU,MAAAA,cAAgB,EAAA,QAAA;AAClB,KAAA;AAAA,GAAA,iBAECd,KAAA,CAAAC,aAAA,CAAAc,iBAAA,EAAA;AAAkBC,IAAAA,IAAM,EAAA,SAAA;AAAWC,IAAAA,MAAM,EAAA;GAAI,CAChD,CAEJ,CAAA,CAAA;AAEJ;;;;"}
+{"version":3,"file":"RefreshControl.js","sources":["../../../../src/components/PullRefresh/RefreshControl.tsx"],"sourcesContent":["import React from \"react\";\nimport { View, RefreshControl as RNRefreshControl } from \"react-native\";\nimport { ProgressIndicator } from \"../ProgressIndicator\";\n\ninterface IOSRefreshControlProps {\n  onRefresh: () => void;\n  refreshing: boolean;\n  progressViewOffset?: number;\n  height?: number;\n  style?: any;\n}\nconst IOSRefreshControl = ({ onRefresh, refreshing, progressViewOffset, style }: IOSRefreshControlProps) => {\n  return (\n    <RNRefreshControl\n      refreshing={refreshing}\n      onRefresh={onRefresh}\n      progressViewOffset={progressViewOffset}\n      style={{ backgroundColor: \"transparent\" }}\n      tintColor=\"transparent\" // 隐藏原生指示器\n    >\n      {refreshing && (\n        <View\n          style={{\n            position: \"absolute\",\n            top: 0,\n            left: 0,\n            right: 0,\n            zIndex: 1000,\n            alignItems: \"center\",\n            width: \"100%\",\n            justifyContent: \"center\",\n            ...style,\n          }}\n        >\n          <ProgressIndicator type={\"refresh\"} size={36} />\n        </View>\n      )}\n    </RNRefreshControl>\n  );\n};\n\nexport default IOSRefreshControl;\n"],"names":["IOSRefreshControl","onRefresh","refreshing","_ref","progressViewOffset","style","React","createElement","RNRefreshControl","backgroundColor","tintColor","View","_objectSpread","position","top","left","right","zIndex","alignItems","width","justifyContent","ProgressIndicator","type","size"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,IAAMA,oBAAoB,SAApBA,wBAAsG;AAAA,EAAA,IAA/EC,iBAAAA;IAAWC,UAAY,GAAAC,IAAA,CAAZD,UAAY;IAAAE,kBAAA,GAAAD,IAAA,CAAAC,kBAAA;IAAoBC,aAAAA;AAEpE,EAAA,sBAAAC,KAAA,CAAAC,aAAA,CAACC,cAAA,EAAA;AACCN,IAAAA,UAAA,EAAAA,UAAA;AACAD,IAAAA,SAAA,EAAAA,SAAA;AACAG,IAAAA,kBAAA,EAAAA,kBAAA;AACAC,IAAAA,KAAA,EAAO;AAAEI,MAAAA,eAAA,EAAiB,aAAA;KAAc;AACxCC,IAAAA,SAAU,EAAA,aAAA;GAAA,EAETR,UACC,mBAAAI,KAAA,CAAAC,aAAA,CAACI,IAAA,EAAA;AACCN,IAAAA,KAAO,EAAAO,cAAA,CAAA;AACLC,MAAAA,QAAU,EAAA,UAAA;AACVC,MAAAA,GAAK,EAAA,CAAA;AACLC,MAAAA,IAAM,EAAA,CAAA;AACNC,MAAAA,KAAO,EAAA,CAAA;AACPC,MAAAA,MAAQ,EAAA,GAAA;AACRC,MAAAA,UAAY,EAAA,QAAA;AACZC,MAAAA,KAAO,EAAA,MAAA;AACPC,MAAAA,cAAgB,EAAA,QAAA;AAAA,KAAA,EACbf,KAAA,CAAA;AACL,GAAA,iBAECC,KAAA,CAAAC,aAAA,CAAAc,iBAAA,EAAA;AAAkBC,IAAAA,IAAM,EAAA,SAAA;AAAWC,IAAAA,MAAM,EAAA;GAAI,CAChD,CAEJ,CAAA,CAAA;AAEJ;;;;"}

package/lib/src/components/PullRefresh/RefreshControl.d.ts

@@ -4,7 +4,7 @@ interface IOSRefreshControlProps {
     refreshing: boolean;
     progressViewOffset?: number;
     height?: number;
-    colors?: string[];
+    style?: any;
 }
-declare const IOSRefreshControl: ({ onRefresh, refreshing, progressViewOffset, colors }: IOSRefreshControlProps) => React.JSX.Element;
+declare const IOSRefreshControl: ({ onRefresh, refreshing, progressViewOffset, style }: IOSRefreshControlProps) => React.JSX.Element;
 export default IOSRefreshControl;

package/lib/types/components/PullRefresh/RefreshControl.d.ts

@@ -4,7 +4,7 @@ interface IOSRefreshControlProps {
     refreshing: boolean;
     progressViewOffset?: number;
     height?: number;
-    colors?: string[];
+    style?: any;
 }
-declare const IOSRefreshControl: ({ onRefresh, refreshing, progressViewOffset, colors }: IOSRefreshControlProps) => React.JSX.Element;
+declare const IOSRefreshControl: ({ onRefresh, refreshing, progressViewOffset, style }: IOSRefreshControlProps) => React.JSX.Element;
 export default IOSRefreshControl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xhsreds/reds-rn-next",
-  "version": "0.11.1-beta202601131935",
+  "version": "0.11.1-beta202601151410",
   "author": "贾斌(呀哈) <jiabin@xiaohongshu.com>",
   "license": "ISC",
   "dependencies": {
@@ -27,7 +27,7 @@
     "react-native-svg": "13.14.0",
     "@xhs/react-native-harmony": "*",
     "@xhs/reds-components": "*",
-    "@xhsreds/reds-token-next": "0.11.1-beta202601131935"
+    "@xhsreds/reds-token-next": "0.11.1-beta202601151410"
   },
   "peerDependenciesMeta": {
     "ozone-schema-web": {

package/src/components/PullRefresh/PullRefresh.tsx

@@ -194,10 +194,8 @@ export default function PullRefresh(props: RedsPullRefresh) {
     }
     setAnimation(animation);
     animation.start(({ finished }: { finished: boolean }) => {
-      if (finished) {
-        cb && cb();
-        setAnimation(undefined);
-      }
+      cb && cb();
+      setAnimation(undefined);
     });
   };
 
@@ -341,6 +339,30 @@ export default function PullRefresh(props: RedsPullRefresh) {
           updatePullState(PullState.FINISH);
         }, props?.msHoldingTime ?? 1000),
       );
+      setIsRefreshing(false);
+    }
+    // 滚动结束了但是还有下拉距离
+    if (effectiveRefreshing === false && pullState === PullState.FINISH) {
+      console.log("滚动结束了但是还有下拉距离");
+      setIsPulling(false);
+      updatePullState(PullState.HOLDING);
+      setPullTimeout(
+        //@ts-ignore
+        setTimeout(() => {
+          pan.flattenOffset();
+          setMoveHeight(0);
+          setMovePercent(0);
+          props.onPullProgress?.({ distance: 0, percent: 0 });
+          lastMoveHeightRef.current = 0;
+          animatedTo(0, () => {
+            setIsPulling(false);
+            updatePullState(PullState.INIT);
+            pan.setValue(0);
+            pan.flattenOffset();
+          });
+          updatePullState(PullState.FINISH);
+        }, props?.msHoldingTime ?? 1000),
+      );
 
       setIsRefreshing(false);
     }

package/src/components/PullRefresh/RefreshControl.tsx

@@ -7,16 +7,15 @@ interface IOSRefreshControlProps {
   refreshing: boolean;
   progressViewOffset?: number;
   height?: number;
-  colors?: string[];
+  style?: any;
 }
-const IOSRefreshControl = ({ onRefresh, refreshing, progressViewOffset, colors }: IOSRefreshControlProps) => {
+const IOSRefreshControl = ({ onRefresh, refreshing, progressViewOffset, style }: IOSRefreshControlProps) => {
   return (
     <RNRefreshControl
       refreshing={refreshing}
       onRefresh={onRefresh}
       progressViewOffset={progressViewOffset}
       style={{ backgroundColor: "transparent" }}
-      colors={colors}
       tintColor="transparent" // 隐藏原生指示器
     >
       {refreshing && (
@@ -29,8 +28,8 @@ const IOSRefreshControl = ({ onRefresh, refreshing, progressViewOffset, colors }
             zIndex: 1000,
             alignItems: "center",
             width: "100%",
-            backgroundColor: "transparent",
             justifyContent: "center",
+            ...style,
           }}
         >
           <ProgressIndicator type={"refresh"} size={36} />

package/src/i18n/@types/resources.d.ts

@@ -1,32 +1,32 @@
 interface Resources {
   componentKey: {
-    sureKey: "Confirm";
-    satisfyKey: "Satisfy";
-    confirmKey: "Confirm";
-    uploadingKey: "Uploading";
-    resetKey: "Reset";
-    NoDataKey: "No data available at the moment";
-    liveStreamingKey: "live";
-    generallyKey: "Generally";
-    uploadFailedKey: "Upload failed";
-    submitKey: "Submit";
-    requestSuccessfulKey: "Request successful";
-    cancelKey: "Cancel";
-    PullDownToRefreshKey: "Pull down to refresh";
-    selectAllKey: "SelectAll";
-    requestDataKey: "Request data";
-    closeKey: "Close";
-    veryBadKey: "Very bad";
-    searchKey: "Search";
-    expandKey: "Expand";
-    IDCardPhotoKey: "ID card photo";
-    finishKey: "Finish";
-    surpriseKey: "Surprise";
-    releaseRefreshKey: "Release refresh";
-    nationalEmblemSideOfIDCardKey: "National emblem side of ID card";
-    buttonKey: "Button";
-    jumpKey: "Jump";
-    disappointmentKey: "Disappointment";
+    sureKey: "確定";
+    satisfyKey: "滿意";
+    confirmKey: "確認";
+    uploadingKey: "上傳中";
+    resetKey: "重置";
+    NoDataKey: "暫無數據";
+    liveStreamingKey: "直播";
+    generallyKey: "一般";
+    uploadFailedKey: "上傳失敗";
+    submitKey: "提交";
+    requestSuccessfulKey: "請求成功";
+    cancelKey: "取消";
+    PullDownToRefreshKey: "下拉重繪";
+    selectAllKey: "全選";
+    requestDataKey: "請求數據中";
+    closeKey: "收起";
+    veryBadKey: "極差";
+    searchKey: "蒐索";
+    expandKey: "展開";
+    IDCardPhotoKey: "身份證人像面";
+    finishKey: "完成";
+    surpriseKey: "驚喜";
+    releaseRefreshKey: "鬆開重繪";
+    nationalEmblemSideOfIDCardKey: "身份证国徽面";
+    buttonKey: "按鈕";
+    jumpKey: "跳轉";
+    disappointmentKey: "失望";
   };
 }
 export default Resources;

package/src/i18n/index.json

@@ -1,4 +1,35 @@
 {
+  "zh_tw": {
+    "componentKey": {
+      "sureKey": "確定",
+      "satisfyKey": "滿意",
+      "confirmKey": "確認",
+      "uploadingKey": "上傳中",
+      "resetKey": "重置",
+      "NoDataKey": "暫無數據",
+      "liveStreamingKey": "直播",
+      "generallyKey": "一般",
+      "uploadFailedKey": "上傳失敗",
+      "submitKey": "提交",
+      "requestSuccessfulKey": "請求成功",
+      "cancelKey": "取消",
+      "PullDownToRefreshKey": "下拉重繪",
+      "selectAllKey": "全選",
+      "requestDataKey": "請求數據中",
+      "closeKey": "收起",
+      "veryBadKey": "極差",
+      "searchKey": "蒐索",
+      "expandKey": "展開",
+      "IDCardPhotoKey": "身份證人像面",
+      "finishKey": "完成",
+      "surpriseKey": "驚喜",
+      "releaseRefreshKey": "鬆開重繪",
+      "nationalEmblemSideOfIDCardKey": "身份证国徽面",
+      "buttonKey": "按鈕",
+      "jumpKey": "跳轉",
+      "disappointmentKey": "失望"
+    }
+  },
   "en_us": {
     "componentKey": {
       "sureKey": "Confirm",
@@ -60,36 +91,5 @@
       "jumpKey": "跳转",
       "disappointmentKey": "失望"
     }
-  },
-  "zh_tw": {
-    "componentKey": {
-      "sureKey": "確定",
-      "satisfyKey": "滿意",
-      "confirmKey": "確認",
-      "uploadingKey": "上傳中",
-      "resetKey": "重置",
-      "NoDataKey": "暫無數據",
-      "liveStreamingKey": "直播",
-      "generallyKey": "一般",
-      "uploadFailedKey": "上傳失敗",
-      "submitKey": "提交",
-      "requestSuccessfulKey": "請求成功",
-      "cancelKey": "取消",
-      "PullDownToRefreshKey": "下拉重繪",
-      "selectAllKey": "全選",
-      "requestDataKey": "請求數據中",
-      "closeKey": "收起",
-      "veryBadKey": "極差",
-      "searchKey": "蒐索",
-      "expandKey": "展開",
-      "IDCardPhotoKey": "身份證人像面",
-      "finishKey": "完成",
-      "surpriseKey": "驚喜",
-      "releaseRefreshKey": "鬆開重繪",
-      "nationalEmblemSideOfIDCardKey": "身份证国徽面",
-      "buttonKey": "按鈕",
-      "jumpKey": "跳轉",
-      "disappointmentKey": "失望"
-    }
   }
 }