@xhsreds/reds-rn-next 0.10.1-fix-pull-refresh202511272021 → 0.10.1

package/lib/cjs/components/ConfigProvider/hooks/ConfigCache/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var components_ConfigProvider_hooks_ConfigCache_ConfigCache = require('./ConfigCache.js');
-require('../../../../_chunks/C9tZEm0t.js');
+require('../../../../_chunks/nlVjgQi5.js');
 require('@xhsreds/reds-token-next');
 
 

package/lib/cjs/components/ConfigProvider/hooks/themeToken/index.js

@@ -4,7 +4,7 @@ var components_ConfigProvider_hooks_themeToken_useColorMode = require('./useColo
 var components_ConfigProvider_hooks_themeToken_useThemeToken = require('./useThemeToken.js');
 require('react');
 require('../ConfigContext/ConfigContext.js');
-require('../../../../_chunks/C9tZEm0t.js');
+require('../../../../_chunks/nlVjgQi5.js');
 require('@xhsreds/reds-token-next');
 require('../ConfigCache/ConfigCache.js');
 

package/lib/cjs/components/ConfigProvider/hooks/themeToken/useThemeToken.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var _rollupPluginBabelHelpers = require('../../../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var redsTokenNext = require('@xhsreds/reds-token-next');
 var components_ConfigProvider_hooks_ConfigCache_ConfigCache = require('../ConfigCache/ConfigCache.js');

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

@@ -7,7 +7,7 @@ var components_ConfigProvider_interface_index = require('../../_chunks/BzoUq9KD.
 var components_ConfigProvider_hooks_themeToken_useThemeToken = require('./hooks/themeToken/useThemeToken.js');
 var components_ConfigProvider_hooks_themeToken_useColorMode = require('./hooks/themeToken/useColorMode.js');
 require('./hooks/ConfigCache/ConfigCache.js');
-require('../../_chunks/C9tZEm0t.js');
+require('../../_chunks/nlVjgQi5.js');
 require('@xhsreds/reds-token-next');
 require('./hooks/ConfigContext/ConfigContext.js');
 require('react');

package/lib/cjs/components/DatePicker/DatePicker.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var components_DatePicker_interface_index = require('../../_chunks/BiKD1VTc.js');
 var components_Picker_Picker = require('../Picker/Picker.js');
@@ -37,7 +37,7 @@ require('@xhs/lottie-react-native');
 require('../PickerView/styles.js');
 require('../PickerView/Wheel.js');
 require('../Sheets/AnimatedSheets.js');
-require('../../_chunks/DVfoVjpR.js');
+require('../../_chunks/47jfgoRG.js');
 require('../Sheets/styles.js');
 require('../Button/Button.js');
 require('../../_chunks/DJ6i78mM.js');

package/lib/cjs/components/DatePicker/api.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var components_DatePicker_DatePicker = require('./DatePicker.js');
 var components_DatePicker_interface_index = require('../../_chunks/BiKD1VTc.js');
@@ -42,7 +42,7 @@ require('@xhs/lottie-react-native');
 require('../PickerView/styles.js');
 require('../PickerView/Wheel.js');
 require('../Sheets/AnimatedSheets.js');
-require('../../_chunks/DVfoVjpR.js');
+require('../../_chunks/47jfgoRG.js');
 require('../Sheets/styles.js');
 require('../Button/Button.js');
 require('../../_chunks/DJ6i78mM.js');

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var components_DatePicker_DatePicker = require('./DatePicker.js');
 var components_DatePicker_interface_index = require('../../_chunks/BiKD1VTc.js');
 var components_DatePicker_api = require('./api.js');
-require('../../_chunks/C9tZEm0t.js');
+require('../../_chunks/nlVjgQi5.js');
 require('react');
 require('../Picker/Picker.js');
 require('../../_chunks/PRipBqKL.js');
@@ -39,7 +39,7 @@ require('@xhs/lottie-react-native');
 require('../PickerView/styles.js');
 require('../PickerView/Wheel.js');
 require('../Sheets/AnimatedSheets.js');
-require('../../_chunks/DVfoVjpR.js');
+require('../../_chunks/47jfgoRG.js');
 require('../Sheets/styles.js');
 require('../Button/Button.js');
 require('../../_chunks/DJ6i78mM.js');

package/lib/cjs/components/Divider/Divider.js

@@ -2,36 +2,57 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var reactNative = require('react-native');
 var components_Divider_interface_index = require('../../_chunks/CY-sysEj.js');
 var components_Divider_styles = require('./styles.js');
 var pvCount_useUnmountedProcess = require('../../pvCount/useUnmountedProcess.js');
 require('../ConfigProvider/hooks/ConfigCache/ConfigCache.js');
-require('@xhsreds/reds-token-next');
+var components_ConfigProvider_hooks_themeToken_useThemeToken = require('../ConfigProvider/hooks/themeToken/useThemeToken.js');
 require('@xhs/reds-apm/src/index.native');
-require('../ConfigProvider/hooks/themeToken/useThemeToken.js');
-require('../ConfigProvider/hooks/ConfigContext/ConfigContext.js');
 require('../../pvCount/pvData.js');
+require('@xhsreds/reds-token-next');
+require('../ConfigProvider/hooks/ConfigContext/ConfigContext.js');
 
 var Divider = function Divider(props) {
+  var _useState = React.useState(0),
+    _useState2 = _rollupPluginBabelHelpers._slicedToArray(_useState, 2),
+    textWidth = _useState2[0],
+    setTextWidth = _useState2[1];
+  var _useState3 = React.useState(0),
+    _useState4 = _rollupPluginBabelHelpers._slicedToArray(_useState3, 2),
+    containerWidth = _useState4[0],
+    setContainerWidth = _useState4[1];
+  var themeColor = components_ConfigProvider_hooks_themeToken_useThemeToken.useThemeColor("Divider");
+  var typography = components_ConfigProvider_hooks_themeToken_useThemeToken.useThemeTypography("Divider");
   pvCount_useUnmountedProcess.default("Divider");
   var finalProps = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, components_Divider_interface_index.DividerDefaultProps), props), {}, {
-    direction: props.direction,
-    orientation: props.orientation
+    direction: props.direction || components_Divider_interface_index.DividerDefaultProps.direction,
+    orientation: props.orientation || components_Divider_interface_index.DividerDefaultProps.orientation
   });
-  var styles = components_Divider_styles.getStyles(finalProps);
-  var isPrimary = finalProps.direction === "primary" || finalProps.direction === "secondary";
+  var styles = React.useMemo(function () {
+    return components_Divider_styles.getStyles(finalProps, textWidth, containerWidth, themeColor, typography);
+  }, [textWidth, containerWidth, themeColor, typography]);
+  var handleLayout = function handleLayout(e) {
+    setTextWidth(e.nativeEvent.layout.width);
+  };
+  var handlerContainerWidth = function handlerContainerWidth(e) {
+    setContainerWidth(e.nativeEvent.layout.width);
+  };
   return /* @__PURE__ */React.createElement(reactNative.View, {
-    style: [styles.divider, styles[finalProps.direction]]
+    style: [styles.divider, styles[finalProps.direction]],
+    onLayout: handlerContainerWidth
   }, finalProps.orientation && finalProps.direction !== "vertical" && /* @__PURE__ */React.createElement(reactNative.View, {
     style: styles.textContainer
-  }, isPrimary && /* @__PURE__ */React.createElement(reactNative.View, {
+  }, /* @__PURE__ */React.createElement(reactNative.View, {
     style: styles.before
-  }), props.children && /* @__PURE__ */React.createElement(reactNative.Text, {
-    style: styles.text
-  }, props.children), isPrimary && /* @__PURE__ */React.createElement(reactNative.View, {
+  }), props.children ? /* @__PURE__ */React.createElement(reactNative.Text, {
+    style: styles.text,
+    onLayout: handleLayout
+  }, props.children) : /* @__PURE__ */React.createElement(reactNative.Text, {
+    style: styles.noTextBorderStyle
+  }), /* @__PURE__ */React.createElement(reactNative.View, {
     style: styles.after
   })));
 };

package/lib/cjs/components/Divider/Divider.js.map

@@ -1 +1 @@
-{"version":3,"file":"Divider.js","sources":["../../../../src/components/Divider/Divider.tsx"],"sourcesContent":["import React from \"react\";\nimport { View, Text } from \"react-native\";\nimport { RedsDivider, DividerDefaultProps } from \"./interface\";\nimport { getStyles } from \"./styles\";\nimport useMounted from \"../../pvCount/useUnmountedProcess\";\n\nconst Divider = (props: RedsDivider) => {\n  useMounted(\"Divider\");\n  const finalProps: RedsDivider = {\n    ...DividerDefaultProps,\n    ...props,\n    direction: props.direction as RedsDivider[\"direction\"],\n    orientation: props.orientation as RedsDivider[\"orientation\"],\n  };\n\n  const styles = getStyles(finalProps);\n  const isPrimary = finalProps.direction === \"primary\" || finalProps.direction === \"secondary\";\n\n  return (\n    <View style={[styles.divider, styles[finalProps.direction!]]}>\n      {finalProps.orientation && finalProps.direction !== \"vertical\" && (\n        <View style={styles.textContainer}>\n          {isPrimary && <View style={styles.before} />}\n          {props.children && <Text style={styles.text}>{props.children}</Text>}\n          {isPrimary && <View style={styles.after} />}\n        </View>\n      )}\n    </View>\n  );\n};\n\nexport default React.memo(Divider);\n"],"names":["Divider","props","useMounted","finalProps","_objectSpread","DividerDefaultProps","direction","orientation","styles","getStyles","isPrimary","React","createElement","View","style","divider","textContainer","before","children","Text","text","after","memo"],"mappings":";;;;;;;;;;;;;;;;;AAMA,IAAMA,OAAA,GAAU,SAAVA,OAAAA,CAAWC,KAAuB,EAAA;EACtCC,mCAAA,CAAW,SAAS,CAAA,CAAA;EACpB,IAAMC,UAA0B,GAAAC,wCAAA,CAAAA,wCAAA,CAAAA,wCAAA,CAAA,EAAA,EAC3BC,sDAAA,CAAA,EACAJ,KAAA,CAAA,EAAA,EAAA,EAAA;IACHK,WAAWL,KAAM,CAAAK,SAAA;IACjBC,aAAaN,KAAM,CAAAM,WAAAA;GACrB,CAAA,CAAA;AAEM,EAAA,IAAAC,MAAA,GAASC,oCAAUN,UAAU,CAAA,CAAA;AACnC,EAAA,IAAMO,SAAY,GAAAP,UAAA,CAAWG,SAAc,KAAA,SAAA,IAAaH,WAAWG,SAAc,KAAA,WAAA,CAAA;AAG/E,EAAA,sBAAAK,KAAA,CAAAC,aAAA,CAACC;IAAKC,KAAO,EAAA,CAACN,OAAOO,OAAS,EAAAP,MAAA,CAAOL,WAAWG,SAAU,CAAC,CAAA;KACxDH,UAAW,CAAAI,WAAA,IAAeJ,WAAWG,SAAc,KAAA,UAAA,uCACjDO,gBAAK,EAAA;IAAAC,KAAA,EAAON,OAAOQ,aAAAA;GACjB,EAAAN,SAAA,uCAAcG,gBAAK,EAAA;IAAAC,KAAA,EAAON,OAAOS,MAAAA;AAAQ,GAAA,CAAA,EACzChB,MAAMiB,QAAY,mBAAAP,KAAA,CAAAC,aAAA,CAACO;IAAKL,KAAO,EAAAN,MAAA,CAAOY,IAAAA;KAAOnB,KAAM,CAAAiB,QAAS,GAC5DR,SAAa,mBAAAC,KAAA,CAAAC,aAAA,CAACC;IAAKC,KAAO,EAAAN,MAAA,CAAOa,KAAAA;GAAO,CAC3C,CAEJ,CAAA,CAAA;AAEJ,CAAA,CAAA;AAEA,gBAAA,aAAeV,KAAA,CAAMW,KAAKtB,OAAO,CAAA;;;;"}
+{"version":3,"file":"Divider.js","sources":["../../../../src/components/Divider/Divider.tsx"],"sourcesContent":["import React, { useState, useMemo } from \"react\";\nimport { View, Text } from \"react-native\";\nimport { RedsDivider, DividerDefaultProps } from \"./interface\";\nimport { getStyles } from \"./styles\";\nimport useMounted from \"../../pvCount/useUnmountedProcess\";\nimport { useThemeColor, useThemeTypography } from \"../ConfigProvider\";\n\nconst Divider = (props: RedsDivider) => {\n  const [textWidth, setTextWidth] = useState(0);\n  const [containerWidth, setContainerWidth] = useState(0);\n  const themeColor = useThemeColor(\"Divider\");\n  const typography = useThemeTypography(\"Divider\");\n  useMounted(\"Divider\");\n  const finalProps: RedsDivider = {\n    ...DividerDefaultProps,\n    ...props,\n    direction: (props.direction || DividerDefaultProps.direction) as RedsDivider[\"direction\"],\n    orientation: (props.orientation || DividerDefaultProps.orientation) as RedsDivider[\"orientation\"],\n  };\n\n  const styles = useMemo(() => {\n    return getStyles(finalProps, textWidth, containerWidth, themeColor, typography);\n  }, [textWidth, containerWidth, themeColor, typography]);\n\n  const handleLayout = (e: any) => {\n    setTextWidth(e.nativeEvent.layout.width);\n  };\n\n  const handlerContainerWidth = (e: any) => {\n    setContainerWidth(e.nativeEvent.layout.width);\n  };\n\n  return (\n    <View style={[styles.divider, styles[finalProps.direction!]]} onLayout={handlerContainerWidth}>\n      {finalProps.orientation && finalProps.direction !== \"vertical\" && (\n        <View style={styles.textContainer}>\n          <View style={styles.before} />\n          {props.children ? (\n            <Text style={styles.text} onLayout={handleLayout}>\n              {props.children}\n            </Text>\n          ) : (\n            <Text style={styles.noTextBorderStyle}></Text>\n          )}\n          <View style={styles.after} />\n        </View>\n      )}\n    </View>\n  );\n};\n\nexport default React.memo(Divider);\n"],"names":["Divider","props","_useState","useState","_useState2","_slicedToArray","textWidth","setTextWidth","_useState3","_useState4","containerWidth","setContainerWidth","themeColor","useThemeColor","typography","useThemeTypography","useMounted","finalProps","_objectSpread","DividerDefaultProps","direction","orientation","styles","useMemo","getStyles","handleLayout","e","nativeEvent","layout","width","handlerContainerWidth","React","createElement","View","style","divider","onLayout","textContainer","before","children","Text","text","noTextBorderStyle","after","memo"],"mappings":"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"}

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

@@ -4,17 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var components_Divider_Divider = require('./Divider.js');
 var components_Divider_interface_index = require('../../_chunks/CY-sysEj.js');
-require('../../_chunks/C9tZEm0t.js');
+require('../../_chunks/nlVjgQi5.js');
 require('react');
 require('react-native');
 require('./styles.js');
+require('../../pvCount/useUnmountedProcess.js');
+require('@xhs/reds-apm/src/index.native');
+require('../../pvCount/pvData.js');
 require('../ConfigProvider/hooks/ConfigCache/ConfigCache.js');
 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('../../pvCount/useUnmountedProcess.js');
-require('../../pvCount/pvData.js');
 
 
 

package/lib/cjs/components/Divider/styles.js

@@ -1,35 +1,28 @@
 'use strict';
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var reactNative = require('react-native');
 var components_Divider_interface_index = require('../../_chunks/CY-sysEj.js');
-require('../ConfigProvider/hooks/ConfigCache/ConfigCache.js');
-require('react');
-require('@xhs/reds-apm/src/index.native');
-var components_ConfigProvider_hooks_themeToken_useThemeToken = require('../ConfigProvider/hooks/themeToken/useThemeToken.js');
-require('@xhsreds/reds-token-next');
-require('../ConfigProvider/hooks/ConfigContext/ConfigContext.js');
 
 var baseDivider = {
   position: "relative"
 };
-var getStyles = function getStyles(p) {
+var getStyles = function getStyles(p, textWidth, containerWidth, themeColor, typography) {
   var props = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, components_Divider_interface_index.DividerDefaultProps), p);
-  var themeColor = components_ConfigProvider_hooks_themeToken_useThemeToken.useThemeColor("Divider");
-  var typography = components_ConfigProvider_hooks_themeToken_useThemeToken.useThemeTypography("Divider");
   var isHorizontal = props.direction === "horizontal";
+  p.children;
+  var remainingWidth = containerWidth - textWidth;
   var beforeAfterCommon = {
     borderStyle: "solid",
-    borderTopWidth: 0.5,
-    borderColor: props.color || themeColor.Separator2,
-    width: 8
+    borderTopWidth: props.stroke || 0.5,
+    borderColor: props.color || themeColor.Separator2
   };
   var dividerStyle = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, baseDivider), {}, {
-    borderBottomWidth: isHorizontal ? props.stroke ? props.stroke : reactNative.StyleSheet.hairlineWidth : 0,
-    borderLeftWidth: isHorizontal ? 0 : props.stroke ? props.stroke : reactNative.StyleSheet.hairlineWidth,
-    borderBottomColor: isHorizontal ? props.color || themeColor.Separator2 : void 0,
-    borderLeftColor: isHorizontal ? void 0 : props.color || themeColor.Separator2,
-    borderStyle: "solid",
+    // borderBottomWidth: isHorizontal && hasTextContent ? 0 : (isHorizontal ? (props.stroke ? props.stroke : StyleSheet.hairlineWidth) : 0),
+    // borderLeftWidth: isHorizontal ? 0 : props.stroke ? props.stroke : StyleSheet.hairlineWidth,
+    // borderBottomColor: isHorizontal && !hasTextContent ? props.color || themeColor.Separator2 : undefined,
+    // borderLeftColor: isHorizontal ? undefined : props.color || themeColor.Separator2,
+    // borderStyle: "solid",
     marginVertical: props.margin && props.margin[0] && Number(props.margin[0]) || (isHorizontal ? 20 : 0),
     marginHorizontal: props.margin && props.margin[1] && Number(props.margin[1]) || (isHorizontal ? 0 : 12),
     marginLeft: props.margin && props.margin[1] && (props.orientation === "center" || props.orientation === "left") && Number(props.margin[1]) || (isHorizontal ? 0 : 12),
@@ -37,16 +30,10 @@ var getStyles = function getStyles(p) {
     width: isHorizontal ? props.size : "auto"
   });
   var textContainer = {
-    paddingVertical: 0,
-    paddingHorizontal: 16,
-    position: "absolute",
-    lineHeight: 18,
-    left: props.orientation === "left" ? 24 : void 0,
-    right: props.orientation === "right" ? 24 : void 0,
-    alignSelf: props.orientation === "center" ? "center" : void 0,
     flexDirection: "row",
     alignItems: "center",
-    top: isHorizontal && -9 || 0
+    width: "100%"
+    // 移除 position absolute，改为正常布局
   };
   var textStyle = {
     fontSize: typography.C2FontSize,
@@ -59,12 +46,30 @@ var getStyles = function getStyles(p) {
   var secondaryStyle = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, textStyle), {}, {
     color: "rgba(51, 51, 51, .3)"
   });
