@nutui/nutui-react-taro 2.0.22 → 2.0.23-beta.0

package/dist/nutui.react.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.22 Fri Oct 27 2023 18:00:59 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.23 Fri Nov 03 2023 19:33:54 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -1929,7 +1929,7 @@ var __publicField = (obj, key, value) => {
     style: {}
   };
   const prefixCls$1 = "nut-button";
-  const defaultProps$1u = {
+  const defaultProps$1v = {
     ...ComponentDefaults,
     color: "",
     type: "default",
@@ -1961,7 +1961,7 @@ var __publicField = (obj, key, value) => {
         style,
         ...rest
       } = {
-        ...defaultProps$1u,
+        ...defaultProps$1v,
         ...props
       };
       const getStyle = React.useCallback(() => {
@@ -2020,7 +2020,7 @@ var __publicField = (obj, key, value) => {
   );
   Button.displayName = "NutButton";
   const CellGroupContext = React.createContext(null);
-  const defaultProps$1t = {
+  const defaultProps$1u = {
     ...ComponentDefaults,
     title: "",
     description: "",
@@ -2029,7 +2029,7 @@ var __publicField = (obj, key, value) => {
   const classPrefix$p = "nut-cell-group";
   const CellGroup = (props) => {
     const { children, className, style, title, description, divider, ...rest } = {
-      ...defaultProps$1t,
+      ...defaultProps$1u,
       ...props
     };
     return /* @__PURE__ */ React.createElement("div", { className: classNames(classPrefix$p, className), ...rest }, title ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$p}__title` }, title) : null, description ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$p}__description` }, description) : null, /* @__PURE__ */ React.createElement(
@@ -2040,9 +2040,9 @@ var __publicField = (obj, key, value) => {
       /* @__PURE__ */ React.createElement(CellGroupContext.Provider, { value: { divider } }, children)
     ));
   };
-  CellGroup.defaultProps = defaultProps$1t;
+  CellGroup.defaultProps = defaultProps$1u;
   CellGroup.displayName = "NutCellGroup";
-  const defaultProps$1s = {
+  const defaultProps$1t = {
     ...ComponentDefaults,
     title: null,
     description: null,
@@ -2067,7 +2067,7 @@ var __publicField = (obj, key, value) => {
       style,
       ...rest
     } = {
-      ...defaultProps$1s,
+      ...defaultProps$1t,
       ...props
     };
     const handleClick = (event) => {
@@ -2100,7 +2100,7 @@ var __publicField = (obj, key, value) => {
       (ctx == null ? void 0 : ctx.divider) ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$o}__divider` }) : null
     );
   };
-  Cell.defaultProps = defaultProps$1s;
+  Cell.defaultProps = defaultProps$1t;
   Cell.displayName = "NutCell";
   Cell.Group = CellGroup;
   var INFINITY = 1 / 0;
@@ -3241,7 +3241,7 @@ var __publicField = (obj, key, value) => {
   const pxCheck = (value) => {
     return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
   };
-  const defaultProps$1r = {
+  const defaultProps$1s = {
     src: "",
     error: true,
     loading: true
@@ -3260,7 +3260,7 @@ var __publicField = (obj, key, value) => {
       onLoad,
       onError,
       ...rest
-    } = { ...defaultProps$1r, ...props };
+    } = { ...defaultProps$1s, ...props };
     const [innerLoading, setInnerLoading] = React.useState(true);
     const [isError, setIsError] = React.useState(false);
     const handleLoad = (e) => {
@@ -3320,7 +3320,7 @@ var __publicField = (obj, key, value) => {
       }
     ), renderLoading(), renderErrorImg());
   };
-  Image$1.defaultProps = defaultProps$1r;
+  Image$1.defaultProps = defaultProps$1s;
   Image$1.displayName = "NutImage";
   function _extends$1() {
     _extends$1 = Object.assign ? Object.assign.bind() : function(target) {
@@ -5063,6 +5063,178 @@ var __publicField = (obj, key, value) => {
     onExited: propTypesExports.func
   }) : {};
   const CSSTransition$1 = CSSTransition;
+  const MIN_DISTANCE = 10;
+  function getDirection(x, y2) {
+    if (x > y2 && x > MIN_DISTANCE) {
+      return "horizontal";
+    }
+    if (y2 > x && y2 > MIN_DISTANCE) {
+      return "vertical";
+    }
+    return "";
+  }
+  function useTouch() {
+    const startX = React.useRef(0);
+    const startY = React.useRef(0);
+    const deltaX = React.useRef(0);
+    const deltaY = React.useRef(0);
+    const offsetX = React.useRef(0);
+    const offsetY = React.useRef(0);
+    const direction = React.useRef("");
+    const isVertical = () => direction.current === "vertical";
+    const isHorizontal = () => direction.current === "horizontal";
+    const reset = () => {
+      deltaX.current = 0;
+      deltaY.current = 0;
+      offsetX.current = 0;
+      offsetY.current = 0;
+      direction.current = "";
+    };
+    const start = (event) => {
+      reset();
+      startX.current = event.touches[0].clientX;
+      startY.current = event.touches[0].clientY;
+    };
+    const move = (event) => {
+      const touch = event.touches[0];
+      deltaX.current = touch.clientX < 0 ? 0 : touch.clientX - startX.current;
+      deltaY.current = touch.clientY - startY.current;
+      offsetX.current = Math.abs(deltaX.current);
+      offsetY.current = Math.abs(deltaY.current);
+      if (!direction.current) {
+        direction.current = getDirection(offsetX.current, offsetY.current);
+      }
+    };
+    return {
+      move,
+      start,
+      reset,
+      startX,
+      startY,
+      deltaX,
+      deltaY,
+      offsetX,
+      offsetY,
+      direction,
+      isVertical,
+      isHorizontal
+    };
+  }
+  const canUseDom = !!(typeof window !== "undefined" && typeof document !== "undefined" && window.document && window.document.createElement);
+  const defaultRoot = canUseDom ? window : void 0;
+  const overflowStylePatterns = ["scroll", "auto", "overlay"];
+  function isElement(node) {
+    const ELEMENT_NODE_TYPE = 1;
+    return node.nodeType === ELEMENT_NODE_TYPE;
+  }
+  function getScrollParent(el, root2 = defaultRoot) {
+    let node = el;
+    while (node && node !== root2 && isElement(node)) {
+      if (node === document.body) {
+        return root2;
+      }
+      const { overflowY } = window.getComputedStyle(node);
+      if (overflowStylePatterns.includes(overflowY) && node.scrollHeight > node.clientHeight) {
+        return node;
+      }
+      node = node.parentNode;
+    }
+    return root2;
+  }
+  let passiveSupported = false;
+  if (canUseDom) {
+    try {
+      const opts = Object.defineProperty({}, "passive", {
+        get() {
+          passiveSupported = true;
+        }
+      });
+      window.addEventListener("test-passive-supported", null, opts);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+  let totalLockCount = 0;
+  const BODY_LOCK_CLASS = "nut-overflow-hidden";
+  function getScrollableElement(el) {
+    let current = el == null ? void 0 : el.parentElement;
+    while (current) {
+      if (current.clientHeight < current.scrollHeight) {
+        return current;
+      }
+      current = current.parentElement;
+    }
+    return null;
+  }
+  function useLockScroll(rootRef, shouldLock) {
+    const touch = useTouch();
+    const onTouchMove = (event) => {
+      touch.move(event);
+      const direction = touch.deltaY.current > 0 ? "10" : "01";
+      const el = getScrollParent(
+        event.target,
+        rootRef.current
+      );
+      if (!el)
+        return;
+      if (shouldLock === "strict") {
+        const scrollableParent = getScrollableElement(event.target);
+        if (scrollableParent === document.body || scrollableParent === document.documentElement) {
+          event.preventDefault();
+          return;
+        }
+      }
+      const { scrollHeight, offsetHeight, scrollTop } = el;
+      let status = "11";
+      if (scrollTop === 0) {
+        status = offsetHeight >= scrollHeight ? "00" : "01";
+      } else if (scrollTop + offsetHeight >= scrollHeight) {
+        status = "10";
+      }
+      if (status !== "11" && touch.isVertical() && !(parseInt(status, 2) & parseInt(direction, 2))) {
+        if (event.cancelable) {
+          event.preventDefault();
+        }
+      }
+    };
+    const lock = () => {
+      document.addEventListener("touchstart", touch.start);
+      document.addEventListener(
+        "touchmove",
+        onTouchMove,
+        passiveSupported ? { passive: false } : false
+      );
+      if (!totalLockCount) {
+        document.body.classList.add(BODY_LOCK_CLASS);
+      }
+      totalLockCount++;
+    };
+    const unlock = () => {
+      if (totalLockCount) {
+        document.removeEventListener("touchstart", touch.start);
+        document.removeEventListener("touchmove", onTouchMove);
+        totalLockCount--;
+        if (!totalLockCount) {
+          document.body.classList.remove(BODY_LOCK_CLASS);
+        }
+      }
+    };
+    React.useEffect(() => {
+      if (shouldLock) {
+        lock();
+        return () => {
+          unlock();
+        };
+      }
+    }, [shouldLock]);
+  }
+  const useLockScrollTaro = (shouldLock) => {
+    const refObject = React.useRef(null);
+    if (Taro.getEnv() === "WEB") {
+      useLockScroll(refObject, shouldLock);
+    }
+    return refObject;
+  };
   const defaultOverlayProps = {
     ...ComponentDefaults,
     zIndex: 1e3,
@@ -5093,30 +5265,18 @@ var __publicField = (obj, key, value) => {
     };
     const [innerVisible, setInnerVisible] = React.useState(visible);
     const classPrefix2 = `nut-overlay`;
+    const nodeRef = useLockScrollTaro(!!props.lockScroll && innerVisible);
     React.useEffect(() => {
       if (visible) {
         setInnerVisible(true);
       } else {
         setInnerVisible(false);
       }
-      lock();
     }, [visible]);
-    React.useEffect(() => {
-      return () => {
-        document.body.classList.remove("nut-overflow-hidden");
-      };
-    }, []);
     const classes = classNames(className, classPrefix2);
     const styles = {
       ...style
     };
-    const lock = () => {
-      if (lockScroll && visible) {
-        document.body.classList.add("nut-overflow-hidden");
-      } else {
-        document.body.classList.remove("nut-overflow-hidden");
-      }
-    };
     const handleClick = (e) => {
       if (closeOnOverlayClick) {
         onClick && onClick(e);
@@ -5131,6 +5291,7 @@ var __publicField = (obj, key, value) => {
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
       CSSTransition$1,
       {
+        nodeRef,
         classNames: `${classPrefix2}-slide`,
         unmountOnExit: true,
         timeout: duration,
@@ -5141,6 +5302,7 @@ var __publicField = (obj, key, value) => {
       /* @__PURE__ */ React.createElement(
         components.View,
         {
+          ref: nodeRef,
           className: classes,
           style: styles,
           ...rest,
@@ -5154,7 +5316,7 @@ var __publicField = (obj, key, value) => {
   Overlay.defaultProps = defaultOverlayProps;
   Overlay.displayName = "NutOverlay";
   const DataContext$1 = React.createContext({});
-  const defaultProps$1q = {
+  const defaultProps$1r = {
     ...ComponentDefaults,
     span: "24",
     offset: "0",
@@ -5162,7 +5324,7 @@ var __publicField = (obj, key, value) => {
   };
   const Col = (props) => {
     const { className, style, span, offset, children, onClick } = {
-      ...defaultProps$1q,
+      ...defaultProps$1r,
       ...props
     };
     const [colName, setColName] = React.useState("");
@@ -5194,9 +5356,9 @@ var __publicField = (obj, key, value) => {
       children
     );
   };
-  Col.defaultProps = defaultProps$1q;
+  Col.defaultProps = defaultProps$1r;
   Col.displayName = "NutCol";
-  const defaultProps$1p = {
+  const defaultProps$1q = {
     ...ComponentDefaults,
     contentPosition: "center",
     direction: "horizontal"
@@ -5204,7 +5366,7 @@ var __publicField = (obj, key, value) => {
   const classPrefix$m = `nut-divider`;
   const Divider = (props) => {
     const { children, contentPosition, style, className, direction, ...rest } = {
-      ...defaultProps$1p,
+      ...defaultProps$1q,
       ...props
     };
     const classes = direction === "horizontal" ? classNames({
@@ -5219,14 +5381,14 @@ var __publicField = (obj, key, value) => {
     });
     return /* @__PURE__ */ React.createElement("div", { className: `${classes} ${className || ""}`, style, ...rest }, children);
   };
-  Divider.defaultProps = defaultProps$1p;
+  Divider.defaultProps = defaultProps$1q;
   Divider.displayName = "NutDivider";
   const gridContext = {
     onClick: (item, index) => {
     }
   };
   const GridContext = React.createContext(gridContext);
-  const defaultProps$1o = {
+  const defaultProps$1p = {
     text: "",
     columns: 4,
     gap: 0,
@@ -5252,7 +5414,7 @@ var __publicField = (obj, key, value) => {
       onClick,
       ...rest
     } = {
-      ...defaultProps$1o,
+      ...defaultProps$1p,
       ...props
     };
     const classPrefix2 = "nut-grid-item";
@@ -5310,9 +5472,9 @@ var __publicField = (obj, key, value) => {
       /* @__PURE__ */ React.createElement("div", { className: contentClass() }, children && /* @__PURE__ */ React.createElement(React.Fragment, null, children), text && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__text` }, text))
     );
   };
-  GridItem.defaultProps = defaultProps$1o;
+  GridItem.defaultProps = defaultProps$1p;
   GridItem.displayName = "NutGridItem";
-  const defaultProps$1n = {
+  const defaultProps$1o = {
     columns: 4,
     gap: 0,
     center: true,
@@ -5333,7 +5495,7 @@ var __publicField = (obj, key, value) => {
       className,
       onClick,
       ...rest
-    } = { ...defaultProps$1n, ...props };
+    } = { ...defaultProps$1o, ...props };
     const childrenDom = React.Children.toArray(children);
     const classPrefix2 = "nut-grid";
     const rootClass = () => {
@@ -5363,18 +5525,18 @@ var __publicField = (obj, key, value) => {
       });
     })));
   };
