@nutui/nutui-react 1.3.3-beta.2 → 1.3.4-beta.0

package/dist/nutui.react.es.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.3.3-beta.2 Wed Sep 14 2022 14:10:06 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.3.4-beta.0 Wed Sep 21 2022 14:27:51 GMT+0800 (China Standard Time)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -145,6 +145,8 @@ const Button = (props) => {
     onClick,
     className,
     style,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
   } = {
     ...defaultProps$1k,
@@ -215,12 +217,12 @@ const Button = (props) => {
     className: "nut-button__warp",
     style: getStyle()
   }, loading && /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: "loading"
   }), !loading && icon ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: icon
   }) : "", children));
 };
@@ -1481,6 +1483,8 @@ const Cell = (props) => {
     className,
     iconSlot,
     linkSlot,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
   } = {
     ...defaultProps$1j,
@@ -1514,8 +1518,8 @@ const Cell = (props) => {
   }, children || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, icon || iconSlot ? /* @__PURE__ */ React__default.createElement("div", {
     className: b2("icon")
   }, iconSlot || (icon ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: icon,
     className: "icon"
   }) : null)) : null, title || subTitle ? /* @__PURE__ */ React__default.createElement("div", {
@@ -1530,8 +1534,8 @@ const Cell = (props) => {
     }),
     style: styles
   }, desc) : null, !linkSlot && (isLink || to2) ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: "right",
     className: b2("link")
   }) : linkSlot));
@@ -1565,9 +1569,9 @@ CellGroup.defaultProps = defaultProps$1i;
 CellGroup.displayName = "NutCellGroup";
 var classnames = { exports: {} };
 /*!
-  Copyright (c) 2018 Jed Watson.
-  Licensed under the MIT License (MIT), see
-  http://jedwatson.github.io/classnames
+	Copyright (c) 2018 Jed Watson.
+	Licensed under the MIT License (MIT), see
+	http://jedwatson.github.io/classnames
 */
 (function(module) {
   (function() {
@@ -1589,14 +1593,14 @@ var classnames = { exports: {} };
             }
           }
         } else if (argType === "object") {
-          if (arg.toString === Object.prototype.toString) {
-            for (var key in arg) {
-              if (hasOwn.call(arg, key) && arg[key]) {
-                classes.push(key);
-              }
-            }
-          } else {
+          if (arg.toString !== Object.prototype.toString && !arg.toString.toString().includes("[native code]")) {
             classes.push(arg.toString());
+            continue;
+          }
+          for (var key in arg) {
+            if (hasOwn.call(arg, key) && arg[key]) {
+              classes.push(key);
+            }
           }
         }
       }
@@ -2172,7 +2176,9 @@ const Popup = (props) => {
     onClickCloseIcon,
     onOpened,
     onClosed,
-    onClick
+    onClick,
+    iconClassPrefix,
+    iconFontClassName
   } = props;
   const [index2, setIndex] = useState(zIndex || _zIndex);
   const [innerVisible, setInnerVisible] = useState(visible);
@@ -2271,8 +2277,8 @@ const Popup = (props) => {
       className: closeClasses,
       onClick: onHandleClickCloseIcon
     }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: closeIcon,
       size: "12px"
     })) : ""));
@@ -2684,8 +2690,13 @@ const GridItem = (props) => {
     center,
     reverse,
     direction,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
-  } = { ...defaultProps$1a, ...props };
+  } = {
+    ...defaultProps$1a,
+    ...props
+  };
   const b2 = cn("grid-item");
   const pxCheck2 = (value) => {
     return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
@@ -2718,8 +2729,8 @@ const GridItem = (props) => {
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: contentClass()
   }, icon && isIconName() ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: icon,
     size: iconSize || parentIconSize,
     color: iconColor || parentIconColor
@@ -2729,6 +2740,218 @@ const GridItem = (props) => {
 };
 GridItem.defaultProps = defaultProps$1a;
 GridItem.displayName = "NutGridItem";
+const canUseDom = !!(typeof window !== "undefined" && typeof document !== "undefined" && window.document && window.document.createElement);
+const defaultRoot = canUseDom ? window : void 0;
+const overflowStylePatterns = ["scroll", "auto", "overlay"];
+function isElement(node) {
+  const ELEMENT_NODE_TYPE = 1;
+  return node.nodeType === ELEMENT_NODE_TYPE;
+}
+function getScrollParent(el, root = defaultRoot) {
+  let node = el;
+  while (node && node !== root && isElement(node)) {
+    if (node === document.body) {
+      return root;
+    }
+    const { overflowY } = window.getComputedStyle(node);
+    if (overflowStylePatterns.includes(overflowY) && node.scrollHeight > node.clientHeight) {
+      return node;
+    }
+    node = node.parentNode;
+  }
+  return root;
+}
+function isWindow(val) {
+  return val === window;
+}
+const getRect = (elementRef) => {
+  const element = elementRef;
+  if (isWindow(element)) {
+    const width = element.innerWidth;
+    const height = element.innerHeight;
+    return {
+      top: 0,
+      left: 0,
+      right: width,
+      bottom: height,
+      width,
+      height
+    };
+  }
+  if (element && element.getBoundingClientRect) {
+    return element.getBoundingClientRect();
+  }
+  return {
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    width: 0,
+    height: 0
+  };
+};
+function useWatch(dep, callback, config2 = { immediate: false }) {
+  const { immediate } = config2;
+  const prev = useRef();
+  const inited = useRef(false);
+  const stop2 = useRef(false);
+  useEffect(() => {
+    const execute = () => callback(prev.current);
+    if (!stop2.current) {
+      if (!inited.current) {
+        inited.current = true;
+        if (immediate) {
+          execute();
+        }
+      } else {
+        execute();
+      }
+      prev.current = dep;
+    }
+  }, [dep]);
+  return () => {
+    stop2.current = true;
+  };
+}
+const Sticky = (props) => {
+  const {
+    position = "top",
+    top = 0,
+    bottom = 0,
+    zIndex = 2e3,
+    children,
+    container,
+    className,
+    onChange,
+    ...rest
+  } = props;
+  const stickyRef = useRef(null);
+  const rootRef = useRef(null);
+  const offset = position === "top" ? top : bottom;
+  const [isFixed, setIsFixed] = useState(false);
+  const [stickyStyle, setStickyStyle] = useState({
+    [position]: `${offset}px`,
+    zIndex
+  });
+  const [rootStyle, setRootStyle] = useState({});
+  const getElement = useCallback(() => {
+    return getScrollParent(rootRef.current);
+  }, []);
+  useEffect(() => {
+    if (position === "top")
+      return;
+    const containerEle = container == null ? void 0 : container.current;
+    if (!rootRef.current && !containerEle)
+      return;
+    const rootRect = getRect(rootRef.current);
+    const containerRect = getRect(containerEle);
+    const clientHeight = document.documentElement.clientHeight;
+    const stCurrent = stickyRef.current;
+    const stickyRect = getRect(stCurrent);
+    let fixed = clientHeight - bottom < rootRect.bottom;
+    if (containerEle) {
+      fixed = containerRect.bottom > clientHeight - bottom - stickyRect.height && clientHeight - bottom - stickyRect.height > containerRect.top;
+    }
+    const defaultPostVal = fixed ? "fixed" : "inherit";
+    setStickyStyle((prev) => {
+      return {
+        ...prev,
+        position: defaultPostVal
+      };
+    });
+    setIsFixed(fixed);
+  }, [position, container, bottom]);
+  const handleScroll = useCallback(() => {
+    const containerEle = container == null ? void 0 : container.current;
+    if (!rootRef.current && !containerEle)
+      return;
+    const rootRect = getRect(rootRef.current);
+    const stCurrent = stickyRef.current;
+    const stickyRect = getRect(stCurrent);
+    const containerRect = getRect(containerEle);
+    if (rootRect.height) {
+      setRootStyle((prev) => {
+        return {
+          ...prev,
+          height: rootRect.height
+        };
+      });
+    }
+    if (position === "top") {
+      if (containerEle) {
+        const fixed = top > rootRect.top && containerRect.bottom > 0;
+        const positionVal = fixed ? "fixed" : "inherit";
+        const diff = containerRect.bottom - top - stickyRect.height;
+        const transform = diff < 0 ? diff : 0;
+        setStickyStyle((prev) => {
+          return {
+            ...prev,
+            position: positionVal,
+            transform: `translate3d(0, ${transform}px, 0)`
+          };
+        });
+        setIsFixed(fixed);
+      } else {
+        const fixed = top > rootRect.top;
+        const positionVal = fixed ? "fixed" : "inherit";
+        setStickyStyle((prev) => {
+          return {
+            ...prev,
+            position: positionVal
+          };
+        });
+        setIsFixed(fixed);
+      }
+    } else {
+      const clientHeight = document.documentElement.clientHeight;
+      if (containerEle) {
+        const fixed = containerRect.bottom > 0 && clientHeight - bottom - stickyRect.height > containerRect.top;
+        const positionVal = fixed ? "fixed" : "inherit";
+        const diff = containerRect.bottom - (clientHeight - bottom);
+        const transform = diff < 0 ? diff : 0;
+        setStickyStyle((prev) => {
+          return {
+            ...prev,
+            position: positionVal,
+            transform: `translate3d(0, ${transform}px, 0)`
+          };
+        });
+        setIsFixed(fixed);
+      } else {
+        const fixed = clientHeight - bottom < rootRect.bottom;
+        const positionVal = fixed ? "fixed" : "inherit";
+        setStickyStyle((prev) => {
+          return {
+            ...prev,
+            position: positionVal
+          };
+        });
+        setIsFixed(fixed);
+      }
+    }
+  }, [position, bottom, container, top]);
+  useWatch(isFixed, () => {
+    onChange && onChange(isFixed);
+  });
+  useEffect(() => {
+    const el = getElement();
+    el.addEventListener("scroll", handleScroll, false);
+    return () => {
+      el.removeEventListener("tap", handleScroll);
+    };
+  }, [getElement, handleScroll]);
+  return /* @__PURE__ */ React__default.createElement("div", {
+    ref: rootRef,
+    style: rootStyle,
+    className: `nut-sticky ${className}`,
+    ...rest
+  }, /* @__PURE__ */ React__default.createElement("div", {
+    className: "nut-sticky-box",
+    ref: stickyRef,
+    style: stickyStyle
+  }, children));
+};
+Sticky.displayName = "NutSticky";
 const defaultProps$19 = {
   ...ComponentDefaults,
   title: "",
@@ -2761,7 +2984,9 @@ const NavBar = (props) => {
     onClickTitle,
     onClickIcon,
     onClickBack,
-    onClickRight
+    onClickRight,
+    iconClassPrefix,
+    iconFontClassName
   } = {
     ...defaultProps$19,
     ...props
@@ -2786,8 +3011,8 @@ const NavBar = (props) => {
       className: `${b2("left")}`,
       onClick: (e2) => onClickBack(e2)
     }, leftShow && /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: "left",
       color: "#979797"
     }), leftText && /* @__PURE__ */ React__default.createElement("div", {
@@ -2803,8 +3028,8 @@ const NavBar = (props) => {
     }, title), titIcon && /* @__PURE__ */ React__default.createElement("div", {
       onClick: (e2) => onClickIcon(e2)
     }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: titIcon
     })), slot.content);
   };
