@nutui/nutui-react-taro 3.0.5 → 3.0.7

package/dist/nutui.react.umd.js

@@ -3784,6 +3784,66 @@
       stop.current = true;
     };
   }
+  function _class_call_check(instance, Constructor) {
+    if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _defineProperties(target, props) {
+    for (var i2 = 0; i2 < props.length; i2++) {
+      var descriptor = props[i2];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+  function _create_class(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    return Constructor;
+  }
+  var MiniLru = /* @__PURE__ */ function() {
+    function MiniLru2(capacity) {
+      _class_call_check(this, MiniLru2);
+      _define_property(this, "cache", void 0);
+      _define_property(this, "capacity", void 0);
+      if (capacity <= 0) {
+        throw new Error("Cache capacity must be a positive number");
+      }
+      this.cache = /* @__PURE__ */ new Map();
+      this.capacity = capacity;
+    }
+    _create_class(MiniLru2, [
+      {
+        key: "get",
+        value: function get(key2) {
+          if (this.cache.has(key2)) {
+            var value2 = this.cache.get(key2);
+            this.cache.delete(key2);
+            this.cache.set(key2, value2);
+            return value2;
+          }
+          return null;
+        }
+      },
+      {
+        key: "set",
+        value: function set(key2, value2) {
+          if (this.cache.has(key2)) {
+            this.cache.delete(key2);
+          } else if (this.cache.size >= this.capacity) {
+            this.cache.delete(this.cache.keys().next().value);
+          }
+          this.cache.set(key2, value2);
+        }
+      },
+      {
+        key: "has",
+        value: function has2(key2) {
+          return this.cache.has(key2);
+        }
+      }
+    ]);
+    return MiniLru2;
+  }();
   var inBrowser$1 = typeof document !== "undefined" && !!document.scripts;
   function isWindow(val2) {
     return val2 === window;
@@ -3815,6 +3875,7 @@
       height: 0
     };
   };
+  var lru = new MiniLru(10);
   function makeRect(width2, height2) {
     return {
       top: 0,
@@ -3841,8 +3902,15 @@
           return [
             2,
             new Promise(function(resolve, reject) {
+              if (lru.has(element)) {
+                resolve(lru.get(element));
+                return;
+              }
               Taro.createSelectorQuery().select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
                 var _param = _sliced_to_array(param, 1), rects = _param[0];
+                if (rects) {
+                  lru.set(element, rects);
+                }
                 resolve(rects);
               });
             })
@@ -4454,7 +4522,8 @@
     top: 0,
     right: 0,
     fill: "solid",
-    size: "large"
+    size: "large",
+    disabled: false
   });
   var Badge = function(props) {
     var getContent = function getContent2() {
@@ -4475,14 +4544,14 @@
     };
     var _this;
     var rtl = useRtl();
-    var _$_object_spread = _object_spread({}, defaultProps$1l, props), className = _$_object_spread.className, style = _$_object_spread.style, value2 = _$_object_spread.value, max = _$_object_spread.max, children = _$_object_spread.children, dot = _$_object_spread.dot, top = _$_object_spread.top, right2 = _$_object_spread.right, fill = _$_object_spread.fill, size = _$_object_spread.size;
+    var _$_object_spread = _object_spread({}, defaultProps$1l, props), className = _$_object_spread.className, style = _$_object_spread.style, value2 = _$_object_spread.value, max = _$_object_spread.max, children = _$_object_spread.children, dot = _$_object_spread.dot, top = _$_object_spread.top, right2 = _$_object_spread.right, fill = _$_object_spread.fill, size = _$_object_spread.size, disabled = _$_object_spread.disabled;
     var classPrefix2 = "nut-badge";
     var isHarmony2 = harmony();
     var classes = classNames(classPrefix2, className);
     var badgeRef = React.useRef(null);
     var _useState = _sliced_to_array(React.useState({}), 2), contentStyle = _useState[0], setContentStyle = _useState[1];
     var _obj;
-    var contentClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-sup"), isNumber() || isString() || dot), _define_property(_obj, "".concat(classPrefix2, "-number"), isNumber()), _define_property(_obj, "".concat(classPrefix2, "-one"), typeof getContent() === "string" && ((_this = "".concat(getContent())) === null || _this === void 0 ? void 0 : _this.length) === 1), _define_property(_obj, "".concat(classPrefix2, "-dot"), dot), _define_property(_obj, "".concat(classPrefix2, "-dot-").concat(size), dot), _define_property(_obj, "".concat(classPrefix2, "-").concat(fill), fill === "outline"), _define_property(_obj, "".concat(classPrefix2, "-content"), children), _obj));
+    var contentClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-sup"), isNumber() || isString() || dot), _define_property(_obj, "".concat(classPrefix2, "-number"), isNumber()), _define_property(_obj, "".concat(classPrefix2, "-one"), typeof getContent() === "string" && ((_this = "".concat(getContent())) === null || _this === void 0 ? void 0 : _this.length) === 1), _define_property(_obj, "".concat(classPrefix2, "-dot"), dot), _define_property(_obj, "".concat(classPrefix2, "-dot-").concat(size), dot), _define_property(_obj, "".concat(classPrefix2, "-").concat(fill), fill === "outline"), _define_property(_obj, "".concat(classPrefix2, "-content"), children), _define_property(_obj, "".concat(classPrefix2, "-disabled"), disabled), _obj));
     React.useEffect(function() {
       if (badgeRef.current) {
         getPositionStyle();
@@ -4898,14 +4967,6 @@
   SideBar.displayName = "NutSideBar";
   SideBar.Item = SideBarItem;
   const TabbarContext = React.createContext(null);
-  function addColorForHarmony(maybeElement, color) {
-    if (React.isValidElement(maybeElement) && harmony()) {
-      return React.cloneElement(maybeElement, {
-        color
-      });
-    }
-    return maybeElement;
-  }
   var defaultProps$1g = _object_spread_props(_object_spread({}, ComponentDefaults), {
     title: "",
     icon: null,
@@ -4913,11 +4974,12 @@
     dot: false,
     max: 99,
     top: "0",
-    right: "0"
+    right: "0",
+    direction: "vertical"
   });
   var TabbarItem = function(props) {
     var ctx = React.useContext(TabbarContext);
-    var _ref = _object_spread({}, defaultProps$1g, props), className = _ref.className, style = _ref.style, title = _ref.title, icon = _ref.icon, value2 = _ref.value, dot = _ref.dot, max = _ref.max, top = _ref.top, right2 = _ref.right, index2 = _ref.index, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps$1g, props), className = _ref.className, style = _ref.style, title = _ref.title, icon = _ref.icon, value2 = _ref.value, dot = _ref.dot, max = _ref.max, top = _ref.top, right2 = _ref.right, index2 = _ref.index, direction = _ref.direction, onActiveClick = _ref.onActiveClick, rest = _object_without_properties(_ref, [
       "className",
       "style",
       "title",
@@ -4927,15 +4989,19 @@
       "max",
       "top",
       "right",
-      "index"
+      "index",
+      "direction",
+      "onActiveClick"
     ]);
     var active2 = index2 === (ctx === null || ctx === void 0 ? void 0 : ctx.selectIndex);
     var classPrefix2 = "nut-tabbar-item";
-    var tabbarItemClass = classNames(classPrefix2, _define_property({}, "".concat(classPrefix2, "-active"), active2), className);
-    var boxPrefix = "".concat(classPrefix2, "-icon-box");
-    var titleClass = classNames(boxPrefix, "".concat(boxPrefix, "-nav"), _define_property({}, "".concat(boxPrefix, "-large"), !icon));
+    var _obj;
+    var tabbarItemClass = classNames(classPrefix2, (_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-active"), active2), _define_property(_obj, "".concat(classPrefix2, "-large"), !icon || !title), _obj), className);
+    var renderNodeWithActive = function(node) {
+      return node && typeof node === "function" ? node(active2) : node;
+    };
     var badgeProps = {
-      value: value2,
+      value: renderNodeWithActive(value2),
       dot,
       max,
       top,
@@ -4944,11 +5010,32 @@
     };
     var renderTitleText = function() {
       return title && /* @__PURE__ */ React.createElement(components.View, {
-        className: titleClass,
+        className: "".concat(classPrefix2, "-text"),
         style: {
           color: active2 ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor
         }
-      }, title);
+      }, renderNodeWithActive(title));
+    };
+    var renderTitle = function() {
+      return /* @__PURE__ */ React.createElement(Badge, _object_spread({
+        size: "normal"
+      }, badgeProps), renderTitleText());
+    };
+    var renderIcon = function() {
+      var distIcon = renderNodeWithActive(icon);
+      return /* @__PURE__ */ React.isValidElement(distIcon) ? /* @__PURE__ */ React.cloneElement(distIcon, _object_spread_props(_object_spread({}, distIcon.props), {
+        color: active2 ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor
+      })) : null;
+    };
+    var renderIconAndTitle = function() {
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Badge, _object_spread_props(_object_spread({
+        size: "normal"
+      }, badgeProps), {
+        top: 3
+      }), renderIcon()), renderTitleText());
+    };
+    var renderDualItem = function() {
+      return dot ? null : /* @__PURE__ */ React.createElement(React.Fragment, null, renderIcon(), renderTitleText(), /* @__PURE__ */ React.createElement(Badge, badgeProps));
     };
     return /* @__PURE__ */ React.createElement(components.View, _object_spread({
       className: tabbarItemClass,
@@ -4956,23 +5043,22 @@
         color: active2 ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor
       }, style),
       onClick: function() {
-        return ctx === null || ctx === void 0 ? void 0 : ctx.handleClick(index2);
+        return active2 ? onActiveClick === null || onActiveClick === void 0 ? void 0 : onActiveClick() : ctx === null || ctx === void 0 ? void 0 : ctx.handleClick(index2);
       }
-    }, rest), icon ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Badge, badgeProps, /* @__PURE__ */ React.createElement(components.View, {
-      className: boxPrefix
-    }, addColorForHarmony(icon, active2 ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor))), renderTitleText()) : /* @__PURE__ */ React.createElement(Badge, badgeProps, renderTitleText()));
+    }, rest), direction === "horizontal" && !dot ? renderDualItem() : /* @__PURE__ */ React.createElement(React.Fragment, null, icon && renderIconAndTitle(), !icon && renderTitle()));
   };
   var defaultProps$1f = _object_spread_props(_object_spread({}, ComponentDefaults), {
     defaultValue: 0,
     fixed: false,
     inactiveColor: "",
     activeColor: "",
+    direction: "vertical",
     safeArea: false,
-    onSwitch: function(value2) {
+    onSwitch: function() {
     }
   });
   var Tabbar = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$1f, props), children = _$_object_spread.children, defaultValue = _$_object_spread.defaultValue, value2 = _$_object_spread.value, fixed = _$_object_spread.fixed, activeColor = _$_object_spread.activeColor, inactiveColor = _$_object_spread.inactiveColor, safeArea = _$_object_spread.safeArea, className = _$_object_spread.className, style = _$_object_spread.style, onSwitch = _$_object_spread.onSwitch;
+    var _$_object_spread = _object_spread({}, defaultProps$1f, props), children = _$_object_spread.children, defaultValue = _$_object_spread.defaultValue, value2 = _$_object_spread.value, fixed = _$_object_spread.fixed, activeColor = _$_object_spread.activeColor, inactiveColor = _$_object_spread.inactiveColor, direction = _$_object_spread.direction, safeArea = _$_object_spread.safeArea, className = _$_object_spread.className, style = _$_object_spread.style, onSwitch = _$_object_spread.onSwitch;
     var classPrefix2 = "nut-tabbar";
     var _usePropsValue = _sliced_to_array(usePropsValue({
       value: value2,
@@ -4980,11 +5066,26 @@
       finalValue: 0,
       onChange: onSwitch
     }), 2), selectIndex = _usePropsValue[0], setSelectIndex = _usePropsValue[1];