-  var beforeStyle = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, beforeAfterCommon), {}, {
-    marginRight: 8,
+  var beforeStyle = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, beforeAfterCommon), {}, {
+    marginRight: props.children ? 8 : 0
+  }, isHorizontal ? props.orientation === "center" ? {
+    flex: 1
+  } : {
+    width: props.orientation === "left" ? remainingWidth * 0.15 : remainingWidth * 0.85
+  } : {
+    width: 8
+  }), {}, {
+    borderColor: props.direction === "secondary" ? "rgba(51, 51, 51, .3)" : props.color || themeColor.Separator2
+  });
+  var afterStyle = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, beforeAfterCommon), {}, {
+    marginLeft: props.children ? 8 : 0
+  }, isHorizontal ? props.orientation === "center" ? {
+    flex: 1
+  } : {
+    width: props.orientation === "right" ? remainingWidth * 0.15 : remainingWidth * 0.85
+  } : {
+    width: 8
+  }), {}, {
     borderColor: props.direction === "secondary" ? "rgba(51, 51, 51, .3)" : props.color || themeColor.Separator2
   });
-  var afterStyle = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, beforeAfterCommon), {}, {
-    marginLeft: 8,
+  var noTextBorderStyle = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, beforeAfterCommon), {}, {
+    width: "auto",
     borderColor: props.direction === "secondary" ? "rgba(51, 51, 51, .3)" : props.color || themeColor.Separator2
   });
   var verticalStyle = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, dividerStyle), {}, {
@@ -80,7 +85,8 @@ var getStyles = function getStyles(p) {
     textContainer: textContainer,
     text: textStyle,
     before: beforeStyle,
-    after: afterStyle
+    after: afterStyle,
+    noTextBorderStyle: noTextBorderStyle
   });
 };
 