-  Grid.defaultProps = defaultProps$1n;
+  Grid.defaultProps = defaultProps$1o;
   Grid.displayName = "NutGrid";
   Grid.Item = GridItem;
-  const defaultProps$1m = {};
+  const defaultProps$1n = {};
   const Layout = (props) => {
-    ({ ...defaultProps$1m, ...props });
+    ({ ...defaultProps$1n, ...props });
     return /* @__PURE__ */ React.createElement("div", { className: "nut-layout" }, "Layout");
   };
-  Layout.defaultProps = defaultProps$1m;
+  Layout.defaultProps = defaultProps$1n;
   Layout.displayName = "NutLayout";
   const classPrefix$l = "nut-row";
-  const defaultProps$1l = {
+  const defaultProps$1m = {
     ...ComponentDefaults,
     type: "",
     justify: "start",
@@ -5394,7 +5556,7 @@ var __publicField = (obj, key, value) => {
       gutter,
       onClick
     } = {
-      ...defaultProps$1l,
+      ...defaultProps$1m,
       ...props
     };
     const getClass = (prefix, type22) => {
@@ -5426,15 +5588,15 @@ var __publicField = (obj, key, value) => {
       children
     ));
   };
-  Row.defaultProps = defaultProps$1l;
+  Row.defaultProps = defaultProps$1m;
   Row.displayName = "NutRow";
   const prefixCls = "nut-space";
-  const defaultProps$1k = {
+  const defaultProps$1l = {
     direction: "horizontal"
   };
   const Space = (props) => {
     const { className, style, children, wrap, align, direction, justify } = {
-      ...defaultProps$1k,
+      ...defaultProps$1l,
       ...props
     };
     const cls = classNames(
@@ -5449,7 +5611,7 @@ var __publicField = (obj, key, value) => {
       return child !== null && child !== void 0 && /* @__PURE__ */ React.createElement("div", { className: `${prefixCls}-item` }, child);
     }));
   };
-  Space.defaultProps = defaultProps$1k;
+  Space.defaultProps = defaultProps$1l;
   Space.displayName = "NutSpace";
   function useWatch(dep, callback, config2 = { immediate: false }) {
     const { immediate } = config2;
@@ -5527,28 +5689,7 @@ var __publicField = (obj, key, value) => {
     }
     return Promise.resolve(makeRect(0, 0));
   };
-  const canUseDom = !!(typeof window !== "undefined" && typeof document !== "undefined" && window.document && window.document.createElement);
-  const defaultRoot = canUseDom ? window : void 0;
-  const overflowStylePatterns = ["scroll", "auto", "overlay"];
-  function isElement(node) {
-    const ELEMENT_NODE_TYPE = 1;
-    return node.nodeType === ELEMENT_NODE_TYPE;
-  }
-  function getScrollParent(el, root2 = defaultRoot) {
-    let node = el;
-    while (node && node !== root2 && isElement(node)) {
-      if (node === document.body) {
-        return root2;
-      }
-      const { overflowY } = window.getComputedStyle(node);
-      if (overflowStylePatterns.includes(overflowY) && node.scrollHeight > node.clientHeight) {
-        return node;
-      }
-      node = node.parentNode;
-    }
-    return root2;
-  }
-  const defaultProps$1j = {
+  const defaultProps$1k = {
     ...ComponentDefaults,
     position: "top",
     zIndex: 900
@@ -5565,7 +5706,7 @@ var __publicField = (obj, key, value) => {
       className,
       onChange,
       ...rest
-    } = { ...defaultProps$1j, ...props };
+    } = { ...defaultProps$1k, ...props };
     const stickyRef = React.useRef(null);
     const rootRef = React.useRef(null);
     const [rootRect, setRootRect] = React.useState({});
@@ -5671,9 +5812,9 @@ var __publicField = (obj, key, value) => {
       )
     );
   };
-  Sticky.defaultProps = defaultProps$1j;
+  Sticky.defaultProps = defaultProps$1k;
   Sticky.displayName = "NutSticky";
-  const defaultProps$1i = {
+  const defaultProps$1j = {
     ...ComponentDefaults,
     threshold: 200,
     zIndex: 900,
@@ -5681,7 +5822,7 @@ var __publicField = (obj, key, value) => {
   };
   const BackTop = (props) => {
     const { children, threshold, zIndex, className, duration, style, onClick } = {
-      ...defaultProps$1i,
+      ...defaultProps$1j,
       ...props
     };
     const classPrefix2 = "nut-backtop";
@@ -5719,10 +5860,10 @@ var __publicField = (obj, key, value) => {
       children || /* @__PURE__ */ React.createElement(a$2, { width: 19, height: 19, className: "nut-backtop-main" })
     );
   };
-  BackTop.defaultProps = defaultProps$1i;
+  BackTop.defaultProps = defaultProps$1j;
   BackTop.displayName = "NutBackTop";
   const elevatorContext = React.createContext({});
-  const defaultProps$1h = {
+  const defaultProps$1i = {
     ...ComponentDefaults,
     height: "200px",
     floorKey: "title",
@@ -5749,7 +5890,7 @@ var __publicField = (obj, key, value) => {
       children,
       ...rest
     } = {
-      ...defaultProps$1h,
+      ...defaultProps$1i,
       ...props
     };
     const classPrefix2 = "nut-elevator";
@@ -5961,10 +6102,10 @@ var __publicField = (obj, key, value) => {
       })
     ))) : null, sticky && scrollY > 0 ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__list__fixed` }, /* @__PURE__ */ React.createElement("span", { className: `${classPrefix2}__list__fixed__title` }, list[currentIndex][floorKey])) : null);
   };
-  Elevator.defaultProps = defaultProps$1h;
+  Elevator.defaultProps = defaultProps$1i;
   Elevator.displayName = "NutElevator";
   Elevator.Context = elevatorContext;
-  const defaultProps$1g = {
+  const defaultProps$1h = {
     ...ComponentDefaults,
     activeText: "",
     inactiveText: "",
@@ -5992,7 +6133,7 @@ var __publicField = (obj, key, value) => {
       content,
       ...rest
     } = {
-      ...defaultProps$1g,
+      ...defaultProps$1h,
       ...props
     };
     const classPrefix2 = "nut-fixednav";
@@ -6044,9 +6185,9 @@ var __publicField = (obj, key, value) => {
       /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__btn`, onClick: () => onUpdateValue() }, content || /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(a$j, { color: "#fff" }), /* @__PURE__ */ React.createElement("div", { className: "text" }, visible ? activeText || locale.fixednav.activeText : inactiveText || locale.fixednav.inactiveText)))
     );
   };