+    var sizeCls = React.useMemo(function() {
+      var size = React.Children.count(children);
+      var _obj;
+      return size > 3 ? "" : classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-wrap-3"), size === 3), _define_property(_obj, "".concat(classPrefix2, "-wrap-2"), size === 2), _define_property(_obj, "".concat(classPrefix2, "-wrap-").concat(direction), size === 2 && direction !== "vertical"), _obj));
+    }, [
+      children,
+      direction
+    ]);
+    var itemDirection = React.useMemo(function() {
+      var size = React.Children.count(children);
+      return size === 2 && direction !== "vertical" && direction;
+    }, [
+      direction,
+      children
+    ]);
     return /* @__PURE__ */ React.createElement(components.View, {
       className: classNames(classPrefix2, _define_property({}, "".concat(classPrefix2, "-fixed"), fixed), className),
       style
     }, /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classPrefix2, "-wrap")
+      className: "".concat(classPrefix2, "-wrap ").concat(sizeCls)
     }, /* @__PURE__ */ React.createElement(TabbarContext.Provider, {
       value: {
         selectIndex,
@@ -4993,12 +5094,12 @@
         handleClick: setSelectIndex
       }
     }, React.Children.map(children, function(child, index2) {
-      if (!/* @__PURE__ */ React.isValidElement(child)) return null;
-      return /* @__PURE__ */ React.cloneElement(child, _object_spread_props(_object_spread({}, child.props), {
-        index: index2
-      }));
-    }))), (fixed || safeArea) && /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classPrefix2, "-safe-area")
+      return /* @__PURE__ */ React.isValidElement(child) ? /* @__PURE__ */ React.cloneElement(child, _object_spread_props(_object_spread({}, child.props), {
+        index: index2,
+        direction: itemDirection
+      })) : null;
+    }))), (fixed || safeArea) && /* @__PURE__ */ React.createElement(SafeArea, {
+      position: "bottom"
     }));
   };
   Tabbar.displayName = "NutTabbar";
@@ -5014,9 +5115,9 @@
     var classes = classNames(classPrefix2, {
       active: !disabled && props.active
     }, autoHeightClassName, className);
-    return children && /* @__PURE__ */ React.createElement(components.View, {
+    return children ? /* @__PURE__ */ React.createElement(components.View, {
       className: classes
-    }, !disabled && children);
+    }, !disabled && children) : null;
   };
   var defaultProps$1d = _object_spread_props(_object_spread({}, ComponentDefaults), {
     tabStyle: {},
@@ -7870,6 +7971,7 @@
     var isMoving = React.useRef(false);
     var rollerRef = React.useRef(null);
     var pickerRollerRef = React.useRef(null);
+    var placeholderRef = React.useRef(null);
     var _useState3 = _sliced_to_array(React.useState(0), 2), startTime = _useState3[0], setStartTime = _useState3[1];
     var _useState4 = _sliced_to_array(React.useState(0), 2), startY = _useState4[0], setStartY = _useState4[1];
     var transformY = React.useRef(0);
@@ -7962,7 +8064,7 @@
               ]);
               return [
                 4,
-                getRectByTaro(rollerRef.current)
+                getRectByTaro(placeholderRef.current)
               ];
             case 1:
               placeholder = _state.sent();