package/lib/cjs/components/Divider/styles.js.map

@@ -1 +1 @@
-{"version":3,"file":"styles.js","sources":["../../../../src/components/Divider/styles.ts"],"sourcesContent":["import { StyleSheet, ViewStyle, TextStyle, DimensionValue } from \"react-native\";\nimport { RedsDivider, DividerDefaultProps } from \"./interface\";\nimport { useThemeColor, useThemeTypography } from \"../ConfigProvider\";\n\nconst baseDivider: ViewStyle = {\n  position: \"relative\",\n};\n\nconst baseText: TextStyle = {\n  paddingVertical: 0,\n  paddingHorizontal: 16,\n  position: \"absolute\",\n  backgroundColor: \"#fff\",\n  lineHeight: 18,\n};\n\nconst getStyles = (p: RedsDivider) => {\n  const props = { ...DividerDefaultProps, ...p };\n  const themeColor = useThemeColor(\"Divider\");\n  const typography = useThemeTypography(\"Divider\");\n  const isHorizontal = props.direction === \"horizontal\";\n  const beforeAfterCommon: ViewStyle = {\n    borderStyle: \"solid\",\n    borderTopWidth: 0.5,\n    borderColor: props.color || themeColor.Separator2,\n    width: 8,\n  };\n\n  const dividerStyle: ViewStyle = {\n    ...baseDivider,\n    borderBottomWidth: isHorizontal ? (props.stroke ? props.stroke : StyleSheet.hairlineWidth) : 0,\n    borderLeftWidth: isHorizontal ? 0 : props.stroke ? props.stroke : StyleSheet.hairlineWidth,\n    borderBottomColor: isHorizontal ? props.color || themeColor.Separator2 : undefined,\n    borderLeftColor: isHorizontal ? undefined : props.color || themeColor.Separator2,\n    borderStyle: \"solid\",\n    marginVertical: (props.margin && props.margin[0] && Number(props.margin[0])) || (isHorizontal ? 20 : 0),\n    marginHorizontal: (props.margin && props.margin[1] && Number(props.margin[1])) || (isHorizontal ? 0 : 12),\n    marginLeft:\n      (props.margin &&\n        props.margin[1] &&\n        (props.orientation === \"center\" || props.orientation === \"left\") &&\n        Number(props.margin[1])) ||\n      (isHorizontal ? 0 : 12),\n    marginRight:\n      (props.margin && props.margin[1] && props.orientation === \"center\" ? Number(props.margin[1]) : 0) ||\n      (isHorizontal ? 0 : 12),\n    width: (isHorizontal ? props.size : \"auto\") as DimensionValue,\n  };\n\n  const textContainer: TextStyle = {\n    paddingVertical: 0,\n    paddingHorizontal: 16,\n    position: \"absolute\",\n    lineHeight: 18,\n    left: props.orientation === \"left\" ? 24 : undefined,\n    right: props.orientation === \"right\" ? 24 : undefined,\n    alignSelf: props.orientation === \"center\" ? \"center\" : undefined,\n    flexDirection: \"row\",\n    alignItems: \"center\",\n    top: (isHorizontal && -9) || 0,\n  };\n\n  const textStyle: TextStyle = {\n    fontSize: typography.C2FontSize,\n    fontWeight: \"400\" as TextStyle[\"fontWeight\"],\n    color: props.direction === \"secondary\" ? \"rgba(51, 51, 51, .3)\" : themeColor.Description,\n  };\n\n  const primaryStyle: TextStyle = {\n    ...textStyle,\n    color: themeColor.Description,\n  };\n\n  const secondaryStyle: TextStyle = {\n    ...textStyle,\n    color: \"rgba(51, 51, 51, .3)\",\n  };\n\n  const beforeStyle: ViewStyle = {\n    ...beforeAfterCommon,\n    marginRight: 8,\n    borderColor: props.direction === \"secondary\" ? \"rgba(51, 51, 51, .3)\" : props.color || themeColor.Separator2,\n  };\n\n  const afterStyle: ViewStyle = {\n    ...beforeAfterCommon,\n    marginLeft: 8,\n    borderColor: props.direction === \"secondary\" ? \"rgba(51, 51, 51, .3)\" : props.color || themeColor.Separator2,\n  };\n\n  const verticalStyle: ViewStyle = {\n    ...dividerStyle,\n    height: (props.size || 18) as DimensionValue,\n    marginVertical: 0,\n  };\n\n  return StyleSheet.create({\n    divider: baseDivider,\n    horizontal: dividerStyle,\n    vertical: verticalStyle,\n    primary: primaryStyle,\n    secondary: secondaryStyle,\n    textContainer: textContainer,\n    text: textStyle,\n    before: beforeStyle,\n    after: afterStyle,\n  });\n};\n\nexport { getStyles };\n"],"names":["baseDivider","position","getStyles","p","props","_objectSpread","DividerDefaultProps","themeColor","useThemeColor","typography","useThemeTypography","isHorizontal","direction","beforeAfterCommon","borderStyle","borderTopWidth","borderColor","color","Separator2","width","dividerStyle","borderBottomWidth","stroke","StyleSheet","hairlineWidth","borderLeftWidth","borderBottomColor","borderLeftColor","marginVertical","margin","Number","marginHorizontal","marginLeft","orientation","marginRight","size","textContainer","paddingVertical","paddingHorizontal","lineHeight","left","right","alignSelf","flexDirection","alignItems","top","textStyle","fontSize","C2FontSize","fontWeight","Description","primaryStyle","secondaryStyle","beforeStyle","afterStyle","verticalStyle","height","create","divider","horizontal","vertical","primary","secondary","text","before","after"],"mappings":"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"}
+{"version":3,"file":"styles.js","sources":["../../../../src/components/Divider/styles.ts"],"sourcesContent":["import { StyleSheet, ViewStyle, TextStyle, DimensionValue } from \"react-native\";\nimport { RedsDivider, DividerDefaultProps } from \"./interface\";\n\nconst baseDivider: ViewStyle = {\n  position: \"relative\",\n};\n\nconst getStyles = (p: RedsDivider, textWidth: number, containerWidth: number, themeColor: any, typography: any) => {\n  const props = { ...DividerDefaultProps, ...p };\n  const isHorizontal = props.direction === \"horizontal\";\n  const hasTextContent = p.children;\n\n  const remainingWidth = containerWidth - textWidth;\n\n  const beforeAfterCommon: ViewStyle = {\n    borderStyle: \"solid\",\n    borderTopWidth: props.stroke || 0.5,\n    borderColor: props.color || themeColor.Separator2,\n  };\n\n  const dividerStyle: ViewStyle = {\n    ...baseDivider,\n    // borderBottomWidth: isHorizontal && hasTextContent ? 0 : (isHorizontal ? (props.stroke ? props.stroke : StyleSheet.hairlineWidth) : 0),\n    // borderLeftWidth: isHorizontal ? 0 : props.stroke ? props.stroke : StyleSheet.hairlineWidth,\n    // borderBottomColor: isHorizontal && !hasTextContent ? props.color || themeColor.Separator2 : undefined,\n    // borderLeftColor: isHorizontal ? undefined : props.color || themeColor.Separator2,\n    // borderStyle: \"solid\",\n    marginVertical: (props.margin && props.margin[0] && Number(props.margin[0])) || (isHorizontal ? 20 : 0),\n    marginHorizontal: (props.margin && props.margin[1] && Number(props.margin[1])) || (isHorizontal ? 0 : 12),\n    marginLeft:\n      (props.margin &&\n        props.margin[1] &&\n        (props.orientation === \"center\" || props.orientation === \"left\") &&\n        Number(props.margin[1])) ||\n      (isHorizontal ? 0 : 12),\n    marginRight:\n      (props.margin && props.margin[1] && props.orientation === \"center\" ? Number(props.margin[1]) : 0) ||\n      (isHorizontal ? 0 : 12),\n    width: (isHorizontal ? props.size : \"auto\") as DimensionValue,\n  };\n\n  const textContainer: ViewStyle = {\n    flexDirection: \"row\",\n    alignItems: \"center\",\n    width: \"100%\",\n    // 移除 position absolute，改为正常布局\n  };\n\n  const textStyle: TextStyle = {\n    fontSize: typography.C2FontSize,\n    fontWeight: \"400\" as TextStyle[\"fontWeight\"],\n    color: props.direction === \"secondary\" ? \"rgba(51, 51, 51, .3)\" : themeColor.Description,\n  };\n\n  const primaryStyle: TextStyle = {\n    ...textStyle,\n    color: themeColor.Description,\n  };\n\n  const secondaryStyle: TextStyle = {\n    ...textStyle,\n    color: \"rgba(51, 51, 51, .3)\",\n  };\n\n  const beforeStyle: ViewStyle = {\n    ...beforeAfterCommon,\n    marginRight: props.children ? 8 : 0,\n    ...(isHorizontal\n      ? props.orientation === \"center\"\n        ? { flex: 1 }\n        : { width: props.orientation === \"left\" ? remainingWidth * 0.15 : remainingWidth * 0.85 }\n      : { width: 8 }),\n    borderColor: props.direction === \"secondary\" ? \"rgba(51, 51, 51, .3)\" : props.color || themeColor.Separator2,\n  };\n\n  const afterStyle: ViewStyle = {\n    ...beforeAfterCommon,\n    marginLeft: props.children ? 8 : 0,\n    ...(isHorizontal\n      ? props.orientation === \"center\"\n        ? { flex: 1 }\n        : { width: props.orientation === \"right\" ? remainingWidth * 0.15 : remainingWidth * 0.85 }\n      : { width: 8 }),\n    borderColor: props.direction === \"secondary\" ? \"rgba(51, 51, 51, .3)\" : props.color || themeColor.Separator2,\n  };\n\n  const noTextBorderStyle: ViewStyle = {\n    ...beforeAfterCommon,\n    width: \"auto\",\n    borderColor: props.direction === \"secondary\" ? \"rgba(51, 51, 51, .3)\" : props.color || themeColor.Separator2,\n  };\n\n  const verticalStyle: ViewStyle = {\n    ...dividerStyle,\n    height: (props.size || 18) as DimensionValue,\n    marginVertical: 0,\n  };\n\n  return StyleSheet.create({\n    divider: baseDivider,\n    horizontal: dividerStyle,\n    vertical: verticalStyle,\n    primary: primaryStyle,\n    secondary: secondaryStyle,\n    textContainer: textContainer,\n    text: textStyle,\n    before: beforeStyle,\n    after: afterStyle,\n    noTextBorderStyle: noTextBorderStyle,\n  });\n};\n\nexport { getStyles };\n"],"names":["baseDivider","position","getStyles","p","textWidth","containerWidth","themeColor","typography","props","_objectSpread","DividerDefaultProps","isHorizontal","direction","children","remainingWidth","beforeAfterCommon","borderStyle","borderTopWidth","stroke","borderColor","color","Separator2","dividerStyle","marginVertical","margin","Number","marginHorizontal","marginLeft","orientation","marginRight","width","size","textContainer","flexDirection","alignItems","textStyle","fontSize","C2FontSize","fontWeight","Description","primaryStyle","secondaryStyle","beforeStyle","flex","afterStyle","noTextBorderStyle","verticalStyle","height","StyleSheet","create","divider","horizontal","vertical","primary","secondary","text","before","after"],"mappings":"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"}