-  FixedNav.defaultProps = defaultProps$1g;
+  FixedNav.defaultProps = defaultProps$1h;
   FixedNav.displayName = "NutFixedNav";
-  const defaultProps$1f = {
+  const defaultProps$1g = {
     ...ComponentDefaults,
     left: "",
     right: "",
@@ -6058,8 +6199,8 @@ var __publicField = (obj, key, value) => {
   };
   const NavBar = (props) => {
     const {
-      right,
-      left,
+      right: right2,
+      left: left2,
       className,
       style,
       back,
@@ -6069,7 +6210,7 @@ var __publicField = (obj, key, value) => {
       zIndex,
       onBackClick
     } = {
-      ...defaultProps$1f,
+      ...defaultProps$1g,
       ...props
     };
     const classPrefix2 = "nut-navbar";
@@ -6088,13 +6229,13 @@ var __publicField = (obj, key, value) => {
           onClick: (e) => onBackClick(e)
         },
         back
-      ), left);
+      ), left2);
     };
     const renderContent = () => {
       return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__title` }, children);
     };
     const renderRight = () => {
-      return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__right` }, right);
+      return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__right` }, right2);
     };
     const renderWrapper = () => {
       return /* @__PURE__ */ React.createElement("div", { className: cls, style: styles() }, renderLeft(), renderContent(), renderRight());
@@ -6106,9 +6247,9 @@ var __publicField = (obj, key, value) => {
     const cls = classNames(classPrefix2, classes, className);
     return /* @__PURE__ */ React.createElement(React.Fragment, null, fixed && placeholder ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}--placeholder` }, renderWrapper()) : renderWrapper());
   };
-  NavBar.defaultProps = defaultProps$1f;
+  NavBar.defaultProps = defaultProps$1g;
   NavBar.displayName = "NutNavBar";