@@ -8009,7 +8111,7 @@
       }
     }, [
       pickerRollerRef.current,
-      rollerRef.current
+      placeholderRef.current
     ]);
     React.useEffect(function() {
       isMoving.current = false;
@@ -8051,6 +8153,10 @@
       className: "nut-pickerview-list",
       ref: pickerRollerRef
     }, /* @__PURE__ */ React.createElement(components.View, {
+      className: "".concat(classPrefix2, "-placeholder"),
+      ref: placeholderRef,
+      id: "".concat(classPrefix2, "-placeholder-").concat(uuid)
+    }), /* @__PURE__ */ React.createElement(components.View, {
       className: classPrefix2,
       id: "".concat(classPrefix2, "-").concat(uuid),
       ref: rollerRef,
@@ -8872,22 +8978,6 @@
   };
   DatePickerView.displayName = "NutDatePickerView";
   var Context = React.createContext({});
-  function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
-  }
-  function _defineProperties(target, props) {
-    for (var i2 = 0; i2 < props.length; i2++) {
-      var descriptor = props[i2];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, descriptor.key, descriptor);
-    }
-  }
-  function _create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    return Constructor;
-  }
   function _extends() {
     _extends = Object.assign ? Object.assign.bind() : function(target) {
       for (var i2 = 1; i2 < arguments.length; i2++) {
@@ -12659,7 +12749,9 @@
       outerValue
     ]);
     React.useEffect(function() {
-      autoFocus && forceFocus();
+      if (Taro.getEnv() === "WEB") {
+        autoFocus && forceFocus();
+      }
     }, [
       autoFocus
     ]);
@@ -12667,10 +12759,12 @@
       return /* @__PURE__ */ React.createElement(components.Input, {
         className: "".concat(classPrefix2, "-input ").concat(clearable ? "".concat(classPrefix2, "-input-clear") : ""),
         ref: searchRef,
-        value: value2 || "",
+        style,
+        value: (value2 || "").toString(),
         placeholder: placeholder || locale.placeholder,
         disabled: disabled || readOnly,
         maxlength: maxLength,
+        autoFocus,
         onInput,
         onFocus: focus,
         onBlur: blur,
@@ -13041,15 +13135,17 @@
   var defaultProps$M = _object_spread_props(_object_spread({}, ComponentDefaults), {
     disabled: false,
     activeText: "",
-    inactiveText: ""
+    inactiveText: "",
+    loadingIcon: /* @__PURE__ */ React.createElement(IconSVG$h, null)
   });
   var Switch = function(props) {
-    var _ref = _object_spread({}, defaultProps$M, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, className = _ref.className, style = _ref.style, onChange = _ref.onChange, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps$M, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, loadingIcon = _ref.loadingIcon, className = _ref.className, style = _ref.style, onChange = _ref.onChange, rest = _object_without_properties(_ref, [
       "checked",
       "defaultChecked",
       "disabled",
       "activeText",
       "inactiveText",
+      "loadingIcon",
       "className",
       "style",
       "onChange"
@@ -13060,6 +13156,12 @@
       value: checked,
       defaultValue: defaultChecked
     }), 2), value2 = _usePropsValue[0], setValue = _usePropsValue[1];
+    React.useEffect(function() {
+      changing && setChanging(false);
+    }, [
+      value2
+    ]);
+    var _useState = _sliced_to_array(React.useState(false), 2), changing = _useState[0], setChanging = _useState[1];
     var classes = function() {
       var _obj2;
       return classNames([
@@ -13068,17 +13170,18 @@
         (_obj2 = {}, _define_property(_obj2, "".concat(classPrefix2, "-close"), !value2), _define_property(_obj2, "".concat(classPrefix2, "-disabled"), disabled), _define_property(_obj2, "".concat(classPrefix2, "-disabled-close"), disabled && !value2), _obj2)
       ]);
     };
-    var onClick = function(event) {
-      if (disabled) return;
-      onChange && onChange(!value2, event);
+    var onClick = function() {
+      if (disabled || changing) return;
+      if (onChange) {
+        setChanging(true);
+        onChange(!value2);
+      }
       setValue(!value2);
     };
     var _obj, _obj1;
     return /* @__PURE__ */ React.createElement(components.View, _object_spread({
       className: classes(),
-      onClick: function(e) {
-        return onClick(e);
-      },
+      onClick,
       style
     }, rest), /* @__PURE__ */ React.createElement(components.View, {
       className: classNames([
@@ -13090,9 +13193,9 @@
         ],
         (_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-button-open-rtl"), rtl && value2), _define_property(_obj, "".concat(classPrefix2, "-button-close-rtl"), rtl && !value2), _obj)
       ])
-    }, !value2 && !activeText && /* @__PURE__ */ React.createElement(components.View, {
+    }, changing && loadingIcon ? /* @__PURE__ */ React.createElement(React.Fragment, null, loadingIcon) : /* @__PURE__ */ React.createElement(React.Fragment, null, !value2 && !activeText && /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-close-line")
-    })), activeText && /* @__PURE__ */ React.createElement(components.View, {
+    }))), activeText && /* @__PURE__ */ React.createElement(components.View, {
       className: classNames("".concat(classPrefix2, "-label"), (_obj1 = {}, _define_property(_obj1, "".concat(classPrefix2, "-label-open"), value2), _define_property(_obj1, "".concat(classPrefix2, "-label-close"), !value2), _define_property(_obj1, "".concat(classPrefix2, "-label-open-rtl"), rtl && value2), _define_property(_obj1, "".concat(classPrefix2, "-label-close-rtl"), rtl && !value2), _define_property(_obj1, "".concat(classPrefix2, "-label-close-disabled"), disabled && !value2), _obj1))
     }, value2 ? activeText : inactiveText));
   };
@@ -14033,7 +14136,7 @@
     }
   };
   var Content = function(props) {
-    var _$_object_spread = _object_spread({}, defaultContentProps, props), visible = _$_object_spread.visible, title = _$_object_spread.title, header = _$_object_spread.header, footer = _$_object_spread.footer, close2 = _$_object_spread.close, footerDirection = _$_object_spread.footerDirection, children = _$_object_spread.children, onClick = _$_object_spread.onClick;
+    var _$_object_spread = _object_spread({}, defaultContentProps, props), visible = _$_object_spread.visible, title = _$_object_spread.title, header = _$_object_spread.header, footer = _$_object_spread.footer, close2 = _$_object_spread.close, footerDirection = _$_object_spread.footerDirection, children = _$_object_spread.children, style = _$_object_spread.style, className = _$_object_spread.className, onClick = _$_object_spread.onClick;
     var classPrefix2 = "nut-dialog";
     var renderHeader = function() {
       return title && /* @__PURE__ */ React.createElement(components.View, {
@@ -14046,11 +14149,11 @@
       }, footer);
     };
     var handleClick = function(e) {
-      onClick && onClick(e);
+      onClick(e);
     };
     return /* @__PURE__ */ React.createElement(components.View, {
-      className: classNames("".concat(classPrefix2, "-outer"), props.className),
-      style: props.style,
+      className: classNames("".concat(classPrefix2, "-outer"), className),
+      style,
       onClick: function(e) {
         return handleClick(e);
       }
@@ -14117,15 +14220,15 @@
     footer: "",
     confirmText: "",
     cancelText: "",
-    overlay: true,
-    overlayStyle: {},
-    overlayClassName: "nut-dialog-overlay",
     hideConfirmButton: false,
     hideCancelButton: false,
     disableConfirmButton: false,
     footerDirection: "horizontal",
     closeIconPosition: "bottom",
     closeIcon: false,
+    overlay: true,
+    overlayStyle: {},
+    overlayClassName: "nut-dialog-overlay",
     zIndex: 1200,
     beforeCancel: function() {
       return true;
@@ -14137,15 +14240,17 @@
     },
     onClose: function() {
     },
+    onConfirm: function() {
+    },
     onOverlayClick: function() {
       return true;
     }
   });
   var BaseDialog = function(props) {
+    var _useParams = useParams(mergeProps(defaultProps$H, props)), _useParams_params = _useParams.params, id = _useParams_params.id, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, children = _useParams_params.children, className = _useParams_params.className, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, content2 = _useParams_params.content, disableConfirmButton = _useParams_params.disableConfirmButton, footer = _useParams_params.footer, footerDirection = _useParams_params.footerDirection, header = _useParams_params.header, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, style = _useParams_params.style, title = _useParams_params.title, visible = _useParams_params.visible, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
     var classPrefix2 = "nut-dialog";
     var locale = useConfig().locale;
     var _useState = _sliced_to_array(React.useState(false), 2), loading = _useState[0], setLoading = _useState[1];
-    var _useParams = useParams(mergeProps(defaultProps$H, props)), _useParams_params = _useParams.params, id = _useParams_params.id, className = _useParams_params.className, style = _useParams_params.style, visible = _useParams_params.visible, footer = _useParams_params.footer, title = _useParams_params.title, header = _useParams_params.header, content2 = _useParams_params.content, children = _useParams_params.children, footerDirection = _useParams_params.footerDirection, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, disableConfirmButton = _useParams_params.disableConfirmButton, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
     useCustomEvent(id, function(param) {
       var status = param.status, options = param.options;
       setParams(_object_spread_props(_object_spread({}, options), {
@@ -14159,8 +14264,8 @@
         e.stopPropagation();
         if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
         if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
-        onClose === null || onClose === void 0 ? void 0 : onClose();
-        onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+        onClose();
+        onCancel();
       };
       var handleOk = /* @__PURE__ */ function() {
         var _ref = _async_to_generator(function(e) {
@@ -14184,7 +14289,7 @@
               case 2:
                 _state.sent();
                 setLoading(false);
-                onClose === null || onClose === void 0 ? void 0 : onClose();
+                onClose();
                 return [
                   3,
                   4
@@ -14228,8 +14333,8 @@
       };
       var renderConfirm = function() {
         return !hideConfirmButton && /* @__PURE__ */ React.createElement(Button, {
-          size: "large",
           type: "primary",
+          size: "large",
           className: classNames("".concat(classPrefix2, "-footer-ok ").concat(btnClass), {
             disabled: disableConfirmButton
           }),
@@ -14247,8 +14352,8 @@
       var handleCancel = function() {
         if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
         if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
-        onClose === null || onClose === void 0 ? void 0 : onClose();
-        onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+        onClose();
+        onCancel();
       };
       var _obj;
       var closeClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-close"), true), _define_property(_obj, "".concat(classPrefix2, "-close-").concat(closeIconPosition), true), _obj));
@@ -14261,8 +14366,8 @@
     var onHandleClickOverlay = function(e) {
       if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
         var closed = onOverlayClick && onOverlayClick(e);
-        closed && onClose && onClose();
-        closed && onCancel && onCancel();
+        closed && onClose();
+        closed && onCancel();
       }
     };
     var renderContent = function() {
@@ -31578,83 +31683,110 @@
         return Object.prototype.hasOwnProperty.call(t2, e2);
       }, r.p = "", r(r.s = 1);
     }([function(t, e, r) {
-      function i2(t2, e2) {
+      function i2() {
+        var t2 = { request: function() {
+        }, getSystemInfoSync: function() {
+          return {};
+        } };
+        return "undefined" != typeof wx && (t2 = wx), "undefined" != typeof jd && (t2 = jd), t2;
+      }
+      function s(t2) {
+        return (s = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(t3) {
+          return typeof t3;
+        } : function(t3) {
+          return t3 && "function" == typeof Symbol && t3.constructor === Symbol && t3 !== Symbol.prototype ? "symbol" : typeof t3;
+        })(t2);
+      }
+      function a(t2, e2) {
         for (var r2 = 0; r2 < e2.length; r2++) {
           var i3 = e2[r2];
-          i3.enumerable = i3.enumerable || false, i3.configurable = true, "value" in i3 && (i3.writable = true), Object.defineProperty(t2, i3.key, i3);
+          i3.enumerable = i3.enumerable || false, i3.configurable = true, "value" in i3 && (i3.writable = true), Object.defineProperty(t2, o(i3.key), i3);
         }
       }
-      function s(t2, e2, r2) {
-        return e2 in t2 ? Object.defineProperty(t2, e2, { value: r2, enumerable: true, configurable: true, writable: true }) : t2[e2] = r2, t2;
+      function n(t2, e2, r2) {
+        return (e2 = o(e2)) in t2 ? Object.defineProperty(t2, e2, { value: r2, enumerable: true, configurable: true, writable: true }) : t2[e2] = r2, t2;
+      }
+      function o(t2) {
+        var e2 = function(t3, e3) {
+          if ("object" != s(t3) || !t3) return t3;
+          var r2 = t3[Symbol.toPrimitive];
+          if (void 0 !== r2) {
+            var i3 = r2.call(t3, e3 || "default");
+            if ("object" != s(i3)) return i3;
+            throw new TypeError("@@toPrimitive must return a primitive value.");
+          }
+          return ("string" === e3 ? String : Number)(t3);
+        }(t2, "string");
+        return "symbol" == s(e2) ? e2 : e2 + "";
       }
       r.d(e, "c", function() {
-        return _;
+        return E;
       }), r.d(e, "b", function() {
-        return x;
+        return T;
       }), r.d(e, "a", function() {
-        return P;
+        return S;
       });
-      var a = /* @__PURE__ */ new WeakMap(), n = /* @__PURE__ */ new WeakMap(), o = /* @__PURE__ */ new WeakMap(), h = /* @__PURE__ */ new WeakMap(), l = /* @__PURE__ */ new WeakMap();
-      function p(t2) {
+      var h = /* @__PURE__ */ new WeakMap(), l = /* @__PURE__ */ new WeakMap(), p = /* @__PURE__ */ new WeakMap(), f = /* @__PURE__ */ new WeakMap(), m = /* @__PURE__ */ new WeakMap();
+      function c(t2) {
         if ("function" == typeof this["on".concat(t2)]) {
           for (var e2 = arguments.length, r2 = new Array(e2 > 1 ? e2 - 1 : 0), i3 = 1; i3 < e2; i3++) r2[i3 - 1] = arguments[i3];
           this["on".concat(t2)].apply(this, r2);
         }
       }
-      function f(t2) {
-        this.readyState = t2, p.call(this, "readystatechange");
+      function d(t2) {
+        this.readyState = t2, c.call(this, "readystatechange");
       }
-      var m = function() {
+      var u = function() {
         function t2() {
           !function(t3, e3) {
             if (!(t3 instanceof e3)) throw new TypeError("Cannot call a class as a function");
-          }(this, t2), s(this, "onabort", null), s(this, "onerror", null), s(this, "onload", null), s(this, "onloadstart", null), s(this, "onprogress", null), s(this, "ontimeout", null), s(this, "onloadend", null), s(this, "onreadystatechange", null), s(this, "readyState", 0), s(this, "response", null), s(this, "responseText", null), s(this, "responseType", ""), s(this, "responseXML", null), s(this, "status", 0), s(this, "statusText", ""), s(this, "upload", {}), s(this, "withCredentials", false), o.set(this, { "content-type": "application/x-www-form-urlencoded" }), h.set(this, {});
+          }(this, t2), n(this, "onabort", null), n(this, "onerror", null), n(this, "onload", null), n(this, "onloadstart", null), n(this, "onprogress", null), n(this, "ontimeout", null), n(this, "onloadend", null), n(this, "onreadystatechange", null), n(this, "readyState", 0), n(this, "response", null), n(this, "responseText", null), n(this, "responseType", ""), n(this, "responseXML", null), n(this, "status", 0), n(this, "statusText", ""), n(this, "upload", {}), n(this, "withCredentials", false), p.set(this, { "content-type": "application/x-www-form-urlencoded" }), f.set(this, {});
         }
-        var e2, r2;
         return e2 = t2, (r2 = [{ key: "abort", value: function() {
-          var t3 = l.get(this);
+          var t3 = m.get(this);
           t3 && t3.abort();
         } }, { key: "getAllResponseHeaders", value: function() {
-          var t3 = h.get(this);
+          var t3 = f.get(this);
           return Object.keys(t3).map(function(e3) {
             return "".concat(e3, ": ").concat(t3[e3]);
           }).join("\n");
         } }, { key: "getResponseHeader", value: function(t3) {
-          return h.get(this)[t3];
+          return f.get(this)[t3];
         } }, { key: "open", value: function(e3, r3) {
-          n.set(this, e3), a.set(this, r3), f.call(this, t2.OPENED);
+          l.set(this, e3), h.set(this, r3), d.call(this, t2.OPENED);
         } }, { key: "overrideMimeType", value: function() {
         } }, { key: "send", value: function() {
           var e3 = this, r3 = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "";
           if (this.readyState !== t2.OPENED) throw new Error("Failed to execute 'send' on 'XMLHttpRequest': The object's state must be OPENED.");
-          wx.request({ data: r3, url: a.get(this), method: n.get(this), header: o.get(this), success: function(r4) {
-            var i3 = r4.data, s2 = r4.statusCode, a2 = r4.header;
+          i2().request({ data: r3, url: h.get(this), method: l.get(this), header: p.get(this), success: function(r4) {
+            var i3 = r4.data, s3 = r4.statusCode, a2 = r4.header;
             if ("string" != typeof i3 && !(i3 instanceof ArrayBuffer)) try {
               i3 = JSON.stringify(i3);
             } catch (t3) {
             }
-            if (e3.status = s2, h.set(e3, a2), p.call(e3, "loadstart"), f.call(e3, t2.HEADERS_RECEIVED), f.call(e3, t2.LOADING), e3.response = i3, i3 instanceof ArrayBuffer) {
+            if (e3.status = s3, f.set(e3, a2), c.call(e3, "loadstart"), d.call(e3, t2.HEADERS_RECEIVED), d.call(e3, t2.LOADING), e3.response = i3, i3 instanceof ArrayBuffer) {
               e3.responseText = "";
-              for (var n2 = new Uint8Array(i3), o2 = n2.byteLength, l2 = 0; l2 < o2; l2++) e3.responseText += String.fromCharCode(n2[l2]);
+              for (var n2 = new Uint8Array(i3), o2 = n2.byteLength, h2 = 0; h2 < o2; h2++) e3.responseText += String.fromCharCode(n2[h2]);
             } else e3.responseText = i3;
-            f.call(e3, t2.DONE), p.call(e3, "load"), p.call(e3, "loadend");
+            d.call(e3, t2.DONE), c.call(e3, "load"), c.call(e3, "loadend");
           }, fail: function(t3) {
             var r4 = t3.errMsg;
-            -1 !== r4.indexOf("abort") ? p.call(e3, "abort") : p.call(e3, "error", r4), p.call(e3, "loadend");
+            -1 !== r4.indexOf("abort") ? c.call(e3, "abort") : c.call(e3, "error", r4), c.call(e3, "loadend");
           } });
         } }, { key: "setRequestHeader", value: function(t3, e3) {
-          var r3 = o.get(this);
-          r3[t3] = e3, o.set(this, r3);
-        } }]) && i2(e2.prototype, r2), t2;
+          var r3 = p.get(this);
+          r3[t3] = e3, p.set(this, r3);
+        } }]) && a(e2.prototype, r2), s2 && a(e2, s2), Object.defineProperty(e2, "prototype", { writable: false }), e2;
+        var e2, r2, s2;
       }();
-      function c() {
+      function y() {
       }
-      function d() {
+      function g() {
         console.error("小程序由于不支持动态创建 canvas 的能力，故 lottie 中有关图片处理的操作无法支持，请保持图片的原始宽高与 JSON 描述的一致，避免需要对图片处理");
       }
-      function u(t2) {
+      function v(t2) {
         return "canvas" === t2 ? (console.warn("发现 Lottie 动态创建 canvas 组件，但小程序不支持动态创建组件，接下来可能会出现异常"), { getContext: function() {
-          return { fillRect: c, createImage: d, drawImage: d };
+          return { fillRect: y, createImage: g, drawImage: g };
         } }) : "img" === t2 ? function(t3) {
           if (void 0 === t3.createImage) return {};
           var e2 = t3.createImage();
@@ -31665,42 +31797,42 @@
           }, e2;
         }(this) : void 0;
       }
-      function y(t2, e2) {
+      function b(t2, e2) {
         return function(r2) {
           return e2.call(t2, Array.from(r2));
         };
       }
-      function g(t2, e2) {
+      function P(t2, e2) {
         return function() {
           return e2.call(t2);
         };
       }
-      function v(t2, e2, r2) {
+      function _(t2, e2, r2) {
         var i3 = t2[e2];
         t2[e2] = r2(t2, i3);
       }
-      s(m, "UNSEND", 0), s(m, "OPENED", 1), s(m, "HEADERS_RECEIVED", 2), s(m, "LOADING", 3), s(m, "DONE", 4);
-      var b = wx.getSystemInfoSync(), P = { requestAnimationFrame: function(t2) {
+      n(u, "UNSEND", 0), n(u, "OPENED", 1), n(u, "HEADERS_RECEIVED", 2), n(u, "LOADING", 3), n(u, "DONE", 4);
+      var x = i2().getSystemInfoSync(), S = { requestAnimationFrame: function(t2) {
         setTimeout(function() {
           "function" == typeof t2 && t2(Date.now());
         }, 16);
       } };
-      P.window = { devicePixelRatio: b.pixelRatio }, P.document = P.window.document = { body: {}, createElement: u }, P.navigator = P.window.navigator = { userAgent: "" }, XMLHttpRequest = m;
-      var _ = function(t2) {
-        var e2 = P.window, r2 = P.document;
-        P._requestAnimationFrame = e2.requestAnimationFrame, P._cancelAnimationFrame = e2.cancelAnimationFrame, e2.requestAnimationFrame = function(e3) {
+      S.window = { devicePixelRatio: x.pixelRatio }, S.document = S.window.document = { body: {}, createElement: v }, S.navigator = S.window.navigator = { userAgent: "" }, XMLHttpRequest = u;
+      var E = function(t2) {
+        var e2 = S.window, r2 = S.document;
+        S._requestAnimationFrame = e2.requestAnimationFrame, S._cancelAnimationFrame = e2.cancelAnimationFrame, e2.requestAnimationFrame = function(e3) {
           var r3 = false;
           setTimeout(function() {
             r3 || (r3 = true, "function" == typeof e3 && e3(Date.now()));
           }, 100), t2.requestAnimationFrame(function(t3) {
             r3 || (r3 = true, "function" == typeof e3 && e3(t3));
           });
-        }, e2.cancelAnimationFrame = t2.cancelAnimationFrame.bind(t2), P._body = r2.body, P._createElement = r2.createElement, r2.body = {}, r2.createElement = u.bind(t2);
+        }, e2.cancelAnimationFrame = t2.cancelAnimationFrame.bind(t2), S._body = r2.body, S._createElement = r2.createElement, r2.body = {}, r2.createElement = v.bind(t2);
         var i3 = t2.getContext("2d");
-        i3.canvas || (i3.canvas = t2), v(i3, "setLineDash", y), v(i3, "fill", g);
-      }, x = function() {
-        var t2 = P.window, e2 = P.document;
-        t2.requestAnimationFrame = P._requestAnimationFrame, t2.cancelAnimationFrame = P._cancelAnimationFrame, e2.body = P._body, e2.createElement = P._createElement;
+        i3.canvas || (i3.canvas = t2), _(i3, "setLineDash", b), _(i3, "fill", P);
+      }, T = function() {
+        var t2 = S.window, e2 = S.document;
+        t2.requestAnimationFrame = S._requestAnimationFrame, t2.cancelAnimationFrame = S._cancelAnimationFrame, e2.body = S._body, e2.createElement = S._createElement;
       };
     }, function(module, __webpack_exports__, __webpack_require__) {
       __webpack_require__.r(__webpack_exports__), (function(module) {
@@ -35259,7 +35391,7 @@
   var implementation;
   if (process.env.TARO_ENV === "h5") {
     implementation = Lottie$2;
-  } else if (process.env.TARO_ENV === "weapp") {
+  } else if (process.env.TARO_ENV === "weapp" || process.env.TARO_ENV === "jd") {
     implementation = Lottie$1;
   } else {
     implementation = function(props) {
@@ -35759,10 +35891,14 @@
   NoticeBar.displayName = "NutNoticeBar";
   var defaultProps$B = _object_spread_props(_object_spread({}, ComponentDefaults), {
     id: "",
-    duration: 3e3,
-    type: "danger",
+    distance: 8,
+    navHeight: 57,
     position: "top",
     visible: false,
+    closeable: false,
+    leftIcon: null,
+    rightIcon: null,
+    duration: 3e3,
     onClose: function() {
     },
     onClick: function() {
@@ -35770,13 +35906,12 @@
   });
   var classPrefix$c = "nut-notify";
   var Notify = function(props) {
-    var _mergeProps = mergeProps(defaultProps$B, props), id = _mergeProps.id, children = _mergeProps.children, style = _mergeProps.style, type2 = _mergeProps.type, className = _mergeProps.className, position2 = _mergeProps.position, visible = _mergeProps.visible, duration = _mergeProps.duration, onClose = _mergeProps.onClose, onClick = _mergeProps.onClick;
+    var _mergeProps = mergeProps(defaultProps$B, props), id = _mergeProps.id, style = _mergeProps.style, children = _mergeProps.children, distance = _mergeProps.distance, navHeight = _mergeProps.navHeight, closeable = _mergeProps.closeable, leftIcon = _mergeProps.leftIcon, rightIcon = _mergeProps.rightIcon, position2 = _mergeProps.position, visible = _mergeProps.visible, duration = _mergeProps.duration, className = _mergeProps.className, onClose = _mergeProps.onClose, onClick = _mergeProps.onClick;
     useCustomEvent(id, function(status) {
       status ? show2() : hide2();
     });
     var timer;
     var _useState = _sliced_to_array(React.useState(false), 2), showNotify = _useState[0], setShowNotify = _useState[1];
-    var cssRef = React.useRef(null);
     React.useEffect(function() {
       if (visible) {
         show2();
@@ -35786,9 +35921,6 @@
     }, [
       visible
     ]);
-    var clickHandle = function() {
-      onClick();
-    };
     var show2 = function() {
       setShowNotify(true);
       clearTimer();
@@ -35808,10 +35940,29 @@
       setShowNotify(false);
       onClose();
     };
+    var getDistance = React.useMemo(function() {
+      if (position2 === "top") {
+        return {
+          top: pxTransform(web() ? Number(distance) + navHeight : Number(distance))
+        };
+      }
+      return {
+        bottom: pxTransform(Number(distance))
+      };
+    }, [
+      distance,
+      position2
+    ]);
     var _obj;
-    var classes = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix$c, "-popup-top"), position2 === "top"), _define_property(_obj, "".concat(classPrefix$c, "-popup-bottom"), position2 === "bottom"), _define_property(_obj, "".concat(classPrefix$c), true), _define_property(_obj, "".concat(classPrefix$c, "-").concat(type2), true), _obj));
+    var classes = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix$c), true), _define_property(_obj, "".concat(className), true), _obj));
+    var handleClick = function() {
+      onClick === null || onClick === void 0 ? void 0 : onClick();
+    };
+    var handleClickIcon = function() {
+      hide2();
+    };
+    var _obj1;
     return /* @__PURE__ */ React.createElement(CSSTransition, {
-      nodeRef: cssRef,
       in: showNotify,
       timeout: 300,
       classNames: "fade",
@@ -35820,10 +35971,19 @@
       position: position2,
       id
     }, /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classes, " ").concat(className),
-      style,
-      onClick: clickHandle
-    }, children));
+      className: classes,
+      style: _object_spread({}, style, getDistance),
+      onClick: handleClick
+    }, leftIcon ? /* @__PURE__ */ React.createElement(components.View, {
+      className: "".concat(classPrefix$c, "-left-icon")
+    }, leftIcon) : null, /* @__PURE__ */ React.createElement(components.View, {
+      className: classNames((_obj1 = {}, _define_property(_obj1, "".concat(classPrefix$c, "-content"), true), _define_property(_obj1, "".concat(classPrefix$c, "-ellipsis"), closeable || rightIcon), _define_property(_obj1, "".concat(classPrefix$c, "-layout-left"), leftIcon || rightIcon), _obj1))
+    }, children), rightIcon || closeable ? /* @__PURE__ */ React.createElement(components.View, {
+      className: "".concat(classPrefix$c, "-right-icon"),
+      onClick: handleClickIcon
+    }, rightIcon || (closeable ? /* @__PURE__ */ React.createElement(IconSVG$p, {
+      size: 12
+    }) : null)) : null));
   };
   function open(selector) {
     var path = useCustomEventsPath(selector);
@@ -35847,7 +36007,6 @@
     ],
     arrowOffset: 0,
     targetId: "",
-    className: "",
     showArrow: true,
     closeOnOutsideClick: true,
     closeOnActionClick: true,
@@ -35885,129 +36044,100 @@
     var popoverRef = React.useRef(null);
     var popoverContentRef = React.useRef(null);
     var _useState = _sliced_to_array(React.useState(false), 2), showPopup = _useState[0], setShowPopup = _useState[1];
-    var _useState1 = _sliced_to_array(React.useState(0), 2), elWidth = _useState1[0], setElWidth = _useState1[1];
-    var _useState2 = _sliced_to_array(React.useState(0), 2), elHeight = _useState2[0], setElHeight = _useState2[1];
-    var _useState3 = _sliced_to_array(React.useState(), 2), rootPosition = _useState3[0], setRootPosition = _useState3[1];
+    var _useState1 = _sliced_to_array(React.useState(0), 2), popWidth = _useState1[0], setPopWidth = _useState1[1];
+    var _useState2 = _sliced_to_array(React.useState(0), 2), popHeight = _useState2[0], setPopHeight = _useState2[1];
+    var _useState3 = _sliced_to_array(React.useState(), 2), wrapperPosition = _useState3[0], setWrapperPosition = _useState3[1];
     React.useEffect(function() {
       setShowPopup(visible);
       if (visible) {
-        setTimeout(function() {
-          getContentWidth();
-        }, 0);
+        getWrapperPosition();
       }
     }, [
       visible
     ]);
-    var getContentWidth = /* @__PURE__ */ function() {
+    var uid = useUuid();
+    var popoverId = "popover-".concat(uid);
+    var getWrapperPosition = /* @__PURE__ */ function() {
       var _ref2 = _async_to_generator(function() {
-        var rect;
         return __generator(this, function(_state) {
-          Taro.createSelectorQuery().selectViewport().scrollOffset(/* @__PURE__ */ function() {
-            var _ref3 = _async_to_generator(function(res) {
-              var distance;
-              return __generator(this, function(_state2) {
-                switch (_state2.label) {
-                  case 0:
-                    distance = res.scrollTop;
-                    if (!targetId) return [
-                      3,
-                      4
-                    ];
-                    if (!(Taro.getEnv() === Taro.ENV_TYPE.WEB)) return [
-                      3,
-                      1
-                    ];
-                    rect = getRect(document.querySelector("#".concat(targetId)));
-                    return [
-                      3,
-                      3
-                    ];
-                  case 1:
-                    return [
-                      4,
-                      getRectTaro(targetId)
-                    ];
-                  case 2:
-                    rect = _state2.sent();
-                    _state2.label = 3;
-                  case 3:
-                    return [
-                      3,
-                      6
-                    ];
-                  case 4:
-                    return [
-                      4,
-                      getRectByTaro(popoverRef.current)
-                    ];
-                  case 5:
-                    rect = _state2.sent();
-                    _state2.label = 6;
-                  case 6:
-                    setRootPosition({
-                      width: rect.width,
-                      height: rect.height,
-                      left: rtl ? rect.right : rect.left,
-                      top: rect.top + distance,
-                      right: rtl ? rect.left : rect.right
-                    });
-                    return [
-                      2
-                    ];
-                }
-              });
+          Taro.nextTick(/* @__PURE__ */ _async_to_generator(function() {
+            var rect, _tmp, width2, height2, right2, left2, top;
+            return __generator(this, function(_state2) {
+              switch (_state2.label) {
+                case 0:
+                  if (!targetId) return [
+                    3,
+                    2
+                  ];
+                  return [
+                    4,
+                    getRectByTaro(document.querySelector("#".concat(targetId)), targetId)
+                  ];
+                case 1:
+                  _tmp = _state2.sent();
+                  return [
+                    3,
+                    4
+                  ];
+                case 2:
+                  return [
+                    4,
+                    getRectByTaro(popoverRef.current, popoverId)
+                  ];
+                case 3:
+                  _tmp = _state2.sent();
+                  _state2.label = 4;
+                case 4:
+                  rect = _tmp;
+                  width2 = rect.width, height2 = rect.height, right2 = rect.right, left2 = rect.left, top = rect.top;
+                  setWrapperPosition({
+                    width: width2,
+                    height: height2,
+                    left: rtl ? right2 : left2,
+                    top,
+                    right: rtl ? left2 : right2
+                  });
+                  getPopoverContentW();
+                  return [
+                    2
+                  ];
+              }
             });
-            return function(res) {
-              return _ref3.apply(this, arguments);
-            };
-          }()).exec();
-          setTimeout(function() {
-            getPopoverContentW();
-          }, 300);
+          }));
           return [
             2
           ];
         });
       });
-      return function getContentWidth2() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    var getRectTaro = /* @__PURE__ */ function() {
-      var _ref2 = _async_to_generator(function(targetId2) {
-        return __generator(this, function(_state) {
-          return [
-            2,
-            new Promise(function(resolve) {
-              Taro.createSelectorQuery().select("#".concat(targetId2)).boundingClientRect().exec(function(res) {
-                resolve(res[0]);
-              });
-            })
-          ];
-        });
-      });
-      return function getRectTaro2(targetId2) {
+      return function getWrapperPosition2() {
         return _ref2.apply(this, arguments);
       };
     }();
     var getPopoverContentW = /* @__PURE__ */ function() {
       var _ref2 = _async_to_generator(function() {
-        var rectContent;
         return __generator(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              return [
-                4,
-                getRectByTaro(popoverContentRef.current)
-              ];
-            case 1:
-              rectContent = _state.sent();
-              setElWidth(rectContent.width);
-              setElHeight(rectContent.height);
-              return [
-                2
-              ];
-          }
+          Taro.nextTick(/* @__PURE__ */ _async_to_generator(function() {
+            var rectContent;
+            return __generator(this, function(_state2) {
+              switch (_state2.label) {
+                case 0:
+                  return [
+                    4,
+                    getRectByTaro(popoverContentRef.current)
+                  ];
+                case 1:
+                  rectContent = _state2.sent();
+                  setPopWidth(rectContent.width);
+                  setPopHeight(rectContent.height);
+                  return [
+                    2
+                  ];
+              }
+            });
+          }));
+          return [
+            2
+          ];
         });
       });
       return function getPopoverContentW2() {
@@ -36016,23 +36146,23 @@
     }();
     var clickAway = function() {
       if (closeOnOutsideClick) {
-        onClick && onClick();
-        onClose && onClose();
+        onClick === null || onClick === void 0 ? void 0 : onClick();
+        onClose === null || onClose === void 0 ? void 0 : onClose();
       }
     };
-    var _obj;
-    var classes = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix$b), true), _define_property(_obj, "".concat(classPrefix$b, "-").concat(theme), theme === "dark"), _obj), className);
+    var classes = classNames(classPrefix$b, _define_property({}, "".concat(classPrefix$b, "-").concat(theme), theme === "dark"), className);
     var popoverArrow = function() {
       var prefixCls2 = "nut-popover-arrow";
-      return "".concat(prefixCls2, " ").concat(prefixCls2, "-").concat(location.split("-")[0], " ").concat(prefixCls2, "-").concat(location);
+      var direction = location.split("-")[0];
+      return "".concat(prefixCls2, " ").concat(prefixCls2, "-").concat(direction, " ").concat(prefixCls2, "-").concat(location);
     };
-    var getRootPosition = function() {
+    var getPopoverPosition = function() {
       var styles = {};
-      if (!rootPosition) {
+      if (!wrapperPosition) {
         styles.visibility = "hidden";
         return styles;
       }
-      var width2 = rootPosition.width, height2 = rootPosition.height, left2 = rootPosition.left, top = rootPosition.top, right2 = rootPosition.right;
+      var width2 = wrapperPosition.width, height2 = wrapperPosition.height, left2 = wrapperPosition.left, top = wrapperPosition.top, right2 = wrapperPosition.right;
       var direction = location.split("-")[0];
       var skew = location.split("-")[1];
       var cross = 0;
@@ -36048,36 +36178,36 @@
           "bottom",
           "top"
         ].includes(direction)) {
-          var h = direction === "bottom" ? height2 + cross : -(elHeight + cross);
-          styles.top = "".concat(top + h, "px");
+          var h = direction === "bottom" ? height2 + cross : -(popHeight + cross);
+          styles.top = pxTransform(top + h);
           if (!skew) {
-            styles[dir] = "".concat(-(elWidth - width2) / 2 + rootPosition[dir] + parallel, "px");
+            styles[dir] = pxTransform(-(popWidth - width2) / 2 + wrapperPosition[dir] + parallel);
           }
-          if (skew === "start") {
-            styles.left = "".concat(left2 + parallel, "px");
+          if (skew === "left") {
+            styles.left = pxTransform(left2 + parallel);
           }
-          if (skew === "end") {
-            styles.left = "".concat(right2 + parallel, "px");
+          if (skew === "right") {
+            styles.left = pxTransform(right2 + parallel);
           }
         }
         if ([
           "left",
           "right"
         ].includes(direction)) {
-          var contentW = direction === "left" ? -(elWidth + cross) : width2 + cross;
-          styles.left = "".concat(left2 + contentW, "px");
+          var contentW = direction === "left" ? -(popWidth + cross) : width2 + cross;
+          styles.left = pxTransform(left2 + contentW);
           if (!skew) {
-            styles.top = "".concat(top - elHeight / 2 + height2 / 2 - 4 + parallel, "px");
+            styles.top = pxTransform(top - popHeight / 2 + height2 / 2 - 4 + parallel);
           }
-          if (skew === "start") {
-            styles.top = "".concat(top + parallel, "px");
+          if (skew === "top") {
+            styles.top = pxTransform(top + parallel);
           }
-          if (skew === "end") {
-            styles.top = "".concat(top + height2 + parallel, "px");
+          if (skew === "bottom") {
+            styles.top = pxTransform(top + height2 + parallel);
           }
         }
       }
-      styles.visibility = elWidth === 0 ? "hidden" : "initial";
+      styles.visibility = popWidth === 0 ? "hidden" : "initial";
       return styles;
     };
     var popoverArrowStyle = function() {
@@ -36095,10 +36225,10 @@
           if (!skew) {
             styles[dir] = "calc(50% + ".concat(arrowOffset, "px)");
           }
-          if (skew === "start") {
+          if (skew === "left") {
             styles[dir] = "".concat(base + arrowOffset, "px");
           }
-          if (skew === "end") {
+          if (skew === "right") {
             styles[dir2] = "".concat(base - arrowOffset, "px");
           }
         }
@@ -36109,10 +36239,10 @@
           if (!skew) {
             styles.top = "calc(50% - ".concat(arrowOffset, "px)");
           }
-          if (skew === "start") {
+          if (skew === "top") {
             styles.top = "".concat(base - arrowOffset, "px");
           }
-          if (skew === "end") {
+          if (skew === "bottom") {
             styles.bottom = "".concat(base + arrowOffset, "px");
           }
         }
@@ -36131,6 +36261,7 @@
     return /* @__PURE__ */ React.createElement(React.Fragment, null, !targetId && /* @__PURE__ */ React.createElement(components.View, {
       className: "nut-popover-wrapper",
       ref: popoverRef,
+      id: popoverId,
       onClick: function() {
         var _props_onClick;
         props === null || props === void 0 ? void 0 : (_props_onClick = props.onClick) === null || _props_onClick === void 0 ? void 0 : _props_onClick.call(props);
@@ -36143,7 +36274,7 @@
       style
     }, Array.isArray(children) ? children[0] : children), /* @__PURE__ */ React.createElement(components.View, {
       className: classes,
-      style: getRootPosition()
+      style: _object_spread({}, getPopoverPosition(), style)
     }, /* @__PURE__ */ React.createElement(Popup, _object_spread({
       className: "nut-popover-content nut-popover-content-".concat(location),
       position: "none",
@@ -36158,25 +36289,26 @@
     }, /* @__PURE__ */ React.createElement(IconSVG$x, {
       width: 8,
       height: 4
-    })), Array.isArray(children) ? children[1] : "", list.map(function(item, index2) {
+    })), Array.isArray(children) ? children[1] : null, list.map(function(item, index2) {
+      var _item_action;
       return /* @__PURE__ */ React.createElement(components.View, {
         className: classNames({
-          "nut-popover-menu-item": true,
-          "nut-popover-menu-disabled": item.disabled
+          "nut-popover-item": true,
+          "nut-popover-item-disabled": item.disabled
         }, item.className),
         key: item.key || index2,
         onClick: function() {
           return handleSelect(item, index2);
         }
       }, item.icon && /* @__PURE__ */ React.createElement(components.View, {
-        className: "nut-popover-menu-item-icon"
-      }, item.icon), /* @__PURE__ */ React.createElement(components.View, {
-        className: "nut-popover-menu-item-name"
-      }, item.name), item.action && item.action.icon && /* @__PURE__ */ React.createElement(components.View, {
-        className: "nut-popover-menu-item-action-icon",
+        className: "nut-popover-item-icon"
+      }, item.icon), /* @__PURE__ */ React.createElement(components.Text, {
+        className: "nut-popover-item-name"
+      }, item.name), ((_item_action = item.action) === null || _item_action === void 0 ? void 0 : _item_action.icon) && /* @__PURE__ */ React.createElement(components.View, {
+        className: "nut-popover-item-action-icon",
         onClick: function(e) {
-          var _item_action_onClick, _item_action;
-          return (_item_action = item.action) === null || _item_action === void 0 ? void 0 : (_item_action_onClick = _item_action.onClick) === null || _item_action_onClick === void 0 ? void 0 : _item_action_onClick.call(_item_action, e);
+          var _item_action_onClick, _item_action2;
+          return (_item_action2 = item.action) === null || _item_action2 === void 0 ? void 0 : (_item_action_onClick = _item_action2.onClick) === null || _item_action_onClick === void 0 ? void 0 : _item_action_onClick.call(_item_action2, e);
         }
       }, item.action.icon));
     }))), showPopup && closeOnOutsideClick && /* @__PURE__ */ React.createElement(components.View, {
@@ -36423,203 +36555,83 @@
     })) : null, children);
   };
   ResultPage.displayName = "NutResultPage";
-  var AvatarContext = React.createContext({});
   var defaultProps$x = _object_spread_props(_object_spread({}, ComponentDefaults), {
-    maxContent: "",
-    max: "",
-    maxBackground: "#eee",
-    maxColor: "#666",
-    gap: "-8",
-    level: "left"
-  });
-  var classPrefix$a = "nut-avatar-group";
-  var AvatarGroup = function(props) {
-    var propAvatarGroup = _object_spread({}, defaultProps$x, props);
-    var className = propAvatarGroup.className, style = propAvatarGroup.style, children = propAvatarGroup.children;
-    var avatarGroupRef = React.useRef(null);
-    var cls = classNames(classPrefix$a, className);
-    var parentAvatar = {
-      propAvatarGroup: _object_spread({
-        avatarCount: React.Children.count(children) || 0
-      }, propAvatarGroup),
-      avatarGroupRef
-    };
-    return /* @__PURE__ */ React.createElement(AvatarContext.Provider, {
-      value: parentAvatar
-    }, /* @__PURE__ */ React.createElement(components.View, {
-      className: cls,
-      style,
-      ref: avatarGroupRef
-    }, React.Children.map(children, function(child, index2) {
-      var _child_type;
-      return (child === null || child === void 0 ? void 0 : (_child_type = child.type) === null || _child_type === void 0 ? void 0 : _child_type.displayName) === "NutAvatar" ? /* @__PURE__ */ React.cloneElement(child, {
-        avatarIndex: index2 + 1,
-        className: "nut-avatar-group-avatar"
-      }) : child;
-    })));
-  };
-  AvatarGroup.displayName = "NutAvatarGroup";
-  var defaultProps$w = _object_spread_props(_object_spread({}, ComponentDefaults), {
-    size: harmony() ? "40" : "",
-    shape: "round",
-    icon: "",
-    background: "#eee",
-    color: "#666",
-    fit: "cover",
-    src: "",
-    alt: "",
-    avatarIndex: 0
-  });
-  var classPrefix$9 = "nut-avatar";
-  var Avatar = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$w, props), children = _$_object_spread.children, size = _$_object_spread.size, shape = _$_object_spread.shape, background = _$_object_spread.background, color = _$_object_spread.color, src = _$_object_spread.src, icon = _$_object_spread.icon, fit = _$_object_spread.fit, avatarIndex = _$_object_spread.avatarIndex, className = _$_object_spread.className, style = _$_object_spread.style, onClick = _$_object_spread.onClick, onError = _$_object_spread.onError;
-    var _useState = _sliced_to_array(React.useState(false), 2), showMax = _useState[0], setShowMax = _useState[1];
-    var avatarRef = React.useRef(null);
-    var parent2 = React.useContext(AvatarContext);
-    var sizeValue = [
-      "large",
-      "normal",
-      "small"
-    ];
-    var propAvatarGroup = parent2.propAvatarGroup;
-    var groupSize = propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.size;
-    var groupShape = propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.shape;
-    var groupCount = propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.avatarCount;
-    var groupMax = propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.max;
-    var _obj;
-    var classes = classNames((_obj = {}, _define_property(_obj, "nut-avatar-".concat(groupSize || size || "normal"), true), _define_property(_obj, "nut-avatar-".concat(groupShape || shape), true), _define_property(_obj, "nut-avatar-".concat(groupSize || size || "normal", "-round"), shape === "round" && true), _obj));
-    var nativeClasses = classNames(_define_property({}, "nut-avatar-first-child", avatarIndex === 1));
-    var cls = classNames(classPrefix$9, classes, className, nativeClasses);
-    var _obj1;
-    var styles = _object_spread((_obj1 = {
-      width: sizeValue.indexOf(size) > -1 ? "" : pxTransform(parseInt(size)),
-      height: sizeValue.indexOf(size) > -1 ? "" : pxTransform(parseInt(size)),
-      backgroundColor: "".concat(background),
-      color
-    }, _define_property(_obj1, harmony() ? "marginRight" : "marginLeft", avatarIndex !== 1 && (propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.gap) ? "".concat(propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.gap, "px") : ""), _define_property(_obj1, "zIndex", (propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.level) === "right" ? Math.abs(groupCount - avatarIndex) : ""), _obj1), style);
-    var maxStyles = {
-      backgroundColor: "".concat(propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.maxBackground),
-      color: "".concat(propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.maxColor)
-    };
-    React.useEffect(function() {
-      var maxCount = groupMax || groupCount;
-      if (avatarIndex === groupCount && avatarIndex !== maxCount && groupCount > maxCount) {
-        setShowMax(true);
-      }
-    }, [
-      avatarIndex,
-      groupCount
-    ]);
-    var errorEvent = function() {
-      onError && onError();
-    };
-    var clickAvatar = function(e) {
-      onClick && onClick(e);
-    };
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, (showMax || !groupMax || avatarIndex <= groupMax) && /* @__PURE__ */ React.createElement(components.View, {
-      className: cls,
-      style: !showMax ? styles : maxStyles,
-      onClick: clickAvatar,
-      ref: avatarRef
-    }, (!groupMax || avatarIndex <= groupMax) && /* @__PURE__ */ React.createElement(React.Fragment, null, src && /* @__PURE__ */ React.createElement(components.Image, {
-      className: "nut-avatar-img nut-avatar-".concat(groupSize || size || "normal", "-img"),
-      src,
-      style: {
-        objectFit: fit
-      },
-      onError: errorEvent
-    }), /* @__PURE__ */ React.isValidElement(icon) ? /* @__PURE__ */ React.createElement(components.View, {
-      className: "nut-avatar-text"
-    }, /* @__PURE__ */ React.cloneElement(icon, _object_spread_props(_object_spread({}, icon.props), {
-      color,
-      className: "".concat(icon.props.className || "", " nut-avatar-icon nut-avatar-").concat(groupSize || size || "normal", "-icon")
-    }))) : null, children && /* @__PURE__ */ React.createElement(components.View, {
-      style: {
-        color
-      },
-      className: "nut-avatar-text nut-avatar-".concat(groupSize || size || "normal", "-text")
-    }, children), !src && !icon && !children && /* @__PURE__ */ React.createElement(components.View, {
-      className: "nut-avatar-text"
-    }, /* @__PURE__ */ React.createElement(IconSVG$1, {
-      style: {
-        color
-      },
-      className: "nut-avatar-icon nut-avatar-".concat(groupSize || size || "normal", "-icon")
-    }))), showMax && /* @__PURE__ */ React.createElement(components.View, {
-      className: "nut-avatar-text nut-avatar-".concat(groupSize || "normal", "-text"),
-      style: _object_spread({}, maxStyles)
-    }, (propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.maxContent) ? propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.maxContent : "+ ".concat(avatarIndex - Number(groupMax || 0)))));
-  };
-  Avatar.displayName = "NutAvatar";
-  Avatar.Group = AvatarGroup;
-  var defaultProps$v = _object_spread_props(_object_spread({}, ComponentDefaults), {
     rows: 1,
-    animated: false,
-    title: false,
-    avatar: false,
-    avatarSize: "50px",
+    animated: true,
     visible: false,
-    avatarShape: "round"
+    size: "normal",
+    shape: "round",
+    duration: 0.6,
+    inline: false
   });
   var Skeleton = function(props) {
-    var _ref = _object_spread({}, defaultProps$v, props), className = _ref.className, animated = _ref.animated, rows = _ref.rows, title = _ref.title, avatar = _ref.avatar, avatarSize = _ref.avatarSize, visible = _ref.visible, children = _ref.children, avatarShape = _ref.avatarShape, rest = _object_without_properties(_ref, [
+    var shapeStyle = function shapeStyle2() {
+      if (shape === "circle") return {
+        borderRadius: "50%"
+      };
+      if (shape === "square") return {
+        borderRadius: "0"
+      };
+      return {};
+    };
+    var durationStyle = function durationStyle2() {
+      if (typeof duration !== "undefined") return {
+        animationDuration: "".concat(duration, "s")
+      };
+      return {};
+    };
+    var _ref = _object_spread({}, defaultProps$x, props), className = _ref.className, width2 = _ref.width, height2 = _ref.height, shape = _ref.shape, animated = _ref.animated, rows = _ref.rows, visible = _ref.visible, size = _ref.size, duration = _ref.duration, children = _ref.children, rest = _object_without_properties(_ref, [
       "className",
+      "width",
+      "height",
+      "shape",
       "animated",
       "rows",
-      "title",
-      "avatar",
-      "avatarSize",
       "visible",
-      "children",
-      "avatarShape"
+      "size",
+      "duration",
+      "children"
     ]);
     var classPrefix2 = "nut-skeleton";
     var classes = classNames(classPrefix2, className);
-    var _obj;
-    var avatarClass = classNames((_obj = {}, _define_property(_obj, "nut-avatar", true), _define_property(_obj, "nut-skeleton-content-avatar", true), _define_property(_obj, "avatar-".concat(avatarShape), avatarShape), _obj));
-    var repeatLines = function(num) {
+    var repeatCount = function(num) {
       return Array.from({
         length: num
       }, function(v, i2) {
         return i2;
       });
     };
-    var getStyle = function() {
-      if (avatarSize) {
-        return {
-          width: pxTransform(parseInt(avatarSize)),
-          height: pxTransform(parseInt(avatarSize))
-        };
-      }
-      return {
-        width: pxTransform(50),
-        height: pxTransform(50)
-      };
+    var _useState = _sliced_to_array(React.useState(false), 2), animate = _useState[0], setAnimate = _useState[1];
+    var playAnimation = function() {
+      setAnimate(false);
+      setTimeout(function() {
+        setAnimate(true);
+      }, 10);
     };
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, visible ? /* @__PURE__ */ React.createElement(React.Fragment, null, children) : /* @__PURE__ */ React.createElement(components.View, _object_spread({
+    React.useEffect(function() {
+      if (!animated) return;
+      playAnimation();
+      var intervalId = setInterval(playAnimation, 1e3 + duration * 1e3);
+      return function() {
+        return clearInterval(intervalId);
+      };
+    }, []);
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, visible ? children : /* @__PURE__ */ React.createElement(components.View, _object_spread({
       className: classes
-    }, rest), animated && /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classPrefix2, "-animation")
-    }), /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classPrefix2, "-content")
-    }, avatar && /* @__PURE__ */ React.createElement(Avatar, {
-      className: avatarClass,
-      background: "rgb(239, 239, 239)",
-      shape: avatarShape,
-      style: getStyle(),
-      icon: "null"
-    }), rows === 1 ? /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classPrefix2, "-content-block")
-    }) : /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classPrefix2, "-content-line")
-    }, title && /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classPrefix2, "-content-title")
-    }), repeatLines(rows).map(function(item, index2) {
+    }, rest), repeatCount(rows).map(function(item, index2) {
+      var contentClass = "".concat(classPrefix2, "-content ").concat(classPrefix2, "-content-").concat(size, " ").concat(classPrefix2, "-content-").concat(size, "-").concat(index2);
       return /* @__PURE__ */ React.createElement(components.View, {
-        className: "".concat(classPrefix2, "-content-block ").concat(index2 === repeatLines(rows).length - 1 ? "".concat(classPrefix2, "-content-block-last-child") : ""),
-        key: index2
-      });
-    })))));
+        className: "".concat(contentClass),
+        key: index2,
+        style: _object_spread({
+          width: width2,
+          height: height2
+        }, shapeStyle())
+      }, animated && /* @__PURE__ */ React.createElement(components.View, {
+        className: "".concat(classPrefix2, "-animated ").concat(animate ? "".concat(classPrefix2, "-animation") : ""),
+        style: durationStyle()
+      }));
+    })));
   };
   Skeleton.displayName = "NutSkeleton";
   function preventDefault(event, isStopPropagation) {
@@ -36630,7 +36642,7 @@
       event.stopPropagation();
     }
   }
-  var defaultProps$u = _object_spread_props(_object_spread({}, ComponentDefaults), {
+  var defaultProps$w = _object_spread_props(_object_spread({}, ComponentDefaults), {
     name: ""
   });
   var Swipe = /* @__PURE__ */ React.forwardRef(function(props, instanceRef) {
@@ -36694,7 +36706,7 @@
         return getWidth();
       });
     });
-    var _$_object_spread = _object_spread({}, defaultProps$u, props), children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
+    var _$_object_spread = _object_spread({}, defaultProps$w, props), children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
     var root2 = React.useRef();
     var opened = React.useRef(false);
     var lockClick = React.useRef(false);
@@ -36928,7 +36940,7 @@
     }, renderActionContent("left"), children, renderActionContent("right")));
   });
   Swipe.displayName = "NutSwipe";
