@nutui/nutui-react-taro 3.0.6 → 3.0.8

package/dist/nutui.react.umd.js

@@ -1316,17 +1316,14 @@
         onError && onError(e);
       }
     };
-    var containerStyle = {
-      // eslint-disable-next-line no-nested-ternary
-      height: height2 ? pxCheck(height2) : Taro.getEnv() === "WEB" ? "" : "100%",
-      // eslint-disable-next-line no-nested-ternary
-      width: width2 ? pxCheck(width2) : Taro.getEnv() === "WEB" ? "" : "100%",
-      overflow: radius !== void 0 && radius !== null ? "hidden" : "",
-      borderRadius: (
-        // eslint-disable-next-line no-nested-ternary
-        radius !== void 0 && radius != null ? pxCheck(radius) : ""
-      )
-    };
+    var containerStyle = _object_spread({}, height2 ? {
+      height: pxCheck(height2)
+    } : {}, width2 ? {
+      width: pxCheck(width2)
+    } : {}, radius !== void 0 && radius !== null ? {
+      overflow: "hidden",
+      borderRadius: pxCheck(radius)
+    } : {});
     var imgStyle = _object_spread_props(_object_spread({}, style), {
       width: width2,
       height: height2
@@ -1367,7 +1364,7 @@
       innerLoading
     ]);
     return /* @__PURE__ */ React.createElement(components.View, {
-      className: classNames(classPrefix2, className),
+      className: classNames(classPrefix2, _define_property({}, "".concat(classPrefix2, "-basic"), Taro.getEnv() !== "WEB"), className),
       style: containerStyle
     }, /* @__PURE__ */ React.createElement(components.Image, _object_spread_props(_object_spread({}, rest), {
       className: "".concat(classPrefix2, "-default ").concat(className ? "".concat(className, "-image") : ""),
@@ -3784,6 +3781,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 +3872,7 @@
       height: 0
     };
   };
+  var lru = new MiniLru(10);
   function makeRect(width2, height2) {
     return {
       top: 0,
@@ -3841,8 +3899,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);
               });
             })
@@ -4797,11 +4862,19 @@
     var titleRectRef = React.useRef([]);
     var _useState = _sliced_to_array(React.useState(0), 2), scrollTop = _useState[0], setScrollTop = _useState[1];
     var scrollDirection = function(to) {
+      if (sidebarDuration === 0) {
+        setScrollTop(to);
+        return;
+      }
+      var from = scrollTop;
+      var frames2 = Math.round(sidebarDuration / 16);
       var count = 0;
-      var frames2 = sidebarDuration === 0 ? 1 : Math.round(sidebarDuration / 16);
       function animate() {
-        setScrollTop(to);
-        if (++count < frames2) {
+        var progress = count / frames2;
+        var current = from + (to - from) * progress;
+        setScrollTop(current);
+        if (count < frames2) {
+          count++;
           requestAniFrame$1(animate);
         }
       }
@@ -5047,9 +5120,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: {},
@@ -5628,6 +5701,7 @@
           });
           next.push({
             selected: val2,
+            selectedText: opt === null || opt === void 0 ? void 0 : opt.text,
             pane: currentOptions
           });
           pathNodes.current[index2] = opt;
