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

package/src/components/PullRefresh/RefreshControl.tsx

@@ -1,6 +1,5 @@
 import React from "react";
-import { View } from "react-native";
-import { RefreshControl } from "react-native-gesture-handler";
+import { View, RefreshControl as RNRefreshControl } from "react-native";
 import { ProgressIndicator } from "../ProgressIndicator";
 
 interface IOSRefreshControlProps {
@@ -8,25 +7,27 @@ interface IOSRefreshControlProps {
   refreshing: boolean;
   progressViewOffset?: number;
   height?: number;
+  colors?: string[];
 }
-const IOSRefreshControl = ({ onRefresh, refreshing, progressViewOffset, height }: IOSRefreshControlProps) => {
+const IOSRefreshControl = ({ onRefresh, refreshing, progressViewOffset, colors }: IOSRefreshControlProps) => {
   return (
-    <RefreshControl
+    <RNRefreshControl
       refreshing={refreshing}
       onRefresh={onRefresh}
+      progressViewOffset={progressViewOffset}
       style={{ backgroundColor: "transparent" }}
+      colors={colors}
       tintColor="transparent" // 隐藏原生指示器
     >
       {refreshing && (
         <View
           style={{
             position: "absolute",
-            top: progressViewOffset || 0,
+            top: 0,
             left: 0,
             right: 0,
             zIndex: 1000,
             alignItems: "center",
-            height: height || 30,
             width: "100%",
             backgroundColor: "transparent",
             justifyContent: "center",
@@ -35,7 +36,7 @@ const IOSRefreshControl = ({ onRefresh, refreshing, progressViewOffset, height }
           <ProgressIndicator type={"refresh"} size={36} />
         </View>
       )}
-    </RefreshControl>
+    </RNRefreshControl>
   );
 };
 

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

@@ -1,32 +1,32 @@
 interface Resources {
   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: "失望";
+    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";
   };
 }
 export default Resources;

package/src/i18n/index.json

@@ -1,4 +1,35 @@
 {
+  "en_us": {
+    "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"
+    }
+  },
   "zh_cn": {
     "componentKey": {
       "sureKey": "确定",
@@ -60,36 +91,5 @@
       "jumpKey": "跳轉",
       "disappointmentKey": "失望"
     }
-  },
-  "en_us": {
-    "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"
-    }
   }
 }