-  var defaultProps$t = _object_spread_props(_object_spread({}, defaultOverlayProps), {
+  var defaultProps$v = _object_spread_props(_object_spread({}, defaultOverlayProps), {
     id: "",
     duration: 2,
     position: "middle",
@@ -36947,7 +36959,7 @@
     }
   });
   var Toast = function(props) {
-    var _useParams = useParams(mergeProps(defaultProps$t, props)), _useParams_params = _useParams.params, id = _useParams_params.id, position2 = _useParams_params.position, contentStyle = _useParams_params.contentStyle, icon = _useParams_params.icon, content2 = _useParams_params.content, duration = _useParams_params.duration, title = _useParams_params.title, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, lockScroll = _useParams_params.lockScroll, contentClassName = _useParams_params.contentClassName, visible = _useParams_params.visible, size = _useParams_params.size, className = _useParams_params.className, style = _useParams_params.style, wordBreak = _useParams_params.wordBreak, zIndex = _useParams_params.zIndex, onClose = _useParams_params.onClose, setParams = _useParams.setParams;
+    var _useParams = useParams(mergeProps(defaultProps$v, props)), _useParams_params = _useParams.params, id = _useParams_params.id, position2 = _useParams_params.position, contentStyle = _useParams_params.contentStyle, icon = _useParams_params.icon, content2 = _useParams_params.content, duration = _useParams_params.duration, title = _useParams_params.title, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, lockScroll = _useParams_params.lockScroll, contentClassName = _useParams_params.contentClassName, visible = _useParams_params.visible, size = _useParams_params.size, className = _useParams_params.className, style = _useParams_params.style, wordBreak = _useParams_params.wordBreak, zIndex = _useParams_params.zIndex, onClose = _useParams_params.onClose, setParams = _useParams.setParams;
     var classPrefix2 = "nut-toast";
     var timer = React.useRef(-1);
     var rtl = useRtl();
@@ -37071,21 +37083,21 @@
   Toast.displayName = "NutToast";
   Toast.show = show;
   Toast.hide = hide;
-  var defaultProps$s = _object_spread_props(_object_spread({}, ComponentDefaults), {
+  var defaultProps$u = _object_spread_props(_object_spread({}, ComponentDefaults), {
     type: "shake",
     action: "initial",
     loop: false,
     onClick: function(event) {
     }
   });
-  var classPrefix$8 = "nut-animate";
+  var classPrefix$a = "nut-animate";
   var Animate = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$s, props), className = _$_object_spread.className, type2 = _$_object_spread.type, action = _$_object_spread.action, loop = _$_object_spread.loop, onClick = _$_object_spread.onClick, children = _$_object_spread.children, style = _$_object_spread.style;
+    var _$_object_spread = _object_spread({}, defaultProps$u, props), className = _$_object_spread.className, type2 = _$_object_spread.type, action = _$_object_spread.action, loop = _$_object_spread.loop, onClick = _$_object_spread.onClick, children = _$_object_spread.children, style = _$_object_spread.style;
     var _useState = _sliced_to_array(React.useState(false), 2), clicked = _useState[0], setClicked = _useState[1];
     var _obj;
     var classes = classNames((_obj = {
       "nut-ani-container": true
-    }, _define_property(_obj, "".concat(classPrefix$8, "-").concat(type2), action === "initial" || clicked), _define_property(_obj, "loop", loop), _obj), className);
+    }, _define_property(_obj, "".concat(classPrefix$a, "-").concat(type2), action === "initial" || clicked), _define_property(_obj, "loop", loop), _obj), className);
     var handleClick = function(event) {
       setClicked(true);
       if (!loop) {
@@ -37104,7 +37116,7 @@
     }, children));
   };
   Animate.displayName = "NutAnimate";