package/lib/cjs/components/DropDown/DropDown.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var reactNative = require('react-native');
 require('../ConfigProvider/hooks/ConfigCache/ConfigCache.js');

package/lib/cjs/components/DropDown/DropDownItem.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var reactNative = require('react-native');
 var components_DropDown_interface_index = require('../../_chunks/BtaVqoIv.js');

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var components_DropDown_DropDown = require('./DropDown.js');
 var components_DropDown_DropDownItem = require('./DropDownItem.js');
 var components_DropDown_interface_index = require('../../_chunks/BtaVqoIv.js');
-require('../../_chunks/C9tZEm0t.js');
+require('../../_chunks/nlVjgQi5.js');
 require('react');
 require('react-native');
 require('../ConfigProvider/hooks/ConfigCache/ConfigCache.js');

package/lib/cjs/components/Empty/Empty.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var reactNative = require('react-native');
 var components_Empty_interface_index = require('../../_chunks/DMQXZWqe.js');

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var components_Empty_Empty = require('./Empty.js');
 var components_Empty_interface_index = require('../../_chunks/DMQXZWqe.js');
-require('../../_chunks/C9tZEm0t.js');
+require('../../_chunks/nlVjgQi5.js');
 require('react');
 require('react-native');
 require('./styles.js');

package/lib/cjs/components/Empty/styles.js

