@nutui/nutui-react-taro 2.6.20 → 2.6.22

package/dist/nutui.react.es.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.20 Fri Sep 20 2024 13:48:55 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.22 Sat Oct 12 2024 15:01:29 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -304,7 +304,7 @@ const Button = React__default.forwardRef(
     };
     const getStyle = useCallback(() => {
       const style2 = {};
-      if (props.color) {
+      if (color) {
         if (props.fill === "outline" || props.fill === "dashed") {
           style2.color = color;
           if (!(color == null ? void 0 : color.includes("gradient"))) {
@@ -317,7 +317,7 @@ const Button = React__default.forwardRef(
         }
       }
       return style2;
-    }, [color]);
+    }, [color, props.fill]);
     const handleClick = (e2) => {
       if (!loading && !disabled && onClick) {
         onClick(e2);
@@ -3945,7 +3945,7 @@ function useWatch(dep, callback, config2 = { immediate: false }) {
     stop.current = true;
   };
 }
-const inBrowser = typeof document !== "undefined" && !!document.scripts;
+const inBrowser$1 = typeof document !== "undefined" && !!document.scripts;
 function isWindow(val) {
   return val === window;
 }
@@ -3987,7 +3987,7 @@ function makeRect(width, height) {
 }
 const getRectByTaro = async (element) => {
   if (element) {
-    if (inBrowser) {
+    if (inBrowser$1) {
       return Promise.resolve(getRect(element));
     }
     return new Promise((resolve, reject) => {
@@ -4152,11 +4152,16 @@ const BackTop = (props) => {
     ...props
   };
   const classPrefix2 = "nut-backtop";
-  const [backTop, SetBackTop] = useState(false);
-  usePageScroll((res) => {
-    const { scrollTop } = res;
-    scrollTop >= threshold ? SetBackTop(true) : SetBackTop(false);
-  });
+  const [backTop, setBackTop] = useState(false);
+  const cls = classNames(classPrefix2, { show: backTop }, className);
+  const handleScroll = useCallback(
+    (res) => {
+      const { scrollTop } = res;
+      setBackTop(scrollTop >= threshold);
+    },
+    [threshold]
+  );
+  usePageScroll(handleScroll);
   const goTop = (e2) => {
     onClick && onClick(e2);
     pageScrollTo({
@@ -4172,23 +4177,7 @@ const BackTop = (props) => {
     bottom: "20px",
     zIndex
   };
-  return /* @__PURE__ */ React__default.createElement(
-    "div",
-    {
-      className: classNames(
-        classPrefix2,
-        {
-          show: backTop
-        },
-        className
-      ),
-      style: styles,
-      onClick: (e2) => {
-        goTop(e2);
-      }
-    },
-    children || /* @__PURE__ */ React__default.createElement(N, { size: 19, className: "nut-backtop-main" })
-  );
+  return /* @__PURE__ */ React__default.createElement("div", { className: cls, style: styles, onClick: (e2) => goTop(e2) }, children || /* @__PURE__ */ React__default.createElement(N, { size: 19, className: "nut-backtop-main" }));
 };
 BackTop.displayName = "NutBackTop";
 const elevatorContext = createContext({});
@@ -4612,11 +4601,10 @@ const NavBar = (props) => {
   };
   const classes = classNames({
     [`${classPrefix2}-fixed`]: fixed,
-    [`${classPrefix2}-safe-area-inset-top`]: safeAreaInsetTop,
     [`${classPrefix2}-title-align-${titleAlign}`]: true
   });
   const cls = classNames(classPrefix2, classes, className);
-  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, fixed && placeholder ? /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-placeholder` }, renderWrapper()) : renderWrapper());
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, safeAreaInsetTop && /* @__PURE__ */ React__default.createElement(SafeArea, { position: "top" }), fixed && placeholder ? /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-placeholder` }, renderWrapper()) : renderWrapper());
 };
 NavBar.displayName = "NutNavBar";
 const defaultProps$1f = {
@@ -5204,8 +5192,9 @@ const TabPane = (props) => {
   );
   return children ? /* @__PURE__ */ React__default.createElement("div", { className: classes }, !disabled && children) : null;
 };
+const inBrowser = typeof window !== "undefined";
 function requestAniFrame() {
-  if (typeof window !== "undefined") {
+  if (inBrowser) {
     const _window = window;
     return _window.requestAnimationFrame || _window.webkitRequestAnimationFrame || function(callback) {
       _window.setTimeout(callback, 1e3 / 60);
@@ -10759,9 +10748,19 @@ const MenuItem = forwardRef((props, ref) => {
   useEffect(() => {
     setShowPopup(show2);
   }, [show2]);
+  const getParentOffset = useCallback(() => {
+    setTimeout(async () => {
+      const p = parent.menuRef.current;
+      const rect = await getRectByTaro(p);
+      setPosition({
+        height: rect.height,
+        top: rect.top
+      });
+    }, 100);
+  }, [parent.menuRef]);
   useEffect(() => {
     getParentOffset();
-  }, [showPopup]);
+  }, [showPopup, getParentOffset]);
   const windowHeight = useMemo$1(() => getSystemInfoSync().windowHeight, []);
   const updateItemOffset = useCallback(() => {
     if (!parent.lockScroll) return;
@@ -10774,7 +10773,7 @@ const MenuItem = forwardRef((props, ref) => {
         });
       }
     });
-  }, [direction, windowHeight]);
+  }, [direction, windowHeight, parent.lockScroll, parent.menuRef]);
   usePageScroll(updateItemOffset);
   useImperativeHandle(ref, () => ({
     toggle: (s) => {
@@ -10802,16 +10801,6 @@ const MenuItem = forwardRef((props, ref) => {
     top: 0,
     height: 0
   });
-  const getParentOffset = () => {
-    setTimeout(async () => {
-      const p = parent.menuRef.current;
-      const rect = await getRectByTaro(p);
-      setPosition({
-        height: rect.height,
-        top: rect.top
-      });
-    }, 100);
-  };
   const isShow = () => {
     if (showPopup) return {};
     return { display: "none" };
@@ -10956,24 +10945,29 @@ const Menu = (props) => {
     ...props
   };
   const menuRef = useRef(null);
+  const [showMenuItem, setShowMenuItem] = useState([]);
+  const [menuItemTitle, setMenuItemTitle] = useState([]);
   const [isScrollFixed, setIsScrollFixed] = useState(false);
+  const cls = classNames(`nut-menu`, className, {
+    "scroll-fixed": isScrollFixed
+  });
   const getScrollTop = (el) => {
-    return Math.max(0, "scrollTop" in el ? el.scrollTop : el.pageYOffset);
+    return Math.max(
+      0,
+      el === window ? window.scrollY : el.scrollTop
+    );
   };
-  const onScroll = () => {
-    const { scrollFixed: scrollFixed2 } = props;
+  const onScroll = useCallback(() => {
     const scrollTop = getScrollTop(window);
-    const isFixed = scrollTop > (typeof scrollFixed2 === "boolean" ? 30 : Number(scrollFixed2));
+    const isFixed = scrollTop > (typeof scrollFixed === "boolean" ? 30 : Number(scrollFixed));
     setIsScrollFixed(isFixed);
-  };
+  }, [scrollFixed]);
   useEffect(() => {
     if (scrollFixed) {
       window.addEventListener("scroll", onScroll);
     }
     return () => window.removeEventListener("scroll", onScroll);
-  }, []);
-  const [showMenuItem, setShowMenuItem] = useState([]);
-  const [menuItemTitle, setMenuItemTitle] = useState([]);
+  }, [scrollFixed, onScroll]);
   const toggleMenuItem = (index, from = "NORMAL") => {
     showMenuItem[index] = !showMenuItem[index];
     if (showMenuItem[index]) {
@@ -11076,26 +11070,15 @@ const Menu = (props) => {
       return null;
     });
   };
-  return /* @__PURE__ */ React__default.createElement(
+  return /* @__PURE__ */ React__default.createElement("div", { ...rest, className: cls, ref: menuRef }, /* @__PURE__ */ React__default.createElement(
     "div",
     {
-      ...rest,
-      className: classNames(`nut-menu`, className, {
-        "scroll-fixed": isScrollFixed
-      }),
-      ref: menuRef
+      className: classNames("nut-menu-bar", {
+        opened: showMenuItem.includes(true)
+      })
     },
-    /* @__PURE__ */ React__default.createElement(
-      "div",
-      {
-        className: classNames("nut-menu-bar", {
-          opened: showMenuItem.includes(true)
-        })
-      },
-      menuTitle()
-    ),
-    cloneChildren()
-  );
+    menuTitle()
+  ), cloneChildren());
 };
 Menu.displayName = "NutMenu";
 Menu.Item = MenuItem;
@@ -11286,6 +11269,13 @@ const RadioGroup = React__default.forwardRef(
       disabled,
       ...rest
     } = { ...defaultProps$R, ...props };
+    const cls = classNames(
+      classPrefix$g,
+      {
+        [`${classPrefix$g}-${props.direction}`]: props.direction
+      },
+      className
+    );
     const [val2State, setVal2State] = usePropsValue({
       defaultValue: props.defaultValue,
       value: props.value,
@@ -11308,7 +11298,7 @@ const RadioGroup = React__default.forwardRef(
           }
         );
       });
-    }, [options]);
+    }, [options, labelPosition, val2State]);
     return /* @__PURE__ */ React__default.createElement(
       RadioContext.Provider,
       {
@@ -11325,20 +11315,7 @@ const RadioGroup = React__default.forwardRef(
           }
         }
       },
-      /* @__PURE__ */ React__default.createElement(
-        "div",
-        {
-          className: classNames(
-            classPrefix$g,
-            {
-              [`${classPrefix$g}-${props.direction}`]: props.direction
-            },
-            className
-          ),
-          ...rest
-        },
-        (options == null ? void 0 : options.length) ? renderOptionsChildren() : children
-      )
+      /* @__PURE__ */ React__default.createElement("div", { className: cls, ...rest }, (options == null ? void 0 : options.length) ? renderOptionsChildren() : children)
     );
   }
 );