-  var defaultProps$r = _object_spread_props(_object_spread({}, ComponentDefaults), {
+  var defaultProps$t = _object_spread_props(_object_spread({}, ComponentDefaults), {
     length: 0,
     value: "",
     delay: 300,
@@ -37112,7 +37124,7 @@
     thousands: false
   });
   var CountUp = function(props) {
-    var _mergeProps = mergeProps(defaultProps$r, props), length2 = _mergeProps.length, value2 = _mergeProps.value, delay = _mergeProps.delay, duration = _mergeProps.duration, className = _mergeProps.className, thousands = _mergeProps.thousands;
+    var _mergeProps = mergeProps(defaultProps$t, props), length2 = _mergeProps.length, value2 = _mergeProps.value, delay = _mergeProps.delay, duration = _mergeProps.duration, className = _mergeProps.className, thousands = _mergeProps.thousands;
     _mergeProps.style;
     var rest = _object_without_properties(_mergeProps, [
       "length",
@@ -37215,7 +37227,7 @@
     })));
   };
   CountUp.displayName = "NutCountUp";
-  var defaultProps$q = {};
+  var defaultProps$s = {};
   var AnimatingNumbers = /* @__PURE__ */ function(Component) {
     _inherits(AnimatingNumbers2, Component);
     function AnimatingNumbers2(props) {
@@ -37239,11 +37251,11 @@
     ]);
     return AnimatingNumbers2;
   }(React.Component);