@@ -7,7 +7,7 @@ require('../ConfigProvider/hooks/ConfigCache/ConfigCache.js');
 require('react');
 require('@xhs/reds-apm/src/index.native');
 var components_ConfigProvider_hooks_themeToken_useThemeToken = require('../ConfigProvider/hooks/themeToken/useThemeToken.js');
-require('../../_chunks/C9tZEm0t.js');
+require('../../_chunks/nlVjgQi5.js');
 require('@xhsreds/reds-token-next');
 require('../ConfigProvider/hooks/ConfigContext/ConfigContext.js');
 

package/lib/cjs/components/FAB/FAB.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var reactNative = require('react-native');
 var components_FAB_interface_index = require('../../_chunks/C5m2_Avu.js');

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var components_FAB_FAB = require('./FAB.js');
 var components_FAB_interface_index = require('../../_chunks/C5m2_Avu.js');
-require('../../_chunks/C9tZEm0t.js');
+require('../../_chunks/nlVjgQi5.js');
 require('react');
 require('react-native');
 require('./styles.js');

package/lib/cjs/components/Form/Form.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var components_Form_interface_index = require('../../_chunks/DawXj8aA.js');
 var components_Button_Button = require('../Button/Button.js');

package/lib/cjs/components/Form/FormItem.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var reactNative = require('react-native');
 var components_Form_interface_index = require('../../_chunks/DawXj8aA.js');

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var components_Form_Form = require('./Form.js');
 var components_Form_FormItem = require('./FormItem.js');
 var components_Form_interface_index = require('../../_chunks/DawXj8aA.js');