@@ -11396,29 +11373,6 @@ const Radio = (props) => {
       }
     };
   }
-  const renderLabel = () => {
-    return /* @__PURE__ */ React__default.createElement(
-      "div",
-      {
-        className: classNames(`${classPrefix2}-label`, {
-          [`${classPrefix2}-label-disabled`]: disabled
-        })
-      },
-      children
-    );
-  };
-  const renderButton = () => {
-    return /* @__PURE__ */ React__default.createElement(
-      "div",
-      {
-        className: classNames(`${classPrefix2}-button`, {
-          [`${classPrefix2}-button-active`]: checkedStatement,
-          [`${classPrefix2}-button-disabled`]: disabled
-        })
-      },
-      children
-    );
-  };
   const color = () => {
     return {
       [`${classPrefix2}-icon-disabled`]: disabled,
@@ -11442,8 +11396,21 @@ const Radio = (props) => {
       className: classNames(color())
     }) : /* @__PURE__ */ React__default.createElement(A, { className: classNames(color()) });
   };
+  const renderLabel = () => {
+    const labelcls = classNames(`${classPrefix2}-label`, {
+      [`${classPrefix2}-label-disabled`]: disabled
+    });
+    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, renderIcon(), /* @__PURE__ */ React__default.createElement("div", { className: labelcls }, children));
+  };
+  const renderButton = () => {
+    const buttoncls = classNames(`${classPrefix2}-button`, {
+      [`${classPrefix2}-button-active`]: checkedStatement,
+      [`${classPrefix2}-button-disabled`]: disabled
+    });
+    return /* @__PURE__ */ React__default.createElement("div", { className: buttoncls }, children);
+  };
   const renderByShape = (shape2) => {
-    return shape2 === "button" ? renderButton() : /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, renderIcon(), renderLabel());
+    return shape2 === "button" ? renderButton() : renderLabel();
   };
   const renderRadioItem = () => {
     return renderByShape(context && context.shape ? context.shape : shape);
@@ -11452,22 +11419,14 @@ const Radio = (props) => {
     if (disabled || checkedStatement) return;
     setCheckedStatement(!checkedStatement);
   };
-  return /* @__PURE__ */ React__default.createElement(
-    "div",
+  const cls = classNames(
+    classPrefix2,
     {
-      className: classNames(
-        classPrefix2,
-        {
-          [`${classPrefix2}-reverse`]: labelPosition === "left"
-        },
-        className
-      ),
-      style,
-      onClick: handleClick,
-      ...rest
+      [`${classPrefix2}-reverse`]: labelPosition === "left"
     },
-    renderRadioItem()
+    className
   );
+  return /* @__PURE__ */ React__default.createElement("div", { className: cls, style, onClick: handleClick, ...rest }, renderRadioItem());
 };
 Radio.displayName = "NutRadio";
 Radio.Group = RadioGroup;
@@ -11489,9 +11448,6 @@ const Range = (props) => {
     button,
     vertical,
     marks,
-    onChange,
-    onStart,
-    onEnd,
     minDescription,
     maxDescription,
     currentDescription,
@@ -11499,7 +11455,10 @@ const Range = (props) => {
     max,
     step,
     value,
-    defaultValue
+    defaultValue,
+    onChange,
+    onStart,
+    onEnd
   } = { ...defaultProps$P, ...props };
   const classPrefix2 = "nut-range";
   const [buttonIndex, setButtonIndex] = useState(0);
@@ -11517,7 +11476,7 @@ const Range = (props) => {
     finalValue: 0,
     onChange: handleChange
   });
-  const [exactValue, setEaxctValue] = useState(
+  const [exactValue, setExactValue] = useState(
     () => value || defaultValue || 0
   );
   const marksRef = useRef({});
@@ -11535,10 +11494,7 @@ const Range = (props) => {
         setMarksList(list);
       }
     }
-  }, [marks]);
-  const scope = () => {
-    return max - min;
-  };
+  }, [marks, max, min]);
   const classes = classNames(classPrefix2, {
     [`${classPrefix2}-disabled`]: disabled,
     [`${classPrefix2}-vertical`]: vertical
@@ -11550,41 +11506,38 @@ const Range = (props) => {
     },
     className
   );
-  const markClassName = useCallback(
-    (mark) => {
-      const classPrefix22 = "nut-range-mark";
-      let lowerBound = min;
-      let upperBound = max;
-      if (range3 && Array.isArray(current)) {
-        lowerBound = current[0];
-        upperBound = current[1];
-      } else {
-        upperBound = current;
-      }
-      const isActive = mark <= upperBound && mark >= lowerBound;
-      return [
-        `${classPrefix22}-text`,
-        `${isActive ? `${classPrefix22}-text-active` : ""}`
-      ].join(" ");
-    },
-    [range3, current, min, max]
-  );
+  const markClassName = (mark) => {
+    const classPrefix22 = "nut-range-mark";
+    let lowerBound = min;
+    let upperBound = max;
+    if (range3 && Array.isArray(current)) {
+      lowerBound = current[0];
+      upperBound = current[1];
+    } else {
+      upperBound = current;
+    }
+    const isActive = mark <= upperBound && mark >= lowerBound;
+    return [
+      `${classPrefix22}-text`,
+      `${isActive ? `${classPrefix22}-text-active` : ""}`
+    ].join(" ");
+  };
   const isRange = (val) => {
     return !!range3 && Array.isArray(val);
   };
+  const scope = useMemo$1(() => {
+    if (max < min || max === min) {
+      console.log("max 的值需要大于 min的值");
+    }
+    return max - min;
+  }, [max, min]);
   const calcMainAxis = () => {
     const modelVal = current;
-    if (isRange(modelVal)) {
-      return `${(modelVal[1] - modelVal[0]) * 100 / scope()}%`;
-    }
-    return `${(modelVal - min) * 100 / scope()}%`;
+    return isRange(modelVal) ? `${(modelVal[1] - modelVal[0]) * 100 / scope}%` : `${(modelVal - min) * 100 / scope}%`;
   };
   const calcOffset = () => {
     const modelVal = current;
-    if (isRange(modelVal)) {
-      return `${(modelVal[0] - min) * 100 / scope()}%`;
-    }
-    return `0%`;
+    return isRange(modelVal) ? `${(modelVal[0] - min) * 100 / scope}%` : `0%`;
   };
   const barStyle = () => {
     if (vertical) {
@@ -11604,11 +11557,11 @@ const Range = (props) => {
   const marksStyle = (mark) => {
     const dir = rtl ? "right" : "left";
     let style = {
-      [dir]: `${(mark - min) / scope() * 100}%`
+      [dir]: `${(mark - min) / scope * 100}%`
     };
     if (vertical) {
       style = {
-        top: `${(mark - min) / scope() * 100}%`
+        top: `${(mark - min) / scope * 100}%`
       };
     }
     return style;
@@ -11655,8 +11608,8 @@ const Range = (props) => {
       delta = (event.detail.y ? event.detail.y : event.clientY) - rect.top;
       total = rect.height;
     }
-    const value2 = min + delta / total * scope();
-    setEaxctValue(current);
+    const value2 = min + delta / total * scope;
+    setExactValue(current);
     if (isRange(current)) {
       const [left2, right2] = current;
       const middle = (left2 + right2) / 2;
@@ -11674,7 +11627,7 @@ const Range = (props) => {
       return;
     }
     touch.start(event);
-    setEaxctValue(current);
+    setExactValue(current);
     if (isRange(current)) {
       setStartValue(current.map(format2));
     } else {
@@ -11695,12 +11648,12 @@ const Range = (props) => {
     if (!rect) return;
     let delta = touch.deltaX.current;
     let total = rect.width;
-    let diff = delta / total * scope();
+    let diff = delta / total * scope;
     diff = rtl ? -diff : diff;
     if (vertical) {
       delta = touch.deltaY.current;
       total = rect.height;
-      diff = delta / total * scope();
+      diff = delta / total * scope;
     }
     let newValue;
     if (isRange(startValue)) {
@@ -11709,7 +11662,7 @@ const Range = (props) => {
     } else {
       newValue = startValue + diff;
     }
-    setEaxctValue(newValue);
+    setExactValue(newValue);
     updateValue(newValue);
   };
   const onTouchEnd = () => {
@@ -11729,57 +11682,65 @@ const Range = (props) => {
   const renderButton = (index) => {
     return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, button || /* @__PURE__ */ React__default.createElement("div", { className: "nut-range-button" }, currentDescription !== null && /* @__PURE__ */ React__default.createElement("div", { className: "number" }, currentDescription ? currentDescription(curValue(index)) : curValue(index))));
   };
-  return /* @__PURE__ */ React__default.createElement("div", { className: containerClasses }, minDescription !== null && /* @__PURE__ */ React__default.createElement("div", { className: "min" }, minDescription || min), /* @__PURE__ */ React__default.createElement("div", { ref: root2, className: classes, onClick: (e2) => click(e2) }, marksList.length > 0 && /* @__PURE__ */ React__default.createElement("div", { className: "nut-range-mark" }, marksList.map((mark) => {
-    return /* @__PURE__ */ React__default.createElement(
-      "span",
-      {
-        key: mark,
-        className: markClassName(mark),
-        style: marksStyle(mark)
-      },
-      Array.isArray(marks) ? marksRef.current[mark] : marks[mark],
-      /* @__PURE__ */ React__default.createElement(
-        "span",
+  const renderRangeButton = () => {
+    return [0, 1].map((item, index) => {
+      const cls = `${index === 0 ? "nut-range-button-wrapper-left" : ""}
+                  ${index === 1 ? "nut-range-button-wrapper-right" : ""}`;
+      return /* @__PURE__ */ React__default.createElement(
+        "div",
         {
-          className: classNames("nut-range-tick", {
-            active: tickClass(mark)
-          })
-        }
-      )
-    );
-  })), /* @__PURE__ */ React__default.createElement("div", { className: "nut-range-bar", style: barStyle() }, range3 ? [0, 1].map((item, index) => {
-    return /* @__PURE__ */ React__default.createElement(
-      "div",
-      {
-        key: index,
-        className: `${index === 0 ? "nut-range-button-wrapper-left" : ""}
-                  ${index === 1 ? "nut-range-button-wrapper-right" : ""}`,
-        onTouchStart: (e2) => {
-          if (typeof index === "number") {
+          key: index,
+          className: cls,
+          onTouchStart: (e2) => {
             setButtonIndex(index);
-          }
-          onTouchStart(e2);
+            onTouchStart(e2);
+          },
+          onTouchMove,
+          onTouchEnd,
+          onTouchCancel: onTouchEnd,
+          onClick: (e2) => e2.stopPropagation()
         },
-        onTouchMove: (e2) => onTouchMove(e2),
+        renderButton(index)
+      );
+    });
+  };
+  const renderSingleButton = () => {
+    return /* @__PURE__ */ React__default.createElement(
+      View,
+      {
+        catchMove: true,
+        className: "nut-range-button-wrapper",
+        onTouchStart,
+        onTouchMove,
         onTouchEnd,
         onTouchCancel: onTouchEnd,
         onClick: (e2) => e2.stopPropagation()
       },
-      renderButton(index)
+      renderButton()
     );
-  }) : /* @__PURE__ */ React__default.createElement(
-    View,
-    {
-      catchMove: true,
-      className: "nut-range-button-wrapper",
-      onTouchStart: (e2) => onTouchStart(e2),
-      onTouchMove: (e2) => onTouchMove(e2),
-      onTouchEnd,
-      onTouchCancel: onTouchEnd,
-      onClick: (e2) => e2.stopPropagation()
-    },
-    renderButton()
-  ))), maxDescription !== null && /* @__PURE__ */ React__default.createElement("div", { className: "max" }, maxDescription || max));
+  };
+  const renderMark = () => {
+    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, marksList.length > 0 && /* @__PURE__ */ React__default.createElement("div", { className: "nut-range-mark" }, marksList.map((mark) => {
+      return /* @__PURE__ */ React__default.createElement(
+        "span",
+        {
+          key: mark,
+          className: markClassName(mark),
+          style: marksStyle(mark)
+        },
+        Array.isArray(marks) ? marksRef.current[mark] : marks[mark],
+        /* @__PURE__ */ React__default.createElement(
+          "span",
+          {
+            className: classNames("nut-range-tick", {
+              active: tickClass(mark)
+            })
+          }
+        )
+      );
+    })));
+  };
+  return /* @__PURE__ */ React__default.createElement("div", { className: containerClasses }, minDescription !== null && /* @__PURE__ */ React__default.createElement("div", { className: "min" }, minDescription || min), /* @__PURE__ */ React__default.createElement("div", { ref: root2, className: classes, onClick: (e2) => click(e2) }, renderMark(), /* @__PURE__ */ React__default.createElement("div", { className: "nut-range-bar", style: barStyle() }, range3 ? renderRangeButton() : renderSingleButton())), maxDescription !== null && /* @__PURE__ */ React__default.createElement("div", { className: "max" }, maxDescription || max));
 };
 Range.displayName = "NutRange";
 const defaultProps$O = {
@@ -12862,6 +12823,7 @@ const Preview = ({
   onDeleteItem,
   handleItemClick,
   previewUrl,
+  deleteIcon,
   children
 }) => {
   const renderIcon = (item) => {
@@ -12879,12 +12841,12 @@ const Preview = ({
         key: item.uid
       },
       previewType === "picture" && !children && deletable && /* @__PURE__ */ React__default.createElement(
-        u$1,
+        View,
         {
-          color: "rgba(0,0,0,0.6)",
           className: "close",
           onClick: () => onDeleteItem(item, index)
-        }
+        },
+        deleteIcon
       ),
       previewType === "picture" && !children && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader-preview-img" }, item.status === "ready" ? /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader-preview-progress" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader-preview-progress-msg" }, item.message)) : item.status !== "success" && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader-preview-progress" }, renderIcon(item), /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader-preview-progress-msg" }, item.message)), ((_a = item.type) == null ? void 0 : _a.includes("image")) ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, item.url && /* @__PURE__ */ React__default.createElement(
         Image$2,
@@ -12947,6 +12909,7 @@ const defaultProps$H = {
   mediaType: ["image", "video"],
   camera: "back",
   uploadIcon: /* @__PURE__ */ React__default.createElement(y, { size: "20px", color: "#808080" }),
+  deleteIcon: /* @__PURE__ */ React__default.createElement(u$1, { color: "rgba(0,0,0,0.6)" }),
   uploadLabel: "",
   previewType: "picture",
   fit: "cover",
@@ -12974,6 +12937,7 @@ const InternalUploader = (props, ref) => {
   const {
     children,
     uploadIcon,
+    deleteIcon,
     uploadLabel,
     accept,
     name,
@@ -13300,6 +13264,7 @@ const InternalUploader = (props, ref) => {
         onDeleteItem,
         handleItemClick,
         previewUrl,
+        deleteIcon,
         children
       }
     }
@@ -15045,15 +15010,14 @@ const defaultProps$v = {
   size: "",
   shape: "round",
   icon: "",
-  fit: "cover",
   background: "#eee",
   color: "#666",
+  fit: "cover",
   src: "",
   alt: ""
 };
 const classPrefix$a = `nut-avatar`;
 const Avatar = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   const {
     children,
     size,
@@ -15061,9 +15025,9 @@ const Avatar = (props) => {
     background,
     color,
     src,
+    alt,
     icon,
     fit,
-    alt,
     className,
     style,
     onClick,
@@ -15079,9 +15043,10 @@ const Avatar = (props) => {
   const avatarRef = useRef(null);
   const parent = useContext(AvatarContext);
   const sizeValue = ["large", "normal", "small"];
+  const { propAvatarGroup, avatarGroupRef } = parent;
   const classes = classNames({
-    [`nut-avatar-${((_a = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _a.size) || size || "normal"}`]: true,
-    [`nut-avatar-${((_b = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _b.shape) || shape}`]: true
+    [`nut-avatar-${(propAvatarGroup == null ? void 0 : propAvatarGroup.size) || size || "normal"}`]: true,
+    [`nut-avatar-${(propAvatarGroup == null ? void 0 : propAvatarGroup.shape) || shape}`]: true
   });
   const cls = classNames(classPrefix$a, classes, className);
   const styles = {
@@ -15089,52 +15054,52 @@ const Avatar = (props) => {
     height: sizeValue.indexOf(size) > -1 ? "" : `${size}px`,
     backgroundColor: `${background}`,
     color,
-    marginLeft: avatarIndex !== 1 && ((_c = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _c.gap) ? `${(_d = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _d.gap}px` : "",
-    zIndex: ((_e = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _e.level) === "right" ? `${Math.abs(maxSum - avatarIndex)}` : "",
+    marginLeft: avatarIndex !== 1 && (propAvatarGroup == null ? void 0 : propAvatarGroup.gap) ? `${propAvatarGroup == null ? void 0 : propAvatarGroup.gap}px` : "",
+    zIndex: (propAvatarGroup == null ? void 0 : propAvatarGroup.level) === "right" ? `${Math.abs(maxSum - avatarIndex)}` : "",
     ...style
   };
   const maxStyles = {
-    backgroundColor: `${(_f = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _f.maxBackground}`,
-    color: `${(_g = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _g.maxColor}`
+    backgroundColor: `${propAvatarGroup == null ? void 0 : propAvatarGroup.maxBackground}`,
+    color: `${propAvatarGroup == null ? void 0 : propAvatarGroup.maxColor}`
   };
+  const avatarLength = useCallback(
+    (children2) => {
+      var _a, _b;
+      for (let i2 = 0; i2 < children2.length; i2++) {
+        if (children2[i2] && children2[i2].classList && isAvatarInClassList(children2[i2])) {
+          children2[i2].setAttribute("data-index", i2 + 1);
+        }
+      }
+      const index = Number((_b = (_a = avatarRef == null ? void 0 : avatarRef.current) == null ? void 0 : _a.dataset) == null ? void 0 : _b.index);
+      const maxCount = propAvatarGroup == null ? void 0 : propAvatarGroup.max;
+      setMaxSum(children2.length);
+      setAvatarIndex(index);
+      if (index === children2.length && index !== maxCount && children2.length > maxCount) {
+        setShowMax(true);
+      }
+    },
+    [propAvatarGroup == null ? void 0 : propAvatarGroup.max]
+  );
   useEffect(() => {
-    var _a2;
-    const avatarChildren = (_a2 = parent == null ? void 0 : parent.avatarGroupRef) == null ? void 0 : _a2.current.children;
+    const avatarChildren = avatarGroupRef == null ? void 0 : avatarGroupRef.current.children;
     if (avatarChildren) {
       avatarLength(avatarChildren);
     }
-  }, []);
+  }, [avatarLength, avatarGroupRef]);
   const isAvatarInClassList = (element) => {
-    var _a2, _b2;
+    var _a, _b;
     if (getEnv() === Taro.ENV_TYPE.WEB) {
       return element.classList[0] === "nut-avatar" || element.classList.values().next().value === "nut-avatar";
     }
-    return ((_a2 = element.classList) == null ? void 0 : _a2.tokenList[0]) === "nut-avatar" || ((_b2 = element.classList) == null ? void 0 : _b2.tokenList.values().next().value) === "nut-avatar";
-  };
-  const avatarLength = (children2) => {
-    var _a2, _b2, _c2;
-    for (let i2 = 0; i2 < children2.length; i2++) {
-      if (children2[i2] && children2[i2].classList && isAvatarInClassList(children2[i2])) {
-        children2[i2].setAttribute("data-index", i2 + 1);
-      }
-    }
-    const index = (_b2 = (_a2 = avatarRef == null ? void 0 : avatarRef.current) == null ? void 0 : _a2.dataset) == null ? void 0 : _b2.index;
-    const maxCount = (_c2 = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _c2.max;
-    setMaxSum(children2.length);
-    setAvatarIndex(index);
-    if (index === children2.length && index !== maxCount && children2.length > maxCount) {
-      setShowMax(true);
-    }
+    return ((_a = element.classList) == null ? void 0 : _a.tokenList[0]) === "nut-avatar" || ((_b = element.classList) == null ? void 0 : _b.tokenList.values().next().value) === "nut-avatar";
   };
   const errorEvent = () => {
-    if (onError) {
-      onError();
-    }
+    onError && onError();
   };
   const clickAvatar = (e2) => {
     onClick && onClick(e2);
   };
-  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, (showMax || !((_h = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _h.max) || avatarIndex <= ((_i = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _i.max)) && /* @__PURE__ */ React__default.createElement(
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, (showMax || !(propAvatarGroup == null ? void 0 : propAvatarGroup.max) || avatarIndex <= (propAvatarGroup == null ? void 0 : propAvatarGroup.max)) && /* @__PURE__ */ React__default.createElement(
     "div",
     {
       className: cls,
@@ -15143,7 +15108,7 @@ const Avatar = (props) => {
       onClick: clickAvatar,
       ref: avatarRef
     },
-    (!((_j = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _j.max) || avatarIndex <= ((_k = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _k.max)) && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, src && /* @__PURE__ */ React__default.createElement(
+    (!(propAvatarGroup == null ? void 0 : propAvatarGroup.max) || avatarIndex <= (propAvatarGroup == null ? void 0 : propAvatarGroup.max)) && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, src && /* @__PURE__ */ React__default.createElement(
       Image$1,
       {
         className: "avatar-img",
@@ -15155,7 +15120,7 @@ const Avatar = (props) => {
       ...icon.props,
       className: `${icon.props.className || ""} icon`
     }) : null, children && /* @__PURE__ */ React__default.createElement("span", { className: "text" }, children), !src && !icon && !children && /* @__PURE__ */ React__default.createElement(D, { className: "icon" })),
-    showMax && /* @__PURE__ */ React__default.createElement("div", { className: "text" }, ((_l = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _l.maxContent) ? (_m = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _m.maxContent : `+ ${avatarIndex - Number(((_n = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _n.max) || 0)}`)
+    showMax && /* @__PURE__ */ React__default.createElement("div", { className: "text" }, (propAvatarGroup == null ? void 0 : propAvatarGroup.maxContent) ? propAvatarGroup == null ? void 0 : propAvatarGroup.maxContent : `+ ${avatarIndex - Number((propAvatarGroup == null ? void 0 : propAvatarGroup.max) || 0)}`)
   ));
 };
 Avatar.displayName = "NutAvatar";
@@ -15620,22 +15585,22 @@ const CountUp = (props) => {
     className,
     thousands,
     style,
-    ...reset
+    ...rest
   } = mergeProps(defaultProps$q, props);
   const classPrefix2 = "nut-countup";
   const countupRef = useRef(null);
   const timerRef = useRef(0);
   const numbers = Array.from({ length: 10 }, (v, i2) => i2);
-  const getShowNumber = () => {
+  const getShowNumber = useCallback(() => {
     const splitArr = value.split(".");
     const intNumber = length && splitArr[0].length < length ? (Array(length).join("0") + splitArr[0]).slice(-length) : splitArr[0];
     const currNumber = `${thousands ? intNumber.replace(/(\d)(?=(?:\d{3})+$)/g, "$1,") : intNumber}${splitArr[1] ? "." : ""}${splitArr[1] || ""}`;
     return currNumber.split("");
-  };
+  }, [length, thousands, value]);
   const [numerArr, setNumerArr] = useState([]);
   const [transformArr, setTransformArr] = useState([]);
   const isLoaded = useRef(false);
-  const setNumberTransform = () => {
+  const setNumberTransform = useCallback(() => {
     if (countupRef.current && numerArr.length) {
       createSelectorQuery().selectAll(".nut-countup-listitem").node((numberItems) => {
         const transformArrCache = [];
@@ -15650,7 +15615,7 @@ const CountUp = (props) => {
         setTransformArr([...transformArrCache]);
       }).exec();
     }
-  };
+  }, [numerArr]);
   const numberEaseStyle = (idx) => {
     return {
       transition: `transform ${duration}s ease-in-out`,
@@ -15659,7 +15624,7 @@ const CountUp = (props) => {
   };
   useEffect(() => {
     setNumberTransform();
-  }, [numerArr]);
+  }, [numerArr, setNumberTransform]);
   useEffect(() => {
     if (!isLoaded.current) {
       isLoaded.current = true;
@@ -15672,7 +15637,7 @@ const CountUp = (props) => {
     return () => {
       window.clearTimeout(timerRef.current);
     };
-  }, [value]);
+  }, [value, delay, getShowNumber]);
   return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2} ${className}`, ref: countupRef }, /* @__PURE__ */ React__default.createElement("ul", { className: `${classPrefix2}-list` }, numerArr.map((item, idx) => {
     return /* @__PURE__ */ React__default.createElement(
       "li",
@@ -15787,7 +15752,7 @@ const Audio = (props) => {
     onPlay == null ? void 0 : onPlay(audioCtx);
   });
   audioCtx.onCanplay(() => {
-    const intervalID = setInterval(function() {
+    const intervalID = setInterval(() => {
       if (audioCtx.duration !== 0) {
         setTotalSeconds(audioCtx.duration);
         clearInterval(intervalID);
@@ -15804,8 +15769,7 @@ const Audio = (props) => {
     setCurrentDuration(formatSeconds(audioCtx.currentTime.toString()));
   });
   audioCtx.onError((res) => {
-    console.warn("code", res.errCode);
-    console.warn("message", res.errMsg);
+    console.warn("onError", res.errCode, res.errMsg);
   });
   function formatSeconds(value) {
     if (!value) {
@@ -18355,6 +18319,7 @@ const InternalBarrage = (props, ref) => {
   const barrageContainer = useRef(null);
   const barrageCWidth = useRef(0);
   const timer = useRef(0);
+  const domTimer = useRef(0);
   const index = useRef(0);
   const times = useRef([]);
   const historyIndex = useRef(-1);
@@ -18376,28 +18341,34 @@ const InternalBarrage = (props, ref) => {
     }
     return 0;
   };
+  const clearDomTimeout = () => {
+    if (domTimer.current) {
+      clearTimeout(domTimer.current);
+      domTimer.current = 0;
+    }
+  };
   useEffect(() => {
     const init = async () => {
+      var _a;
       if (barrageBody.current) {
         barrageCWidth.current = await getNodeWidth(barrageBody.current);
+        (_a = barrageBody.current) == null ? void 0 : _a.style.setProperty(
+          "--move-distance",
+          `-${barrageCWidth.current}px`
+        );
+        index.current = 0;
+        run();
       }
     };
-    init();
-    setTimeout(() => {
-      var _a;
-      (_a = barrageBody.current) == null ? void 0 : _a.style.setProperty(
-        "--move-distance",
-        `-${barrageCWidth.current}px`
-      );
-      index.current = 0;
-      run();
+    domTimer.current = window.setTimeout(() => {
+      init();
     }, 300);
     return () => {
-      clearInterval(timer.current);
+      clearDomTimeout();
     };
   }, [list]);
   const run = () => {
-    clearInterval(timer.current);
+    clearTimeout(timer.current);
     let intervalCache = interval;
     const _index = (loop ? index.current % list.length : index.current) % rows;
     const result = times.current[_index] - rows * interval;
@@ -18408,7 +18379,30 @@ const InternalBarrage = (props, ref) => {
       play();
     }, intervalCache);
   };
-  const play = async () => {
+  const setStyle = async (el, currentIndex) => {
+    try {
+      if (el) {
+        const refe = await getRectByTaro(el);
+        const width = refe.width;
+        const height = refe.height;
+        el.classList.add("move");
+        const elScrollDuration = Math.round(
+          width / barrageCWidth.current * duration
+        );
+        times.current[currentIndex] = elScrollDuration;
+        el.style.animationDuration = `${duration + elScrollDuration}ms`;
+        el.style.top = `${currentIndex * (height + gapY) + 20}px`;
+        el.style.width = `${width}px`;
+      }
+    } catch (error) {
+      console.log("异常自动流转到下一个", error);
+      barrageContainer.current.removeChild(el);
+    }
+    el.addEventListener("animationend", () => {
+      barrageContainer.current.removeChild(el);
+    });
+  };
+  const play = () => {
     if (!loop && index.current >= list.length) {
       return;
     }
@@ -18420,25 +18414,9 @@ const InternalBarrage = (props, ref) => {
     }
     historyIndex.current = currentIndex;
     el.innerHTML = list[_index];
-    el.classList.add("barrage-item");
     barrageContainer.current.appendChild(el);
-    try {
-      const width = await getNodeWidth(el);
-      const height = await getNodeWidth(el, "height");
-      el.classList.add("move");
-      const elScrollDuration = width / barrageCWidth.current * duration;
-      times.current[currentIndex] = Math.ceil(elScrollDuration);
-      el.style.animationDuration = `${(duration + elScrollDuration).toFixed(
-        2
-      )}ms`;
-      el.style.top = `${currentIndex * (height + gapY) + 20}px`;
-      el.style.width = `${width}px`;
-    } catch (error) {
-      console.log("异常自动流转到下一个");
-    }
-    el.addEventListener("animationend", () => {
-      barrageContainer.current.removeChild(el);
-    });
+    el.classList.add("barrage-item");
+    requestAnimationFrame(() => setStyle(el, currentIndex));
     index.current++;
     run();
   };