-  const defaultProps$1e = {
+  const defaultProps$1f = {
     ...ComponentDefaults,
     position: "center",
     transition: "",
@@ -6129,7 +6270,7 @@ var __publicField = (obj, key, value) => {
     onCloseIconClick: (e) => true,
     ...defaultOverlayProps
   };
-  let _zIndex = 1100;
+  const _zIndex = 1100;
   const Popup = (props) => {
     const {
       children,
@@ -6144,7 +6285,7 @@ var __publicField = (obj, key, value) => {
       closeable,
       closeIconPosition,
       closeIcon,
-      left,
+      left: left2,
       title,
       style,
       transition,
@@ -6160,11 +6301,13 @@ var __publicField = (obj, key, value) => {
       afterShow,
       afterClose,
       onClick
-    } = { ...defaultProps$1e, ...props };
-    const [index, setIndex] = React.useState(zIndex || _zIndex);
+    } = { ...defaultProps$1f, ...props };
+    let innerIndex = zIndex || _zIndex;
+    const [index, setIndex] = React.useState(innerIndex);
     const [innerVisible, setInnerVisible] = React.useState(visible);
     const [showChildren, setShowChildren] = React.useState(true);
     const [transitionName, setTransitionName] = React.useState("");
+    const refObject = useLockScrollTaro(innerVisible && lockScroll);
     const classPrefix2 = "nut-popup";
     const baseStyle = {
       zIndex: index
@@ -6190,9 +6333,7 @@ var __publicField = (obj, key, value) => {
     const open2 = () => {
       if (!innerVisible) {
         setInnerVisible(true);
-        if (props.zIndex === void 0) {
-          setIndex(++_zIndex);
-        }
+        setIndex(++innerIndex);
       }
       if (destroyOnClose) {
         setShowChildren(true);
@@ -6248,7 +6389,7 @@ var __publicField = (obj, key, value) => {
       return null;
     };
     const renderTitle = () => {
-      return /* @__PURE__ */ React.createElement(React.Fragment, null, position === "bottom" && /* @__PURE__ */ React.createElement(React.Fragment, null, left && /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix2}-left-icon` }, left), title && /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix2}-title` }, title)));
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, position === "bottom" && /* @__PURE__ */ React.createElement(React.Fragment, null, left2 && /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix2}-left-icon` }, left2), title && /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix2}-title` }, title)));
     };
     const renderPop = () => {
       return /* @__PURE__ */ React.createElement(
@@ -6264,9 +6405,11 @@ var __publicField = (obj, key, value) => {
         /* @__PURE__ */ React.createElement(
           components.View,
           {
+            ref: refObject,
             style: popStyles,
             className: popClassName,
-            onClick: onHandleClick
+            onClick: onHandleClick,
+            catchMove: lockScroll
           },
           renderTitle(),
           renderIcon(),
@@ -6297,10 +6440,10 @@ var __publicField = (obj, key, value) => {
     }, [position, transition]);
     return /* @__PURE__ */ React.createElement(React.Fragment, null, renderToContainer(portal, renderNode()));
   };
-  Popup.defaultProps = defaultProps$1e;
+  Popup.defaultProps = defaultProps$1f;
   Popup.displayName = "NutPopup";
   const OffsetContext = React.createContext(20);
-  const defaultProps$1d = {
+  const defaultProps$1e = {
     ...ComponentDefaults,
     position: "left",
     width: "80%"
@@ -6317,7 +6460,7 @@ var __publicField = (obj, key, value) => {
       onClose,
       ...rest
     } = {
-      ...defaultProps$1d,
+      ...defaultProps$1e,
       ...props
     };
     const indent = props.indent ? Number(props.indent) : 20;
@@ -6357,7 +6500,7 @@ var __publicField = (obj, key, value) => {
       )))
     );
   };
-  SideNavBar.defaultProps = defaultProps$1d;
+  SideNavBar.defaultProps = defaultProps$1e;
   SideNavBar.displayName = "NutSideNavBar";
   const SideNavBarItem = (props) => {
     const classPrefix2 = "nut-subsidenavbar";
@@ -6376,13 +6519,13 @@ var __publicField = (obj, key, value) => {
       title
     );
   };
-  const defaultProps$1c = {
+  const defaultProps$1d = {
     open: true
   };
   const SubSideNavBar = (props) => {
     const classPrefix2 = "nut-subsidenavbar";
     const { title, value, children, onClick, open: open2, ...rest } = {
-      ...defaultProps$1c,
+      ...defaultProps$1d,
       ...props
     };
     const [subShow, setSubShow] = React.useState(open2);
@@ -6392,8 +6535,8 @@ var __publicField = (obj, key, value) => {
       (nodeList, level = 1) => {
         const titleClass = nodeList[0].className;
         if (titleClass.includes(`${classPrefix2}__title`)) {
-          const left = offset * (level + 1);
-          nodeList[0].style.paddingLeft = `${left}px`;
+          const left2 = offset * (level + 1);
+          nodeList[0].style.paddingLeft = `${left2}px`;
         }
         const childNodes = nodeList[1] && nodeList[1].children && Array.from(nodeList[1].children).filter(
           (item) => item.nodeType !== 3 && item.nodeType !== 8
@@ -6401,8 +6544,8 @@ var __publicField = (obj, key, value) => {
         childNodes.forEach((item) => {
           const itemClass = item.className;
           if (itemClass.includes(`${classPrefix2}__item`)) {
-            const left = offset * (level + 2);
-            item.style.paddingLeft = `${left}px`;
+            const left2 = offset * (level + 2);
+            item.style.paddingLeft = `${left2}px`;
           }
           if (itemClass.includes(`${classPrefix2}__list`)) {
             let level2 = item.getAttribute("level") ? Number(item.getAttribute("level")) : 1;
@@ -6460,7 +6603,7 @@ var __publicField = (obj, key, value) => {
     );
     return [stateRef.current, setState];
   }
-  const defaultProps$1b = {
+  const defaultProps$1c = {
     ...ComponentDefaults,
     value: "",
     dot: false,
@@ -6470,8 +6613,8 @@ var __publicField = (obj, key, value) => {
     color: ""
   };
   const Badge = (props) => {
-    const { className, style, value, max, children, dot, top, right, color } = {
-      ...defaultProps$1b,
+    const { className, style, value, max, children, dot, top, right: right2, color } = {
+      ...defaultProps$1c,
       ...props
     };
     const classPrefix2 = "nut-badge";
@@ -6492,15 +6635,15 @@ var __publicField = (obj, key, value) => {
     const getStyle = () => {
       const style2 = {};
       style2.top = `${Number(top) || parseFloat(String(top)) || 0}px`;
-      style2.right = `${Number(right) || parseFloat(String(right)) || 0}px`;
+      style2.right = `${Number(right2) || parseFloat(String(right2)) || 0}px`;
       style2.background = color;
       return style2;
     };
     return /* @__PURE__ */ React.createElement("div", { className: classes, style }, typeof value === "object" && value && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__icon` }, value), /* @__PURE__ */ React.createElement("div", null, children), /* @__PURE__ */ React.createElement("div", { className: contentClasses, style: getStyle() }, content()));
   };
-  Badge.defaultProps = defaultProps$1b;
+  Badge.defaultProps = defaultProps$1c;
   Badge.displayName = "NutBadge";
-  const defaultProps$1a = {
+  const defaultProps$1b = {
     ...ComponentDefaults,
     title: "",
     icon: null,
@@ -6526,11 +6669,11 @@ var __publicField = (obj, key, value) => {
       dot,
       max,
       top,
-      right,
+      right: right2,
       handleClick,
       ...rest
     } = {
-      ...defaultProps$1a,
+      ...defaultProps$1b,
       ...props
     };
     const classPrefix2 = "nut-tabbar-item";
@@ -6546,7 +6689,7 @@ var __publicField = (obj, key, value) => {
       dot,
       max,
       top,
-      right,
+      right: right2,
       color: activeColor
     };
     return /* @__PURE__ */ React.createElement(
@@ -6563,7 +6706,7 @@ var __publicField = (obj, key, value) => {
       icon ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Badge, { ...badgeProps }, /* @__PURE__ */ React.createElement("div", { className: boxPrefix }, icon)), /* @__PURE__ */ React.createElement("div", { className: titleClass }, title)) : /* @__PURE__ */ React.createElement(Badge, { ...badgeProps }, /* @__PURE__ */ React.createElement("div", { className: titleClass }, title))
     );
   };
-  const defaultProps$19 = {
+  const defaultProps$1a = {
     ...ComponentDefaults,
     defaultValue: 0,
     fixed: false,
@@ -6586,7 +6729,7 @@ var __publicField = (obj, key, value) => {
       style,
       onSwitch
     } = {
-      ...defaultProps$19,
+      ...defaultProps$1a,
       ...props
     };
     const classPrefix2 = "nut-tabbar";
@@ -6621,17 +6764,17 @@ var __publicField = (obj, key, value) => {
       (fixed || safeArea) && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__safe-area` })
     );
   };
-  Tabbar.defaultProps = defaultProps$19;
+  Tabbar.defaultProps = defaultProps$1a;
   Tabbar.displayName = "NutTabbar";
   Tabbar.Item = TabbarItem;
-  const defaultProps$18 = {
+  const defaultProps$19 = {
     title: "",
     value: "",
     disabled: false
   };
   const TabPane = (props) => {
     const { children, autoHeightClassName, className, disabled } = {
-      ...defaultProps$18,
+      ...defaultProps$19,
       ...props
     };
     const classPrefix2 = "nut-tabpane";
@@ -6657,7 +6800,7 @@ var __publicField = (obj, key, value) => {
     };
   }
   const requestAniFrame$1 = requestAniFrame();
-  const defaultProps$17 = {
+  const defaultProps$18 = {
     ...ComponentDefaults,
     tabStyle: {},
     name: "",
@@ -6685,7 +6828,7 @@ var __publicField = (obj, key, value) => {
       autoHeight,
       ...rest
     } = {
-      ...defaultProps$17,
+      ...defaultProps$18,
       ...props
     };
     const [value, setValue] = usePropsValue({
@@ -6798,11 +6941,11 @@ var __publicField = (obj, key, value) => {
             to = top - (navRectRef.current.height - titleRect.height) / 2;
           } else {
             const DEFAULT_PADDING = 20;
-            const left = titleRects.slice(0, value).reduce(
+            const left2 = titleRects.slice(0, value).reduce(
               (prev, curr) => prev + curr.width,
               DEFAULT_PADDING
             );
-            to = left - (navRectRef.current.width - titleRect.width) / 2;
+            to = left2 - (navRectRef.current.width - titleRect.width) / 2;
           }
           Taro.nextTick(() => {
             scrollWithAnimation.current = true;
@@ -6902,10 +7045,10 @@ var __publicField = (obj, key, value) => {
       return React.cloneElement(child, childProps);
     }))));
   };
-  Tabs.defaultProps = defaultProps$17;
+  Tabs.defaultProps = defaultProps$18;
   Tabs.displayName = "NutTabs";
   Tabs.TabPane = TabPane;
-  const defaultProps$16 = {
+  const defaultProps$17 = {
     type: "custom",
     existList: [],
     defaultIcon: null,
@@ -6924,7 +7067,7 @@ var __publicField = (obj, key, value) => {
       onSelect,
       onSwitch,
       ...rest
-    } = { ...defaultProps$16, ...props };
+    } = { ...defaultProps$17, ...props };
     const classPrefix2 = "nut-address";
     const selectedExist = (item) => {
       existList.forEach((list, index) => {
@@ -7086,7 +7229,7 @@ var __publicField = (obj, key, value) => {
     }
   }
   const Tree$1 = Tree;
-  const defaultProps$15 = {
+  const defaultProps$16 = {
     ...ComponentDefaults,
     activeColor: "",
     activeIcon: "checklist",
@@ -7130,7 +7273,7 @@ var __publicField = (obj, key, value) => {
       onClose,
       onChange,
       onPathChange
-    } = { ...defaultProps$15, ...props };
+    } = { ...defaultProps$16, ...props };
     const [tabvalue, setTabvalue] = React.useState("c1");
     const [optionsData, setOptionsData] = React.useState([]);
     const isLazy = () => state.configs.lazy && Boolean(state.configs.onLoad);
@@ -7427,9 +7570,9 @@ var __publicField = (obj, key, value) => {
     ) : renderTabs());
   };
   const Cascader = React.forwardRef(InternalCascader);
-  Cascader.defaultProps = defaultProps$15;
+  Cascader.defaultProps = defaultProps$16;
   Cascader.displayName = "NutCascader";
-  const defaultProps$14 = {
+  const defaultProps$15 = {
     ...ComponentDefaults,
     visible: false,
     type: "custom",
@@ -7446,7 +7589,7 @@ var __publicField = (obj, key, value) => {
       height,
       options,
       title,
-      left,
+      left: left2,
       value,
       defaultValue,
       optionKey,
@@ -7456,7 +7599,7 @@ var __publicField = (obj, key, value) => {
       onPathChange,
       ...rest
     } = {
-      ...defaultProps$14,
+      ...defaultProps$15,
       ...props
     };
     return /* @__PURE__ */ React.createElement(React.Fragment, null, type2 === "custom" && /* @__PURE__ */ React.createElement(
@@ -7466,7 +7609,7 @@ var __publicField = (obj, key, value) => {
         value,
         defaultValue,
         title,
-        left,
+        left: left2,
         options,
         format: format2,
         optionKey,
@@ -7481,7 +7624,7 @@ var __publicField = (obj, key, value) => {
       }
     ));
   };
-  const defaultProps$13 = {
+  const defaultProps$14 = {
     ...ComponentDefaults,
     defaultValue: [],
     type: "custom",
@@ -7523,7 +7666,7 @@ var __publicField = (obj, key, value) => {
       onSwitch,
       ...rest
     } = {
-      ...defaultProps$13,
+      ...defaultProps$14,
       ...props
     };
     const classPrefix2 = "nut-address";
@@ -7614,7 +7757,7 @@ var __publicField = (obj, key, value) => {
     ));
   };
   const Address = React.forwardRef(InternalAddress);
-  Address.defaultProps = defaultProps$13;
+  Address.defaultProps = defaultProps$14;
   Address.displayName = "NutAddress";
   const Utils = {
     /**
@@ -7864,7 +8007,7 @@ var __publicField = (obj, key, value) => {
   const isStartAndEnd = (days) => {
     return days.length >= 2 && Utils.isEqual(days[0], days[1]);
   };
-  const defaultProps$12 = {
+  const defaultProps$13 = {
     ...ComponentDefaults,
     type: "single",
     autoBackfill: false,
@@ -7924,7 +8067,7 @@ var __publicField = (obj, key, value) => {
       onUpdate,
       onDayClick,
       onPageChange
-    } = { ...defaultProps$12, ...props };
+    } = { ...defaultProps$13, ...props };
     const weekdays = locale.calendaritem.weekdays;
     const weeks = [
       ...weekdays.slice(firstDayOfWeek, 7),
@@ -8265,6 +8408,8 @@ var __publicField = (obj, key, value) => {
       const scrollTop2 = e.detail.scrollTop;
       Taro.getEnv() === "WEB" && setScrollTop(scrollTop2);
       let current = Math.floor(scrollTop2 / avgHeight);
+      if (!monthsData[current + 1])
+        return;
       const nextTop = monthsData[current + 1].scrollTop;
       const nextHeight = monthsData[current + 1].cssHeight;
       if (current === 0) {
@@ -8469,9 +8614,9 @@ var __publicField = (obj, key, value) => {
     };
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: classes, style }, renderHeader(), renderContent(), popup && !autoBackfill ? renderFooter() : ""));
   });
-  CalendarItem.defaultProps = defaultProps$12;
+  CalendarItem.defaultProps = defaultProps$13;
   CalendarItem.displayName = "NutCalendarItem";
-  const defaultProps$11 = {
+  const defaultProps$12 = {
     ...ComponentDefaults,
     type: "single",
     autoBackfill: false,
@@ -8534,7 +8679,7 @@ var __publicField = (obj, key, value) => {
       onConfirm,
       onDayClick,
       onPageChange
-    } = { ...defaultProps$11, ...props };
+    } = { ...defaultProps$12, ...props };
     const calendarRef = React.useRef(null);
     const close2 = () => {
       onClose && onClose();
@@ -8608,8 +8753,387 @@ var __publicField = (obj, key, value) => {
       renderItem()
     ) : renderItem());
   });
-  Calendar.defaultProps = defaultProps$11;
+  Calendar.defaultProps = defaultProps$12;
   Calendar.displayName = "NutCalendar";
+  const left = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNi42MDUgOS40OWEuNzcxLjc3MSAwIDAgMSAwLS45OGwzLjYtNC4zNzJhLjc3MS43NzEgMCAwIDEgMS4xOS45ODFMOC4yIDlsMy4xOTcgMy44ODFhLjc3MS43NzEgMCAxIDEtMS4xOTEuOThsLTMuNi00LjM3eiIvPjwvc3ZnPg==";
+  const right = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTEuMzk2IDkuNDlhLjc3MS43NzEgMCAwIDAgMC0uOThsLTMuNi00LjM3MmEuNzcxLjc3MSAwIDAgMC0xLjE5MS45ODFMOS44IDlsLTMuMTk2IDMuODgxYS43NzEuNzcxIDAgMCAwIDEuMTkuOThsMy42LTQuMzd6Ii8+PC9zdmc+";
+  const doubleLeft = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTMuODUzIDQuMDI2YS43NzEuNzcxIDAgMCAxIC4xMiAxLjA4NUwxMC44NjQgOWwzLjExIDMuODg5YS43NzEuNzcxIDAgMSAxLTEuMjA0Ljk2M2wtMy40OTgtNC4zN2EuNzcxLjc3MSAwIDAgMSAwLS45NjRsMy40OTctNC4zNzFhLjc3MS43NzEgMCAwIDEgMS4wODQtLjEyem0tNS4yNDUgMGEuNzcxLjc3MSAwIDAgMSAuMTIgMS4wODVMNS42MTcgOWwzLjExMSAzLjg4OWEuNzcxLjc3MSAwIDAgMS0xLjIwNS45NjNsLTMuNDk3LTQuMzdhLjc3MS43NzEgMCAwIDEgMC0uOTY0bDMuNDk3LTQuMzcxYS43NzEuNzcxIDAgMCAxIDEuMDg1LS4xMnoiLz48L3N2Zz4=";
+  const doubleRight = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNC4xNDcgMTMuOTc0YS43NzEuNzcxIDAgMCAxLS4xMi0xLjA4NUw3LjEzNiA5IDQuMDI4IDUuMTFhLjc3MS43NzEgMCAxIDEgMS4yMDQtLjk2M2wzLjQ5NyA0LjM3MWEuNzcxLjc3MSAwIDAgMSAwIC45NjRsLTMuNDk3IDQuMzcxYS43NzEuNzcxIDAgMCAxLTEuMDg0LjEyem01LjI0NSAwYS43NzEuNzcxIDAgMCAxLS4xMi0xLjA4NUwxMi4zODMgOSA5LjI3MiA1LjExYS43NzEuNzcxIDAgMSAxIDEuMjA1LS45NjNsMy40OTcgNC4zNzFhLjc3MS43NzEgMCAwIDEgMCAuOTY0bC0zLjQ5NyA0LjM3MWEuNzcxLjc3MSAwIDAgMS0xLjA4NS4xMnoiLz48L3N2Zz4=";
+  const Icon = ({ url }) => {
+    const style = {
+      background: `url('${url}') no-repeat center`,
+      backgroundSize: "100% 100%",
+      width: "18px",
+      height: "18px"
+    };
+    return /* @__PURE__ */ React.createElement(components.View, { style });
+  };
+  const Left = () => /* @__PURE__ */ React.createElement(Icon, { url: left });
+  const Right = () => /* @__PURE__ */ React.createElement(Icon, { url: right });
+  const DoubleLeft = () => /* @__PURE__ */ React.createElement(Icon, { url: doubleLeft });
+  const DoubleRight = () => /* @__PURE__ */ React.createElement(Icon, { url: doubleRight });
+  const convertDateToDay = (date2) => {
+    return date2 ? {
+      year: date2.getFullYear(),
+      month: date2.getMonth() + 1,
+      date: date2.getDate()
+    } : null;
+  };
+  const convertDayToDate = (day) => {
+    return day ? new Date(day.year, day.month - 1, day.date) : null;
+  };
+  const getPrevMonthDays = (year, month, firstDayOfWeek) => {
+    let prevMonth = month - 1;
+    let prevYear = year;
+    if (prevMonth <= 0) {
+      prevMonth = 12;
+      prevYear -= 1;
+    }
+    let days = Utils.getMonthPreDay(year, month);
+    days -= firstDayOfWeek;
+    if (days >= 7) {
+      days -= 7;
+    }
+    const preDates = Utils.getMonthDays(`${prevYear}`, `${prevMonth}`);
+    const months = Array.from(Array(preDates), (_, k) => {
+      return {
+        type: "prev",
+        year: prevYear,
+        month: prevMonth,
+        date: k + 1
+      };
+    });
+    return months.slice(preDates - days);
+  };
+  const getCurrentMonthDays = (year, month) => {
+    const days = Utils.getMonthDays(`${year}`, `${month}`);
+    return Array.from(Array(days), (_, k) => {
+      return {
+        type: "current",
+        year,
+        month,
+        date: k + 1
+      };
+    });
+  };
+  const getCurrentWeekDays = (day, firstDayOfWeek) => {
+    const current = new Date(day.year, day.month - 1, day.date);
+    const count = (current.getDay() + 7 - firstDayOfWeek) % 7;
+    return [
+      convertDateToDay(
+        new Date(current.getTime() - 24 * 60 * 60 * 1e3 * count)
+      ),
+      convertDateToDay(
+        new Date(current.getTime() + 24 * 60 * 60 * 1e3 * (6 - count))
+      )
+    ];
+  };
+  const defaultProps$11 = {
+    ...ComponentDefaults,
+    type: "single",
+    firstDayOfWeek: 0
+  };
+  const CalendarCard = React.forwardRef((props, ref) => {
+    const { locale } = useConfig$1();
+    const {
+      style,
+      type: type2,
+      value,
+      defaultValue,
+      firstDayOfWeek,
+      startDate,
+      endDate,
+      disableDay,
+      renderDay,
+      renderDayTop,
+      renderDayBottom,
+      onDayClick,
+      onPageChange,
+      onChange
+    } = { ...defaultProps$11, ...props };
+    const [month, setMonth] = React.useState(() => {
+      let date2 = new Date(Date.now());
+      const val = value || defaultValue;
+      if (Array.isArray(val)) {
+        if (val.length) {
+          date2 = val[0];
+        }
+      } else if (val) {
+        date2 = val;
+      }
+      return {
+        year: date2.getFullYear(),
+        month: date2.getMonth() + 1
+      };
+    });
+    const [days, setDays] = React.useState([]);
+    const valueToRange = (val) => {
+      if (Array.isArray(val)) {
+        return val.map((date2) => {
+          return convertDateToDay(date2);
+        });
+      }
+      return val ? [convertDateToDay(val)] : [];
+    };
+    const rangeTovalue = (range2) => {
+      if (Array.isArray(range2)) {
+        return range2.map((day) => {
+          return convertDayToDate(day);
+        });
+      }
+      return range2 ? [convertDayToDate(range2)] : [];
+    };
+    const [innerValue, setInnerValue] = React.useState(() => {
+      const val = value || defaultValue ? valueToRange(value || defaultValue) : [];
+      return val;
+    });
+    React.useEffect(() => {
+      const val = value || defaultValue ? valueToRange(value || defaultValue) : [];
+      setInnerValue(val);
+    }, [value]);
+    const change = (v) => {
+      setInnerValue(v);
+      if (type2 === "single") {
+        const date2 = convertDayToDate(v[0]);
+        onChange == null ? void 0 : onChange(date2);
+      } else if (type2 === "multiple" || type2 === "range" || type2 === "week") {
+        const val = rangeTovalue(v);
+        onChange == null ? void 0 : onChange(val);
+      }
+    };
+    const getDays = (month2) => {
+      const y2 = month2.year;
+      const m = month2.month;
+      const days2 = [
+        ...getPrevMonthDays(y2, m, firstDayOfWeek),
+        ...getCurrentMonthDays(y2, m)
+      ];
+      const size = days2.length;
+      const yearOfNextMonth = month2.month === 12 ? month2.year + 1 : month2.year;
+      const monthOfNextMonth = month2.month === 12 ? 1 : month2.month + 1;
+      for (let i = 1; i <= 42 - size; i++) {
+        days2.push({
+          type: "next",
+          year: yearOfNextMonth,
+          month: monthOfNextMonth,
+          date: i
+        });
+      }
+      return days2;
+    };
+    React.useEffect(() => {
+      const newDays = getDays(month);
+      setDays(newDays);
+      onPageChange == null ? void 0 : onPageChange(month);
+    }, [month]);
+    const isSameDay = (day1, day2) => {
+      return (day1 == null ? void 0 : day1.year) === (day2 == null ? void 0 : day2.year) && (day1 == null ? void 0 : day1.month) === (day2 == null ? void 0 : day2.month) && (day1 == null ? void 0 : day1.date) === (day2 == null ? void 0 : day2.date);
+    };
+    const compareDay = (day1, day2) => {
+      if (day1 && day2) {
+        if (day1.year === day2.year) {
+          if (day1.month === day2.month) {
+            return day1.date - day2.date;
+          }
+          return day1.month - day2.month;
+        }
+        return day1.year - day2.year;
+      }
+    };
+    const isDisable = (day) => {
+      if (disableDay && disableDay(day)) {
+        return true;
+      }
+      if (startDate && Number(compareDay(day, convertDateToDay(startDate))) < 0) {
+        return true;
+      }
+      if (endDate && Number(compareDay(day, convertDateToDay(endDate))) > 0) {
+        return true;
+      }
+      return false;
+    };
+    const isActive = (day) => {
+      if (type2 === "single" || type2 === "multiple") {
+        for (const val of innerValue) {
+          if (isSameDay(day, val)) {
+            return true;
+          }
+        }
+      } else if (type2 === "range" && innerValue.length === 1 && isSameDay(innerValue[0], day)) {
+        return true;
+      }
+      return false;
+    };
+    const isStart2 = (day) => {
+      return (type2 === "range" || type2 === "week") && innerValue.length === 2 && isSameDay(day, innerValue[0]);
+    };
+    const isEnd2 = (day) => {
+      return (type2 === "range" || type2 === "week") && innerValue.length === 2 && isSameDay(day, innerValue[1]);
+    };
+    const isMid = (day) => {
+      if (type2 === "range" || type2 === "week") {
+        if (innerValue.length === 2) {
+          const c1 = compareDay(innerValue[0], day);
+          const c2 = compareDay(day, innerValue[1]);
+          if (c1 && c1 < 0 && c2 && c2 < 0) {
+            return true;
+          }
+        }
+      }
+      return false;
+    };
+    const isWeekend = (day) => {
+      const d = new Date(day.year, day.month - 1, day.date).getDay();
+      return d === 0 || d === 6;
+    };
+    const getClasses = (day) => {
+      if (isDisable(day)) {
+        return ["disabled"];
+      }
+      const res = [];
+      if (day.type === "current") {
+        if (isActive(day)) {
+          res.push("active");
+        }
+        if (isStart2(day)) {
+          res.push("start");
+        }
+        if (isEnd2(day)) {
+          res.push("end");
+        }
+        if (isMid(day)) {
+          res.push("mid");
+        }
+        if (isWeekend(day)) {
+          res.push("weekend");
+        }
+      }
+      return res;
+    };
+    const jumpTo = (year, month2) => {
+      setMonth({ year, month: month2 });
+    };
+    const jump = (step = 1) => {
+      const current = month.year * 12 + month.month;
+      let newMonth = (current + step) % 12;
+      if (newMonth === 0) {
+        newMonth = 12;
+      }
+      const newYear = Math.floor((current + step - newMonth) / 12);
+      setMonth({
+        year: newYear,
+        month: newMonth
+      });
+    };
+    React.useImperativeHandle(ref, () => {
+      return {
+        jump,
+        jumpTo
+      };
+    });
+    const handleDayClick = (day) => {
+      if (day.type === "prev" || day.type === "next" || isDisable(day)) {
+        return;
+      }
+      onDayClick == null ? void 0 : onDayClick(day);
+      switch (type2) {
+        case "single": {
+          if (innerValue[0] && isSameDay(innerValue[0], day)) {
+            change([]);
+          } else {
+            change([day]);
+          }
+          break;
+        }
+        case "multiple": {
+          const t = innerValue.find((i) => isSameDay(i, day));
+          if (t) {
+            change(innerValue.filter((i) => i !== t));
+          } else {
+            change([...innerValue, day]);
+          }
+          break;
+        }
+        case "range": {
+          const len = innerValue.length;
+          if (len === 0 || len === 2) {
+            change([day]);
+          } else if (len === 1) {
+            const t = compareDay(innerValue[0], day);
+            if (t === 0 || t === null || t === void 0) {
+              change([]);
+            } else if (t < 0) {
+              change([innerValue[0], day]);
+            } else {
+              change([day, innerValue[0]]);
+            }
+          } else {
+            console.warn("[NutUI] Calendar range error");
+          }
+          break;
+        }
+        case "week": {
+          if (innerValue.length === 2 || innerValue.length === 0) {
+            const [left2, right2] = getCurrentWeekDays(day, firstDayOfWeek);
+            change([left2, right2]);
+          } else {
+            console.warn("[NutUI] Calendar week error");
+          }
+          break;
+        }
+        default: {
+          console.warn("[NutUI] Calendar type error");
+        }
+      }
+    };
+    const monthTitle = locale.calendaritem.monthTitle;
+    const renderHeader = () => {
+      return /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-header" }, /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-header-left" }, /* @__PURE__ */ React.createElement("div", { className: "double-left", onClick: () => jump(-12) }, /* @__PURE__ */ React.createElement(DoubleLeft, null)), /* @__PURE__ */ React.createElement("div", { className: "left", onClick: () => jump(-1) }, /* @__PURE__ */ React.createElement(Left, null))), /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-header-title" }, monthTitle(month.year, month.month)), /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-header-right" }, /* @__PURE__ */ React.createElement("div", { className: "right", onClick: () => jump(1) }, /* @__PURE__ */ React.createElement(Right, null)), /* @__PURE__ */ React.createElement("div", { className: "double-right", onClick: () => jump(12) }, /* @__PURE__ */ React.createElement(DoubleRight, null))));
+    };
+    const [weekHeader] = React.useState(() => {
+      const weekdays = locale.calendaritem.weekdays.map((day, index) => {
+        return {
+          name: day,
+          key: index
+        };
+      });
+      return [
+        ...weekdays.slice(firstDayOfWeek, 7),
+        ...weekdays.slice(0, firstDayOfWeek)
+      ];
+    });
+    const renderContent = () => {
+      return /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-content" }, /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-days" }, weekHeader.map((day) => {
+        return /* @__PURE__ */ React.createElement(
+          "div",
+          {
+            className: classNames("nut-calendarcard-day", "header", {
+              weekend: day.key === 0 || day.key === 6
+            }),
+            key: day.key
+          },
+          day.name
+        );
+      })), /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-days" }, days.map((day) => /* @__PURE__ */ React.createElement(
+        "div",
+        {
+          className: classNames(
+            "nut-calendarcard-day",
+            day.type,
+            getClasses(day)
+          ),
+          key: `${day.year}-${day.month}-${day.date}`,
+          onClick: () => handleDayClick(day)
+        },
+        /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-day-top" }, renderDayTop ? renderDayTop(day) : ""),
+        /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-day-inner" }, renderDay ? renderDay(day) : day.date),
+        /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard-day-bottom" }, renderDayBottom ? renderDayBottom(day) : "")
+      ))));
+    };
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: "nut-calendarcard", style }, renderHeader(), renderContent()));
+  });
+  CalendarCard.defaultProps = defaultProps$11;
+  CalendarCard.displayName = "NutCalendarCard";
   const CheckboxGroupContext = React.createContext(null);
   const Context$1 = CheckboxGroupContext;
   const defaultProps$10 = {
@@ -8833,84 +9357,6 @@ var __publicField = (obj, key, value) => {
   Checkbox.defaultProps = defaultProps$$;
   Checkbox.displayName = "NutCheckBox";
   Checkbox.Group = CheckboxGroup;
-  const MIN_DISTANCE = 10;
-  function getDirection(x, y2) {
-    if (x > y2 && x > MIN_DISTANCE) {
-      return "horizontal";
-    }
-    if (y2 > x && y2 > MIN_DISTANCE) {
-      return "vertical";
-    }
-    return "";
-  }
-  function useTouch() {
-    const [startX, SetStartX] = React.useState(0);
-    const [startY, SetStartY] = React.useState(0);
-    const [moveX, SetMoveX] = React.useState(0);
-    const [moveY, SetMoveY] = React.useState(0);
-    const [deltaX, SetDeltaX] = React.useState(0);
-    const [deltaY, SetDeltaY] = React.useState(0);
-    const [offsetX, SetOffsetX] = React.useState(0);
-    const [offsetY, SetOffsetY] = React.useState(0);
-    const [direction, SetDirection] = React.useState("");
-    const isVertical = () => direction === "vertical";
-    const isHorizontal = () => direction === "horizontal";
-    const reset = () => {
-      SetDeltaX(0);
-      SetDeltaY(0);
-      SetOffsetX(0);
-      SetOffsetY(0);
-      SetDirection("");
-    };
-    const start = (event) => {
-      reset();
-      SetStartX(event.touches[0].clientX);
-      SetStartY(event.touches[0].clientY);
-    };
-    const move = (event) => {
-      const touch = event.touches[0];
-      const dX = touch.clientX - startX;
-      const dY = touch.clientY - startY;
-      SetDeltaX(dX);
-      SetDeltaY(dY);
-      SetMoveX(touch.clientX);
-      SetMoveY(touch.clientY);
-      SetOffsetX(Math.abs(dX));
-      SetOffsetY(Math.abs(dY));
-      if (!direction) {
-        SetDirection(getDirection(offsetX, offsetY));
-      }
-    };
-    return {
-      move,
-      start,
-      reset,
-      startX,
-      startY,
-      moveX,
-      moveY,
-      deltaX,
-      deltaY,
-      offsetX,
-      offsetY,
-      direction,
-      isVertical,
-      isHorizontal
-    };
-  }
-  let passiveSupported = false;
-  if (canUseDom) {
-    try {
-      const opts = Object.defineProperty({}, "passive", {
-        get() {
-          passiveSupported = true;
-        }
-      });
-      window.addEventListener("test-passive-supported", null, opts);
-    } catch (e) {
-      console.log(e);
-    }
-  }
   const InternalPickerPanel = (props, ref) => {
     const {
       keyIndex = 0,
@@ -8934,7 +9380,7 @@ var __publicField = (obj, key, value) => {
     let timer;
     const listRef = React.useRef(null);
     const rollerRef = React.useRef(null);
-    const PickerPanelRef = React.useRef(null);
+    const pickerPanelRef = React.useRef(null);
     const [startTime, setStartTime] = React.useState(0);
     const [startY, setStartY] = React.useState(0);
     const transformY = React.useRef(0);
@@ -8980,11 +9426,11 @@ var __publicField = (obj, key, value) => {
       }
     };
     const setChooseValue = (move) => {
-      chooseItem && chooseItem(options == null ? void 0 : options[Math.round(-move / lineSpacing.current)], keyIndex);
+      chooseItem == null ? void 0 : chooseItem(options == null ? void 0 : options[Math.round(-move / lineSpacing.current)], keyIndex);
     };
     const touchStart = (event) => {
       touch.start(event);
-      setStartY(touch.deltaY);
+      setStartY(touch.deltaY.current);
       setStartTime(Date.now());
       transformY.current = scrollDistance;
     };
@@ -8994,13 +9440,13 @@ var __publicField = (obj, key, value) => {
         moving.current = true;
         preventDefault2(event, true);
       }
-      const move = touch.deltaY - startY;
+      const move = touch.deltaY.current - startY;
       setMove(move);
     };
     const touchEnd = () => {
       if (!moving.current)
         return;
-      const move = touch.deltaY - startY;
+      const move = touch.deltaY.current - startY;
       const moveTime = Date.now() - startTime;
       if (moveTime <= INERTIA_TIME && Math.abs(move) > INERTIA_DISTANCE) {
         const distance = momentum(move, moveTime);
@@ -9047,9 +9493,7 @@ var __publicField = (obj, key, value) => {
       setChooseValue(scrollDistance);
     };
     const preventDefault2 = (event, isStopPropagation) => {
-      if (!passiveSupported && (typeof event.cancelable !== "boolean" || event.cancelable)) {
-        event.preventDefault();
-      }
+      event.preventDefault();
       if (isStopPropagation) {
         event.stopPropagation();
       }
@@ -9090,56 +9534,56 @@ var __publicField = (obj, key, value) => {
       stopMomentum,
       moving: moving.current
     }));
-    return /* @__PURE__ */ React.createElement(
+    React.useEffect(() => {
+      const eventOptions = passiveSupported ? { passive: false, once: true } : false;
+      const element = pickerPanelRef.current;
+      element.addEventListener("touchstart", touchStart, eventOptions);
+      element.addEventListener("touchmove", touchMove, eventOptions);
+      element.addEventListener("touchend", touchEnd, eventOptions);
+      return () => {
+        element.removeEventListener("touchstart", touchStart, eventOptions);
+        element.removeEventListener("touchmove", touchMove, eventOptions);
+        element.removeEventListener("touchend", touchEnd, eventOptions);
+      };
+    });
+    return /* @__PURE__ */ React.createElement("div", { className: "nut-picker-list", ref: pickerPanelRef }, /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: "nut-picker-list",
-        ref: PickerPanelRef,
-        onTouchStart: touchStart,
-        onTouchMove: touchMove,
-        onTouchEnd: touchEnd
+        className: "nut-picker-roller",
+        ref: rollerRef,
+        style: threeDimensional ? touchRollerStyle() : touchTileStyle(),
+        onTransitionEnd: stopMomentum
       },
-      /* @__PURE__ */ React.createElement(
-        "div",
-        {
-          className: "nut-picker-roller",
-          ref: rollerRef,
-          style: threeDimensional ? touchRollerStyle() : touchTileStyle(),
-          onTransitionEnd: stopMomentum
-        },
-        threeDimensional && options.map((item, index) => {
-          return /* @__PURE__ */ React.createElement(
-            "div",
-            {
-              className: `nut-picker-roller-item ${isHidden(index + 1) && "nut-picker-roller-item-hidden"}`,
-              style: {
-                transform: `rotate3d(1, 0, 0, ${-rotation * (index + 1)}deg) translate3d(0px, 0px, 104px)`,
-                height: `${lineSpacing.current}px`,
-                lineHeight: `${lineSpacing.current}px`
-              },
-              key: item.value ? item.value : index
-            },
-            /* @__PURE__ */ React.createElement(React.Fragment, null, item.text ? item.text : item)
-          );
-        }),
-        !threeDimensional && options.map((item, index) => {
-          return /* @__PURE__ */ React.createElement(
-            "div",
-            {
-              className: "nut-picker-roller-item-title",
-              key: item.value ? item.value : index,
-              style: {
-                height: `${lineSpacing.current}px`,
-                lineHeight: `${lineSpacing.current}px`
-              }
+      threeDimensional && options.map((item, index) => {
+        return /* @__PURE__ */ React.createElement(
+          "div",
+          {
+            className: `nut-picker-roller-item ${isHidden(index + 1) && "nut-picker-roller-item-hidden"}`,
+            style: {
+              transform: `rotate3d(1, 0, 0, ${-rotation * (index + 1)}deg) translate3d(0px, 0px, 104px)`,
+              height: `${lineSpacing.current}px`,
+              lineHeight: `${lineSpacing.current}px`
             },
-            /* @__PURE__ */ React.createElement(React.Fragment, null, item.text ? item.text : item)
-          );
-        })
-      ),
-      /* @__PURE__ */ React.createElement("div", { className: "nut-picker-mask" }),
-      /* @__PURE__ */ React.createElement("div", { className: "nut-picker-indicator", ref: listRef })
-    );
+            key: item.value ? item.value : index
+          },
+          /* @__PURE__ */ React.createElement(React.Fragment, null, item.text ? item.text : item)
+        );
+      }),
+      !threeDimensional && options.map((item, index) => {
+        return /* @__PURE__ */ React.createElement(
+          "div",
+          {
+            className: "nut-picker-roller-item-title",
+            key: item.value ? item.value : index,
+            style: {
+              height: `${lineSpacing.current}px`,
+              lineHeight: `${lineSpacing.current}px`
+            }
+          },
+          /* @__PURE__ */ React.createElement(React.Fragment, null, item.text ? item.text : item)
+        );
+      })
+    ), /* @__PURE__ */ React.createElement("div", { className: "nut-picker-mask" }), /* @__PURE__ */ React.createElement("div", { className: "nut-picker-indicator", ref: listRef }));
   };
   const PickerPanel = React.forwardRef(InternalPickerPanel);
   const PickerPanel$1 = PickerPanel;
@@ -9174,6 +9618,7 @@ var __publicField = (obj, key, value) => {
       visible,
       title,
       options = [],
+      popupProps = {},
       defaultValue = [],
       className,
       style,
@@ -9430,6 +9875,7 @@ var __publicField = (obj, key, value) => {
     return /* @__PURE__ */ React.createElement(React.Fragment, null, typeof children === "function" && children(selectedValue), /* @__PURE__ */ React.createElement(
       Popup,
       {
+        ...popupProps,
         visible: innerVisible,
         position: "bottom",
         afterClose: () => {
@@ -9502,6 +9948,7 @@ var __publicField = (obj, key, value) => {
       visible,
       title,
       defaultValue,
+      pickerProps = {},
       formatter,
       onClose,
       onConfirm,
@@ -9782,6 +10229,7 @@ var __publicField = (obj, key, value) => {
       options.length && /* @__PURE__ */ React.createElement(
         Picker$1,
         {
+          ...pickerProps,
           title,
           visible,
           options,
@@ -12605,12 +13053,12 @@ var __publicField = (obj, key, value) => {
       const value2 = min + delta / total * scope();
       setEaxctValue(current);
       if (isRange(current)) {
-        const [left, right] = current;
-        const middle = (left + right) / 2;
+        const [left2, right2] = current;
+        const middle = (left2 + right2) / 2;
         if (value2 <= middle) {
-          updateValue([value2, right], true);
+          updateValue([value2, right2], true);
         } else {
-          updateValue([left, value2], true);
+          updateValue([left2, value2], true);
         }
       } else {
         updateValue(value2, true);
@@ -12639,11 +13087,11 @@ var __publicField = (obj, key, value) => {
       touch.move(event);
       setDragStatus("draging");
       const rect = await getRectByTaro(root2.current);
-      let delta = touch.deltaX;
+      let delta = touch.deltaX.current;
       let total = rect.width;
       let diff = delta / total * scope();
       if (vertical) {
-        delta = touch.deltaY;
+        delta = touch.deltaY.current;
         total = rect.height;
         diff = delta / total * scope();
       }
@@ -12866,8 +13314,8 @@ var __publicField = (obj, key, value) => {
       clearable,
       readOnly,
       autoFocus,
-      right,
-      left,
+      right: right2,
+      left: left2,
       leftIn,
       rightIn,
       onChange,
@@ -12885,10 +13333,11 @@ var __publicField = (obj, key, value) => {
       searchSelf && searchSelf.focus();
     };
     const change = (event) => {
-      const { value: value2 } = event.target;
-      onChange && (onChange == null ? void 0 : onChange(value2, event));
-      setValue(value2);
-      value2 === "" && forceFocus();
+      if (value === event.target.value)
+        return;
+      onChange && (onChange == null ? void 0 : onChange(event.target.value, event));
+      setValue(event.target.value);
+      event.target.value === "" && forceFocus();
     };
     const focus = (event) => {
       const { value: value2 } = event.target;
@@ -12901,7 +13350,7 @@ var __publicField = (obj, key, value) => {
       onBlur && (onBlur == null ? void 0 : onBlur(value2, event));
     };
     React.useEffect(() => {
-      setValue(props.value);
+      setValue(props.value || "");
     }, [props.value]);
     React.useEffect(() => {
       autoFocus && forceFocus();
@@ -12935,9 +13384,9 @@ var __publicField = (obj, key, value) => {
       return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__leftin ${classPrefix2}__icon` }, leftIn);
     };
     const renderLeft = () => {
-      if (!left)
+      if (!left2)
         return null;
-      return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__left` }, left);
+      return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__left` }, left2);
     };
     const renderRightIn = () => {
       if (!rightIn)
@@ -12945,9 +13394,9 @@ var __publicField = (obj, key, value) => {
       return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__rightin ${classPrefix2}__icon` }, rightIn);
     };
     const renderRight = () => {
-      if (!right)
+      if (!right2)
         return null;
-      return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__right` }, right);
+      return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__right` }, right2);
     };
     const handleClear = () => {
       return /* @__PURE__ */ React.createElement(
@@ -12964,8 +13413,8 @@ var __publicField = (obj, key, value) => {
         return;
       }
       setValue("");
-      onClear && onClear(event);
       forceFocus();
+      onClear && onClear(event);
     };
     const onKeypress = (e) => {
       if (e.key === "Enter" || e.keyCode === 13) {
@@ -14297,6 +14746,7 @@ var __publicField = (obj, key, value) => {
         }
       }
     );
+    const refObject = useLockScrollTaro(!!(visible && lockScroll));
     const renderFooter = () => {
       if (footer === null)
         return "";
@@ -14349,6 +14799,7 @@ var __publicField = (obj, key, value) => {
       components.View,
       {
         style: { display: visible ? "block" : "none" },
+        ref: refObject,
         catchMove: lockScroll
       },
       /* @__PURE__ */ React.createElement(React.Fragment, null, overlay ? /* @__PURE__ */ React.createElement(
@@ -14427,14 +14878,14 @@ var __publicField = (obj, key, value) => {
     const getInfo = () => {
       const el = myDrag.current;
       if (el) {
-        const { top, left, bottom, right } = boundary;
+        const { top, left: left2, bottom, right: right2 } = boundary;
         const { screenWidth, windowHeight } = Taro.getSystemInfoSync();
         Taro.createSelectorQuery().select(`.${className}`).boundingClientRect((rec) => {
           setBoundaryState({
             top: -rec.top + top,
-            left: -rec.left + left,
+            left: -rec.left + left2,
             bottom: windowHeight - rec.height - rec.top - bottom,
-            right: screenWidth - rec.width - rec.left - right
+            right: screenWidth - rec.width - rec.left - right2
           });
           middleLine.current = screenWidth - rec.width - rec.left - (screenWidth - rec.width) / 2;
         }).exec();
@@ -14828,9 +15279,7 @@ var __publicField = (obj, key, value) => {
           scrollList.current = [].concat(childs);
         } else {
           scrollList.current = [].concat(list);
-          setTimeout(() => {
-            startRollEasy();
-          }, Number(duration));
+          startRollEasy();
         }
       } else {
         initScrollWrap();
@@ -14959,11 +15408,9 @@ var __publicField = (obj, key, value) => {
     }, [ready]);
     React.useEffect(() => {
       if (isVertical && children) {
-        setTimeout(() => {
-          init();
-          stopAutoPlay();
-          autoplay();
-        }, 300);
+        init();
+        stopAutoPlay();
+        autoplay();
       }
     }, [children, container == null ? void 0 : container.current]);
     const stopAutoPlay = () => {
@@ -15016,6 +15463,9 @@ var __publicField = (obj, key, value) => {
     };
     const getStyle = (moveOffset = offset) => {
       const target = innerRef.current;
+      if (!target) {
+        return;
+      }
       let _offset = 0;
       const val = ((rect == null ? void 0 : rect.height) || 0) - height;
       _offset = moveOffset + Number(active === childCount - 1 && val / 2);
@@ -15361,7 +15811,7 @@ var __publicField = (obj, key, value) => {
       }
       const contentWidth = elWidth;
       const contentHeight = elHeight;
-      const { width, height, left, top, right } = rootPosition;
+      const { width, height, left: left2, top, right: right2 } = rootPosition;
       const direction = location.split("-")[0];
       const skew = location.split("-")[1];
       let cross = 0;
@@ -15375,18 +15825,18 @@ var __publicField = (obj, key, value) => {
           const h = direction === "bottom" ? height + cross : -(contentHeight + cross);
           styles.top = `${top + h}px`;
           if (!skew) {
-            styles.left = `${-(contentWidth - width) / 2 + left + parallel}px`;
+            styles.left = `${-(contentWidth - width) / 2 + left2 + parallel}px`;
           }
           if (skew === "start") {
-            styles.left = `${left + parallel}px`;
+            styles.left = `${left2 + parallel}px`;
           }
           if (skew === "end") {
-            styles.left = `${right + parallel}px`;
+            styles.left = `${right2 + parallel}px`;
           }
         }
         if (["left", "right"].includes(direction)) {
           const contentW = direction === "left" ? -(contentWidth + cross) : width + cross;
-          styles.left = `${left + contentW}px`;
+          styles.left = `${left2 + contentW}px`;
           if (!skew) {
             styles.top = `${top - contentHeight / 2 + height / 2 - 4 + parallel}px`;
           }
@@ -15584,7 +16034,13 @@ var __publicField = (obj, key, value) => {
         pullingRef.current = true;
         setHeight(
           Math.max(
-            rubberbandIfOutOfBounds(touch.deltaY, 0, 0, headHeight * 5, 0.5),
+            rubberbandIfOutOfBounds(
+              touch.deltaY.current,
+              0,
+              0,
+              headHeight * 5,
+              0.5
+            ),
             0
           )
         );
@@ -15898,6 +16354,7 @@ var __publicField = (obj, key, value) => {
     const leftWidth = actionWidth.left;
     const rightWidth = actionWidth.right;
     const onTouchStart = async (event) => {
+      var _a;
       if (leftWrapper.current) {
         const leftRect = await getRectByTaro(leftWrapper.current);
         setActionWidth((v) => ({ ...v, left: leftRect.width }));
@@ -15909,24 +16366,26 @@ var __publicField = (obj, key, value) => {
       if (!props.disabled) {
         startOffset.current = state.offset;
         touch.start(event);
-        props.onTouchStart && props.onTouchStart(event);
+        (_a = props.onTouchStart) == null ? void 0 : _a.call(props, event);
       }
     };
     const onTouchMove = (event) => {
+      var _a;
       if (props.disabled) {
         return;
       }
       touch.move(event);
+      (_a = props.onTouchMove) == null ? void 0 : _a.call(props, event);
       if (touch.isHorizontal()) {
         lockClick.current = true;
         props.onTouchMove && props.onTouchMove(event);
         const newState = { ...state, dragging: true };
-        const isEdge = !opened || touch.deltaX * startOffset.current < 0;
+        const isEdge = !opened || touch.deltaX.current * startOffset.current < 0;
         if (isEdge) {
           preventDefault(event, true);
         }
         newState.offset = rangeCalculation(
-          touch.deltaX + startOffset.current,
+          touch.deltaX.current + startOffset.current,
           -rightWidth || 0,
           leftWidth || 0
         );
@@ -15934,13 +16393,14 @@ var __publicField = (obj, key, value) => {
       }
     };
     const onTouchEnd = (event) => {
+      var _a;
       if (state.dragging) {
         setState((v) => ({ ...v, dragging: false }));
         toggle(state.offset > 0 ? "left" : "right");
         setTimeout(() => {
           lockClick.current = false;
         }, 0);
-        props.onTouchEnd && props.onTouchEnd(event);
+        (_a = props.onTouchEnd) == null ? void 0 : _a.call(props, event);
       }
     };
     const toggle = (side) => {
@@ -15993,11 +16453,12 @@ var __publicField = (obj, key, value) => {
       return null;
     };
     const handleOperate = (event, position) => {
+      var _a;
       event.stopPropagation();
       if (props.beforeClose) {
         props.beforeClose(position);
       } else {
-        props.onActionClick && props.onActionClick(event, position);
+        (_a = props.onActionClick) == null ? void 0 : _a.call(props, event, position);
       }
     };
     React.useImperativeHandle(instanceRef, () => ({
@@ -17303,13 +17764,13 @@ var __publicField = (obj, key, value) => {
       const newContent = `${((_a2 = ellipsis.current) == null ? void 0 : _a2.leading) || ""}${((_b2 = ellipsis.current) == null ? void 0 : _b2.leading) ? symbol : ""}${expandText || ""}${((_c2 = ellipsis.current) == null ? void 0 : _c2.tailing) ? symbol : ""}${((_d2 = ellipsis.current) == null ? void 0 : _d2.tailing) || ""}`;
       setContentCopy(newContent);
     };
-    const tailorContent = (left, right, type2 = "") => {
+    const tailorContent = (left2, right2, type2 = "") => {
       const threeDotWidth = symbolTextWidth;
       const direc = direction === "middle" && type2 ? type2 : direction;
       setExceeded(true);
       let widthPart = -1;
-      const start = left;
-      const end = right;
+      const start = left2;
+      const end = right2;
       let cutoff = 0;
       let marking = 0;
       if (direc === "end") {
@@ -18508,8 +18969,8 @@ var __publicField = (obj, key, value) => {
       });
     };
     const maskStyle = () => {
-      const { width, height, left, top } = maskRect;
-      const center = [left + width / 2, top + height / 2];
+      const { width, height, left: left2, top } = maskRect;
+      const center = [left2 + width / 2, top + height / 2];
       const w2 = Number(maskWidth || width);
       const h = Number(maskHeight || height);
       const styles = {
@@ -19229,7 +19690,7 @@ var __publicField = (obj, key, value) => {
       digits,
       symbol,
       zero,
-      left,
+      left: left2,
       sync,
       color,
       riseColor,
@@ -19275,8 +19736,8 @@ var __publicField = (obj, key, value) => {
       };
       return iconProps;
     })();
-    const renderContent = (left2) => {
-      const classNameSuffix = !left2 ? "icon-after" : "icon-before";
+    const renderContent = (left22) => {
+      const classNameSuffix = !left22 ? "icon-after" : "icon-before";
       return /* @__PURE__ */ React.createElement(
         "span",
         {
@@ -19286,7 +19747,7 @@ var __publicField = (obj, key, value) => {
         calcRate
       );
     };
-    return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2} ${className}`, style, ...rest }, !left && renderContent(!left), Number(value) !== 0 && /* @__PURE__ */ React.createElement(React.Fragment, null, rateTrend.current ? /* @__PURE__ */ React.createElement(React.Fragment, null, riseIcon || /* @__PURE__ */ React.createElement(a, { color: calcIconProps.color })) : /* @__PURE__ */ React.createElement(React.Fragment, null, dropIcon || /* @__PURE__ */ React.createElement(a$1, { color: calcIconProps.color }))), left && renderContent(!left));
+    return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2} ${className}`, style, ...rest }, !left2 && renderContent(!left2), Number(value) !== 0 && /* @__PURE__ */ React.createElement(React.Fragment, null, rateTrend.current ? /* @__PURE__ */ React.createElement(React.Fragment, null, riseIcon || /* @__PURE__ */ React.createElement(a, { color: calcIconProps.color })) : /* @__PURE__ */ React.createElement(React.Fragment, null, dropIcon || /* @__PURE__ */ React.createElement(a$1, { color: calcIconProps.color }))), left2 && renderContent(!left2));
   };
   TrendArrow.defaultProps = defaultProps$1;
   TrendArrow.displayName = "NutTrendArrow";
@@ -19433,6 +19894,7 @@ var __publicField = (obj, key, value) => {
   exports2.Barrage = Barrage;
   exports2.Button = Button;
   exports2.Calendar = Calendar;
+  exports2.CalendarCard = CalendarCard;
   exports2.CalendarItem = CalendarItem;
   exports2.Card = Card;
   exports2.Cascader = Cascader;