-require('../../_chunks/C9tZEm0t.js');
+require('../../_chunks/nlVjgQi5.js');
 require('react');
 require('../Button/Button.js');
 require('react-native');

package/lib/cjs/components/Form/styles.js

@@ -8,7 +8,7 @@ require('../ConfigProvider/hooks/ConfigCache/ConfigCache.js');
 require('react');
 require('@xhs/reds-apm/src/index.native');
 var components_ConfigProvider_hooks_themeToken_useThemeToken = require('../ConfigProvider/hooks/themeToken/useThemeToken.js');
-require('../../_chunks/C9tZEm0t.js');
+require('../../_chunks/nlVjgQi5.js');
 require('@xhsreds/reds-token-next');
 require('../ConfigProvider/hooks/ConfigContext/ConfigContext.js');
 

package/lib/cjs/components/Image/Image.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../_chunks/C9tZEm0t.js');
+var _rollupPluginBabelHelpers = require('../../_chunks/nlVjgQi5.js');
 var React = require('react');
 var reactNative = require('react-native');
 var components_Image_interface_index = require('../../_chunks/DFPiddH3.js');
@@ -177,11 +177,12 @@ var Image = function Image(_ref) {
   };
   var colorMode = components_ConfigProvider_hooks_themeToken_useColorMode.useColorMode();
   return /* @__PURE__ */React.createElement(reactNative.View, {
-    style: _rollupPluginBabelHelpers._objectSpread2({
-      borderRadius: borderRadius,
-      height: height,
-      width: width
-    }, style)
+    style: _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({
+      borderRadius: borderRadius || (style === null || style === void 0 ? void 0 : style.borderRadius)
+    }, style), {}, {
+      height: (height || (style === null || style === void 0 ? void 0 : style.height) || 0) + ((style === null || style === void 0 ? void 0 : style.borderWidth) || 0) * 2,
+      width: (width || (style === null || style === void 0 ? void 0 : style.width) || 0) + ((style === null || style === void 0 ? void 0 : style.borderWidth) || 0) * 2
+    })
   }, imageStatus !== components_Image_interface_index.IMAGE_STATUS.HIDE && /* @__PURE__ */React.createElement(reactNative.Image, _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, props), {}, {
     source: formatSource,
     onLoadStart: onLoadStart,
@@ -196,24 +197,24 @@ var Image = function Image(_ref) {
     style: {
       width: width || (style === null || style === void 0 ? void 0 : style.width),
       height: height || (style === null || style === void 0 ? void 0 : style.height),
-      borderRadius: borderRadius
+      borderRadius: borderRadius || (style === null || style === void 0 ? void 0 : style.borderRadius)
       // opacity: imageStatus === IMAGE_STATUS.LOADED ? 1 : 0,
     },
     apmBiz: props.apmBiz
   })), imageStatus === components_Image_interface_index.IMAGE_STATUS.LOADING && loadStyle !== components_Image_interface_index.TLoadStyle.NONE && /* @__PURE__ */React.createElement(reactNative.View, {
     style: _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({
-      width: width,
-      height: height,
-      borderRadius: borderRadius
+      width: width || (style === null || style === void 0 ? void 0 : style.width),
+      height: height || (style === null || style === void 0 ? void 0 : style.height),
+      borderRadius: borderRadius || (style === null || style === void 0 ? void 0 : style.borderRadius)
     }, components_Image_styles.default.loadingContainer), {}, {
       backgroundColor: loadStyle === components_Image_interface_index.TLoadStyle.AVE ? aveColor : components_Image_styles.default.loadingContainer.backgroundColor
-    }, style)
+    })
   }, loadStyle === components_Image_interface_index.TLoadStyle.BLUR && /* @__PURE__ */React.createElement(reactNative.Image, {
     source: blurSource,
     style: {
       width: width || (style === null || style === void 0 ? void 0 : style.width),
       height: height || (style === null || style === void 0 ? void 0 : style.height),
-      borderRadius: borderRadius
+      borderRadius: borderRadius || (style === null || style === void 0 ? void 0 : style.borderRadius)
     },
     apmBiz: props.apmBiz
   }), loadStyle === components_Image_interface_index.TLoadStyle.LOADING && /* @__PURE__ */React.createElement(components_Image_CircularProgress.default, {
@@ -225,8 +226,7 @@ var Image = function Image(_ref) {
     },
     style: _rollupPluginBabelHelpers._objectSpread2({
       width: width,
-      height: height,
-      borderRadius: borderRadius
+      height: height
     }, components_Image_styles.default.loadingContainer)
   }, /* @__PURE__ */React.createElement(reactNative.Image, {
     style: {