@xhsreds/reds-rn-next 0.10.1-beta202512092141 → 0.10.1-beta202512111630

package/lib/types/components/Sheets/interface/index.d.ts

@@ -27,6 +27,12 @@ export declare const enum AnimatedSheetsSize {
     auto = "auto",
     fixed = "fixed"
 }
+export interface SheetAnimationConfig {
+    /** Duration in milliseconds. Default: 150 */
+    duration?: number;
+    /** Easing function. Default: Easing.ease for sheet, Easing.linear for mask */
+    easing?: (value: number) => number;
+}
 export interface RedsSheets {
     label?: string;
     mask?: boolean;
@@ -57,6 +63,14 @@ export interface RedsSheets {
     onImmediateConfirm?: () => void;
     avoidSheetsMove?: boolean;
     headlerLayout?: "center" | "left";
+    openAnimation?: {
+        duration?: number;
+        easing?: (value: number) => number;
+    };
+    closeAnimation?: {
+        duration?: number;
+        easing?: (value: number) => number;
+    };
 }
 export interface RedsSheetsEvent {
 }
@@ -85,4 +99,6 @@ export declare const SheetsDefaultProps: {
     onImmediateConfirm: () => void;
     avoidSheetsMove: boolean;
     headlerLayout: string;
+    openAnimation: {};
+    closeAnimation: {};
 };

package/lib/types/components/Stepper/interface/index.d.ts

@@ -5,6 +5,7 @@ export interface RedsStepper {
     disable?: boolean;
     onChange?: (value: number) => any;
     isControl?: boolean;
+    style?: any;
 }
 export interface RedsStepperEvent {
 }

package/lib/types/components/Stepper/styles.d.ts

@@ -3,7 +3,8 @@ export declare const getStyles: (themeColor: any, typography: any) => {
         display: "flex";
         flexDirection: "row";
         alignItems: "center";
-        justifyContent: "center";
+        justifyContent: "space-between";
+        width: number;
     };
     opacity: {
         opacity: number;
@@ -19,7 +20,6 @@ export declare const getStyles: (themeColor: any, typography: any) => {
         lineHeight: number;
     };
     text: {
-        paddingHorizontal: number;
         fontWeight: any;
         fontSize: any;
         color: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xhsreds/reds-rn-next",
-  "version": "0.10.1-beta202512092141",
+  "version": "0.10.1-beta202512111630",
   "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.10.0"
+    "@xhsreds/reds-token-next": "0.10.1-beta202512111630"
   },
   "peerDependenciesMeta": {
     "ozone-schema-web": {

package/src/components/ActionablePopover/ActionablePopover.tsx

@@ -1,5 +1,14 @@
 import React, { useState, useMemo, isValidElement, useEffect, useRef } from "react";
-import { Text, View, TouchableWithoutFeedback, GestureResponderEvent, Animated, Image, Dimensions } from "react-native";
+import {
+  Text,
+  View,
+  TouchableWithoutFeedback,
+  GestureResponderEvent,
+  Animated,
+  Image,
+  Dimensions,
+  Platform,
+} from "react-native";
 import { RedsActionablePopover, ActionablePopoverData } from "./interface/index";
 import { ModalWrapper } from "./component";
 import useMounted from "../../pvCount/useUnmountedProcess";

package/src/components/Alert/demo/index.tsx

@@ -106,12 +106,12 @@ export default function App() {
   };
 
   const handleConfirm = (e: GestureResponderEvent) => {
-    console.log("确认按钮点击", e);
+    console.log("确认按钮点击", e.target);
     hideAlert();
   };
 
   const handleCancel = (e: GestureResponderEvent) => {
-    console.log("取消按钮点击", e);
+    console.log("取消按钮点击", e.target);
     hideAlert();
   };
 

package/src/components/BottomBar/styles.ts

@@ -5,7 +5,7 @@ export const getStyles = (themeColor: any) => {
     bottomBar: {
       width: "100%",
       padding: 8,
-      backgroundColor: "inherit",
+      backgroundColor: themeColor.Bg,
     },
     fixed: {
       position: "absolute",

package/src/components/Divider/Divider.tsx

@@ -1,28 +1,48 @@
-import React from "react";
+import React, { useState, useMemo } from "react";
 import { View, Text } from "react-native";
 import { RedsDivider, DividerDefaultProps } from "./interface";
 import { getStyles } from "./styles";
 import useMounted from "../../pvCount/useUnmountedProcess";
+import { useThemeColor, useThemeTypography } from "../ConfigProvider";
 
 const Divider = (props: RedsDivider) => {
+  const [textWidth, setTextWidth] = useState(0);
+  const [containerWidth, setContainerWidth] = useState(0);
+  const themeColor = useThemeColor("Divider");
+  const typography = useThemeTypography("Divider");
   useMounted("Divider");
   const finalProps: RedsDivider = {
     ...DividerDefaultProps,
     ...props,
-    direction: props.direction as RedsDivider["direction"],
-    orientation: props.orientation as RedsDivider["orientation"],
+    direction: (props.direction || DividerDefaultProps.direction) as RedsDivider["direction"],
+    orientation: (props.orientation || DividerDefaultProps.orientation) as RedsDivider["orientation"],
   };
 
-  const styles = getStyles(finalProps);
-  const isPrimary = finalProps.direction === "primary" || finalProps.direction === "secondary";
+  const styles = useMemo(() => {
+    return getStyles(finalProps, textWidth, containerWidth, themeColor, typography);
+  }, [textWidth, containerWidth, themeColor, typography]);
+
+  const handleLayout = (e: any) => {
+    setTextWidth(e.nativeEvent.layout.width);
+  };
+
+  const handlerContainerWidth = (e: any) => {
+    setContainerWidth(e.nativeEvent.layout.width);
+  };
 
   return (
-    <View style={[styles.divider, styles[finalProps.direction!]]}>
+    <View style={[styles.divider, styles[finalProps.direction!]]} onLayout={handlerContainerWidth}>
       {finalProps.orientation && finalProps.direction !== "vertical" && (
         <View style={styles.textContainer}>
-          {isPrimary && <View style={styles.before} />}
-          {props.children && <Text style={styles.text}>{props.children}</Text>}
-          {isPrimary && <View style={styles.after} />}
+          <View style={styles.before} />
+          {props.children ? (
+            <Text style={styles.text} onLayout={handleLayout}>
+              {props.children}
+            </Text>
+          ) : (
+            <Text style={styles.noTextBorderStyle}></Text>
+          )}
+          <View style={styles.after} />
         </View>
       )}
     </View>

package/src/components/Divider/demo/index.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { View, Text, StyleSheet } from "react-native";
+import { View, Text, StyleSheet, ScrollView } from "react-native";
 import { Divider } from "@xhs/reds-rn-next";
 
 const styles = StyleSheet.create({
@@ -21,23 +21,29 @@ const Br = (props: { height?: number }) => <View style={{ height: props.height |
 
 export default function App() {
   return (
-    <View>
+    <ScrollView>
+      <Br />
+      <Br />
       <Desc>默认用法</Desc>
       <Divider>测试</Divider>
       <Br />
-      <Desc>direction 类型用法</Desc>
+      <Desc>direction="primary"</Desc>
       <Divider direction="primary" orientation={"center"}>
         测试
       </Divider>
       <Br />
-      <Divider direction="secondary">测试 </Divider>
+      <Desc>direction="secondary"</Desc>
+      <Divider direction="secondary" orientation={"center"}>
+        测试
+      </Divider>
       <Br />
 
+      <Desc>direction="vertical"</Desc>
       <View style={styles.itemBox}>
         <Divider direction="vertical">测试</Divider>
       </View>
+      <Desc>direction="horizontal"</Desc>
       <Divider direction="horizontal">测试</Divider>
-      <Divider direction="horizontal"></Divider>
       <Br />
       <Br />
 
@@ -67,6 +73,6 @@ export default function App() {
       <Desc>margin 数组：horizontal / [上下，左右] vertical / [左右]</Desc>
       <Divider margin={[10, 20]} stroke={2} direction="horizontal" />
       <Divider margin={[10, 0]} stroke={2} direction="vertical" />
-    </View>
+    </ScrollView>
   );
 }

package/src/components/Divider/styles.ts

@@ -1,38 +1,30 @@
 import { StyleSheet, ViewStyle, TextStyle, DimensionValue } from "react-native";
 import { RedsDivider, DividerDefaultProps } from "./interface";
-import { useThemeColor, useThemeTypography } from "../ConfigProvider";
 
 const baseDivider: ViewStyle = {
   position: "relative",
 };
 
-const baseText: TextStyle = {
-  paddingVertical: 0,
-  paddingHorizontal: 16,
-  position: "absolute",
-  backgroundColor: "#fff",
-  lineHeight: 18,
-};
-
-const getStyles = (p: RedsDivider) => {
+const getStyles = (p: RedsDivider, textWidth: number, containerWidth: number, themeColor: any, typography: any) => {
   const props = { ...DividerDefaultProps, ...p };
-  const themeColor = useThemeColor("Divider");
-  const typography = useThemeTypography("Divider");
   const isHorizontal = props.direction === "horizontal";
+  const hasTextContent = p.children;
+
+  const remainingWidth = containerWidth - textWidth;
+
   const beforeAfterCommon: ViewStyle = {
     borderStyle: "solid",
-    borderTopWidth: 0.5,
+    borderTopWidth: props.stroke || 0.5,
     borderColor: props.color || themeColor.Separator2,
-    width: 8,
   };
 
   const dividerStyle: ViewStyle = {
     ...baseDivider,
-    borderBottomWidth: isHorizontal ? (props.stroke ? props.stroke : StyleSheet.hairlineWidth) : 0,
-    borderLeftWidth: isHorizontal ? 0 : props.stroke ? props.stroke : StyleSheet.hairlineWidth,
-    borderBottomColor: isHorizontal ? props.color || themeColor.Separator2 : undefined,
-    borderLeftColor: isHorizontal ? undefined : 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:
@@ -47,17 +39,11 @@ const getStyles = (p: RedsDivider) => {
     width: (isHorizontal ? props.size : "auto") as DimensionValue,
   };
 
-  const textContainer: TextStyle = {
-    paddingVertical: 0,
-    paddingHorizontal: 16,
-    position: "absolute",
-    lineHeight: 18,
-    left: props.orientation === "left" ? 24 : undefined,
-    right: props.orientation === "right" ? 24 : undefined,
-    alignSelf: props.orientation === "center" ? "center" : undefined,
+  const textContainer: ViewStyle = {
     flexDirection: "row",
     alignItems: "center",
-    top: (isHorizontal && -9) || 0,
+    width: "100%",
+    // 移除 position absolute，改为正常布局
   };
 
   const textStyle: TextStyle = {
@@ -78,13 +64,29 @@ const getStyles = (p: RedsDivider) => {
 
   const beforeStyle: ViewStyle = {
     ...beforeAfterCommon,
-    marginRight: 8,
+    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,
   };
 
   const afterStyle: ViewStyle = {
     ...beforeAfterCommon,
-    marginLeft: 8,
+    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,
+  };
+
+  const noTextBorderStyle: ViewStyle = {
+    ...beforeAfterCommon,
+    width: "auto",
     borderColor: props.direction === "secondary" ? "rgba(51, 51, 51, .3)" : props.color || themeColor.Separator2,
   };
 
@@ -104,6 +106,7 @@ const getStyles = (p: RedsDivider) => {
     text: textStyle,
     before: beforeStyle,
     after: afterStyle,
+    noTextBorderStyle: noTextBorderStyle,
   });
 };
 

package/src/components/Image/Image.tsx

@@ -206,9 +206,15 @@ const Image = ({
   };
 
   const colorMode = useColorMode();
-
   return (
-    <View style={{ borderRadius, height, width, ...(style as {}) }}>
+    <View
+      style={{
+        borderRadius: borderRadius || style?.borderRadius,
+        ...(style as {}),
+        height: ((height || style?.height || 0) as number) + (style?.borderWidth || 0) * 2,
+        width: ((width || style?.width || 0) as number) + (style?.borderWidth || 0) * 2,
+      }}
+    >
       {imageStatus !== IMAGE_STATUS.HIDE && (
         <RNImage
           {...props}
@@ -225,7 +231,7 @@ const Image = ({
           style={{
             width: width || style?.width,
             height: height || style?.height,
-            borderRadius,
+            borderRadius: borderRadius || style?.borderRadius,
             // opacity: imageStatus === IMAGE_STATUS.LOADED ? 1 : 0,
           }}
           // @ts-ignore
@@ -235,12 +241,11 @@ const Image = ({
       {imageStatus === IMAGE_STATUS.LOADING && loadStyle !== TLoadStyle.NONE && (
         <View
           style={{
-            width,
-            height,
-            borderRadius,
+            width: width || style?.width,
+            height: height || style?.height,
+            borderRadius: borderRadius || style?.borderRadius,
             ...styles.loadingContainer,
             backgroundColor: loadStyle === TLoadStyle.AVE ? aveColor : styles.loadingContainer.backgroundColor,
-            ...style,
           }}
         >
           {loadStyle === TLoadStyle.BLUR && (
@@ -249,7 +254,7 @@ const Image = ({
               style={{
                 width: width || style?.width,
                 height: height || style?.height,
-                borderRadius,
+                borderRadius: borderRadius || style?.borderRadius,
               }}
               // @ts-ignore
               apmBiz={props.apmBiz}
@@ -265,7 +270,7 @@ const Image = ({
             onPress={(e) => {
               onReload(e);
             }}
-            style={{ width, height, borderRadius, ...styles.loadingContainer }}
+            style={{ width, height, ...styles.loadingContainer }}
           >
             <RNImage
               style={{ width: 40, height: 40 }}

package/src/components/Image/demo/index.tsx

@@ -16,24 +16,23 @@ export default function App() {
   return (
     <View style={{ display: "flex", flexDirection: "row" }}>
       <ScrollView style={{ backgroundColor: "#50796633" }}>
-        <Desc>基础用法</Desc>
+        {/* <Desc>基础用法</Desc>
 
         <Image width={150} height={150} borderRadius={30} source={{ uri: imageUrl }} abortApmCollection={true}></Image>
         <Br />
 
-        <Desc>Image组件加边框</Desc>
+        <Desc>Image组件加边框</Desc> */}
 
         <Image
           width={150}
           height={150}
-          borderRadius={30}
           source={{ uri: imageUrl }}
           abortApmCollection={true}
           style={{ borderWidth: 1, borderStyle: "solid", borderColor: "red", borderRadius: 50 }}
         ></Image>
         <Br />
 
-        <Desc>加载时显示主要色</Desc>
+        {/* <Desc>加载时显示主要色</Desc>
         <Image loadStyle={TLoadStyle.AVE} width={150} height={150} borderRadius={30} src={imageUrl}></Image>
 
         <Br />
@@ -94,7 +93,7 @@ export default function App() {
           onReload={() => {
             setImageUrl2(imageUrl);
           }}
-        ></Image>
+        ></Image> */}
       </ScrollView>
     </View>
   );

package/src/components/List/ListItem/ListItem.tsx

@@ -21,6 +21,8 @@ export interface RedsListItem {
   contentStyle?: ViewStyle;
   badgeActionContent?: string;
   badgeTitleContent?: string;
+  style?: any;
+  lineStyle?: any;
 }
 
 const ListItem: React.FC<RedsListItem> = ({
@@ -38,6 +40,8 @@ const ListItem: React.FC<RedsListItem> = ({
   children,
   badgeActionContent,
   badgeTitleContent,
+  style,
+  lineStyle,
 }) => {
   useMounted("ListItem");
   const styles = createStyles();
@@ -66,6 +70,7 @@ const ListItem: React.FC<RedsListItem> = ({
           styles.listItem,
           children ? {} : { height: listItemSizeToHeight[size] },
           size === "expand" && styles.expand,
+          style,
         ]}
       >
         {children ? (
@@ -75,7 +80,13 @@ const ListItem: React.FC<RedsListItem> = ({
             {prefix && (
               <View style={[styles.prefix, { height: listItemSizeToHeight[size] }, prefixStyle]}>{prefix}</View>
             )}
-            <View style={[styles.contentBox, lineItem ? styles.hr : {}, { height: listItemSizeToHeight[size] }]}>
+            <View
+              style={[
+                styles.contentBox,
+                lineItem ? { ...styles.hr, ...lineStyle } : {},
+                { height: listItemSizeToHeight[size] },
+              ]}
+            >
               <View
                 style={[styles.contentContainer, { marginBottom: 12, marginTop: 12 }, prefix ? { height: 48 } : {}]}
               >

package/src/components/List/demo/index.tsx

@@ -51,6 +51,8 @@ export default function ListDemo() {
           onClick={() => {
             console.log("click item");
           }}
+          // style={{ backgroundColor: 'blue'}}
+          lineStyle={{ borderBottomColor: "red" }}
         />
         <ListItem title="标题" actionText="描述" />
       </List>

package/src/components/NoticeBar/NoticeBar.tsx

@@ -122,7 +122,9 @@ const NoticeBar = (props: RedsNoticeBar) => {
         )}
       </View>
       {props.actionType === NoticeBarActionType.TEXTACTION ? (
-        <Text style={styles.linkText}>{props.actionText || jumpKey}</Text>
+        <Text style={styles.linkText} onPress={handleLink}>
+          {props.actionText || jumpKey}
+        </Text>
       ) : (
         <></>
       )}

package/src/components/PickerView/Wheel.tsx

@@ -15,31 +15,71 @@ const Wheel = (props: RedsWheel) => {
    */
   const scrollerRef = useRef();
 
-  /**
-   * themeColor
-   */
-  const themeColor = useThemeColor();
+  const [scrollEnded, setScrollEnded] = useState(false);
+
+  const [scrollHeight, setScrollHeight] = useState(0);
 
   const [lastValue, setLastValue] = useState(value);
 
+  const onScrollEndDrag = () => {
+    setScrollEnded(true);
+  };
+
   /**
    * 初始化滚动高度
    */
   useEffect(() => {
     if (value !== lastValue) {
       const idx = getSelectIndex(column, value);
-      handleScroll(idx);
+      setIndex(idx);
     }
   }, [column, value]);
 
-  const handleScroll = (idx: number) => {
-    const newVal = column?.[idx]?.value;
-    scrollTo(idx * itemHeight);
+  /**
+   * themeColor
+   */
+  const themeColor = useThemeColor();
+
+  /**
+   * index
+   */
+  const [index, setIndex] = useState<any>();
+
+  const timer = useRef<any>();
+
+  /**
+   * 初始化滚动高度
+   */
+  useEffect(() => {
+    value && setIndex(getSelectIndex(column, value));
+  }, [column, value]);
+
+  useEffect(() => {
+    const newVal = column?.[index]?.value;
+    scrollTo(index * itemHeight);
     if (newVal) {
-      setLastValue(newVal);
       onSelect(newVal, props.index);
+      setLastValue(newVal);
     }
-  };
+  }, [index, props.index]);
+
+  useEffect(() => {
+    if (scrollEnded) {
+      // @ts-ignore
+      if (scrollHeight != null) {
+        timer.current = setTimeout(() => {
+          const selectIndex = Math.round(scrollHeight / itemHeight);
+          if (selectIndex >= 0 && selectIndex < column.length) {
+            setIndex(selectIndex);
+          }
+        }, 0);
+      }
+      setScrollEnded(false);
+    }
+    return () => {
+      timer.current && clearTimeout(timer.current);
+    };
+  }, [scrollEnded]);
 
   /**
    * 滚动ScrollView
@@ -84,13 +124,17 @@ const Wheel = (props: RedsWheel) => {
     e.persist?.();
     let contentOffset = e.nativeEvent.contentOffset;
     const selectIndex = Math.round(contentOffset.y / itemHeight);
+    setIndex(selectIndex);
     const newVal = column?.[selectIndex]?.value;
     setLastValue(newVal);
-    onSelect(newVal, props.index);
+  };
+
+  const onScroll = (e: NativeSyntheticEvent<NativeScrollEvent>) => {
+    setScrollHeight(e.nativeEvent.contentOffset.y);
   };
 
   const handleClick = (index: number) => {
-    handleScroll(index);
+    setIndex(index);
   };
 
   /**
@@ -127,6 +171,9 @@ const Wheel = (props: RedsWheel) => {
       decelerationRate="fast"
       snapToInterval={itemHeight}
       onMomentumScrollEnd={onMomentumScrollEnd}
+      onScrollEndDrag={onScrollEndDrag}
+      onScroll={onScroll}
+      scrollEventThrottle={16}
       testID={`wheel${props.index}`}
       {...accessibility}
     >

package/src/components/Portal/core/PortalHost.tsx

@@ -1,4 +1,5 @@
 import React, { memo, useEffect } from "react";
+import { View } from "react-native";
 import { usePortalState } from "./hooks/usePortalState";
 import { usePortal } from "./hooks/usePortal";
 import { PortalHostProps } from "../interface";
@@ -16,7 +17,7 @@ const PortalHostComponent = ({ name }: PortalHostProps) => {
   return (
     <>
       {state.map((item, index) => {
-        return item.node;
+        return <React.Fragment key={`protal-key-${item.name}`}>{item.node}</React.Fragment>;
       })}
     </>
   );