@xhsreds/reds-rn-next 0.10.1-beta202512112152 → 0.10.1-beta202512171921

package/lib/cjs/components/PullRefresh/component.js

@@ -37,7 +37,7 @@ require('@xhs/lottie-react-native');
 require('../../_chunks/DoNqsT5m.js');
 require('../LanguageProvider/hooks/LanguageContext.js');
 require('../../i18n/index.js');
-require('@xhs/reds-components/libs/svg');
+require('react-native-svg');
 
 var DefaultRefreshControl = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var PullDownToRefreshKey = props.pullDownToRefreshText || components_LanguageProvider_hooks_useLanguage.useLanguage("componentKey", "PullDownToRefreshKey");

package/lib/cjs/components/PullRefresh/index.js

@@ -39,7 +39,7 @@ require('../LanguageProvider/hooks/LanguageContext.js');
 require('../LanguageProvider/hooks/useLanguage.js');
 require('../../i18n/index.js');
 require('./Refresh.js');
-require('@xhs/reds-components/libs/svg');
+require('react-native-svg');
 
 
 

package/lib/cjs/components/Radio/Radio.js

@@ -224,7 +224,7 @@ require('../List/styles.js');
 require('../Skeleton/Skeleton.js');
 require('../Skeleton/Item/SkeletonItem.js');
 require('../Skeleton/Item/styles.js');
-require('@xhs/reds-components/libs/svg');
+require('react-native-svg');
 require('../Skeleton/styles.js');
 require('../Skeleton/Skeleton69.js');
 require('../Skeleton/Item/SkeletonItem69.js');

package/lib/cjs/components/Radio/index.js

@@ -176,7 +176,7 @@ require('../../_chunks/DC7LGH1r.js');
 require('../Skeleton/Item/SkeletonItem.js');
 require('../../_chunks/EQWxZmIF.js');
 require('../Skeleton/Item/styles.js');
-require('@xhs/reds-components/libs/svg');
+require('react-native-svg');
 require('../Skeleton/styles.js');
 require('../Skeleton/Skeleton69.js');
 require('../Skeleton/Item/SkeletonItem69.js');

package/lib/cjs/components/Skeleton/Item/SkeletonItem.js

@@ -10,7 +10,7 @@ var components_Skeleton_Item_styles = require('./styles.js');
 require('../../ConfigProvider/hooks/ConfigCache/ConfigCache.js');
 require('@xhs/reds-apm/src/index.native');
 var components_ConfigProvider_hooks_themeToken_useThemeToken = require('../../ConfigProvider/hooks/themeToken/useThemeToken.js');
-var Svg = require('@xhs/reds-components/libs/svg');
+var Svg = require('react-native-svg');
 require('@xhsreds/reds-token-next');
 require('../../ConfigProvider/hooks/ConfigContext/ConfigContext.js');
 