-  _define_property(AnimatingNumbers, "defaultProps", defaultProps$q);
+  _define_property(AnimatingNumbers, "defaultProps", defaultProps$s);
   _define_property(AnimatingNumbers, "displayName", "NutAnimatingNumbers");
   _define_property(AnimatingNumbers, "CountUp", CountUp);
   AnimatingNumbers.CountUp = CountUp;
-  var defaultProps$p = _object_spread_props(_object_spread({}, ComponentDefaults), {
+  var defaultProps$r = _object_spread_props(_object_spread({}, ComponentDefaults), {
     className: "",
     src: "",
     style: {},
@@ -37280,7 +37292,7 @@
     };
     var classPrefix2 = "nut-audio";
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps$p, props), className = _ref.className, src = _ref.src, style = _ref.style, autoplay = _ref.autoplay, loop = _ref.loop, type2 = _ref.type, onFastBack = _ref.onFastBack, onForward = _ref.onForward, onPause = _ref.onPause, onPlay = _ref.onPlay, onPlayEnd = _ref.onPlayEnd, onCanPlay = _ref.onCanPlay, children = _ref.children;
+    var _ref = _object_spread({}, defaultProps$r, props), className = _ref.className, src = _ref.src, style = _ref.style, autoplay = _ref.autoplay, loop = _ref.loop, type2 = _ref.type, onFastBack = _ref.onFastBack, onForward = _ref.onForward, onPause = _ref.onPause, onPlay = _ref.onPlay, onPlayEnd = _ref.onPlayEnd, onCanPlay = _ref.onCanPlay, children = _ref.children;
     _ref.iconClassPrefix;
     _ref.iconFontClassName;
     var rest = _object_without_properties(_ref, [
@@ -37443,6 +37455,135 @@
     }, rest), renderAudio());
   };
   Audio.displayName = "NutAudio";