@@ -2860,8 +3085,13 @@ const FixedNav = (props) => {
     type,
     slotList,
     slotBtn,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
-  } = { ...defaultProps$18, ...props };
+  } = {
+    ...defaultProps$18,
+    ...props
+  };
   const b2 = cn("fixednav");
   const classes = classNames(
     {
@@ -2906,8 +3136,8 @@ const FixedNav = (props) => {
     className: "nut-fixednav__btn",
     onClick: () => onUpdateValue()
   }, slotBtn || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: "left",
     color: "#fff"
   }), /* @__PURE__ */ React__default.createElement("div", {
@@ -3009,7 +3239,9 @@ const TabbarItem = (props) => {
     activeColor,
     unactiveColor,
     index: index2,
-    handleClick: handleClick2
+    handleClick: handleClick2,
+    iconClassPrefix,
+    iconFontClassName
   } = {
     ...defaultProps$16,
     ...props
@@ -3043,8 +3275,8 @@ const TabbarItem = (props) => {
   }, "99+")) : /* @__PURE__ */ React__default.createElement("div", {
     className: `${bIcon("dot")}`
   }), icon && /* @__PURE__ */ React__default.createElement("div", null, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     size,
     name: icon
   })), /* @__PURE__ */ React__default.createElement("div", {
@@ -3156,10 +3388,14 @@ function capitalize(string) {
     return "";
   return string[0].toUpperCase() + string.slice(1);
 }
+const actionsWithoutCaptureSupported = ["enter", "leave"];
+function hasCapture(capture = false, actionKey) {
+  return capture && !actionsWithoutCaptureSupported.includes(actionKey);
+}
 function toHandlerProp(device, action = "", capture = false) {
   const deviceProps = EVENT_TYPE_MAP[device];
   const actionKey = deviceProps ? deviceProps[action] || action : action;
-  return "on" + capitalize(device) + capitalize(actionKey) + (capture ? "Capture" : "");
+  return "on" + capitalize(device) + capitalize(actionKey) + (hasCapture(capture, actionKey) ? "Capture" : "");
 }
 const pointerCaptureEvents = ["gotpointercapture", "lostpointercapture"];
 function parseProp(prop) {
@@ -3185,6 +3421,13 @@ function toDomEventType(device, action = "") {
 function isTouch(event) {
   return "touches" in event;
 }
+function getPointerType(event) {
+  if (isTouch(event))
+    return "touch";
+  if ("pointerType" in event)
+    return event.pointerType;
+  return "mouse";
+}
 function getCurrentTargetTouchList(event) {
   return Array.from(event.touches).filter((e2) => {
     var _event$currentTarget, _event$currentTarget$;
@@ -3414,6 +3657,8 @@ class Engine {
       const _absoluteDelta = state._delta.map(Math.abs);
       V.addTo(state._distance, _absoluteDelta);
     }
+    if (this.axisIntent)
+      this.axisIntent(event);
     const [_m0, _m1] = state._movement;
     const [t0, t1] = config2.threshold;
     const {
@@ -3443,8 +3688,8 @@ class Engine {
       movement[0] = _step[0] !== false ? _m0 - _step[0] : 0;
       movement[1] = _step[1] !== false ? _m1 - _step[1] : 0;
     }
-    if (this.intent)
-      this.intent(movement);
+    if (this.restrictToAxis && !state._blocked)
+      this.restrictToAxis(movement);
     const previousOffset = state.offset;
     const gestureIsActive = state._active && !state._blocked || state.active;
     if (gestureIsActive) {
@@ -3501,23 +3746,16 @@ class Engine {
     this.timeoutStore.clean();
   }
 }
-function selectAxis([dx, dy]) {
-  const d2 = Math.abs(dx) - Math.abs(dy);
-  if (d2 > 0)
+function selectAxis([dx, dy], threshold) {
+  const absDx = Math.abs(dx);
+  const absDy = Math.abs(dy);
+  if (absDx > absDy && absDx > threshold) {
     return "x";
-  if (d2 < 0)
+  }
+  if (absDy > absDx && absDy > threshold) {
     return "y";
-  return void 0;
-}
-function restrictVectorToAxis(v2, axis) {
-  switch (axis) {
-    case "x":
-      v2[1] = 0;
-      break;
-    case "y":
-      v2[0] = 0;
-      break;
   }
+  return void 0;
 }
 class CoordinatesEngine extends Engine {
   constructor(...args) {
@@ -3538,13 +3776,25 @@ class CoordinatesEngine extends Engine {
   computeMovement() {
     this.state.movement = V.sub(this.state.offset, this.state.lastOffset);
   }
-  intent(v2) {
-    this.state.axis = this.state.axis || selectAxis(v2);
-    this.state._blocked = (this.config.lockDirection || !!this.config.axis) && !this.state.axis || !!this.config.axis && this.config.axis !== this.state.axis;
-    if (this.state._blocked)
-      return;
+  axisIntent(event) {
+    const state = this.state;
+    const config2 = this.config;
+    if (!state.axis && event) {
+      const threshold = typeof config2.axisThreshold === "object" ? config2.axisThreshold[getPointerType(event)] : config2.axisThreshold;
+      state.axis = selectAxis(state._movement, threshold);
+    }
+    state._blocked = (config2.lockDirection || !!config2.axis) && !state.axis || !!config2.axis && config2.axis !== state.axis;
+  }
+  restrictToAxis(v2) {
     if (this.config.axis || this.config.lockDirection) {
-      restrictVectorToAxis(v2, this.state.axis);
+      switch (this.state.axis) {
+        case "x":
+          v2[1] = 0;
+          break;
+        case "y":
+          v2[0] = 0;
+          break;
+      }
     }
   }
 }
@@ -3554,6 +3804,9 @@ const commonConfigResolver = {
   enabled(value = true) {
     return value;
   },
+  eventOptions(value, _k, config2) {
+    return _objectSpread2(_objectSpread2({}, config2.shared.eventOptions), value);
+  },
   preventDefault(value = false) {
     return value;
   },
@@ -3585,6 +3838,7 @@ const commonConfigResolver = {
     return V.toVector(value, 0);
   }
 };
+const DEFAULT_AXIS_THRESHOLD = 0;
 const coordinatesConfigResolver = _objectSpread2(_objectSpread2({}, commonConfigResolver), {}, {
   axis(_v, _k, {
     axis
@@ -3593,6 +3847,9 @@ const coordinatesConfigResolver = _objectSpread2(_objectSpread2({}, commonConfig
     if (!this.lockDirection)
       return axis;
   },
+  axisThreshold(value = DEFAULT_AXIS_THRESHOLD) {
+    return value;
+  },
   bounds(value = {}) {
     if (typeof value === "function") {
       return (state) => coordinatesConfigResolver.bounds(value(state));
@@ -3676,11 +3933,11 @@ class DragEngine extends CoordinatesEngine {
     const state = this.state;
     if (event.buttons != null && (Array.isArray(config2.pointerButtons) ? !config2.pointerButtons.includes(event.buttons) : config2.pointerButtons !== -1 && config2.pointerButtons !== event.buttons))
       return;
-    this.ctrl.setEventIds(event);
+    const ctrlIds = this.ctrl.setEventIds(event);
     if (config2.pointerCapture) {
       event.target.setPointerCapture(event.pointerId);
     }
-    if (state._pointerActive)
+    if (ctrlIds && ctrlIds.size > 1 && state._pointerActive)
       return;
     this.start(event);
     this.setupPointer(event);
@@ -3688,10 +3945,15 @@ class DragEngine extends CoordinatesEngine {
     state._pointerActive = true;
     this.computeValues(pointerValues(event));
     this.computeInitial();
-    if (config2.preventScroll) {
+    if (config2.preventScrollAxis && getPointerType(event) !== "mouse") {
+      state._active = false;
       this.setupScrollPrevention(event);
     } else if (config2.delay > 0) {
       this.setupDelayTrigger(event);
+      if (config2.triggerAllEvents) {
+        this.compute(event);
+        this.emit();
+      }
     } else {
       this.startPointerDrag(event);
     }
@@ -3723,13 +3985,13 @@ class DragEngine extends CoordinatesEngine {
     }
     V.addTo(state._movement, state._delta);
     this.compute(event);
-    if (state._delayed) {
+    if (state._delayed && state.intentional) {
       this.timeoutStore.remove("dragDelay");
       state.active = false;
       this.startPointerDrag(event);
       return;
     }
-    if (config2.preventScroll && !state._preventScroll) {
+    if (config2.preventScrollAxis && !state._preventScroll) {
       if (state.axis) {
         if (state.axis === config2.preventScrollAxis || config2.preventScrollAxis === "xy") {
           state._active = false;
@@ -3757,7 +4019,7 @@ class DragEngine extends CoordinatesEngine {
     }
     const state = this.state;
     const config2 = this.config;
-    if (!state._pointerActive)
+    if (!state._active || !state._pointerActive)
       return;
     const id = pointerId(event);
     if (state._pointerId !== void 0 && id !== state._pointerId)
@@ -3786,14 +4048,14 @@ class DragEngine extends CoordinatesEngine {
     this.emit();
   }
   pointerClick(event) {
-    if (!this.state.tap) {
+    if (!this.state.tap && event.detail > 0) {
       event.preventDefault();
       event.stopPropagation();
     }
   }
   setupPointer(event) {
     const config2 = this.config;
-    let device = config2.device;
+    const device = config2.device;
     if (config2.pointerLock) {
       event.currentTarget.requestPointerLock();
     }
@@ -3814,29 +4076,29 @@ class DragEngine extends CoordinatesEngine {
     }
   }
   setupScrollPrevention(event) {
+    this.state._preventScroll = false;
     persistEvent(event);
-    this.eventStore.add(this.sharedConfig.window, "touch", "change", this.preventScroll.bind(this), {
-      passive: false
-    });
-    this.eventStore.add(this.sharedConfig.window, "touch", "end", this.clean.bind(this), {
-      passive: false
-    });
-    this.eventStore.add(this.sharedConfig.window, "touch", "cancel", this.clean.bind(this), {
+    const remove = this.eventStore.add(this.sharedConfig.window, "touch", "change", this.preventScroll.bind(this), {
       passive: false
     });
-    this.timeoutStore.add("startPointerDrag", this.startPointerDrag.bind(this), this.config.preventScroll, event);
+    this.eventStore.add(this.sharedConfig.window, "touch", "end", remove);
+    this.eventStore.add(this.sharedConfig.window, "touch", "cancel", remove);
+    this.timeoutStore.add("startPointerDrag", this.startPointerDrag.bind(this), this.config.preventScrollDelay, event);
   }
   setupDelayTrigger(event) {
     this.state._delayed = true;
-    this.timeoutStore.add("dragDelay", this.startPointerDrag.bind(this), this.config.delay, event);
+    this.timeoutStore.add("dragDelay", () => {
+      this.state._step = [0, 0];
+      this.startPointerDrag(event);
+    }, this.config.delay);
   }
   keyDown(event) {
     const deltaFn = KEYS_DELTA_MAP[event.key];
     if (deltaFn) {
       const state = this.state;
       const factor = event.shiftKey ? 10 : event.altKey ? 0.1 : 1;
-      state._delta = deltaFn(factor);
       this.start(event);
+      state._delta = deltaFn(factor);
       state._keyboardActive = true;
       V.addTo(state._movement, state._delta);
       this.compute(event);
@@ -3860,8 +4122,10 @@ class DragEngine extends CoordinatesEngine {
       bindFunction(device, "cancel", this.pointerUp.bind(this));
       bindFunction("lostPointerCapture", "", this.pointerUp.bind(this));
     }
-    bindFunction("key", "down", this.keyDown.bind(this));
-    bindFunction("key", "up", this.keyUp.bind(this));
+    if (this.config.keys) {
+      bindFunction("key", "down", this.keyDown.bind(this));
+      bindFunction("key", "up", this.keyUp.bind(this));
+    }
     if (this.config.filterTaps) {
       bindFunction("click", "", this.pointerClick.bind(this), {
         capture: true,
@@ -3906,6 +4170,11 @@ const DEFAULT_DRAG_DELAY = 180;
 const DEFAULT_SWIPE_VELOCITY = 0.5;
 const DEFAULT_SWIPE_DISTANCE = 50;
 const DEFAULT_SWIPE_DURATION = 250;
+const DEFAULT_DRAG_AXIS_THRESHOLD = {
+  mouse: 0,
+  touch: 0,
+  pen: 8
+};
 const dragConfigResolver = _objectSpread2(_objectSpread2({}, coordinatesConfigResolver), {}, {
   device(_v, _k, {
     pointer: {
@@ -3925,15 +4194,13 @@ const dragConfigResolver = _objectSpread2(_objectSpread2({}, coordinatesConfigRe
       return "touch";
     return "mouse";
   },
-  preventScroll(value = false, _k, {
-    preventScrollAxis = "y"
+  preventScrollAxis(value, _k, {
+    preventScroll
   }) {
-    this.preventScrollAxis = preventScrollAxis;
-    if (!SUPPORT.touchscreen)
-      return false;
-    if (typeof value === "number")
-      return value;
-    return value ? DEFAULT_PREVENT_SCROLL_DELAY : false;
+    this.preventScrollDelay = typeof preventScroll === "number" ? preventScroll : preventScroll || preventScroll === void 0 && value ? DEFAULT_PREVENT_SCROLL_DELAY : void 0;
+    if (!SUPPORT.touchscreen || preventScroll === false)
+      return void 0;
+    return value ? value : preventScroll !== void 0 ? "y" : void 0;
   },
   pointerCapture(_v, _k, {
     pointer: {
@@ -3944,6 +4211,9 @@ const dragConfigResolver = _objectSpread2(_objectSpread2({}, coordinatesConfigRe
     this.pointerButtons = buttons;
     return !this.pointerLock && this.device === "pointer" && capture;
   },
+  keys(value = true) {
+    return value;
+  },
   threshold(value, _k, {
     filterTaps = false,
     tapsThreshold = 3,
@@ -3974,10 +4244,15 @@ const dragConfigResolver = _objectSpread2(_objectSpread2({}, coordinatesConfigRe
       default:
         return value;
     }
+  },
+  axisThreshold(value) {
+    if (!value)
+      return DEFAULT_DRAG_AXIS_THRESHOLD;
+    return _objectSpread2(_objectSpread2({}, DEFAULT_DRAG_AXIS_THRESHOLD), value);
   }
 });
 const SCALE_ANGLE_RATIO_INTENT_DEG = 30;
-const PINCH_WHEEL_RATIO = 36;
+const PINCH_WHEEL_RATIO = 100;
 class PinchEngine extends Engine {
   constructor(...args) {
     super(...args);
@@ -4016,19 +4291,22 @@ class PinchEngine extends Engine {
     } = this.state;
     this.state.movement = [offset[0] / lastOffset[0], offset[1] - lastOffset[1]];
   }
-  intent(v2) {
+  axisIntent() {
     const state = this.state;
+    const [_m0, _m1] = state._movement;
     if (!state.axis) {
-      const axisMovementDifference = Math.abs(v2[0]) * SCALE_ANGLE_RATIO_INTENT_DEG - Math.abs(v2[1]);
+      const axisMovementDifference = Math.abs(_m0) * SCALE_ANGLE_RATIO_INTENT_DEG - Math.abs(_m1);
       if (axisMovementDifference < 0)
         state.axis = "angle";
       else if (axisMovementDifference > 0)
         state.axis = "scale";
     }
+  }
+  restrictToAxis(v2) {
     if (this.config.lockDirection) {
-      if (state.axis === "scale")
+      if (this.state.axis === "scale")
         v2[1] = 0;
-      else if (state.axis === "angle")
+      else if (this.state.axis === "angle")
         v2[0] = 0;
     }
   }
@@ -4179,7 +4457,8 @@ class PinchEngine extends Engine {
     this.emit();
   }
   wheel(event) {
-    if (!event.ctrlKey)
+    const modifierKey = this.config.modifierKey;
+    if (modifierKey && !event[modifierKey])
       return;
     if (!this.state._active)
       this.wheelStart(event);
@@ -4219,11 +4498,10 @@ class PinchEngine extends Engine {
       bindFunction(device, "change", this[device + "Move"].bind(this));
       bindFunction(device, "end", this[device + "End"].bind(this));
       bindFunction(device, "cancel", this[device + "End"].bind(this));
-    } else {
-      bindFunction("wheel", "", this.wheel.bind(this), {
-        passive: false
-      });
     }
+    bindFunction("wheel", "", this.wheel.bind(this), {
+      passive: false
+    });
   }
 }
 const pinchConfigResolver = _objectSpread2(_objectSpread2({}, commonConfigResolver), {}, {
@@ -4271,6 +4549,11 @@ const pinchConfigResolver = _objectSpread2(_objectSpread2({}, commonConfigResolv
     this.lockDirection = config2.axis === "lock";
     const threshold = V.toVector(value, this.lockDirection ? [0.1, 3] : 0);
     return threshold;
+  },
+  modifierKey(value) {
+    if (value === void 0)
+      return "ctrlKey";
+    return value;
   }
 });
 class MoveEngine extends CoordinatesEngine {
@@ -4578,19 +4861,27 @@ function parse(config2, gestureKey) {
   return _config;
 }
 class EventStore {
-  constructor(ctrl) {
-    _defineProperty(this, "_listeners", []);
+  constructor(ctrl, gestureKey) {
+    _defineProperty(this, "_listeners", /* @__PURE__ */ new Set());
     this._ctrl = ctrl;
+    this._gestureKey = gestureKey;
   }
   add(element, device, action, handler, options2) {
+    const listeners = this._listeners;
     const type = toDomEventType(device, action);
-    const eventOptions = _objectSpread2(_objectSpread2({}, this._ctrl.config.shared.eventOptions), options2);
+    const _options = this._gestureKey ? this._ctrl.config[this._gestureKey].eventOptions : {};
+    const eventOptions = _objectSpread2(_objectSpread2({}, _options), options2);
     element.addEventListener(type, handler, eventOptions);
-    this._listeners.push(() => element.removeEventListener(type, handler, eventOptions));
+    const remove = () => {
+      element.removeEventListener(type, handler, eventOptions);
+      listeners.delete(remove);
+    };
+    listeners.add(remove);
+    return remove;
   }
   clean() {
     this._listeners.forEach((remove) => remove());
-    this._listeners = [];
+    this._listeners.clear();
   }
 }
 class TimeoutStore {
@@ -4634,11 +4925,13 @@ class Controller$1 {
   setEventIds(event) {
     if (isTouch(event)) {
       this.touchIds = new Set(touchIds(event));
+      return this.touchIds;
     } else if ("pointerId" in event) {
       if (event.type === "pointerup" || event.type === "pointercancel")
         this.pointerIds.delete(event.pointerId);
       else if (event.type === "pointerdown")
         this.pointerIds.add(event.pointerId);
+      return this.pointerIds;
     }
   }
   applyHandlers(handlers, nativeHandlers) {
@@ -4662,7 +4955,6 @@ class Controller$1 {
   }
   bind(...args) {
     const sharedConfig = this.config.shared;
-    const eventOptions = sharedConfig.eventOptions;
     const props = {};
     let target;
     if (sharedConfig.target) {
@@ -4670,16 +4962,18 @@ class Controller$1 {
       if (!target)
         return;
     }
-    const bindFunction = bindToProps(props, eventOptions, !!target);
     if (sharedConfig.enabled) {
       for (const gestureKey of this.gestures) {
-        if (this.config[gestureKey].enabled) {
+        const gestureConfig = this.config[gestureKey];
+        const bindFunction = bindToProps(props, gestureConfig.eventOptions, !!target);
+        if (gestureConfig.enabled) {
           const Engine2 = EngineMap.get(gestureKey);
           new Engine2(this, args, gestureKey).bind(bindFunction);
         }
       }
+      const nativeBindFunction = bindToProps(props, sharedConfig.eventOptions, !!target);
       for (const eventKey in this.nativeHandlers) {
-        bindFunction(eventKey, "", (event) => this.nativeHandlers[eventKey](_objectSpread2(_objectSpread2({}, this.state.shared), {}, {
+        nativeBindFunction(eventKey, "", (event) => this.nativeHandlers[eventKey](_objectSpread2(_objectSpread2({}, this.state.shared), {}, {
           event,
           args
         })), void 0, true);
@@ -4705,7 +4999,7 @@ class Controller$1 {
 }
 function setupGesture(ctrl, gestureKey) {
   ctrl.gestures.add(gestureKey);
-  ctrl.gestureEventStores[gestureKey] = new EventStore(ctrl);
+  ctrl.gestureEventStores[gestureKey] = new EventStore(ctrl, gestureKey);
   ctrl.gestureTimeoutStores[gestureKey] = new TimeoutStore();
 }
 function resolveGestures(ctrl, internalHandlers) {
@@ -4796,26 +5090,26 @@ function useRecognizers(handlers, config2 = {}, gestureKey, nativeHandlers) {
   }
   return void 0;
 }
-function useDrag(handler, config2 = {}) {
+function useDrag(handler, config2) {
   registerAction(dragAction);
   return useRecognizers({
     drag: handler
-  }, config2, "drag");
+  }, config2 || {}, "drag");
 }
 function createUseGesture(actions) {
   actions.forEach(registerAction);
-  return function useGesture2(_handlers, _config = {}) {
+  return function useGesture2(_handlers, _config) {
     const {
       handlers,
       nativeHandlers,
       config: config2
-    } = parseMergedHandlers(_handlers, _config);
+    } = parseMergedHandlers(_handlers, _config || {});
     return useRecognizers(handlers, config2, void 0, nativeHandlers);
   };
 }
-function useGesture(handlers, config2 = {}) {
+function useGesture(handlers, config2) {
   const hook = createUseGesture([dragAction, pinchAction, scrollAction, wheelAction, moveAction, hoverAction]);
-  return hook(handlers, config2);
+  return hook(handlers, config2 || {});
 }
 let updateQueue = makeQueue();
 const raf = (fn) => schedule(fn, updateQueue);
@@ -5458,7 +5752,7 @@ function findRange(input, inputRange) {
   return i - 1;
 }
 function _extends$2() {
-  _extends$2 = Object.assign || function(target) {
+  _extends$2 = Object.assign ? Object.assign.bind() : function(target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
       for (var key in source) {
@@ -5871,7 +6165,7 @@ function getAnimatedType(value) {
   return parentNode ? parentNode.constructor : is.arr(value) ? AnimatedArray : isAnimatedString(value) ? AnimatedString : AnimatedValue;
 }
 function _extends$1() {
-  _extends$1 = Object.assign || function(target) {
+  _extends$1 = Object.assign ? Object.assign.bind() : function(target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
       for (var key in source) {
@@ -5990,7 +6284,7 @@ const createHost = (components, {
 };
 const getDisplayName = (arg) => is.str(arg) ? arg : arg && is.str(arg.displayName) ? arg.displayName : is.fun(arg) && arg.name || null;
 function _extends() {
-  _extends = Object.assign || function(target) {
+  _extends = Object.assign ? Object.assign.bind() : function(target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
       for (var key in source) {
@@ -6623,6 +6917,7 @@ class SpringValue extends FrameValue {
         const from = anim.fromValues[i];
         const v0 = node2.v0 != null ? node2.v0 : node2.v0 = is.arr(config2.velocity) ? config2.velocity[i] : config2.velocity;
         let velocity;
+        const precision = config2.precision || (from == to2 ? 5e-3 : Math.min(1, Math.abs(to2 - from) * 1e-3));
         if (!is.und(config2.duration)) {
           let p2 = 1;
           if (config2.duration > 0) {
@@ -6644,11 +6939,10 @@ class SpringValue extends FrameValue {
           const decay = config2.decay === true ? 0.998 : config2.decay;
           const e2 = Math.exp(-(1 - decay) * elapsed);
           position = from + v0 / (1 - decay) * (1 - e2);
-          finished = Math.abs(node2.lastPosition - position) < 0.1;
+          finished = Math.abs(node2.lastPosition - position) <= precision;
           velocity = v0 * e2;
         } else {
           velocity = node2.lastVelocity == null ? v0 : node2.lastVelocity;
-          const precision = config2.precision || (from == to2 ? 5e-3 : Math.min(1, Math.abs(to2 - from) * 1e-3));
           const restVelocity = config2.restVelocity || precision / 10;
           const bounceFactor = config2.clamp ? 0 : config2.bounce;
           const canBounce = !is.und(bounceFactor);
@@ -8382,8 +8676,13 @@ const Tabs = (props) => {
     onChange,
     className,
     autoHeight,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
-  } = { ...defaultProps$13, ...props };
+  } = {
+    ...defaultProps$13,
+    ...props
+  };
   const [currentItem, setCurrentItem] = useState({ index: 0 });
   const titles = useRef([]);
   useEffect(() => {
@@ -8464,8 +8763,8 @@ const Tabs = (props) => {
       className: `${b2("")}__titles-item__smile`,
       style: tabsActiveStyle
     }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       color,
       name: "joy-smile"
     })), /* @__PURE__ */ React__default.createElement("div", {
@@ -8735,6 +9034,8 @@ const Menu = (props) => {
     closeOnClickOverlay,
     children,
     activeColor,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
   } = {
     ...defaultProps$_,
@@ -8834,8 +9135,8 @@ const Menu = (props) => {
     }, /* @__PURE__ */ React__default.createElement("div", {
       className: "nut-menu__title-text"
     }, finallyTitle()), /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       className: "nut-menu__title-icon",
       size: "10",
       name: titleIcon || (direction === "up" ? "arrow-up" : "down-arrow")
@@ -8867,14 +9168,14 @@ const MenuItem = (props) => {
     value,
     columns,
     title,
-    iconClassPrefix,
-    fontClassName,
     optionsIcon,
     direction,
     onChange,
     activeTitleClass,
     inactiveTitleClass,
-    children
+    children,
+    iconClassPrefix,
+    iconFontClassName
   } = {
     ...defaultProps$Z,
     ...props
@@ -8983,8 +9284,8 @@ const MenuItem = (props) => {
         handleClick2(item);
       }
     }, item.value === _value ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       className: getIconCName(item.value, value),
       name: optionsIcon,
       color: activeColor
@@ -9063,40 +9364,15 @@ function useTouch() {
     isHorizontal
   };
 }
-function isWindow(val) {
-  return val === window;
-}
-const getRect = (elementRef) => {
-  const element = elementRef;
-  if (isWindow(element)) {
-    const width = element.innerWidth;
-    const height = element.innerHeight;
-    return {
-      top: 0,
-      left: 0,
-      right: width,
-      bottom: height,
-      width,
-      height
-    };
-  }
-  if (element && element.getBoundingClientRect) {
-    return element.getBoundingClientRect();
-  }
-  return {
-    top: 0,
-    left: 0,
-    right: 0,
-    bottom: 0,
-    width: 0,
-    height: 0
-  };
-};
 let createRoot;
+const { version } = ReactDOM;
+const reactDOMClone = {
+  ...ReactDOM
+};
 try {
-  const mainVersion = Number((ReactDOM.version || "").split(".")[0]);
-  if (mainVersion >= 18 && ReactDOM.createRoot) {
-    createRoot = ReactDOM.createRoot;
+  const mainVersion = Number((version || "").split(".")[0]);
+  if (mainVersion >= 18) {
+    createRoot = reactDOMClone.createRoot;
   }
 } catch (e2) {
   console.log(e2);
@@ -9105,8 +9381,10 @@ function legacyRender(node, container) {
   ReactDOM.render(node, container);
 }
 function concurrentRender(node, container) {
-  const root = ReactDOM.createRoot(container);
-  root.render(node);
+  if (createRoot) {
+    const root = createRoot(container);
+    root.render(node);
+  }
 }
 function render(node, container) {
   if (createRoot) {
@@ -10633,7 +10911,10 @@ const defaultProps$U = {
   }
 };
 const Checkbox = (props) => {
-  const { children } = { ...defaultProps$U, ...props };
+  const { children } = {
+    ...defaultProps$U,
+    ...props
+  };
   const b2 = cn("checkbox");
   const {
     iconName,
@@ -10674,8 +10955,8 @@ const Checkbox = (props) => {
   };
   const renderIcon = () => {
     return /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: getIconName(),
       size: iconSize,
       className: color()
@@ -10950,7 +11231,7 @@ const InternalPicker = (props, ref) => {
   const [refs, setRefs] = useRefs();
   const [columnsList, setColumnsList] = useState([]);
   const b2 = cn("picker");
-  let isConfirmEvent = useRef(false);
+  const isConfirmEvent = useRef(false);
   useEffect(() => {
     if (defaultValueData && defaultValueData.length !== 0 && defaultValueData.toString() !== chooseValueData.toString()) {
       const data = [...defaultValueData];
@@ -11474,6 +11755,8 @@ const InputNumber = (props) => {
     overlimit,
     blur,
     focus,
+    iconClassPrefix,
+    iconFontClassName,
     ...restProps
   } = {
     ...defaultProps$S,
@@ -11579,8 +11862,8 @@ const InputNumber = (props) => {
     style: styles,
     ...restProps
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: iconMinusClasses,
     size: buttonSize,
     name: "minus",
@@ -11597,8 +11880,8 @@ const InputNumber = (props) => {
     onBlur: burValue,
     onFocus: focusValue
   }), /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: iconAddClasses,
     size: buttonSize,
     name: "plus",
@@ -11714,8 +11997,13 @@ const Input = (props) => {
     clickLeftIcon,
     clickRightIcon,
     click,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
-  } = { ...defaultProps$R, ...props };
+  } = {
+    ...defaultProps$R,
+    ...props
+  };
   locale.placeholder = placeholder || locale.placeholder;
   const [inputValue, SetInputValue] = useState("");
   const [active, SetActive] = useState(false);
@@ -11843,8 +12131,8 @@ const Input = (props) => {
       onClickLeftIcon(e2);
     }
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: leftIcon,
     size: leftIconSize
   })) : null, /* @__PURE__ */ React__default.createElement("div", {
@@ -11902,8 +12190,8 @@ const Input = (props) => {
       onInput(e2);
     }
   }), clearable && !readonly && active && inputValue.length > 0 ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: "nut-input-clear",
     name: clearIcon,
     size: clearSize,
@@ -11916,8 +12204,8 @@ const Input = (props) => {
       onClickRightIcon(e2);
     }
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: rightIcon,
     size: rightIconSize
   })) : null, slotButton ? /* @__PURE__ */ React__default.createElement("div", {
@@ -12004,7 +12292,10 @@ const defaultProps$P = {
   }
 };
 const Radio = (props) => {
-  const { children } = { ...defaultProps$P, ...props };
+  const { children } = {
+    ...defaultProps$P,
+    ...props
+  };
   const {
     className,
     disabled,
@@ -12016,6 +12307,8 @@ const Radio = (props) => {
     iconActiveName,
     iconSize,
     onChange,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
   } = props;
   const componentName = "nut-radio";
@@ -12050,8 +12343,8 @@ const Radio = (props) => {
   const renderIcon = () => {
     const { iconName: iconName2, iconSize: iconSize2, iconActiveName: iconActiveName2 } = props;
     return /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: checkedStatement ? iconActiveName2 : iconName2,
       size: iconSize2,
       className: color()
@@ -12112,8 +12405,13 @@ const Rate = (props) => {
     readonly,
     allowHalf,
     spacing,
-    onChange
-  } = { ...defaultProps$O, ...props };
+    onChange,
+    iconClassPrefix,
+    iconFontClassName
+  } = {
+    ...defaultProps$O,
+    ...props
+  };
   const b2 = cn("rate");
   const bi = cn("rate-item");
   const [countArray, setCountArray] = useState([1, 2, 3, 4, 5]);
@@ -12160,22 +12458,22 @@ const Rate = (props) => {
       onClick: (event) => onClick(event, n2),
       style: { marginRight: pxCheck2(spacing) }
     }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       size: iconSize,
       className: `${bi("icon")} ${disabled || n2 > score ? bi("icon--disabled") : ""}`,
       name: n2 <= score ? checkedIcon : uncheckedIcon,
       color: n2 <= score ? activeColor : voidColor
     }), allowHalf && score > n2 - 1 && /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       className: `${bi("icon")} ${bi("icon--half")}`,
       color: n2 <= score ? activeColor : voidColor,
       size: iconSize,
       name: checkedIcon
     }), allowHalf && score < n2 - 1 && /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       className: `${bi("icon")} ${bi("icon--disabled")} ${bi(
         "icon--half"
       )}`,
@@ -12232,6 +12530,8 @@ const ShortPassword = (props) => {
     onCancel,
     onClose,
     onComplete,
+    iconClassPrefix,
+    iconFontClassName,
     ...reset
   } = props;
   const b2 = cn("shortpassword");
@@ -12336,8 +12636,8 @@ const ShortPassword = (props) => {
   }, errorMsg2), tips || locale.shortpassword.tips ? /* @__PURE__ */ React__default.createElement("div", {
     className: b2("message__forget")
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: "icon",
     size: "11px",
     name: "tips"
@@ -12484,25 +12784,218 @@ const TextArea = (props) => {
 };
 TextArea.defaultProps = defaultProps$M;
 TextArea.displayName = "NutTextArea";
-class UploadOptions {
-  constructor() {
-    this.url = "";
-    this.name = "file";
-    this.method = "post";
-    this.xhrState = 200;
-    this.timeout = 30 * 1e3;
-    this.headers = {};
-    this.withCredentials = false;
-  }
-}
-class Upload {
-  constructor(options2) {
-    this.options = options2;
-  }
-  upload() {
-    var _a;
-    const { options: options2 } = this;
-    const xhr = new XMLHttpRequest();
+const defaultProps$L = {
+  name: "",
+  size: "",
+  classPrefix: "nut-icon",
+  fontClassName: "nutui-iconfont",
+  color: "",
+  tag: "i",
+  onClick: (e2) => {
+  },
+  className: ""
+};
+function pxCheck(value) {
+  return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
+}
+function Icon(props) {
+  const {
+    name,
+    size,
+    classPrefix,
+    color,
+    tag,
+    children,
+    className,
+    fontClassName,
+    style,
+    onClick,
+    ...rest
+  } = {
+    ...defaultProps$L,
+    ...props
+  };
+  const isImage = name ? name.indexOf("/") !== -1 : false;
+  const type = isImage ? "img" : tag;
+  const b2 = cn("icon");
+  const handleClick2 = (e2) => {
+    if (onClick) {
+      onClick(e2);
+    }
+  };
+  const hasSrc = () => {
+    if (isImage)
+      return { src: name };
+    return {};
+  };
+  return React__default.createElement(
+    type,
+    {
+      className: isImage ? `${b2("img")} ${className || ""} ` : `${fontClassName} ${b2(null)} ${classPrefix}-${name} ${className || ""}`,
+      style: {
+        color,
+        fontSize: pxCheck(size),
+        width: pxCheck(size),
+        height: pxCheck(size),
+        ...style
+      },
+      ...rest,
+      onClick: handleClick2,
+      ...hasSrc()
+    },
+    children
+  );
+}
+Icon.defaultProps = defaultProps$L;
+Icon.displayName = "NutIcon";
+const defaultProps$K = {
+  ...ComponentDefaults,
+  className: "",
+  style: {},
+  isShowPercentage: true,
+  percentage: 0,
+  fillColor: "#f3f3f3",
+  strokeColor: "linear-gradient(135deg, #fa2c19 0%, #fa6419 100%)",
+  strokeWidth: "",
+  textColor: "",
+  textWidth: "",
+  showText: true,
+  textInside: false,
+  textBackground: "linear-gradient(135deg, #fa2c19 0%, #fa6419 100%)",
+  textType: "text",
+  status: false,
+  iconName: "checked",
+  iconColor: "#439422",
+  iconSize: "16px",
+  rounded: true,
+  children: void 0
+};
+const Progress = (props) => {
+  const {
+    className,
+    style,
+    isShowPercentage,
+    percentage,
+    fillColor,
+    strokeColor,
+    strokeWidth,
+    size,
+    textColor,
+    textWidth,
+    showText,
+    textInside,
+    textBackground,
+    textType,
+    status,
+    iconName,
+    iconColor,
+    iconSize,
+    rounded,
+    children,
+    iconClassPrefix,
+    iconFontClassName,
+    ...rest
+  } = {
+    ...defaultProps$K,
+    ...props
+  };
+  const b2 = cn("progress");
+  const classes = classNames(b2(""));
+  const classesOuter = classNames({
+    [`${b2("")}-outer`]: true,
+    [`${b2("")}-${size || "base"}`]: true
+  });
+  const classesInner = classNames({
+    [`${b2("")}-inner`]: true,
+    [`${b2("")}-active`]: status
+  });
+  const classesText = classNames({
+    [`${b2("")}-text`]: true
+  });
+  const classesInsideText = classNames({
+    [`${b2("")}-text`]: true,
+    [`${b2("")}-insidetext`]: true
+  });
+  const classesTextInner = classNames({
+    [`${b2("")}-text__inner`]: true
+  });
+  const stylesOuter = {
+    height: `${strokeWidth}px`,
+    borderRadius: `${rounded ? rounded === true ? "12px" : rounded : 0}`,
+    background: `${fillColor}`
+  };
+  const stylesInner = {
+    width: `${percentage}%`,
+    borderRadius: `${rounded ? rounded === true ? "12px" : rounded : 0}`,
+    background: `${strokeColor}`
+  };
+  const stylesInsideText = {
+    width: `${textWidth}px`,
+    left: `${percentage}%`,
+    background: textBackground || strokeColor
+  };
+  const stylesInsideIcon = {
+    width: `${textWidth}px`,
+    left: `${percentage}%`
+  };
+  const stylesText = {
+    width: `${textWidth}px`
+  };
+  return /* @__PURE__ */ React__default.createElement("div", {
+    className: `${classes} ${className}`,
+    style,
+    ...rest
+  }, /* @__PURE__ */ React__default.createElement("div", {
+    className: classesOuter,
+    style: stylesOuter
+  }, /* @__PURE__ */ React__default.createElement("div", {
+    className: classesInner,
+    style: stylesInner
+  }, showText && textInside && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children ? /* @__PURE__ */ React__default.createElement("div", {
+    className: classesInsideText,
+    style: stylesInsideIcon
+  }, children) : /* @__PURE__ */ React__default.createElement("div", {
+    className: classesInsideText,
+    style: stylesInsideText
+  }, /* @__PURE__ */ React__default.createElement("span", {
+    className: classesTextInner,
+    style: { color: textColor || "#fff" }
+  }, percentage, isShowPercentage ? "%" : ""))))), showText && !textInside && /* @__PURE__ */ React__default.createElement("div", {
+    className: classesText,
+    style: stylesText
+  }, textType === "text" && /* @__PURE__ */ React__default.createElement("span", {
+    className: classesTextInner,
+    style: { color: textColor || "#333" }
+  }, percentage, isShowPercentage ? "%" : ""), textType === "icon" && /* @__PURE__ */ React__default.createElement(Icon, {
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
+    size: iconSize,
+    name: iconName,
+    color: iconColor
+  })));
+};
+Progress.defaultProps = defaultProps$K;
+Progress.displayName = "NutProgress";
+class UploadOptions {
+  constructor() {
+    this.url = "";
+    this.name = "file";
+    this.fileType = "image";
+    this.method = "post";
+    this.xhrState = 200;
+    this.timeout = 30 * 1e3;
+    this.headers = {};
+    this.withCredentials = false;
+  }
+}
+class Upload {
+  constructor(options2) {
+    this.options = options2;
+  }
+  upload() {
+    var _a;
+    const { options: options2 } = this;
+    const xhr = new XMLHttpRequest();
     xhr.timeout = options2.timeout;
     if (xhr.upload) {
       xhr.upload.addEventListener(
@@ -12529,13 +13022,57 @@ class Upload {
         xhr.setRequestHeader(key, value);
       }
       (_a = options2.onStart) == null ? void 0 : _a.call(options2, options2);
-      xhr.send(options2.formData);
+      if (options2.beforeXhrUpload) {
+        options2.beforeXhrUpload(xhr, options2);
+      } else {
+        xhr.send(options2.formData);
+      }
     } else {
       console.warn("\u6D4F\u89C8\u5668\u4E0D\u652F\u6301 XMLHttpRequest");
     }
   }
+  uploadTaro(uploadFile, env) {
+    var _a;
+    const options2 = this.options;
+    if (env === "WEB") {
+      this.upload();
+    } else if (options2.beforeXhrUpload) {
+      options2.beforeXhrUpload(uploadFile, options2);
+    } else {
+      const uploadTask = uploadFile({
+        url: options2.url,
+        filePath: options2.taroFilePath,
+        fileType: options2.fileType,
+        header: {
+          "Content-Type": "multipart/form-data",
+          ...options2.headers
+        },
+        formData: options2.formData,
+        name: options2.name,
+        success(response) {
+          var _a2, _b;
+          if (options2.xhrState == response.statusCode) {
+            (_a2 = options2.onSuccess) == null ? void 0 : _a2.call(options2, response, options2);
+          } else {
+            (_b = options2.onFailure) == null ? void 0 : _b.call(options2, response, options2);
+          }
+        },
+        fail(e2) {
+          var _a2;
+          (_a2 = options2.onFailure) == null ? void 0 : _a2.call(options2, e2, options2);
+        }
+      });
+      (_a = options2.onStart) == null ? void 0 : _a.call(options2, options2);
+      uploadTask.progress(
+        (res) => {
+          var _a2;
+          (_a2 = options2.onProgress) == null ? void 0 : _a2.call(options2, res, options2);
+        }
+      );
+    }
+  }
 }
-const defaultProps$L = {
+const defaultProps$J = {
   ...ComponentDefaults,
   url: "",
   maximum: 1,
@@ -12555,11 +13092,11 @@ const defaultProps$L = {
   xhrState: 200,
   timeout: 1e3 * 30,
   withCredentials: false,
-  clearInput: false,
+  clearInput: true,
   isPreview: true,
   isDeletable: true,
   capture: false,
-  beforeDelete: (file, files) => {
+  onBeforeDelete: (file, files) => {
     return true;
   }
 };
@@ -12568,6 +13105,7 @@ class FileItem {
     this.status = "ready";
     this.message = "\u51C6\u5907\u4E2D..";
     this.uid = new Date().getTime().toString();
+    this.percentage = 0;
     this.formData = new FormData();
   }
 }
@@ -12599,23 +13137,25 @@ const InternalUploader = (props, ref) => {
     className,
     autoUpload,
     clearInput,
-    start: start2,
-    removeImage,
-    change,
-    fileItemClick,
-    progress,
-    success,
-    update: update2,
-    failure,
-    oversize,
-    beforeUpload,
-    beforeDelete,
+    iconClassPrefix,
+    iconFontClassName,
+    onStart,
+    onRemove,
+    onChange,
+    onFileItemClick,
+    onProgress,
+    onSuccess,
+    onUpdate,
+    onFailure,
+    onOversize,
+    onBeforeUpload,
+    onBeforeXhrUpload,
+    onBeforeDelete,
     ...restProps
-  } = { ...defaultProps$L, ...props };
+  } = { ...defaultProps$J, ...props };
   const [fileList, setFileList] = useState([]);
   const [uploadQueue, setUploadQueue] = useState([]);
   useEffect(() => {
-    console.log("defaultFileList", defaultFileList);
     if (defaultFileList) {
       setFileList(defaultFileList);
     }
@@ -12652,6 +13192,11 @@ const InternalUploader = (props, ref) => {
     uploadOption.xhrState = xhrState;
     uploadOption.headers = headers;
     uploadOption.withCredentials = withCredentials;
+    uploadOption.beforeXhrUpload = onBeforeXhrUpload;
+    try {
+      uploadOption.sourceFile = fileItem.formData.get(name);
+    } catch (error) {
+    }
     uploadOption.onStart = (option) => {
       clearUploadQueue(index2);
       setFileList((fileList2) => {
@@ -12664,7 +13209,7 @@ const InternalUploader = (props, ref) => {
         });
         return [...fileList2];
       });
-      start2 && start2(option);
+      onStart && onStart(option);
     };
     uploadOption.onProgress = (e2, option) => {
       setFileList((fileList2) => {
@@ -12672,16 +13217,17 @@ const InternalUploader = (props, ref) => {
           if (item.uid === fileItem.uid) {
             item.status = "uploading";
             item.message = locale.uploader.uploading;
+            item.percentage = (e2.loaded / e2.total * 100).toFixed(0);
+            onProgress && onProgress({ e: e2, option, percentage: item.percentage });
           }
           return item;
         });
         return [...fileList2];
       });
-      progress && progress({ e: e2, option });
     };
     uploadOption.onSuccess = (responseText, option) => {
       setFileList((fileList2) => {
-        update2 && update2(fileList2);
+        onUpdate && onUpdate(fileList2);
         fileList2.map((item) => {
           if (item.uid === fileItem.uid) {
             item.status = "success";
@@ -12691,7 +13237,7 @@ const InternalUploader = (props, ref) => {
         });
         return [...fileList2];
       });
-      success && success({
+      onSuccess && onSuccess({
         responseText,
         option
       });
@@ -12707,7 +13253,7 @@ const InternalUploader = (props, ref) => {
         });
         return [...fileList2];
       });
-      failure && failure({
+      onFailure && onFailure({
         responseText,
         option
       });
@@ -12761,7 +13307,7 @@ const InternalUploader = (props, ref) => {
       return true;
     });
     if (oversizes.length) {
-      oversize && oversize(files);
+      onOversize && onOversize(files);
     }
     if (filterFile.length > maximum2) {
       filterFile.splice(maximum2, filterFile.length - maximum2);
@@ -12774,9 +13320,9 @@ const InternalUploader = (props, ref) => {
   };
   const onDelete = (file, index2) => {
     clearUploadQueue(index2);
-    if (beforeDelete && beforeDelete(file, fileList)) {
+    if (onBeforeDelete && onBeforeDelete(file, fileList)) {
       fileList.splice(index2, 1);
-      removeImage && removeImage(file, fileList);
+      onRemove && onRemove(file, fileList);
       setFileList([...fileList]);
     } else {
       console.log(locale.uploader.deleteWord);
@@ -12788,8 +13334,8 @@ const InternalUploader = (props, ref) => {
     }
     const $el = event.target;
     const { files } = $el;
-    if (beforeUpload) {
-      beforeUpload(new Array().slice.call(files)).then(
+    if (onBeforeUpload) {
+      onBeforeUpload(new Array().slice.call(files)).then(
         (f2) => {
           const _files = filterFiles(new Array().slice.call(f2));
           readFile(_files);
@@ -12799,13 +13345,13 @@ const InternalUploader = (props, ref) => {
       const _files = filterFiles(new Array().slice.call(files));
       readFile(_files);
     }
-    props.change && props.change({ fileList, event });
+    onChange && onChange({ fileList, event });
     if (clearInput) {
       clearInputValue($el);
     }
   };
   const handleItemClick = (file) => {
-    fileItemClick && fileItemClick(file);
+    onFileItemClick && onFileItemClick(file);
   };
   return /* @__PURE__ */ React__default.createElement("div", {
     className: classes,
@@ -12842,15 +13388,15 @@ const InternalUploader = (props, ref) => {
     }, item.message)) : item.status !== "success" && /* @__PURE__ */ React__default.createElement("div", {
       className: "nut-uploader__preview__progress"
     }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       color: "#fff",
       name: `${item.status === "error" ? "failure" : "loading"}`
     }), /* @__PURE__ */ React__default.createElement("div", {
       className: "nut-uploader__preview__progress__msg"
     }, item.message)), isDeletable && /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       color: "rgba(0,0,0,0.6)",
       className: "close",
       name: "failure",
@@ -12871,8 +13417,8 @@ const InternalUploader = (props, ref) => {
       onClick: () => handleItemClick(item),
       className: "nut-uploader__preview-img__file__name"
     }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       color: "#808080",
       name: "link"
     }), "\xA0", item.name))), /* @__PURE__ */ React__default.createElement("div", {
@@ -12883,22 +13429,27 @@ const InternalUploader = (props, ref) => {
       className: `nut-uploader__preview-img__file__name ${item.status}`,
       onClick: () => handleItemClick(item)
     }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: "link"
     }), "\xA0", item.name), /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       color: "#808080",
       className: "nut-uploader__preview-img__file__del",
       name: "del",
       onClick: () => onDelete(item, index2)
+    }), item.status === "uploading" && /* @__PURE__ */ React__default.createElement(Progress, {
+      size: "small",
+      percentage: item.percentage,
+      strokeColor: "linear-gradient(270deg, rgba(18,126,255,1) 0%,rgba(32,147,255,1) 32.815625%,rgba(13,242,204,1) 100%)",
+      showText: false
     })));
   }), maximum > fileList.length && listType === "picture" && !children && /* @__PURE__ */ React__default.createElement("div", {
     className: `nut-uploader__upload ${listType}`
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     size: uploadIconSize,
     color: "#808080",
     name: uploadIcon
@@ -12922,9 +13473,9 @@ const InternalUploader = (props, ref) => {
   })));
 };
 const Uploader = React__default.forwardRef(InternalUploader);
-Uploader.defaultProps = defaultProps$L;
+Uploader.defaultProps = defaultProps$J;
 Uploader.displayName = "NutUploader";
-const defaultProps$K = {
+const defaultProps$I = {
   data: {
     text: "",
     value: "",
@@ -12939,7 +13490,7 @@ const defaultProps$K = {
 };
 const InternalCascaderItem = (props) => {
   const { data, checked, chooseItem } = {
-    ...defaultProps$K,
+    ...defaultProps$I,
     ...props
   };
   const b2 = cn("cascader-item");
@@ -12975,7 +13526,7 @@ const InternalCascaderItem = (props) => {
   }));
 };
 const CascaderItem = React__default.forwardRef(InternalCascaderItem);
-CascaderItem.defaultProps = defaultProps$K;
+CascaderItem.defaultProps = defaultProps$I;
 CascaderItem.displayName = "NutCascaderItem";
 const formatTree = (tree, parent, config2) => tree.map((node) => {
   const {
@@ -13109,7 +13660,7 @@ class Tree {
     return pathNodes;
   }
 }
-const defaultProps$J = {
+const defaultProps$H = {
   className: "",
   style: {},
   visible: false,
@@ -13154,7 +13705,7 @@ const InternalCascader = (props) => {
     onClose,
     onChange,
     onPathChange
-  } = { ...defaultProps$J, ...props };
+  } = { ...defaultProps$H, ...props };
   const [tabvalue, setTabvalue] = useState("c1");
   const [optiosData, setOptiosData] = useState([]);
   const isLazy = () => state.configs.lazy && Boolean(state.configs.lazyLoad);
@@ -13410,9 +13961,9 @@ const InternalCascader = (props) => {
   })))));
 };
 const Cascader = React__default.forwardRef(InternalCascader);
-Cascader.defaultProps = defaultProps$J;
+Cascader.defaultProps = defaultProps$H;
 Cascader.displayName = "NutCascader";
-const defaultProps$I = {
+const defaultProps$G = {
   ...ComponentDefaults,
   placeholder: "",
   shape: "square",
@@ -13458,9 +14009,11 @@ const SearchBar = (props) => {
     onClickLeftinIcon,
     onClickLeftoutIcon,
     onClickRightinIcon,
-    onClickRightoutIcon
+    onClickRightoutIcon,
+    iconClassPrefix,
+    iconFontClassName
   } = {
-    ...defaultProps$I,
+    ...defaultProps$G,
     ...props
   };
   const alignClass = `${align}`;
@@ -13558,8 +14111,8 @@ const SearchBar = (props) => {
       className: `${searchbarBem("clear")} ${rightinIcon ? "pos-right" : ""}`,
       onClick: (e2) => clearaVal(e2)
     }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: "circle-close",
       size: "12",
       color: "#555"
@@ -13599,9 +14152,9 @@ const SearchBar = (props) => {
     className: `${searchbarBem("content")}`
   }, renderLeftinIcon(), renderField(), renderRightinIcon(), clearable && value && handleClear()), renderRightoutIcon(), renderRightLabel());
 };
-SearchBar.defaultProps = defaultProps$I;
+SearchBar.defaultProps = defaultProps$G;
 SearchBar.displayName = "NutSearchBar";
-const defaultProps$H = {
+const defaultProps$F = {
   confirmText: "",
   title: "",
   visible: false,
@@ -13799,9 +14352,9 @@ const NumberKeyboard = (props) => {
     })
   }, confirmText || locale.done))) : null))));
 };
-NumberKeyboard.defaultProps = defaultProps$H;
+NumberKeyboard.defaultProps = defaultProps$F;
 NumberKeyboard.displayName = "NutNumberKeyboard";
-const defaultProps$G = {
+const defaultProps$E = {
   cancelTxt: "",
   optionTag: "name",
   optionSubTag: "subname",
@@ -13835,7 +14388,7 @@ const ActionSheet = (props) => {
     className,
     style,
     ...rest
-  } = { ...defaultProps$G, ...props };
+  } = { ...defaultProps$E, ...props };
   const b2 = cn("actionsheet");
   const isHighlight = (item) => {
     return props.chooseTagValue && props.chooseTagValue === item[props.optionTag || "name"] ? props.color : "#1a1a1a";
@@ -13879,9 +14432,9 @@ const ActionSheet = (props) => {
     onClick: () => cancelActionSheet()
   }, cancelTxt)));
 };
-ActionSheet.defaultProps = defaultProps$G;
+ActionSheet.defaultProps = defaultProps$E;
 ActionSheet.displayName = "NutActionSheet";
-const defaultProps$F = {
+const defaultProps$D = {
   ...ComponentDefaults,
   bottom: 20,
   right: 10,
@@ -13903,9 +14456,11 @@ const BackTop = (props) => {
     className,
     duration,
     style,
-    onClick
+    onClick,
+    iconClassPrefix,
+    iconFontClassName
   } = {
-    ...defaultProps$F,
+    ...defaultProps$D,
     ...props
   };
   const [backTop, SetBackTop] = useState(false);
@@ -13989,16 +14544,16 @@ const BackTop = (props) => {
       goTop(e2);
     }
   }, children || /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     size: "19px",
     className: "nut-backtop-main",
     name: "top"
   }));
 };
-BackTop.defaultProps = defaultProps$F;
+BackTop.defaultProps = defaultProps$D;
 BackTop.displayName = "NutBackTop";
-const defaultProps$E = {
+const defaultProps$C = {
   attract: false,
   direction: void 0,
   boundary: {
@@ -14011,7 +14566,7 @@ const defaultProps$E = {
 };
 const Drag = (props) => {
   const { attract, direction, boundary, children, className, style, ...reset } = {
-    ...defaultProps$E,
+    ...defaultProps$C,
     ...props
   };
   const b2 = cn("drag");
@@ -14073,7 +14628,7 @@ const Drag = (props) => {
     ...bind()
   }, children));
 };
-Drag.defaultProps = defaultProps$E;
+Drag.defaultProps = defaultProps$C;
 Drag.displayName = "NutDrag";
 const Content = (props) => {
   const {
@@ -14268,7 +14823,7 @@ function confirm(config2, renderFunc) {
     update: update2
   };
 }
-const defaultProps$D = {
+const defaultProps$B = {
   okText: "\u786E\u8BA4",
   cancelText: "\u53D6\u6D88",
   mask: true,
@@ -14359,9 +14914,9 @@ Dialog.confirm = (props) => {
     });
   };
 });
-Dialog.defaultProps = defaultProps$D;
+Dialog.defaultProps = defaultProps$B;
 Dialog.displayName = "NutDialog";
-const defaultProps$C = {
+const defaultProps$A = {
   ...ComponentDefaults,
   hasMore: true,
   threshold: 200,
@@ -14391,12 +14946,14 @@ const Infiniteloading = (props) => {
     loadTxt,
     loadMoreTxt,
     className,
-    refresh,
-    loadMore,
-    scrollChange,
+    onRefresh,
+    onLoadMore,
+    onScrollChange,
+    iconClassPrefix,
+    iconFontClassName,
     ...restProps
   } = {
-    ...defaultProps$C,
+    ...defaultProps$A,
     ...props
   };
   const [isInfiniting, setIsInfiniting] = useState(false);
@@ -14444,7 +15001,7 @@ const Infiniteloading = (props) => {
         return false;
       }
       setIsInfiniting(true);
-      loadMore && loadMore(infiniteDone);
+      onLoadMore && onLoadMore(infiniteDone);
       return true;
     });
   };
@@ -14485,7 +15042,7 @@ const Infiniteloading = (props) => {
       distance.current = 0;
       refreshTop.current.style.height = `${distance.current}px`;
     } else {
-      refresh && refresh(refreshDone);
+      onRefresh && onRefresh(refreshDone);
     }
   };
   const requestAniFrame2 = () => {
@@ -14520,7 +15077,7 @@ const Infiniteloading = (props) => {
       direction = "down";
     }
     beforeScrollTop.current = resScrollTop;
-    scrollChange && scrollChange(resScrollTop);
+    onScrollChange && onScrollChange(resScrollTop);
     return offsetDistance <= threshold && direction === "down";
   };
   return /* @__PURE__ */ React__default.createElement("div", {
@@ -14537,8 +15094,8 @@ const Infiniteloading = (props) => {
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: "top-box"
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: "top-img",
     name: pullIcon
   }), /* @__PURE__ */ React__default.createElement("span", {
@@ -14550,8 +15107,8 @@ const Infiniteloading = (props) => {
   }, isInfiniting ? /* @__PURE__ */ React__default.createElement("div", {
     className: "bottom-box"
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: "bottom-img",
     name: loadIcon
   }), /* @__PURE__ */ React__default.createElement("div", {
@@ -14560,7 +15117,7 @@ const Infiniteloading = (props) => {
     className: "tips"
   }, loadMoreTxt || locale.infiniteloading.loadMoreText)));
 };
-Infiniteloading.defaultProps = defaultProps$C;
+Infiniteloading.defaultProps = defaultProps$A;
 Infiniteloading.displayName = "NutInfiniteloading";
 class Notification extends React.PureComponent {
   constructor(props) {
@@ -14735,7 +15292,7 @@ var Notify = {
     }
   }
 };
-const defaultProps$B = {
+const defaultProps$z = {
   isAsync: false,
   checked: false,
   disable: false,
@@ -14758,7 +15315,7 @@ const Switch = (props) => {
     className,
     style
   } = {
-    ...defaultProps$B,
+    ...defaultProps$z,
     ...props
   };
   const [value, setValue] = useState(false);
@@ -14798,7 +15355,7 @@ const Switch = (props) => {
     className: `${b2("label")} close`
   }, inactiveText))));
 };
-Switch.defaultProps = defaultProps$B;
+Switch.defaultProps = defaultProps$z;
 Switch.displayName = "NutSwitch";
 function preventDefault(event, isStopPropagation) {
   if (typeof event.cancelable !== "boolean" || event.cancelable) {
@@ -14808,7 +15365,7 @@ function preventDefault(event, isStopPropagation) {
     event.stopPropagation();
   }
 }
-const defaultProps$A = {
+const defaultProps$y = {
   name: "",
   leftWidth: 0,
   rightWidth: 0
@@ -14816,7 +15373,7 @@ const defaultProps$A = {
 const Swipe = forwardRef((props, instanceRef) => {
   const swipeBem = cn("swipe");
   const touch = useTouch();
-  const { children, className, style } = { ...defaultProps$A, ...props };
+  const { children, className, style } = { ...defaultProps$y, ...props };
   const root = useRef();
   const opened = useRef(false);
   const lockClick = useRef(false);
@@ -14982,29 +15539,8 @@ const Swipe = forwardRef((props, instanceRef) => {
     style: wrapperStyle
   }, renderActionContent("left", leftRef), children, renderActionContent("right", rightRef)));
 });
-Swipe.defaultProps = defaultProps$A;
+Swipe.defaultProps = defaultProps$y;
 Swipe.displayName = "NutSwipe";
-const canUseDom = !!(typeof window !== "undefined" && typeof document !== "undefined" && window.document && window.document.createElement);
-const defaultRoot = canUseDom ? window : void 0;
-const overflowStylePatterns = ["scroll", "auto", "overlay"];
-function isElement(node) {
-  const ELEMENT_NODE_TYPE = 1;
-  return node.nodeType === ELEMENT_NODE_TYPE;
-}
-function getScrollParent(el, root = defaultRoot) {
-  let node = el;
-  while (node && node !== root && isElement(node)) {
-    if (node === document.body) {
-      return root;
-    }
-    const { overflowY } = window.getComputedStyle(node);
-    if (overflowStylePatterns.includes(overflowY) && node.scrollHeight > node.clientHeight) {
-      return node;
-    }
-    node = node.parentNode;
-  }
-  return root;
-}
 function bound(position, min, max) {
   let ret = position;
   if (min !== void 0) {
@@ -15041,7 +15577,7 @@ if (canUseDom) {
     console.log(e2);
   }
 }
-const defaultProps$z = {
+const defaultProps$x = {
   className: "",
   style: {},
   pullingText: "",
@@ -15058,7 +15594,7 @@ const defaultProps$z = {
 const PullToRefresh = (p2) => {
   const { locale } = useConfig();
   const props = {
-    ...defaultProps$z,
+    ...defaultProps$x,
     ...p2,
     ...{
       pullingText: p2.pullingText || locale.pullToRefresh.pullingText,
@@ -15197,10 +15733,10 @@ const PullToRefresh = (p2) => {
     className: "nut-pulltorefresh-content"
   }, props.children));
 };
-PullToRefresh.defaultProps = defaultProps$z;
+PullToRefresh.defaultProps = defaultProps$x;
 PullToRefresh.displayName = "NutPullToRefresh";
 const isObject = (val) => val !== null && typeof val === "object";
-const defaultProps$y = {
+const defaultProps$w = {
   strokeWidth: 5,
   radius: 50,
   strokeLinecap: "round",
@@ -15223,7 +15759,7 @@ const CircleProgress = (props) => {
     strokeLinecap,
     ...restProps
   } = {
-    ...defaultProps$y,
+    ...defaultProps$w,
     ...props
   };
   const b2 = cn("circleprogress");
@@ -15309,9 +15845,9 @@ const CircleProgress = (props) => {
     className: "nut-circleprogress-text"
   }, children || /* @__PURE__ */ React__default.createElement("div", null, progress, "%")));
 };
-CircleProgress.defaultProps = defaultProps$y;
+CircleProgress.defaultProps = defaultProps$w;
 CircleProgress.displayName = "NutCircleProgress";
-const defaultProps$x = {
+const defaultProps$v = {
   ...ComponentDefaults,
   direction: "across",
   list: [],
@@ -15349,8 +15885,13 @@ const NoticeBar = (props) => {
     speed,
     rightIcon,
     close,
-    click
-  } = { ...defaultProps$x, ...props };
+    click,
+    iconClassPrefix,
+    iconFontClassName
+  } = {
+    ...defaultProps$v,
+    ...props
+  };
   const wrap = useRef(null);
   const content = useRef(null);
   const [showNoticeBar, SetShowNoticeBar] = useState(true);
@@ -15541,8 +16082,8 @@ const NoticeBar = (props) => {
     className: "left-icon",
     style: { backgroundImage: `url(${iconBg() || ""})` }
   }, !iconBg() ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: "notice",
     size: "16",
     color
@@ -15558,8 +16099,8 @@ const NoticeBar = (props) => {
     className: "right-icon",
     onClick: onClickIcon
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: rightIcon || "close",
     color
   })) : null) : null, scrollList.current.length > 0 && direction === "vertical" ? /* @__PURE__ */ React__default.createElement("div", {
@@ -15588,23 +16129,23 @@ const NoticeBar = (props) => {
       handleClickIcon();
     }
   }, rightIcon || (closeMode ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: "cross",
     color,
     size: "11px"
   }) : null))) : null);
 };
-NoticeBar.defaultProps = defaultProps$x;
+NoticeBar.defaultProps = defaultProps$v;
 NoticeBar.displayName = "NutNoticeBar";
 const DataContext$1 = createContext({});
-const defaultProps$w = {
+const defaultProps$u = {
   current: 0,
   direction: "horizontal",
   progressDot: false
 };
 const Steps = (props) => {
-  const propSteps = { ...defaultProps$w, ...props };
+  const propSteps = { ...defaultProps$u, ...props };
   const {
     children,
     current,
@@ -15637,9 +16178,9 @@ const Steps = (props) => {
     children
   ));
 };
-Steps.defaultProps = defaultProps$w;
+Steps.defaultProps = defaultProps$u;
 Steps.displayName = "NutSteps";
-const defaultProps$v = {
+const defaultProps$t = {
   ...ComponentDefaults,
   title: "",
   content: "",
@@ -15659,9 +16200,11 @@ const Step = (props) => {
     size,
     className,
     renderContent,
+    iconClassPrefix,
+    iconFontClassName,
     ...restProps
   } = {
-    ...defaultProps$v,
+    ...defaultProps$t,
     ...props
   };
   const parent = useContext$1(DataContext$1);
@@ -15706,8 +16249,8 @@ const Step = (props) => {
   }), /* @__PURE__ */ React__default.createElement("div", {
     className: renderIconClass()
   }, icon ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: "nut-step-icon-inner",
     color: iconColor,
     name: icon,
@@ -15724,10 +16267,10 @@ const Step = (props) => {
     className: "nut-step-content"
   }, renderContent())));
 };
-Step.defaultProps = defaultProps$v;
+Step.defaultProps = defaultProps$t;
 Step.displayName = "NutStep";
 const DataContext = createContext({});
-const defaultProps$u = {
+const defaultProps$s = {
   width: typeof window === "object" ? window.innerWidth : 375,
   height: 0,
   duration: 500,
@@ -15745,7 +16288,7 @@ const defaultProps$u = {
 };
 const DISTANCE = 5;
 const Swiper = React__default.forwardRef((props, ref) => {
-  const propSwiper = { ...defaultProps$u, ...props };
+  const propSwiper = { ...defaultProps$s, ...props };
   const {
     children,
     direction,
@@ -16155,13 +16698,13 @@ const Swiper = React__default.forwardRef((props, ref) => {
     });
   })) : /* @__PURE__ */ React__default.createElement("div", null, pageContent)));
 });
-Swiper.defaultProps = defaultProps$u;
+Swiper.defaultProps = defaultProps$s;
 Swiper.displayName = "NutSwiper";
-const defaultProps$t = {
+const defaultProps$r = {
   direction: "horizontal"
 };
 const SwiperItem = React__default.forwardRef((props, ref) => {
-  const _props = { ...defaultProps$t, ...props };
+  const _props = { ...defaultProps$r, ...props };
   const { children, direction, size } = _props;
   const parent = useContext$1(DataContext);
   const b2 = cn("swiper-item");
@@ -16180,10 +16723,10 @@ const SwiperItem = React__default.forwardRef((props, ref) => {
     style: style()
   }, children);
 });
-SwiperItem.defaultProps = defaultProps$t;
+SwiperItem.defaultProps = defaultProps$r;
 SwiperItem.displayName = "NutSwiperItem";
 const AvatarContext = createContext({});
-const defaultProps$s = {
+const defaultProps$q = {
   ...ComponentDefaults,
   size: "",
   icon: "",
@@ -16209,9 +16752,11 @@ const Avatar = (props) => {
     style,
     activeAvatar,
     onError,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
   } = {
-    ...defaultProps$s,
+    ...defaultProps$q,
     ...props
   };
   const [maxSum, setMaxSum] = useState(0);
@@ -16284,8 +16829,8 @@ const Avatar = (props) => {
     alt,
     onError: errorEvent
   }), icon && /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: "icon",
     name: iconStyles
   }), children && /* @__PURE__ */ React__default.createElement("span", {
@@ -16294,9 +16839,9 @@ const Avatar = (props) => {
     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 - ((_n = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _n.maxCount)}`)));
 };
-Avatar.defaultProps = defaultProps$s;
+Avatar.defaultProps = defaultProps$q;
 Avatar.displayName = "NutAvatar";
-const defaultProps$r = {
+const defaultProps$p = {
   maxContent: "",
   maxCount: "",
   maxBgColor: "#eee",
@@ -16308,7 +16853,7 @@ const defaultProps$r = {
 };
 const AvatarGroup = (props) => {
   useConfig();
-  const propAvatarGroup = { ...defaultProps$r, ...props };
+  const propAvatarGroup = { ...defaultProps$p, ...props };
   const { className, style, children } = propAvatarGroup;
   const avatarGroupRef = useRef(null);
   const b2 = cn("avatar-group");
@@ -16325,9 +16870,9 @@ const AvatarGroup = (props) => {
     ref: avatarGroupRef
   }, children));
 };
-AvatarGroup.defaultProps = defaultProps$r;
+AvatarGroup.defaultProps = defaultProps$p;
 AvatarGroup.displayName = "NutAvatarGroup";
-const defaultProps$q = {
+const defaultProps$o = {
   price: 0,
   needSymbol: true,
   symbol: "&yen;",
@@ -16345,7 +16890,7 @@ const Price = (props) => {
     className,
     ...rest
   } = {
-    ...defaultProps$q,
+    ...defaultProps$o,
     ...props
   };
   const b2 = cn("price");
@@ -16408,9 +16953,9 @@ const Price = (props) => {
     className: `${b2("small")}`
   }, formatDecimal(price)));
 };
-Price.defaultProps = defaultProps$q;
+Price.defaultProps = defaultProps$o;
 Price.displayName = "NutPrice";
-const defaultProps$p = {
+const defaultProps$n = {
   ...ComponentDefaults,
   value: "",
   dot: false,
@@ -16422,8 +16967,18 @@ const defaultProps$p = {
   icons: ""
 };
 const Badge = (props) => {
-  const { children, dot, top, right, zIndex, color, icons } = {
-    ...defaultProps$p,
+  const {
+    children,
+    dot,
+    top,
+    right,
+    zIndex,
+    color,
+    icons,
+    iconClassPrefix,
+    iconFontClassName
+  } = {
+    ...defaultProps$n,
     ...props
   };
   function content() {
@@ -16449,8 +17004,8 @@ const Badge = (props) => {
   }, icons !== "" && /* @__PURE__ */ React__default.createElement("div", {
     className: "slot-icons"
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: "_icon",
     name: icons,
     color: "#ffffff",
@@ -16460,9 +17015,9 @@ const Badge = (props) => {
     style: getStyle()
   }, content()));
 };
-Badge.defaultProps = defaultProps$p;
+Badge.defaultProps = defaultProps$n;
 Badge.displayName = "NutBadge";
-const defaultProps$o = {
+const defaultProps$m = {
   ...ComponentDefaults,
   type: "default",
   color: "",
@@ -16489,9 +17044,11 @@ const Tag = (props) => {
     closeable,
     textColor,
     onClick,
-    onClose
+    onClose,
+    iconClassPrefix,
+    iconFontClassName
   } = {
-    ...defaultProps$o,
+    ...defaultProps$m,
     ...props
   };
   const [btnName, setBtnName] = useState("");
@@ -16546,8 +17103,8 @@ const Tag = (props) => {
   }, children && /* @__PURE__ */ React__default.createElement("span", {
     className: "text"
   }, children), /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     className: "_icon",
     name: "close",
     size: "12",
@@ -16565,7 +17122,7 @@ const Tag = (props) => {
     className: "text"
   }, children)));
 };
-Tag.defaultProps = defaultProps$o;
+Tag.defaultProps = defaultProps$m;
 Tag.displayName = "NutTag";
 function fillRef(ref, node) {
   if (typeof ref === "function") {
@@ -16609,7 +17166,7 @@ class Trigger extends React__default.Component {
     return trigger;
   }
 }
-const defaultProps$n = {
+const defaultProps$l = {
   ...ComponentDefaults,
   list: [],
   theme: "light",
@@ -16634,9 +17191,11 @@ const Popover = (props) => {
     style,
     onClick,
     onChoose,
+    iconClassPrefix,
+    iconFontClassName,
     ...reset
   } = {
-    ...defaultProps$n,
+    ...defaultProps$l,
     ...props
   };
   const goodItem = useRef(null);
@@ -16717,8 +17276,8 @@ const Popover = (props) => {
         handleChoose(item, i);
       }
     }, item.icon ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       className: "popover-menu-item-img",
       name: item.icon
     }) : "", /* @__PURE__ */ React__default.createElement("div", {
@@ -16730,9 +17289,9 @@ const Popover = (props) => {
     style: { background: "transparent" }
   }) : "");
 };
-Popover.defaultProps = defaultProps$n;
+Popover.defaultProps = defaultProps$l;
 Popover.displayName = "NutPopover";
-const defaultProps$m = {
+const defaultProps$k = {
   width: "100px",
   height: "100px",
   row: 1,
@@ -16760,7 +17319,7 @@ const Skeleton = (props) => {
     avatarShape,
     ...restProps
   } = {
-    ...defaultProps$m,
+    ...defaultProps$k,
     ...props
   };
   const b2 = cn("skeleton");
@@ -16815,9 +17374,9 @@ const Skeleton = (props) => {
     });
   })))));
 };
-Skeleton.defaultProps = defaultProps$m;
+Skeleton.defaultProps = defaultProps$k;
 Skeleton.displayName = "NutSkeleton";
-const defaultProps$l = {
+const defaultProps$j = {
   paused: false,
   startTime: Date.now(),
   endTime: Date.now(),
@@ -16844,7 +17403,7 @@ const InternalCountDown = (props, ref) => {
     onUpdate,
     children,
     ...rest
-  } = { ...defaultProps$l, ...props };
+  } = { ...defaultProps$j, ...props };
   const b2 = cn("countdown");
   const [restTimeStamp, setRestTime] = useState(0);
   const stateRef = useRef({
@@ -17040,9 +17599,9 @@ const InternalCountDown = (props, ref) => {
   }));
 };
 const CountDown = React__default.forwardRef(InternalCountDown);
-CountDown.defaultProps = defaultProps$l;
+CountDown.defaultProps = defaultProps$j;
 CountDown.displayName = "NutCountDown";
-const defaultProps$k = {
+const defaultProps$i = {
   activeName: ["0"],
   accordion: false,
   icon: "",
@@ -17065,7 +17624,7 @@ const Collapse = memo(
       iconColor,
       change
     } = {
-      ...defaultProps$k,
+      ...defaultProps$i,
       ...props
     };
     const childrenDom = React__default.Children.toArray(children);
@@ -17116,15 +17675,16 @@ const Collapse = memo(
         icon,
         rotate,
         iconSize,
-        iconColor
+        iconColor,
+        childnull: !!item.props.children
       });
     }));
   },
   areEqual
 );
-Collapse.defaultProps = defaultProps$k;
+Collapse.defaultProps = defaultProps$i;
 Collapse.displayName = "NutCollapse";
-const defaultProps$j = {
+const defaultProps$h = {
   ...ComponentDefaults,
   title: "",
   name: "",
@@ -17138,7 +17698,8 @@ const defaultProps$j = {
   titleIcon: "",
   titleIconColor: "",
   titleIconPosition: "",
-  titleIconSize: ""
+  titleIconSize: "",
+  childnull: true
 };
 const CollapseItem = (props) => {
   const {
@@ -17157,9 +17718,12 @@ const CollapseItem = (props) => {
     titleIconSize,
     iconSize,
     iconColor,
+    childnull,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
   } = {
-    ...defaultProps$j,
+    ...defaultProps$h,
     ...props
   };
   const [domHeight, setDomHeight] = useState(-1);
@@ -17205,16 +17769,16 @@ const CollapseItem = (props) => {
   }, titleIcon && titleIconPosition === "left" && /* @__PURE__ */ React__default.createElement("b", {
     className: colBem("title-icon-left")
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: titleIcon,
     size: titleIconSize,
     color: disabled ? "#C2C2C2" : titleIconColor
   })), title, titleIcon && titleIconPosition === "right" && /* @__PURE__ */ React__default.createElement("b", {
     className: colBem("title-icon-right")
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: titleIcon,
     size: titleIconSize,
     color: disabled ? "#C2C2C2" : titleIconColor
@@ -17226,12 +17790,12 @@ const CollapseItem = (props) => {
     className: colBem("icon"),
     style: iconStyle
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
+    classPrefix: iconClassPrefix,
+    fontClassName: iconFontClassName,
     name: icon,
     size: iconSize,
     color: disabled ? "#C2C2C2" : iconColor
-  })))), /* @__PURE__ */ React__default.createElement("div", {
+  })))), childnull && /* @__PURE__ */ React__default.createElement("div", {
     className: colBem("content"),
     style: { height: currHeight },
     ref: measuredRef
@@ -17239,9 +17803,9 @@ const CollapseItem = (props) => {
     className: colBem("content-text")
   }, children)));
 };
-CollapseItem.defaultProps = defaultProps$j;
+CollapseItem.defaultProps = defaultProps$h;
 CollapseItem.displayName = "NutCollapseItem";
-const defaultProps$i = {
+const defaultProps$g = {
   maxLen: 0,
   endNumber: "",
   delaySpeed: 300,
@@ -17259,7 +17823,7 @@ const CountUp = (props) => {
     thousands,
     ...reset
   } = {
-    ...defaultProps$i,
+    ...defaultProps$g,
     ...props
   };
   const b2 = cn("countup");
@@ -17329,9 +17893,9 @@ const CountUp = (props) => {
     }, item));
   })));
 };
-CountUp.defaultProps = defaultProps$i;
+CountUp.defaultProps = defaultProps$g;
 CountUp.displayName = "NutCountUp";
-const defaultProps$h = {};
+const defaultProps$f = {};
 class AnimatingNumbers extends Component {
   constructor(props) {
     super(props);
@@ -17343,7 +17907,7 @@ class AnimatingNumbers extends Component {
     });
   }
 }
-AnimatingNumbers.defaultProps = defaultProps$h;
+AnimatingNumbers.defaultProps = defaultProps$f;
 AnimatingNumbers.displayName = "NutAnimatingNumbers";
 AnimatingNumbers.CountUp = CountUp;
 AnimatingNumbers.CountUp = CountUp;
@@ -17352,7 +17916,7 @@ const defaultStatus = {
   error: "https://ftcms.jd.com/p/files/61a9e33ee7dcdbcc0ce62736.png",
   network: "https://static-ftcms.jd.com/p/files/61a9e31de7dcdbcc0ce62734.png"
 };
-const defaultProps$g = {
+const defaultProps$e = {
   description: "\u65E0\u5185\u5BB9",
   image: "empty",
   imageSize: "",
@@ -17360,9 +17924,9 @@ const defaultProps$g = {
 };
 const Empty = (props) => {
   const { locale } = useConfig();
-  defaultProps$g.description = locale.noData || defaultProps$g.description;
+  defaultProps$e.description = locale.noData || defaultProps$e.description;
   const { image, imageSize, description, children, className, ...rest } = {
-    ...defaultProps$g,
+    ...defaultProps$e,
     ...props
   };
   const [imgStyle, setImgStyle] = useState({});
@@ -17404,7 +17968,7 @@ const Empty = (props) => {
     className: b2("description")
   }, description) : { description }, children));
 };
-Empty.defaultProps = defaultProps$g;
+Empty.defaultProps = defaultProps$e;
 Empty.displayName = "NutEmpty";
 const initPositinoCache = (reaItemSize, length = 0) => {
   let index2 = 0;
@@ -17517,7 +18081,7 @@ const updateItemSize = (positions, items, sizeKey) => {
     }
   });
 };
-const defaultProps$f = {};
+const defaultProps$d = {};
 const VirtualList = (props) => {
   const {
     sourceData = [],
@@ -17676,9 +18240,9 @@ const VirtualList = (props) => {
     }) : data);
   }))));
 };
-VirtualList.defaultProps = defaultProps$f;
+VirtualList.defaultProps = defaultProps$d;
 VirtualList.displayName = "NutVirtualList";
-const defaultProps$e = {
+const defaultProps$c = {
   ...ComponentDefaults,
   className: "",
   style: {},
@@ -17690,7 +18254,7 @@ const defaultProps$e = {
 };
 const Table = (props) => {
   const { locale } = useConfig();
-  defaultProps$e.noData = locale.noData;
+  defaultProps$c.noData = locale.noData;
   const {
     children,
     className,
@@ -17702,9 +18266,11 @@ const Table = (props) => {
     striped,
     noData,
     onSorter,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
   } = {
-    ...defaultProps$e,
+    ...defaultProps$c,
     ...props
   };
   const [curData, setCurData] = useState(data);
@@ -17745,8 +18311,8 @@ const Table = (props) => {
         key: item.key,
         onClick: () => handleSorterClick(item)
       }, item.title, item.sorter && /* @__PURE__ */ React__default.createElement(Icon$1, {
-        classPrefix: props.iconClassPrefix,
-        fontClassName: props.iconFontClassName,
+        classPrefix: iconClassPrefix,
+        fontClassName: iconFontClassName,
         name: "down-arrow",
         size: "12px"
       }));
@@ -17802,9 +18368,9 @@ const Table = (props) => {
     className: "nut-table__nodata__text"
   }, noData))));
 };
-Table.defaultProps = defaultProps$e;
+Table.defaultProps = defaultProps$c;
 Table.displayName = "NutTable";
-const defaultProps$d = {
+const defaultProps$b = {
   source: {
     type: {},
     src: ""
@@ -17829,7 +18395,7 @@ const Video = (props) => {
     playend,
     ...restProps
   } = {
-    ...defaultProps$d,
+    ...defaultProps$b,
     ...props
   };
   const rootRef = useRef(null);
@@ -17883,195 +18449,8 @@ const Video = (props) => {
     kind: "captions"
   })));
 };
-Video.defaultProps = defaultProps$d;
+Video.defaultProps = defaultProps$b;
 Video.displayName = "NutVideo";
-const defaultProps$c = {
-  name: "",
-  size: "",
-  classPrefix: "nut-icon",
-  fontClassName: "nutui-iconfont",
-  color: "",
-  tag: "i",
-  onClick: (e2) => {
-  },
-  className: ""
-};
-function pxCheck(value) {
-  return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
-}
-function Icon(props) {
-  const {
-    name,
-    size,
-    classPrefix,
-    color,
-    tag,
-    children,
-    className,
-    fontClassName,
-    style,
-    onClick,
-    ...rest
-  } = {
-    ...defaultProps$c,
-    ...props
-  };
-  const isImage = name ? name.indexOf("/") !== -1 : false;
-  const type = isImage ? "img" : tag;
-  const b2 = cn("icon");
-  const handleClick2 = (e2) => {
-    if (onClick) {
-      onClick(e2);
-    }
-  };
-  const hasSrc = () => {
-    if (isImage)
-      return { src: name };
-    return {};
-  };
-  return React__default.createElement(
-    type,
-    {
-      className: isImage ? `${b2("img")} ${className || ""} ` : `${fontClassName} ${b2(null)} ${classPrefix}-${name} ${className || ""}`,
-      style: {
-        color,
-        fontSize: pxCheck(size),
-        width: pxCheck(size),
-        height: pxCheck(size),
-        ...style
-      },
-      ...rest,
-      onClick: handleClick2,
-      ...hasSrc()
-    },
-    children
-  );
-}
-Icon.defaultProps = defaultProps$c;
-Icon.displayName = "NutIcon";
-const defaultProps$b = {
-  ...ComponentDefaults,
-  className: "",
-  style: {},
-  isShowPercentage: true,
-  percentage: 0,
-  fillColor: "#f3f3f3",
-  strokeColor: "linear-gradient(135deg, #fa2c19 0%, #fa6419 100%)",
-  strokeWidth: "",
-  textColor: "",
-  textWidth: "",
-  showText: true,
-  textInside: false,
-  textBackground: "linear-gradient(135deg, #fa2c19 0%, #fa6419 100%)",
-  textType: "text",
-  status: false,
-  iconName: "checked",
-  iconColor: "#439422",
-  iconSize: "16px",
-  rounded: true,
-  children: void 0
-};
-const Progress = (props) => {
-  const {
-    className,
-    style,
-    isShowPercentage,
-    percentage,
-    fillColor,
-    strokeColor,
-    strokeWidth,
-    size,
-    textColor,
-    textWidth,
-    showText,
-    textInside,
-    textBackground,
-    textType,
-    status,
-    iconName,
-    iconColor,
-    iconSize,
-    rounded,
-    children,
-    ...rest
-  } = { ...defaultProps$b, ...props };
-  const b2 = cn("progress");
-  const classes = classNames(b2(""));
-  const classesOuter = classNames({
-    [`${b2("")}-outer`]: true,
-    [`${b2("")}-${size || "base"}`]: true
-  });
-  const classesInner = classNames({
-    [`${b2("")}-inner`]: true,
-    [`${b2("")}-active`]: status
-  });
-  const classesText = classNames({
-    [`${b2("")}-text`]: true
-  });
-  const classesInsideText = classNames({
-    [`${b2("")}-text`]: true,
-    [`${b2("")}-insidetext`]: true
-  });
-  const classesTextInner = classNames({
-    [`${b2("")}-text__inner`]: true
-  });
-  const stylesOuter = {
-    height: `${strokeWidth}px`,
-    borderRadius: `${rounded ? rounded === true ? "12px" : rounded : 0}`,
-    background: `${fillColor}`
-  };
-  const stylesInner = {
-    width: `${percentage}%`,
-    borderRadius: `${rounded ? rounded === true ? "12px" : rounded : 0}`,
-    background: `${strokeColor}`
-  };
-  const stylesInsideText = {
-    width: `${textWidth}px`,
-    left: `${percentage}%`,
-    background: textBackground || strokeColor
-  };
-  const stylesInsideIcon = {
-    width: `${textWidth}px`,
-    left: `${percentage}%`
-  };
-  const stylesText = {
-    width: `${textWidth}px`
-  };
-  return /* @__PURE__ */ React__default.createElement("div", {
-    className: `${classes} ${className}`,
-    style,
-    ...rest
-  }, /* @__PURE__ */ React__default.createElement("div", {
-    className: classesOuter,
-    style: stylesOuter
-  }, /* @__PURE__ */ React__default.createElement("div", {
-    className: classesInner,
-    style: stylesInner
-  }, showText && textInside && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children ? /* @__PURE__ */ React__default.createElement("div", {
-    className: classesInsideText,
-    style: stylesInsideIcon
-  }, children) : /* @__PURE__ */ React__default.createElement("div", {
-    className: classesInsideText,
-    style: stylesInsideText
-  }, /* @__PURE__ */ React__default.createElement("span", {
-    className: classesTextInner,
-    style: { color: textColor || "#fff" }
-  }, percentage, isShowPercentage ? "%" : ""))))), showText && !textInside && /* @__PURE__ */ React__default.createElement("div", {
-    className: classesText,
-    style: stylesText
-  }, textType === "text" && /* @__PURE__ */ React__default.createElement("span", {
-    className: classesTextInner,
-    style: { color: textColor || "#333" }
-  }, percentage, isShowPercentage ? "%" : ""), textType === "icon" && /* @__PURE__ */ React__default.createElement(Icon, {
-    classPrefix: props.iconClassPrefix,
-    fontClassName: props.iconFontClassName,
-    size: iconSize,
-    name: iconName,
-    color: iconColor
-  })));
-};
-Progress.defaultProps = defaultProps$b;
-Progress.displayName = "NutProgress";
 const defaultProps$a = {
   ...ComponentDefaults,
   className: "",
@@ -18113,6 +18492,8 @@ const Audio = (props) => {
     onMute,
     onCanPlay,
     children,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
   } = {
     ...defaultProps$a,
@@ -18170,13 +18551,13 @@ const Audio = (props) => {
       className: `${b2("icon-box")} ${playing ? b2("icon-play") : b2("icon-stop")}`,
       onClick: handleStatusChange
     }, playing ? /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: "service",
       className: "nut-icon-loading"
     }) : /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: "service"
     }))));
   };
@@ -18913,8 +19294,13 @@ const Address = (props) => {
     onTabChecked,
     style,
     className,
+    iconClassPrefix,
+    iconFontClassName,
     ...rest
-  } = { ...defaultProps$6, ...props };
+  } = {
+    ...defaultProps$6,
+    ...props
+  };
   const b2 = cn("address");
   const [privateType, setPrivateType] = useState(type);
   const [tabName] = useState(["province", "city", "country", "town"]);
@@ -19007,8 +19393,8 @@ const Address = (props) => {
       className: "arrow-back",
       onClick: onSwitchModule
     }, privateType === "custom" && backBtnIcon && /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: backBtnIcon,
       color: "#cccccc"
     })), /* @__PURE__ */ React__default.createElement("div", {
@@ -19016,8 +19402,8 @@ const Address = (props) => {
     }, privateType === "custom" ? locale.address.selectRegion || customAddressTitle : locale.address.deliveryTo || existAddressTitle), /* @__PURE__ */ React__default.createElement("div", {
       onClick: () => handClose()
     }, closeBtnIcon && /* @__PURE__ */ React__default.createElement(Icon$1, {
-      classPrefix: props.iconClassPrefix,
-      fontClassName: props.iconFontClassName,
+      classPrefix: iconClassPrefix,
+      fontClassName: iconFontClassName,
       name: closeBtnIcon,
       color: "#cccccc",
       size: "18px"
@@ -19132,7 +19518,7 @@ const InternalBarrage = (props, ref) => {
     el.classList.add("move");
     el.style.animationDuration = `${speeds}ms`;
     el.style.top = `${_index % rows * (height + top) + 20}px`;
-    el.style.width = `${width + 20}px`;
+    el.style.width = `${width}px`;
     el.style.setProperty("--move-distance", `-${barrageCWidth.current}px`);
     el.dataset.index = `${_index}`;
     el.addEventListener("animationend", () => {
@@ -19535,4 +19921,4 @@ const TimeSelect = (props) => {
 };
 TimeSelect.defaultProps = defaultProps;
 TimeSelect.displayName = "NutTimeSelect";
-export { ActionSheet, Address, AnimatingNumbers, Audio, Avatar, AvatarGroup, BackTop, Badge, Barrage, Button, Calendar, CalendarItem, Card, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, CircleProgress, Col, Collapse, CollapseItem, ConfigProvider, CountDown, DatePicker, Dialog, Divider, Drag, Elevator, Empty, FixedNav, Grid, GridItem, Icon$1 as Icon, ImagePreview, Indicator, Infiniteloading, Input, InputNumber, Layout, Menu, MenuItem, NavBar, NoticeBar, Notify, NumberKeyboard, Overlay, Pagination, Picker, Popover, Popup, Price, Progress, PullToRefresh, Radio, RadioGroup, Range, Rate, Row, SearchBar, ShortPassword, SideNavBar, SideNavBarItem, Signature, Skeleton, Step, Steps, SubSideNavBar, Swipe, Swiper, SwiperItem, Switch, TabPane, Tabbar, TabbarItem, Table, Tabs, Tag, TextArea, TimeDetail, TimePannel, TimeSelect, Toast, Uploader, Video, VirtualList };
+export { ActionSheet, Address, AnimatingNumbers, Audio, Avatar, AvatarGroup, BackTop, Badge, Barrage, Button, Calendar, CalendarItem, Card, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, CircleProgress, Col, Collapse, CollapseItem, ConfigProvider, CountDown, DatePicker, Dialog, Divider, Drag, Elevator, Empty, FixedNav, Grid, GridItem, Icon$1 as Icon, ImagePreview, Indicator, Infiniteloading, Input, InputNumber, Layout, Menu, MenuItem, NavBar, NoticeBar, Notify, NumberKeyboard, Overlay, Pagination, Picker, Popover, Popup, Price, Progress, PullToRefresh, Radio, RadioGroup, Range, Rate, Row, SearchBar, ShortPassword, SideNavBar, SideNavBarItem, Signature, Skeleton, Step, Steps, Sticky, SubSideNavBar, Swipe, Swiper, SwiperItem, Switch, TabPane, Tabbar, TabbarItem, Table, Tabs, Tag, TextArea, TimeDetail, TimePannel, TimeSelect, Toast, Uploader, Video, VirtualList };