package/lib/cjs/components/Skeleton/Item/SkeletonItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"SkeletonItem.js","sources":["../../../../../src/components/Skeleton/Item/SkeletonItem.tsx"],"sourcesContent":["import React, { useState, useRef, useEffect, useMemo, useCallback } from \"react\";\nimport { View, Easing, Animated, Text } from \"react-native\";\nimport { RedsSkeletonItem, SkeletonItemDefaultProps } from \"./interface/index\";\nimport createStyles from \"./styles\";\nimport { useThemeColor } from \"../../ConfigProvider\";\nimport Svg, { Defs, LinearGradient, Stop, Rect, ClipPath } from \"@xhs/reds-components/libs/svg\";\n\nconst RectAnimation = Animated.createAnimatedComponent(Rect);\n\nconst SkeletonItem = (props: RedsSkeletonItem) => {\n  const {\n    loading,\n    type,\n    animation,\n    containerStyle,\n    borderRadius, // 解构新属性\n  } = { ...SkeletonItemDefaultProps, ...props };\n\n  const animValue = useRef(new Animated.Value(0)).current;\n  const themeColor = useThemeColor();\n  const styles = createStyles(type);\n\n  useEffect(() => {\n    if (animation) {\n      Animated.loop(\n        Animated.timing(animValue, {\n          toValue: 1,\n          duration: 2000,\n          easing: Easing.linear,\n          useNativeDriver: false,\n        }),\n      ).start();\n    }\n  }, [animation]);\n\n  const interpolatedValue = animValue.interpolate({\n    inputRange: [0, 1],\n    outputRange: [\"-148%\", \"-8%\"],\n  });\n\n  return (\n    loading && (\n      <Animated.View\n        style={[\n          styles,\n          {\n            borderRadius: borderRadius, // 应用 borderRadius\n            overflow: \"hidden\", // 确保内容不会超出圆角边界\n          },\n          containerStyle,\n        ]}\n      >\n        <Svg height=\"100%\" width=\"100%\">\n          <Defs>\n            <LinearGradient id=\"gradient\" x1=\"0\" y1=\"0\" x2=\"100%\" y2=\"0%\">\n              <Stop offset=\"25%\" stopColor={props.color || themeColor.Fill1} stopOpacity={0.2} />\n              <Stop offset=\"28%\" stopColor={props.color || themeColor.Fill1} stopOpacity={0.15} />\n              <Stop offset=\"35%\" stopColor={props.color || themeColor.Fill1} stopOpacity={0.2} />\n            </LinearGradient>\n            {/* 如果需要 SVG 内容也遵循圆角，添加 ClipPath */}\n            {borderRadius > 0 && (\n              <ClipPath id=\"clip\">\n                <Rect\n                  x=\"0\"\n                  y=\"0\"\n                  width=\"100%\"\n                  height=\"100%\"\n                  rx={type === \"avatar\" ? 100 : borderRadius}\n                  ry={type === \"avatar\" ? 100 : borderRadius}\n                />\n              </ClipPath>\n            )}\n          </Defs>\n          <RectAnimation\n            x={interpolatedValue}\n            y=\"0%\"\n            width=\"400%\"\n            height=\"100%\"\n            fill=\"url(#gradient)\"\n            opacity={0.3}\n            clipPath={borderRadius > 0 ? \"url(#clip)\" : undefined} // 应用裁剪路径\n          />\n        </Svg>\n      </Animated.View>\n    )\n  );\n};\n\nSkeletonItem.defaultProps = SkeletonItemDefaultProps;\n\nexport default SkeletonItem;\n"],"names":["RectAnimation","Animated","createAnimatedComponent","Rect","SkeletonItem","props","_SkeletonItemDefaultP","_objectSpread","SkeletonItemDefaultProps","loading","type","animation","containerStyle","borderRadius","animValue","useRef","Value","current","themeColor","useThemeColor","styles","createStyles","useEffect","loop","timing","toValue","duration","easing","Easing","linear","useNativeDriver","start","interpolatedValue","interpolate","inputRange","outputRange","React","createElement","View","style","overflow","Svg","height","width","Defs","LinearGradient","id","x1","y1","x2","y2","Stop","offset","stopColor","color","Fill1","stopOpacity","ClipPath","x","y","rx","ry","fill","opacity","clipPath","defaultProps"],"mappings":"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"}
+{"version":3,"file":"SkeletonItem.js","sources":["../../../../../src/components/Skeleton/Item/SkeletonItem.tsx"],"sourcesContent":["import React, { useState, useRef, useEffect, useMemo, useCallback } from \"react\";\nimport { View, Easing, Animated, Text } from \"react-native\";\nimport { RedsSkeletonItem, SkeletonItemDefaultProps } from \"./interface/index\";\nimport createStyles from \"./styles\";\nimport { useThemeColor } from \"../../ConfigProvider\";\nimport Svg, { Defs, LinearGradient, Stop, Rect, ClipPath } from \"react-native-svg\";\n\nconst RectAnimation = Animated.createAnimatedComponent(Rect);\n\nconst SkeletonItem = (props: RedsSkeletonItem) => {\n  const {\n    loading,\n    type,\n    animation,\n    containerStyle,\n    borderRadius, // 解构新属性\n  } = { ...SkeletonItemDefaultProps, ...props };\n\n  const animValue = useRef(new Animated.Value(0)).current;\n  const themeColor = useThemeColor();\n  const styles = createStyles(type);\n\n  useEffect(() => {\n    if (animation) {\n      Animated.loop(\n        Animated.timing(animValue, {\n          toValue: 1,\n          duration: 2000,\n          easing: Easing.linear,\n          useNativeDriver: false,\n        }),\n      ).start();\n    }\n  }, [animation]);\n\n  const interpolatedValue = animValue.interpolate({\n    inputRange: [0, 1],\n    outputRange: [\"-148%\", \"-8%\"],\n  });\n\n  return (\n    loading && (\n      <Animated.View\n        style={[\n          styles,\n          {\n            borderRadius: borderRadius, // 应用 borderRadius\n            overflow: \"hidden\", // 确保内容不会超出圆角边界\n          },\n          containerStyle,\n        ]}\n      >\n        <Svg height=\"100%\" width=\"100%\">\n          <Defs>\n            <LinearGradient id=\"gradient\" x1=\"0\" y1=\"0\" x2=\"100%\" y2=\"0%\">\n              <Stop offset=\"25%\" stopColor={props.color || themeColor.Fill1} stopOpacity={0.2} />\n              <Stop offset=\"28%\" stopColor={props.color || themeColor.Fill1} stopOpacity={0.15} />\n              <Stop offset=\"35%\" stopColor={props.color || themeColor.Fill1} stopOpacity={0.2} />\n            </LinearGradient>\n            {/* 如果需要 SVG 内容也遵循圆角，添加 ClipPath */}\n            {borderRadius > 0 && (\n              <ClipPath id=\"clip\">\n                <Rect\n                  x=\"0\"\n                  y=\"0\"\n                  width=\"100%\"\n                  height=\"100%\"\n                  rx={type === \"avatar\" ? 100 : borderRadius}\n                  ry={type === \"avatar\" ? 100 : borderRadius}\n                />\n              </ClipPath>\n            )}\n          </Defs>\n          <RectAnimation\n            x={interpolatedValue}\n            y=\"0%\"\n            width=\"400%\"\n            height=\"100%\"\n            fill=\"url(#gradient)\"\n            opacity={0.3}\n            clipPath={borderRadius > 0 ? \"url(#clip)\" : undefined} // 应用裁剪路径\n          />\n        </Svg>\n      </Animated.View>\n    )\n  );\n};\n\nSkeletonItem.defaultProps = SkeletonItemDefaultProps;\n\nexport default SkeletonItem;\n"],"names":["RectAnimation","Animated","createAnimatedComponent","Rect","SkeletonItem","props","_SkeletonItemDefaultP","_objectSpread","SkeletonItemDefaultProps","loading","type","animation","containerStyle","borderRadius","animValue","useRef","Value","current","themeColor","useThemeColor","styles","createStyles","useEffect","loop","timing","toValue","duration","easing","Easing","linear","useNativeDriver","start","interpolatedValue","interpolate","inputRange","outputRange","React","createElement","View","style","overflow","Svg","height","width","Defs","LinearGradient","id","x1","y1","x2","y2","Stop","offset","stopColor","color","Fill1","stopOpacity","ClipPath","x","y","rx","ry","fill","opacity","clipPath","defaultProps"],"mappings":"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"}

package/lib/cjs/components/Skeleton/Skeleton.js

@@ -16,7 +16,7 @@ require('@xhsreds/reds-token-next');
 require('@xhs/reds-apm/src/index.native');
 require('../ConfigProvider/hooks/themeToken/useThemeToken.js');
 require('../ConfigProvider/hooks/ConfigContext/ConfigContext.js');