+  var AvatarContext = React.createContext({});
+  var defaultProps$q = _object_spread_props(_object_spread({}, ComponentDefaults), {
+    maxContent: "",
+    max: "",
+    maxBackground: "#eee",
+    maxColor: "#666",
+    gap: "-8",
+    level: "left"
+  });
+  var classPrefix$9 = "nut-avatar-group";
+  var AvatarGroup = function(props) {
+    var propAvatarGroup = _object_spread({}, defaultProps$q, props);
+    var className = propAvatarGroup.className, style = propAvatarGroup.style, children = propAvatarGroup.children;
+    var avatarGroupRef = React.useRef(null);
+    var cls = classNames(classPrefix$9, className);
+    var parentAvatar = {
+      propAvatarGroup: _object_spread({
+        avatarCount: React.Children.count(children) || 0
+      }, propAvatarGroup),
+      avatarGroupRef
+    };
+    return /* @__PURE__ */ React.createElement(AvatarContext.Provider, {
+      value: parentAvatar
+    }, /* @__PURE__ */ React.createElement(components.View, {
+      className: cls,
+      style,
+      ref: avatarGroupRef
+    }, React.Children.map(children, function(child, index2) {
+      var _child_type;
+      return (child === null || child === void 0 ? void 0 : (_child_type = child.type) === null || _child_type === void 0 ? void 0 : _child_type.displayName) === "NutAvatar" ? /* @__PURE__ */ React.cloneElement(child, {
+        avatarIndex: index2 + 1,
+        className: "nut-avatar-group-avatar"
+      }) : child;
+    })));
+  };
+  AvatarGroup.displayName = "NutAvatarGroup";
+  var defaultProps$p = _object_spread_props(_object_spread({}, ComponentDefaults), {
+    size: harmony() ? "40" : "",
+    shape: "round",
+    icon: "",
+    background: "#eee",
+    color: "#666",
+    fit: "cover",
+    src: "",
+    alt: "",
+    avatarIndex: 0
+  });
+  var classPrefix$8 = "nut-avatar";
+  var Avatar = function(props) {
+    var _$_object_spread = _object_spread({}, defaultProps$p, props), children = _$_object_spread.children, size = _$_object_spread.size, shape = _$_object_spread.shape, background = _$_object_spread.background, color = _$_object_spread.color, src = _$_object_spread.src, icon = _$_object_spread.icon, fit = _$_object_spread.fit, avatarIndex = _$_object_spread.avatarIndex, className = _$_object_spread.className, style = _$_object_spread.style, onClick = _$_object_spread.onClick, onError = _$_object_spread.onError;
+    var _useState = _sliced_to_array(React.useState(false), 2), showMax = _useState[0], setShowMax = _useState[1];
+    var avatarRef = React.useRef(null);
+    var parent2 = React.useContext(AvatarContext);
+    var sizeValue = [
+      "large",
+      "normal",
+      "small"
+    ];
+    var propAvatarGroup = parent2.propAvatarGroup;
+    var groupSize = propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.size;
+    var groupShape = propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.shape;
+    var groupCount = propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.avatarCount;
+    var groupMax = propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.max;
+    var _obj;
+    var classes = classNames((_obj = {}, _define_property(_obj, "nut-avatar-".concat(groupSize || size || "normal"), true), _define_property(_obj, "nut-avatar-".concat(groupShape || shape), true), _define_property(_obj, "nut-avatar-".concat(groupSize || size || "normal", "-round"), shape === "round" && true), _obj));
+    var nativeClasses = classNames(_define_property({}, "nut-avatar-first-child", avatarIndex === 1));
+    var cls = classNames(classPrefix$8, classes, className, nativeClasses);
+    var _obj1;
+    var styles = _object_spread((_obj1 = {
+      width: sizeValue.indexOf(size) > -1 ? "" : pxTransform(parseInt(size)),
+      height: sizeValue.indexOf(size) > -1 ? "" : pxTransform(parseInt(size)),
+      backgroundColor: "".concat(background),
+      color
+    }, _define_property(_obj1, harmony() ? "marginRight" : "marginLeft", avatarIndex !== 1 && (propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.gap) ? "".concat(propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.gap, "px") : ""), _define_property(_obj1, "zIndex", (propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.level) === "right" ? Math.abs(groupCount - avatarIndex) : ""), _obj1), style);
+    var maxStyles = {
+      backgroundColor: "".concat(propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.maxBackground),
+      color: "".concat(propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.maxColor)
+    };
+    React.useEffect(function() {
+      var maxCount = groupMax || groupCount;
+      if (avatarIndex === groupCount && avatarIndex !== maxCount && groupCount > maxCount) {
+        setShowMax(true);
+      }
+    }, [
+      avatarIndex,
+      groupCount
+    ]);
+    var errorEvent = function() {
+      onError && onError();
+    };
+    var clickAvatar = function(e) {
+      onClick && onClick(e);
+    };
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, (showMax || !groupMax || avatarIndex <= groupMax) && /* @__PURE__ */ React.createElement(components.View, {
+      className: cls,
+      style: !showMax ? styles : maxStyles,
+      onClick: clickAvatar,
+      ref: avatarRef
+    }, (!groupMax || avatarIndex <= groupMax) && /* @__PURE__ */ React.createElement(React.Fragment, null, src && /* @__PURE__ */ React.createElement(components.Image, {
+      className: "nut-avatar-img nut-avatar-".concat(groupSize || size || "normal", "-img"),
+      src,
+      style: {
+        objectFit: fit
+      },
+      onError: errorEvent
+    }), /* @__PURE__ */ React.isValidElement(icon) ? /* @__PURE__ */ React.createElement(components.View, {
+      className: "nut-avatar-text"
+    }, /* @__PURE__ */ React.cloneElement(icon, _object_spread_props(_object_spread({}, icon.props), {
+      color,
+      className: "".concat(icon.props.className || "", " nut-avatar-icon nut-avatar-").concat(groupSize || size || "normal", "-icon")
+    }))) : null, children && /* @__PURE__ */ React.createElement(components.View, {
+      style: {
+        color
+      },
+      className: "nut-avatar-text nut-avatar-".concat(groupSize || size || "normal", "-text")
+    }, children), !src && !icon && !children && /* @__PURE__ */ React.createElement(components.View, {
+      className: "nut-avatar-text"
+    }, /* @__PURE__ */ React.createElement(IconSVG$1, {
+      style: {
+        color
+      },
+      className: "nut-avatar-icon nut-avatar-".concat(groupSize || size || "normal", "-icon")
+    }))), showMax && /* @__PURE__ */ React.createElement(components.View, {
+      className: "nut-avatar-text nut-avatar-".concat(groupSize || "normal", "-text"),
+      style: _object_spread({}, maxStyles)
+    }, (propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.maxContent) ? propAvatarGroup === null || propAvatarGroup === void 0 ? void 0 : propAvatarGroup.maxContent : "+ ".concat(avatarIndex - Number(groupMax || 0)))));
+  };
+  Avatar.displayName = "NutAvatar";
+  Avatar.Group = AvatarGroup;
   var defaultProps$o = _object_spread_props(_object_spread({}, ComponentDefaults), {
     strokeWidth: 5,
     radius: 50,
@@ -37593,10 +37734,8 @@
     var context2 = React.useContext(CollapseContext);
     var wrapperRef = React.useRef(null);
     var contentRef = React.useRef(null);
-    var _useState = _sliced_to_array(React.useState(function() {
-      return Math.random().toString(36).slice(-8);
-    }), 1), refRandomId = _useState[0];
-    var target = "#nut-collapse-content-".concat(refRandomId);
+    var uid = useUuid();
+    var target = "nut-collapse-content-".concat(uid);
     var expanded = React.useMemo(function() {
       if (context2) {
         return context2.isOpen(name2);
@@ -37616,82 +37755,64 @@
       expanded,
       rotate
     ]);
-    var handleClick = function() {
-      if (!disabled) {
-        context2.updateValue(name2);
-      }
-    };
-    var _useState1 = _sliced_to_array(React.useState(null), 2), timer = _useState1[0], setTimer = _useState1[1];
-    var _useState2 = _sliced_to_array(React.useState("auto"), 2), currentHeight = _useState2[0], setCurrentHeight = _useState2[1];
-    var inAnimation = React.useRef(false);
-    var _useState3 = _sliced_to_array(React.useState(function() {
-      return expanded ? "auto" : "0px";
-    }), 2), wrapperHeight = _useState3[0], setWrapperHeight = _useState3[1];
-    var getRect2 = function(selector) {
-      return new Promise(function(resolve) {
-        Taro.createSelectorQuery().select(selector).boundingClientRect().exec(function() {
-          var rect = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
-          resolve(rect[0]);
+    var _useState = _sliced_to_array(React.useState(0), 2), tran = _useState[0], setTran = _useState[1];
+    var _useRefState = _sliced_to_array(useRefState(0), 2), currentHeight = _useRefState[0], setCurrentHeight = _useRefState[1];
+    var _useState1 = _sliced_to_array(React.useState(0), 2), wrapperHeight = _useState1[0], setWrapperHeight = _useState1[1];
+    var updateRectHeight = /* @__PURE__ */ function() {
+      var _ref2 = _async_to_generator(function() {
+        var res;
+        return __generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              return [
+                4,
+                getRectByTaro(contentRef.current, target)
+              ];
+            case 1:
+              res = _state.sent();
+              if (res === null || res === void 0 ? void 0 : res.height) {
+                setCurrentHeight(res.height);
+                setWrapperHeight(expanded ? res.height : 0);
+                Taro.nextTick(function() {
+                  setTran(1);
+                });
+              }
+              return [
+                2
+              ];
+          }
         });
       });
-    };
+      return function updateRectHeight2() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
     React.useEffect(function() {
-      setTimeout(function() {
-        getRect2(target).then(function(res) {
-          if (res === null || res === void 0 ? void 0 : res.height) {
-            setCurrentHeight("".concat(res.height, "px"));
-          }
-        });
-      }, 200);
+      Taro.nextTick(function() {
+        updateRectHeight();
+      });
     }, [
-      children
+      children,
+      expanded
     ]);
-    React.useEffect(function() {
-      setTimeout(function() {
-        getRect2(target).then(function(res) {
-          if (res === null || res === void 0 ? void 0 : res.height) {
-            setCurrentHeight("".concat(res.height, "px"));
-          }
-        });
-      }, 100);
-    }, []);
     var toggle = function() {
-      if (timer) {
-        clearTimeout(timer);
-        setTimer(timer);
-      }
-      var start = expanded ? "0px" : currentHeight;
-      var end = expanded ? currentHeight : "0px";
-      inAnimation.current = true;
-      setWrapperHeight(start);
-      setTimeout(function() {
-        setWrapperHeight(end);
-        inAnimation.current = false;
-        if (expanded) {
-          var timer2 = setTimeout(function() {
-            setWrapperHeight("auto");
-          }, 300);
-          setTimer(timer2);
-        }
-      }, 100);
+      var end = !expanded ? currentHeight.current : 0;
+      setWrapperHeight(end);
     };
-    var init = React.useRef(true);
-    React.useEffect(function() {
-      if (init.current) {
-        init.current = false;
-      } else {
-        toggle();
+    var handleClick = function() {
+      if (!disabled) {
+        context2.updateValue(name2);
+        setTimeout(function() {
+          toggle();
+        }, 150);
       }
-    }, [
-      expanded
-    ]);
+    };
+    var _obj;
     return /* @__PURE__ */ React.createElement("div", _object_spread({
       className: classNames(classPrefix2, className),
       style
     }, rest), /* @__PURE__ */ React.createElement(components.View, {
-      className: classNames("".concat(classPrefix2, "-header"), {
-        disabled
-      }),
+      className: classNames("".concat(classPrefix2, "-header"), _define_property({}, "".concat(classPrefix2, "-header-disabled"), disabled)),
       onClick: handleClick
     }, /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-title")
@@ -37703,17 +37824,18 @@
       className: "".concat(classPrefix2, "-icon"),
       style: iconStyle
     }, expandIcon || context2.expandIcon))), /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classPrefix2, "-content"),
-      ref: wrapperRef,
-      style: {
-        willChange: "height",
+      className: classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-content-wrapper"), true), _define_property(_obj, "".concat(classPrefix2, "-content-wrapper-tran"), true), _obj)),
+      style: tran ? {
         height: wrapperHeight
-      }
+      } : {},
+      ref: wrapperRef
     }, /* @__PURE__ */ React.createElement(components.View, {
+      className: "".concat(classPrefix2, "-content"),
       ref: contentRef,
-      className: "".concat(classPrefix2, "-content-text"),
-      id: "nut-collapse-content-".concat(refRandomId)
-    }, children)));
+      id: target
+    }, /* @__PURE__ */ React.createElement(components.View, {
+      className: "".concat(classPrefix2, "-content-text")
+    }, children))));
   };
   CollapseItem.displayName = "NutCollapseItem";
   var defaultProps$m = _object_spread_props(_object_spread({}, ComponentDefaults), {
@@ -38337,7 +38459,7 @@
   var classPrefix$5 = "nut-indicator";
   var Indicator = function(props) {
     var maybeFixedWidth = function maybeFixedWidth2() {
-      if (total === 2 || type2 === "slide") {
+      if (type2 === "dualScreen" || type2 === "slide") {
         return "".concat(classPrefix$5, "-fixed-width");
       }
       return "";
@@ -38731,6 +38853,14 @@
     }, closeIcon === true ? /* @__PURE__ */ React.createElement(IconSVG$p, null) : closeIcon));
   };
   ImagePreview.displayName = "NutImagePreview";
+  function addColorForHarmony(maybeElement, color) {
+    if (React.isValidElement(maybeElement) && harmony()) {
+      return React.cloneElement(maybeElement, {
+        color
+      });
+    }
+    return maybeElement;
+  }
   var defaultPaginationOptions = {
     current: 0,
     itemsPerPage: 10,
@@ -39500,7 +39630,6 @@
     ]);
     var getRootPosition = function() {
       getTaroRectById(list[active2].target).then(function(rect) {
-        console.log("rect", rect);
         setMaskRect({
           top: rect.top,
           left: rect.left,
@@ -39562,16 +39691,16 @@
         }
       }, index2 === active2 && /* @__PURE__ */ React.createElement(React.Fragment, null, showTour && /* @__PURE__ */ React.createElement(components.View, {
         className: "".concat(mask2 ? "nut-tour-mask" : "nut-tour-mask nut-tour-mask-none"),
-        id: "nut-tour-popid",
+        id: "nut-tour-popid".concat(index2),
         style: maskStyle()
       }), /* @__PURE__ */ React.createElement(Popover, {
         visible: showPopup,
         location: item.location || location,
-        targetId: "nut-tour-popid",
+        targetId: "nut-tour-popid".concat(index2 === active2 ? index2 : ""),
         closeOnOutsideClick: false,
         offset: item.popoverOffset || [
           0,
-          12
+          8
         ],
         arrowOffset: item.arrowOffset || 0
       }, /* @__PURE__ */ React.createElement(React.Fragment, null), /* @__PURE__ */ React.createElement(React.Fragment, null, children || /* @__PURE__ */ React.createElement(React.Fragment, null, type2 === "step" && /* @__PURE__ */ React.createElement(components.View, {
@@ -41118,6 +41247,7 @@
     });
   };
   WaterMark.displayName = "NutWaterMark";
+  var destroyList = [];
   exports.ActionSheet = ActionSheet;
   exports.Address = Address;
   exports.Animate = Animate;
@@ -41222,6 +41352,7 @@
   exports.Video = Video;
   exports.VirtualList = VirtualList;
   exports.WaterMark = WaterMark;
+  exports.destroyList = destroyList;
   exports.getDefaultConfig = getDefaultConfig;
   exports.setDefaultConfig = setDefaultConfig;
   exports.useConfig = useConfig;