@@ -5917,7 +5991,7 @@
         }
       }, levels.map(function(pane, index2) {
         return /* @__PURE__ */ React.createElement(Tabs.TabPane, {
-          title: pane.selected || locale.select,
+          title: pane.selectedText || locale.select,
           key: index2
         }, /* @__PURE__ */ React.createElement(components.View, {
           className: classPane
@@ -8910,22 +8984,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++) {
@@ -13087,9 +13145,7 @@
     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, loadingIcon = _ref.loadingIcon, className = _ref.className, style = _ref.style;
-    _ref.onChange;
-    var 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",
@@ -13120,14 +13176,56 @@
         (_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() {
-      if (disabled || changing) return;
-      if (props.onChange) {
-        setChanging(true);
-        props.onChange(!value2);
-      }
-      setValue(!value2);
-    };
+    var onClick = /* @__PURE__ */ function() {
+      var _ref2 = _async_to_generator(function() {
+        return __generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              if (disabled || changing) return [
+                2
+              ];
+              if (!onChange) return [
+                3,
+                4
+              ];
+              setChanging(true);
+              _state.label = 1;
+            case 1:
+              _state.trys.push([
+                1,
+                3,
+                ,
+                4
+              ]);
+              return [
+                4,
+                onChange(!value2)
+              ];
+            case 2:
+              _state.sent();
+              return [
+                3,
+                4
+              ];
+            case 3:
+              _state.sent();
+              setChanging(false);
+              return [
+                3,
+                4
+              ];
+            case 4:
+              setValue(!value2);
+              return [
+                2
+              ];
+          }
+        });
+      });
+      return function onClick2() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
     var _obj, _obj1;
     return /* @__PURE__ */ React.createElement(components.View, _object_spread({
       className: classes(),
@@ -14086,7 +14184,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, {
@@ -14099,11 +14197,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);
       }
@@ -14170,15 +14268,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;
@@ -14190,15 +14288,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), {
@@ -14212,8 +14312,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) {
@@ -14237,7 +14337,7 @@
               case 2:
                 _state.sent();
                 setLoading(false);
-                onClose === null || onClose === void 0 ? void 0 : onClose();
+                onClose();
                 return [
                   3,
                   4
@@ -14281,8 +14381,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
           }),
@@ -14300,8 +14400,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));
@@ -14314,8 +14414,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() {
@@ -31765,7 +31865,7 @@
           "function" == typeof t2 && t2(Date.now());
         }, 16);
       } };
-      S.window = { devicePixelRatio: x.pixelRatio }, S.document = S.window.document = { body: {}, createElement: v }, S.navigator = S.window.navigator = { userAgent: "" }, XMLHttpRequest = u;
+      S.window = { devicePixelRatio: x.pixelRatio }, S.document = S.window.document = { body: {}, createElement: v }, S.navigator = S.window.navigator = { userAgent: "" }, S.window.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) {
@@ -35955,7 +36055,6 @@
     ],
     arrowOffset: 0,
     targetId: "",
-    className: "",
     showArrow: true,
     closeOnOutsideClick: true,
     closeOnActionClick: true,
@@ -35993,129 +36092,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() {
@@ -36124,23 +36194,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;
@@ -36156,36 +36226,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() {
@@ -36203,10 +36273,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");
           }
         }
@@ -36217,10 +36287,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");
           }
         }
@@ -36239,6 +36309,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);
@@ -36251,7 +36322,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",
@@ -36266,25 +36337,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, {
@@ -36537,8 +36609,7 @@
     visible: false,
     size: "normal",
     shape: "round",
-    duration: 0.6,
-    inline: false
+    duration: 0.6
   });
   var Skeleton = function(props) {
     var shapeStyle = function shapeStyle2() {
@@ -36678,7 +36749,7 @@
           return _ref.apply(this, arguments);
         };
       }();
-      setTimeout(function() {
+      Taro.nextTick(function() {
         return getWidth();
       });
     });
@@ -37710,10 +37781,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);
@@ -37733,82 +37802,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")
@@ -37820,17 +37871,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), {
@@ -39625,7 +39677,6 @@
     ]);
     var getRootPosition = function() {
       getTaroRectById(list[active2].target).then(function(rect) {
-        console.log("rect", rect);
         setMaskRect({
           top: rect.top,
           left: rect.left,
@@ -39687,16 +39738,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, {
@@ -41243,6 +41294,7 @@
     });
   };
   WaterMark.displayName = "NutWaterMark";
+  var destroyList = [];
   exports.ActionSheet = ActionSheet;
   exports.Address = Address;
   exports.Animate = Animate;
@@ -41347,6 +41399,7 @@
   exports.Video = Video;
   exports.VirtualList = VirtualList;
   exports.WaterMark = WaterMark;
+  exports.destroyList = destroyList;
   exports.getDefaultConfig = getDefaultConfig;
   exports.setDefaultConfig = setDefaultConfig;
   exports.useConfig = useConfig;