-require('@xhs/reds-components/libs/svg');
+require('react-native-svg');
 require('../../pvCount/pvData.js');
 
 var Skeleton = function Skeleton(props) {

package/lib/cjs/components/Skeleton/index.js

@@ -20,7 +20,7 @@ require('../ConfigProvider/hooks/ConfigCache/ConfigCache.js');
 require('@xhsreds/reds-token-next');
 require('../ConfigProvider/hooks/themeToken/useThemeToken.js');
 require('../ConfigProvider/hooks/ConfigContext/ConfigContext.js');
-require('@xhs/reds-components/libs/svg');
+require('react-native-svg');
 
 var _Platform$constants, _Platform$constants2;
 var SkeletonComponent = ((_Platform$constants = reactNative.Platform.constants) === null || _Platform$constants === void 0 || (_Platform$constants = _Platform$constants.reactNativeVersion) === null || _Platform$constants === void 0 ? void 0 : _Platform$constants.minor) === 72 ? components_Skeleton_Skeleton.default : components_Skeleton_Skeleton69.default;

package/lib/cjs/index.js

@@ -223,7 +223,7 @@ require('./components/List/styles.js');
 require('./components/Skeleton/Skeleton.js');
 require('./components/Skeleton/Item/SkeletonItem.js');
 require('./components/Skeleton/Item/styles.js');
-require('@xhs/reds-components/libs/svg');
+require('react-native-svg');
 require('./components/Skeleton/styles.js');
 require('./components/Skeleton/Skeleton69.js');
 require('./components/Skeleton/Item/SkeletonItem69.js');

package/lib/cjs/pvCount/pvData.js

@@ -29,8 +29,7 @@ var peerDependencies = {
 	"react-native": "*",
 	"react-native-fs": "2.20.0",
 	"react-native-svg": "13.14.0",
-	"@xhs/react-native-harmony": "*",
-	"@xhs/reds-components": "*"
+	"@xhs/react-native-harmony": "*"
 };
 var peerDependenciesMeta = {
 	"ozone-schema-web": {

package/lib/cjs/pvCount/pvData.js.map

@@ -1 +1 @@
-{"version":3,"file":"pvData.js","sources":["../../../src/pvCount/pvData.ts"],"sourcesContent":["import pack from \"../../package.json\";\nimport { push } from \"@xhs/reds-apm/src/index.native\";\nimport { pushByrequestIdleCallback } from \"@xhs/reds-apm/src/index.native\";\n\nlet globalPvData: Record<string, number> = {};\nexport const pushGlobalData = () => {\n  if (Object.keys(globalPvData).length) {\n    push({\n      context_artifactName: \"reds-rn-next\",\n      context_aritfactVersion: pack.version,\n      measurement_name: \"reds_component_usage_pv\",\n      measurement_data: {\n        packageName: process.env.APP_NAME,\n        packageVersion: process.env.APP_VERSION,\n        pvData: JSON.stringify(globalPvData),\n      },\n    });\n    // 上报完数据后清空数据\n    globalPvData = {};\n  }\n};\n\nexport const pvCount = (componentName: string) => {\n  if (!globalPvData[componentName]) {\n    globalPvData[componentName] = 1;\n  } else {\n    globalPvData[componentName]++;\n  }\n  pushByrequestIdleCallback(pushGlobalData);\n};\n"],"names":["globalPvData","pushGlobalData","Object","keys","length","push","context_artifactName","context_aritfactVersion","pack","version","measurement_name","measurement_data","packageName","process","env","APP_NAME","packageVersion","APP_VERSION","pvData","JSON","stringify","pvCount","componentName","pushByrequestIdleCallback"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAIA,eAAuC,EAAC,CAAA;IAC/BC,iBAAiB,SAAjBA,iBAAuB;EAClC,IAAIC,MAAO,CAAAC,IAAA,CAAKH,YAAY,CAAA,CAAEI,MAAQ,EAAA;AAC/BC,IAAAA,iBAAA,CAAA;AACHC,MAAAA,oBAAsB,EAAA,cAAA;MACtBC,yBAAyBC,IAAK,CAAAC,OAAA;AAC9BC,MAAAA,gBAAkB,EAAA,yBAAA;AAClBC,MAAAA,gBAAkB,EAAA;AAChBC,QAAAA,WAAA,EAAaC,QAAQC,GAAI,CAAAC,QAAA;AACzBC,QAAAA,cAAA,EAAgBH,QAAQC,GAAI,CAAAG,WAAA;AAC5BC,QAAAA,MAAA,EAAQC,IAAK,CAAAC,SAAA,CAAUpB,YAAY,CAAA;AACrC,OAAA;AACF,KAAC,CAAA,CAAA;IAEDA,YAAA,GAAe,EAAC,CAAA;AAClB,GAAA;AACF,EAAA;IAEaqB,OAAA,GAAU,SAAVA,OAAAA,CAAWC,aAA0B,EAAA;AAC5C,EAAA,IAAA,CAACtB,YAAa,CAAAsB,aAAa,CAAG,EAAA;AAChCtB,IAAAA,YAAA,CAAasB,aAAa,CAAI,GAAA,CAAA,CAAA;AAChC,GAAO,MAAA;IACLtB,YAAA,CAAasB,aAAa,CAAA,EAAA,CAAA;AAC5B,GAAA;EACAC,sCAAA,CAA0BtB,cAAc,CAAA,CAAA;AAC1C;;;;;"}
+{"version":3,"file":"pvData.js","sources":["../../../src/pvCount/pvData.ts"],"sourcesContent":["import pack from \"../../package.json\";\nimport { push } from \"@xhs/reds-apm/src/index.native\";\nimport { pushByrequestIdleCallback } from \"@xhs/reds-apm/src/index.native\";\n\nlet globalPvData: Record<string, number> = {};\nexport const pushGlobalData = () => {\n  if (Object.keys(globalPvData).length) {\n    push({\n      context_artifactName: \"reds-rn-next\",\n      context_aritfactVersion: pack.version,\n      measurement_name: \"reds_component_usage_pv\",\n      measurement_data: {\n        packageName: process.env.APP_NAME,\n        packageVersion: process.env.APP_VERSION,\n        pvData: JSON.stringify(globalPvData),\n      },\n    });\n    // 上报完数据后清空数据\n    globalPvData = {};\n  }\n};\n\nexport const pvCount = (componentName: string) => {\n  if (!globalPvData[componentName]) {\n    globalPvData[componentName] = 1;\n  } else {\n    globalPvData[componentName]++;\n  }\n  pushByrequestIdleCallback(pushGlobalData);\n};\n"],"names":["globalPvData","pushGlobalData","Object","keys","length","push","context_artifactName","context_aritfactVersion","pack","version","measurement_name","measurement_data","packageName","process","env","APP_NAME","packageVersion","APP_VERSION","pvData","JSON","stringify","pvCount","componentName","pushByrequestIdleCallback"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAIA,eAAuC,EAAC,CAAA;IAC/BC,iBAAiB,SAAjBA,iBAAuB;EAClC,IAAIC,MAAO,CAAAC,IAAA,CAAKH,YAAY,CAAA,CAAEI,MAAQ,EAAA;AAC/BC,IAAAA,iBAAA,CAAA;AACHC,MAAAA,oBAAsB,EAAA,cAAA;MACtBC,yBAAyBC,IAAK,CAAAC,OAAA;AAC9BC,MAAAA,gBAAkB,EAAA,yBAAA;AAClBC,MAAAA,gBAAkB,EAAA;AAChBC,QAAAA,WAAA,EAAaC,QAAQC,GAAI,CAAAC,QAAA;AACzBC,QAAAA,cAAA,EAAgBH,QAAQC,GAAI,CAAAG,WAAA;AAC5BC,QAAAA,MAAA,EAAQC,IAAK,CAAAC,SAAA,CAAUpB,YAAY,CAAA;AACrC,OAAA;AACF,KAAC,CAAA,CAAA;IAEDA,YAAA,GAAe,EAAC,CAAA;AAClB,GAAA;AACF,EAAA;IAEaqB,OAAA,GAAU,SAAVA,OAAAA,CAAWC,aAA0B,EAAA;AAC5C,EAAA,IAAA,CAACtB,YAAa,CAAAsB,aAAa,CAAG,EAAA;AAChCtB,IAAAA,YAAA,CAAasB,aAAa,CAAI,GAAA,CAAA,CAAA;AAChC,GAAO,MAAA;IACLtB,YAAA,CAAasB,aAAa,CAAA,EAAA,CAAA;AAC5B,GAAA;EACAC,sCAAA,CAA0BtB,cAAc,CAAA,CAAA;AAC1C;;;;;"}

package/lib/esm/components/Icon/Icon.72.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo } from 'react';
 import { Image, TouchableOpacity } from 'react-native';
-import { SvgXml } from '@xhs/reds-components/libs/svg';
+import { SvgXml } from 'react-native-svg';
 import { i as iconType, I as IconDefaultProps } from '../../_chunks/xi-gXLIR.js';
 
 var Icon = function Icon(props) {

package/lib/esm/components/Icon/Icon.72.js.map

@@ -1 +1 @@
-{"version":3,"file":"Icon.72.js","sources":["../../../../src/components/Icon/Icon.72.tsx"],"sourcesContent":["import React, { useCallback, useMemo } from \"react\";\nimport { GestureResponderEvent, Image, TouchableOpacity } from \"react-native\";\nimport { SvgXml } from \"@xhs/reds-components/libs/svg\";\nimport { RedsIcon, IconDefaultProps, iconType } from \"./interface/index\";\nconst Icon: React.FC<RedsIcon> = (props) => {\n  const { size, fill, onClick, icon } = props || {};\n\n  /** icon点击事件 */\n  const toggleIcon = useCallback(\n    (e: GestureResponderEvent) => {\n      onClick?.(e);\n    },\n    [onClick],\n  );\n\n  /** icon svg 数据 */\n  const iconSvg = useMemo(() => {\n    if (props?.type === iconType.svg) {\n      if (typeof icon === \"function\") {\n        return size ? (fill ? icon({ size: size, fill: fill }) : icon({ size: size })) : icon({ size: 24 });\n      } else {\n        return icon ?? \"\";\n      }\n    } else {\n      return \"\";\n    }\n  }, [icon, size, fill]);\n\n  const isImage = useMemo(() => {\n    return (\n      props.type === iconType.image ||\n      (typeof icon === \"string\" && icon.includes(\"http\") && icon.indexOf(\"<svg\") === -1)\n    );\n  }, [props.type, icon]);\n\n  const Wrapper = (props: any) => {\n    return onClick ? (\n      <TouchableOpacity\n        testID=\"touchable-element\"\n        onPress={toggleIcon}\n        activeOpacity={1}\n        hitSlop={{ top: 20, bottom: 20, left: 20, right: 20 }}\n      >\n        {props.children}\n      </TouchableOpacity>\n    ) : (\n      props.children\n    );\n  };\n\n  return (\n    <Wrapper>\n      {isImage && icon ? (\n        <Image\n          source={{ uri: icon as string }}\n          style={[props.size ? { height: props.size, width: props.size } : {}, props.styles ? props.styles : {}]}\n        />\n      ) : (\n        iconSvg && <SvgXml testID=\"svg-element\" xml={iconSvg || \"\"} />\n      )}\n    </Wrapper>\n  );\n};\n\nexport default Icon;\n\nIcon.defaultProps = IconDefaultProps;\n"],"names":["Icon","props","_ref","size","fill","onClick","icon","toggleIcon","useCallback","e","iconSvg","useMemo","type","iconType","svg","isImage","image","includes","indexOf","Wrapper","React","createElement","TouchableOpacity","testID","onPress","activeOpacity","hitSlop","top","bottom","left","right","children","Image","source","uri","style","height","width","styles","SvgXml","xml","defaultProps","IconDefaultProps"],"mappings":"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"}
+{"version":3,"file":"Icon.72.js","sources":["../../../../src/components/Icon/Icon.72.tsx"],"sourcesContent":["import React, { useCallback, useMemo } from \"react\";\nimport { GestureResponderEvent, Image, TouchableOpacity } from \"react-native\";\nimport { SvgXml } from \"react-native-svg\";\nimport { RedsIcon, IconDefaultProps, iconType } from \"./interface/index\";\nconst Icon: React.FC<RedsIcon> = (props) => {\n  const { size, fill, onClick, icon } = props || {};\n\n  /** icon点击事件 */\n  const toggleIcon = useCallback(\n    (e: GestureResponderEvent) => {\n      onClick?.(e);\n    },\n    [onClick],\n  );\n\n  /** icon svg 数据 */\n  const iconSvg = useMemo(() => {\n    if (props?.type === iconType.svg) {\n      if (typeof icon === \"function\") {\n        return size ? (fill ? icon({ size: size, fill: fill }) : icon({ size: size })) : icon({ size: 24 });\n      } else {\n        return icon ?? \"\";\n      }\n    } else {\n      return \"\";\n    }\n  }, [icon, size, fill]);\n\n  const isImage = useMemo(() => {\n    return (\n      props.type === iconType.image ||\n      (typeof icon === \"string\" && icon.includes(\"http\") && icon.indexOf(\"<svg\") === -1)\n    );\n  }, [props.type, icon]);\n\n  const Wrapper = (props: any) => {\n    return onClick ? (\n      <TouchableOpacity\n        testID=\"touchable-element\"\n        onPress={toggleIcon}\n        activeOpacity={1}\n        hitSlop={{ top: 20, bottom: 20, left: 20, right: 20 }}\n      >\n        {props.children}\n      </TouchableOpacity>\n    ) : (\n      props.children\n    );\n  };\n\n  return (\n    <Wrapper>\n      {isImage && icon ? (\n        <Image\n          source={{ uri: icon as string }}\n          style={[props.size ? { height: props.size, width: props.size } : {}, props.styles ? props.styles : {}]}\n        />\n      ) : (\n        iconSvg && <SvgXml testID=\"svg-element\" xml={iconSvg || \"\"} />\n      )}\n    </Wrapper>\n  );\n};\n\nexport default Icon;\n\nIcon.defaultProps = IconDefaultProps;\n"],"names":["Icon","props","_ref","size","fill","onClick","icon","toggleIcon","useCallback","e","iconSvg","useMemo","type","iconType","svg","isImage","image","includes","indexOf","Wrapper","React","createElement","TouchableOpacity","testID","onPress","activeOpacity","hitSlop","top","bottom","left","right","children","Image","source","uri","style","height","width","styles","SvgXml","xml","defaultProps","IconDefaultProps"],"mappings":"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"}

package/lib/esm/components/Image/CircularProgress.js

@@ -1,7 +1,7 @@
 import { lightColor } from '@xhsreds/reds-token-next';
 import React, { useRef, useEffect } from 'react';
 import { Animated, StyleSheet, View } from 'react-native';
-import Svg, { Circle, G } from '@xhs/reds-components/libs/svg';
+import Svg, { Circle, G } from 'react-native-svg';
 
 var AnimatedCircle = Animated.createAnimatedComponent(Circle);
 var CircularProgress = function CircularProgress(_ref) {

package/lib/esm/components/Image/CircularProgress.js.map

@@ -1 +1 @@
-{"version":3,"file":"CircularProgress.js","sources":["../../../../src/components/Image/CircularProgress.tsx"],"sourcesContent":["import { lightColor } from \"@xhsreds/reds-token-next\";\nimport React, { useEffect, useRef } from \"react\";\nimport { View, Animated, StyleSheet } from \"react-native\";\nimport Svg, { Circle, G } from \"@xhs/reds-components/libs/svg\";\n\nconst AnimatedCircle = Animated.createAnimatedComponent(Circle);\n\nconst CircularProgress = ({ size = 40, strokeWidth = 3, progress = 75 }) => {\n  const animatedValue = useRef(new Animated.Value(0)).current;\n\n  useEffect(() => {\n    Animated.timing(animatedValue, {\n      toValue: progress,\n      duration: 0,\n      useNativeDriver: true,\n    }).start();\n  }, [progress]);\n\n  const radius = (size - strokeWidth) / 2;\n  const circumference = 2 * Math.PI * radius;\n  const strokeDashoffset = animatedValue.interpolate({\n    inputRange: [0, 100],\n    outputRange: [circumference, 0],\n  });\n\n  return (\n    <View style={styles.container}>\n      <Svg width={size} height={size} viewBox={`0 0 ${size} ${size}`}>\n        <G rotation=\"-90\" origin={`${size / 2}, ${size / 2}`}>\n          <Circle cx=\"50%\" cy=\"50%\" r={radius} stroke={lightColor.Fill2} strokeWidth={strokeWidth} fill=\"none\" />\n          <AnimatedCircle\n            cx=\"50%\"\n            cy=\"50%\"\n            r={radius}\n            stroke={lightColor.Fill4}\n            strokeWidth={strokeWidth}\n            fill=\"none\"\n            strokeDasharray={`${circumference}, ${circumference}`}\n            strokeDashoffset={strokeDashoffset}\n            strokeLinecap=\"round\"\n          />\n        </G>\n      </Svg>\n    </View>\n  );\n};\n\nconst styles = StyleSheet.create({\n  container: {\n    justifyContent: \"center\",\n    alignItems: \"center\",\n    flex: 1,\n  },\n});\n\nexport default CircularProgress;\n"],"names":["AnimatedCircle","Animated","createAnimatedComponent","Circle","CircularProgress","_ref","_ref$size","size","strokeWidth","_ref$strokeWidth","_ref$progress","progress","animatedValue","useRef","Value","current","useEffect","timing","toValue","duration","useNativeDriver","start","radius","circumference","Math","PI","strokeDashoffset","interpolate","inputRange","outputRange","View","style","styles","container","React","createElement","Svg","width","height","viewBox","concat","G","rotation","origin","cx","cy","r","stroke","lightColor","Fill2","fill","Fill4","strokeDasharray","strokeLinecap","StyleSheet","create","justifyContent","alignItems","flex"],"mappings":";;;;;AAKA,IAAMA,cAAA,GAAiBC,QAAS,CAAAC,uBAAA,CAAwBC,MAAM,CAAA,CAAA;AAE9D,IAAMC,gBAAA,GAAmB,SAAnBA,gBAAAA,CAAAC,IAAA,EAAsE;AAAA,EAAA,IAAAC,SAAA,GAAAD,IAAA,CAAhDE,IAAA;AAAAA,IAAAA,IAAA,GAAAD,SAAA,KAAO,KAAA,CAAA,GAAA;4BAAIE,WAAc;AAAdA,IAAAA,WAAc,GAAAC,gBAAA,KAAA,KAAA,CAAA,GAAA,CAAA,GAAAA,gBAAA;IAAAC,aAAA,GAAAL,IAAA,CAAGM,QAAW;AAAXA,IAAAA,QAAW,GAAAD,aAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAAA,aAAA,CAAA;AACjE,EAAA,IAAME,gBAAgBC,MAAO,CAAA,IAAIZ,SAASa,KAAM,CAAA,CAAC,CAAC,CAAE,CAAAC,OAAA,CAAA;AAEpDC,EAAAA,SAAA,CAAU,YAAM;AACdf,IAAAA,QAAA,CAASgB,OAAOL,aAAe,EAAA;AAC7BM,MAAAA,OAAS,EAAAP,QAAA;AACTQ,MAAAA,QAAU,EAAA,CAAA;AACVC,MAAAA,eAAiB,EAAA,IAAA;AACnB,KAAC,EAAEC,KAAM,EAAA,CAAA;AACX,GAAA,EAAG,CAACV,QAAQ,CAAC,CAAA,CAAA;AAEP,EAAA,IAAAW,MAAA,GAAA,CAAUf,OAAOC,WAAe,IAAA,CAAA,CAAA;EAChC,IAAAe,aAAA,GAAgB,CAAI,GAAAC,IAAA,CAAKC,EAAK,GAAAH,MAAA,CAAA;AAC9B,EAAA,IAAAI,gBAAA,GAAmBd,cAAce,WAAY,CAAA;AACjDC,IAAAA,UAAA,EAAY,CAAC,CAAA,EAAG,GAAG,CAAA;AACnBC,IAAAA,WAAA,EAAa,CAACN,aAAA,EAAe,CAAC,CAAA;AAChC,GAAC,CAAA,CAAA;AAED,EAAA,0CACGO,IAAK,EAAA;IAAAC,KAAA,EAAOC,OAAOC,SAAAA;AAClB,GAAA,iBAAAC,KAAA,CAAAC,aAAA,CAACC;AAAIC,IAAAA,KAAO,EAAA9B,IAAA;AAAM+B,IAAAA,QAAQ/B,IAAM;AAAAgC,IAAAA,OAAA,SAAAC,MAAA,CAAgBjC,IAAI,EAAAiC,GAAAA,CAAAA,CAAAA,MAAA,CAAIjC,IAAI,CAAA;AAC1D,GAAA,iBAAA2B,KAAA,CAAAC,aAAA,CAACM;AAAEC,IAAAA,QAAS,EAAA,KAAA;IAAMC,kBAAWpC,IAAA,GAAO,CAAC,EAAA,IAAA,CAAA,CAAAiC,MAAA,CAAKjC,IAAA,GAAO,CAAC,CAAA;AAChD,GAAA,iBAAA2B,KAAA,CAAAC,aAAA,CAAChC;AAAOyC,IAAAA,EAAG,EAAA,KAAA;AAAMC,IAAAA,IAAG,KAAM;AAAAC,IAAAA,CAAA,EAAGxB;IAAQyB,MAAQ,EAAAC,UAAA,CAAWC;AAAOzC,IAAAA,WAA0B,EAA1BA,WAA0B;AAAA0C,IAAAA,IAAA,EAAK,MAAA;GAAO,CACrG,iBAAAhB,KAAA,CAAAC,aAAA,CAACnC,cAAA,EAAA;AACC4C,IAAAA,EAAG,EAAA,KAAA;AACHC,IAAAA,EAAG,EAAA,KAAA;AACHC,IAAAA,CAAG,EAAAxB,MAAA;IACHyB,QAAQC,UAAW,CAAAG,KAAA;AACnB3C,IAAAA,WAAA,EAAAA,WAAA;AACA0C,IAAAA,IAAK,EAAA,MAAA;IACLE,eAAiB,EAAA,EAAA,CAAAZ,MAAA,CAAGjB,aAAa,QAAAiB,MAAA,CAAKjB,aAAa,CAAA;AACnDG,IAAAA,gBAAA,EAAAA,gBAAA;AACA2B,IAAAA,aAAc,EAAA,OAAA;GAChB,CACF,CACF,CACF,CAAA,CAAA;AAEJ,EAAA;AAEA,IAAMrB,MAAA,GAASsB,WAAWC,MAAO,CAAA;AAC/BtB,EAAAA,SAAW,EAAA;AACTuB,IAAAA,cAAgB,EAAA,QAAA;AAChBC,IAAAA,UAAY,EAAA,QAAA;AACZC,IAAAA,IAAM,EAAA,CAAA;AACR,GAAA;AACF,CAAC,CAAA;;;;"}
+{"version":3,"file":"CircularProgress.js","sources":["../../../../src/components/Image/CircularProgress.tsx"],"sourcesContent":["import { lightColor } from \"@xhsreds/reds-token-next\";\nimport React, { useEffect, useRef } from \"react\";\nimport { View, Animated, StyleSheet } from \"react-native\";\nimport Svg, { Circle, G } from \"react-native-svg\";\n\nconst AnimatedCircle = Animated.createAnimatedComponent(Circle);\n\nconst CircularProgress = ({ size = 40, strokeWidth = 3, progress = 75 }) => {\n  const animatedValue = useRef(new Animated.Value(0)).current;\n\n  useEffect(() => {\n    Animated.timing(animatedValue, {\n      toValue: progress,\n      duration: 0,\n      useNativeDriver: true,\n    }).start();\n  }, [progress]);\n\n  const radius = (size - strokeWidth) / 2;\n  const circumference = 2 * Math.PI * radius;\n  const strokeDashoffset = animatedValue.interpolate({\n    inputRange: [0, 100],\n    outputRange: [circumference, 0],\n  });\n\n  return (\n    <View style={styles.container}>\n      <Svg width={size} height={size} viewBox={`0 0 ${size} ${size}`}>\n        <G rotation=\"-90\" origin={`${size / 2}, ${size / 2}`}>\n          <Circle cx=\"50%\" cy=\"50%\" r={radius} stroke={lightColor.Fill2} strokeWidth={strokeWidth} fill=\"none\" />\n          <AnimatedCircle\n            cx=\"50%\"\n            cy=\"50%\"\n            r={radius}\n            stroke={lightColor.Fill4}\n            strokeWidth={strokeWidth}\n            fill=\"none\"\n            strokeDasharray={`${circumference}, ${circumference}`}\n            strokeDashoffset={strokeDashoffset}\n            strokeLinecap=\"round\"\n          />\n        </G>\n      </Svg>\n    </View>\n  );\n};\n\nconst styles = StyleSheet.create({\n  container: {\n    justifyContent: \"center\",\n    alignItems: \"center\",\n    flex: 1,\n  },\n});\n\nexport default CircularProgress;\n"],"names":["AnimatedCircle","Animated","createAnimatedComponent","Circle","CircularProgress","_ref","_ref$size","size","strokeWidth","_ref$strokeWidth","_ref$progress","progress","animatedValue","useRef","Value","current","useEffect","timing","toValue","duration","useNativeDriver","start","radius","circumference","Math","PI","strokeDashoffset","interpolate","inputRange","outputRange","View","style","styles","container","React","createElement","Svg","width","height","viewBox","concat","G","rotation","origin","cx","cy","r","stroke","lightColor","Fill2","fill","Fill4","strokeDasharray","strokeLinecap","StyleSheet","create","justifyContent","alignItems","flex"],"mappings":"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"}

package/lib/esm/components/Image/Image.js

@@ -12,7 +12,7 @@ import { useColorMode } from '../ConfigProvider/hooks/themeToken/useColorMode.js
 import { isLocalFile, isDataUri, convertKeysToSnakeCase } from './utils.js';
 import { apmPush } from './apm.js';
 import { queryCacheBatched } from './queryCacheBatcher.js';
-import '@xhs/reds-components/libs/svg';
+import 'react-native-svg';
 import '../ConfigProvider/hooks/ConfigContext/ConfigContext.js';
 
 var _excluded = ["src", "source", "width", "height", "borderRadius", "errorStyle", "loadStyle", "style", "abortApmCollection", "fadeDuration", "onFirstDrawFinished"];

package/lib/esm/components/Image/index.js

@@ -8,7 +8,7 @@ import './styles.js';
 import '@xhsreds/reds-token-next';
 import './hook/index.js';
 import './CircularProgress.js';
-import '@xhs/reds-components/libs/svg';
+import 'react-native-svg';
 import '../ConfigProvider/hooks/ConfigCache/ConfigCache.js';
 import '@xhs/reds-apm/src/index.native';
 import '../ConfigProvider/hooks/themeToken/useColorMode.js';

package/lib/esm/components/List/ListItem/ArrowRight.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import Svg, { Path } from '@xhs/reds-components/libs/svg';
+import Svg, { Path } from 'react-native-svg';
 
 var ArrowRight = function ArrowRight() {
   return /* @__PURE__ */React.createElement(Svg, {

package/lib/esm/components/List/ListItem/ArrowRight.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArrowRight.js","sources":["../../../../../src/components/List/ListItem/ArrowRight.tsx"],"sourcesContent":["import React from \"react\";\nimport Svg, { Path } from \"@xhs/reds-components/libs/svg\";\n\nconst ArrowRight: React.FC = () => {\n  return (\n    <Svg width=\"7\" height=\"12\" viewBox=\"0 0 7 12\" fill=\"none\">\n      <Path\n        d=\"M5.00001 5.82306L0.880508 1.81204C0.616137 1.55578 0.609566 1.13372 0.865831 0.869345C1.1221 0.604974 1.54415 0.598403 1.80853 0.854668L6.35571 5.28111C6.76108 5.67405 6.77116 6.32121 6.37822 6.72658C6.36708 6.73795 6.36708 6.73795 6.35571 6.74908L1.79718 11.1439C1.53281 11.4002 1.11075 11.3936 0.854485 11.1292C0.59822 10.8649 0.604791 10.4428 0.869162 10.1865L4.99904 6.20613C5.10508 6.10393 5.10819 5.93511 5.00599 5.82907C5.00403 5.82704 5.00204 5.82503 5.00001 5.82306Z\"\n        fill=\"#333333\"\n        fillOpacity=\"0.3\"\n      />\n    </Svg>\n  );\n};\n\nexport default ArrowRight;\n"],"names":["ArrowRight","React","createElement","Svg","width","height","viewBox","fill","Path","d","fillOpacity"],"mappings":";;;AAGA,IAAMA,aAAuB,SAAvBA,aAA6B;AAE/B,EAAA,sBAAAC,KAAA,CAAAC,aAAA,CAACC;AAAIC,IAAAA,KAAM,EAAA,GAAA;AAAIC,IAAAA,QAAO,IAAK;AAAAC,IAAAA,OAAA,EAAQ,UAAW;AAAAC,IAAAA,IAAA,EAAK,MAAA;AACjD,GAAA,iBAAAN,KAAA,CAAAC,aAAA,CAACM,IAAA,EAAA;AACCC,IAAAA,CAAE,EAAA,6dAAA;AACFF,IAAAA,IAAK,EAAA,SAAA;AACLG,IAAAA,WAAY,EAAA,KAAA;AAAA,GACd,CACF,CAAA,CAAA;AAEJ;;;;"}
+{"version":3,"file":"ArrowRight.js","sources":["../../../../../src/components/List/ListItem/ArrowRight.tsx"],"sourcesContent":["import React from \"react\";\nimport Svg, { Path } from \"react-native-svg\";\n\nconst ArrowRight: React.FC = () => {\n  return (\n    <Svg width=\"7\" height=\"12\" viewBox=\"0 0 7 12\" fill=\"none\">\n      <Path\n        d=\"M5.00001 5.82306L0.880508 1.81204C0.616137 1.55578 0.609566 1.13372 0.865831 0.869345C1.1221 0.604974 1.54415 0.598403 1.80853 0.854668L6.35571 5.28111C6.76108 5.67405 6.77116 6.32121 6.37822 6.72658C6.36708 6.73795 6.36708 6.73795 6.35571 6.74908L1.79718 11.1439C1.53281 11.4002 1.11075 11.3936 0.854485 11.1292C0.59822 10.8649 0.604791 10.4428 0.869162 10.1865L4.99904 6.20613C5.10508 6.10393 5.10819 5.93511 5.00599 5.82907C5.00403 5.82704 5.00204 5.82503 5.00001 5.82306Z\"\n        fill=\"#333333\"\n        fillOpacity=\"0.3\"\n      />\n    </Svg>\n  );\n};\n\nexport default ArrowRight;\n"],"names":["ArrowRight","React","createElement","Svg","width","height","viewBox","fill","Path","d","fillOpacity"],"mappings":";;;AAGA,IAAMA,aAAuB,SAAvBA,aAA6B;AAE/B,EAAA,sBAAAC,KAAA,CAAAC,aAAA,CAACC;AAAIC,IAAAA,KAAM,EAAA,GAAA;AAAIC,IAAAA,QAAO,IAAK;AAAAC,IAAAA,OAAA,EAAQ,UAAW;AAAAC,IAAAA,IAAA,EAAK,MAAA;AACjD,GAAA,iBAAAN,KAAA,CAAAC,aAAA,CAACM,IAAA,EAAA;AACCC,IAAAA,CAAE,EAAA,6dAAA;AACFF,IAAAA,IAAK,EAAA,SAAA;AACLG,IAAAA,WAAY,EAAA,KAAA;AAAA,GACd,CACF,CAAA,CAAA;AAEJ;;;;"}

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

@@ -34,7 +34,7 @@ import '../LanguageProvider/hooks/LanguageContext.js';
 import '../LanguageProvider/hooks/useLanguage.js';
 import '../../i18n/index.js';
 import './Refresh.js';
-import '@xhs/reds-components/libs/svg';
+import 'react-native-svg';
 
 var CustomRefreshControl = DefaultRefreshControl;
 function PullRefresh(props) {
@@ -139,13 +139,21 @@ function PullRefresh(props) {
       });
     } else if (panValue > 0) {
       updatePullState(PullState.FINISH);
+      setMoveHeight(0);
+      setMovePercent(0);
       animatedTo(0, function () {
         setIsPulling(false);
         updatePullState(PullState.INIT);
+        pan.setValue(0);
+        pan.flattenOffset();
       });
     } else {
       updatePullState(PullState.INIT);
       setIsPulling(false);
+      setMoveHeight(0);
+      setMovePercent(0);
+      pan.setValue(0);
+      pan.flattenOffset();
     }
   };
   var updatePullState = function updatePullState(state) {
@@ -203,7 +211,16 @@ function PullRefresh(props) {
     if (props.initRefresh && !hasInitRefreshed) {
       return false;
     }
-    return isPulling ? false : scrollY <= 0 && gestureState.vy > 0 && gestureState.vy > Math.abs(gestureState.vx);
+    if (isRefreshing || pullState === PullState.LOADING || pullState === PullState.HOLDING) {
+      return false;
+    }
+    if (isPulling) {
+      return false;
+    }
+    if (gestureState.vy < 0) {
+      return false;
+    }
+    return scrollY <= 0 && gestureState.vy > 0 && gestureState.vy > Math.abs(gestureState.vx);
   };
   var panResponder = useMemo(function () {
     if (Platform.OS !== "ios" && props.nativeAndroidPullRefresh) {
@@ -220,12 +237,17 @@ function PullRefresh(props) {
       });
     }
     return PanResponder.create({
-      onStartShouldSetPanResponder: canMove,
-      onStartShouldSetPanResponderCapture: canMove,
+      onStartShouldSetPanResponder: function onStartShouldSetPanResponder() {
+        return false;
+      },
+      onStartShouldSetPanResponderCapture: function onStartShouldSetPanResponderCapture() {
+        return false;
+      },
       onMoveShouldSetPanResponder: canMove,
       onMoveShouldSetPanResponderCapture: canMove,
       onPanResponderGrant: function onPanResponderGrant() {
         animation && animation.stop();
+        pan.flattenOffset();
         pan.setOffset(pan._value);
         updatePullState(PullState.PULLING);
         pullTimeout && clearTimeout(pullTimeout);
@@ -245,14 +267,17 @@ function PullRefresh(props) {
       },
       onPanResponderRelease: onRelease,
       onPanResponderTerminationRequest: function onPanResponderTerminationRequest() {
-        return false;
+        if (isPulling || pullState === PullState.PULLING) {
+          return false;
+        }
+        return true;
       },
       onPanResponderTerminate: onRelease,
       onShouldBlockNativeResponder: function onShouldBlockNativeResponder() {
-        return true;
+        return isPulling || pullState === PullState.PULLING;
       }
     });
-  }, [isPulling, scrollY, props.initRefresh, hasInitRefreshed, pullAnimHeight, props.nativeAndroidPullRefresh]);
+  }, [isPulling, scrollY, props.initRefresh, hasInitRefreshed, pullAnimHeight, props.nativeAndroidPullRefresh, isRefreshing, pullState]);
   useEffect(function () {
     if (Platform.OS !== "ios" && props.nativeAndroidPullRefresh) return;
     if (pullState === PullState.PULLING && !props.initRefresh) {
@@ -271,9 +296,14 @@ function PullRefresh(props) {
       setPullTimeout(
       //@ts-ignore
       setTimeout(function () {
+        pan.flattenOffset();
+        setMoveHeight(0);
+        setMovePercent(0);
         animatedTo(0, function () {
           setIsPulling(false);
           updatePullState(PullState.INIT);
+          pan.setValue(0);
+          pan.flattenOffset();
         });
         updatePullState(PullState.FINISH);
       }, (_props$msHoldingTime2 = props === null || props === void 0 ? void 0 : props.msHoldingTime) !== null && _props$msHoldingTime2 !== void 0 ? _props$msHoldingTime2 : 1e3));
@@ -288,11 +318,10 @@ function PullRefresh(props) {
   };
   var scrollContent = useMemo(function () {
     return React.Children.map(props.children, function (child) {
-      var _props$androidRefresh, _props$androidRefresh2;
-      return /*#__PURE__*/React.cloneElement(child, _objectSpread2({
-        // 设置滚动响应频率
-        scrollEventThrottle: 1
-      }, Platform.OS === "android" && props.nativeAndroidPullRefresh ? {
+      var _originalOnScroll$_an, _props$androidRefresh, _props$androidRefresh2;
+      var originalOnScroll = child.props.onScroll;
+      var hasNativeDriver = originalOnScroll && (originalOnScroll["__isNative"] === true || (originalOnScroll === null || originalOnScroll === void 0 || (_originalOnScroll$_an = originalOnScroll._animation) === null || _originalOnScroll$_an === void 0 ? void 0 : _originalOnScroll$_an.useNativeDriver) === true);
+      var injectedProps = Platform.OS === "android" && props.nativeAndroidPullRefresh ? {
         refreshControl: /* @__PURE__ */React.createElement(RefreshControl, _objectSpread2(_objectSpread2({}, props.androidRefreshProps || {}), {}, {
           colors: (_props$androidRefresh = (_props$androidRefresh2 = props.androidRefreshProps) === null || _props$androidRefresh2 === void 0 ? void 0 : _props$androidRefresh2.colors) !== null && _props$androidRefresh !== void 0 ? _props$androidRefresh : props.androidColors,
           refreshing: !!props.isRefreshing || internalRefreshing,
@@ -313,9 +342,37 @@ function PullRefresh(props) {
           }
         })),
         onScroll: function onScroll(evt) {
-          if (child.props.onScroll && typeof child.props.onScroll === "function") {
-            child.props.onScroll(evt);
+          if (originalOnScroll && typeof originalOnScroll === "function") {
+            originalOnScroll(evt);
+          }
+        }
+      } : hasNativeDriver ? {
+        // When the child uses native-driver Animated.event, keep it intact to avoid crashes
+        onScroll: originalOnScroll,
+        onMomentumScrollEnd: function onMomentumScrollEnd(evt) {
+          setScrollY(evt.nativeEvent.contentOffset.y);
+          child.props.onMomentumScrollEnd && child.props.onMomentumScrollEnd(evt);
+        },
+        onScrollEndDrag: function onScrollEndDrag(evt) {
+          setScrollY(evt.nativeEvent.contentOffset.y);
+          if (pullState === PullState.LOADING && evt.nativeEvent.contentOffset.y > 0) {
+            var y = Math.max(0, pullAnimHeight - evt.nativeEvent.contentOffset.y);
+            viewRef.current && viewRef.current.setNativeProps({
+              style: {
+                transform: [{
+                  translateY: y
+                }]
+              }
+            });
+            animatedViewRef.current && animatedViewRef.current.setNativeProps({
+              style: {
+                transform: [{
+                  translateY: y
+                }]
+              }
+            });
           }
+          child.props.onScrollEndDrag && child.props.onScrollEndDrag(evt);
         }
       } : {
         onScroll: function onScroll(evt) {
@@ -337,11 +394,14 @@ function PullRefresh(props) {
               }
             });
           }
-          if (child.props.onScroll && typeof child.props.onScroll === "function") {
-            child.props.onScroll(evt);
+          if (originalOnScroll && typeof originalOnScroll === "function") {
+            originalOnScroll(evt);
           }
         }
-      }));
+      };
+      return /*#__PURE__*/React.cloneElement(child, _objectSpread2({
+        scrollEventThrottle: 1
+      }, injectedProps));
     });
   }, [pullState, props.children, pullAnimHeight, internalRefreshing, props.isRefreshing, props.nativeAndroidPullRefresh]);
   var content = useMemo(function () {