@nutui/nutui-react-taro 2.0.22 → 2.0.23

package/dist/nutui.react.es.js

@@ -5,12 +5,12 @@ 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.
 */
 import * as React from "react";
-import React__default, { useCallback, createContext, useContext, useState, useEffect, useRef, useMemo as useMemo$1, isValidElement, forwardRef, useImperativeHandle, Component, Children } from "react";
+import React__default, { useCallback, createContext, useContext, useState, useRef, useEffect, useMemo as useMemo$1, isValidElement, forwardRef, useImperativeHandle, Component, Children } from "react";
 import Taro, { getEnv, createSelectorQuery, usePageScroll, getSystemInfoSync, pageScrollTo, nextTick, ENV_TYPE, canvasToTempFilePath, uploadFile, chooseMedia, chooseImage, Events, getCurrentInstance, useReady, createInnerAudioContext, getSystemInfo, createOffscreenCanvas } from "@tarojs/taro";
 import { Image as Image$2, View, ScrollView, PickerView, PickerViewColumn, Input as Input$1, Textarea, Swiper as Swiper$1, SwiperItem as SwiperItem$1, Video as Video$1 } from "@tarojs/components";
 import ReactDOM, { createPortal } from "react-dom";
@@ -1913,7 +1913,7 @@ const ComponentDefaults = {
   style: {}
 };
 const prefixCls$1 = "nut-button";
-const defaultProps$1u = {
+const defaultProps$1v = {
   ...ComponentDefaults,
   color: "",
   type: "default",
@@ -1945,7 +1945,7 @@ const Button = React__default.forwardRef(
       style,
       ...rest
     } = {
-      ...defaultProps$1u,
+      ...defaultProps$1v,
       ...props
     };
     const getStyle = useCallback(() => {
@@ -2004,7 +2004,7 @@ const Button = React__default.forwardRef(
 );
 Button.displayName = "NutButton";
 const CellGroupContext = createContext(null);
-const defaultProps$1t = {
+const defaultProps$1u = {
   ...ComponentDefaults,
   title: "",
   description: "",
@@ -2013,7 +2013,7 @@ const defaultProps$1t = {
 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__default.createElement("div", { className: classNames(classPrefix$p, className), ...rest }, title ? /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix$p}__title` }, title) : null, description ? /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix$p}__description` }, description) : null, /* @__PURE__ */ React__default.createElement(
@@ -2024,9 +2024,9 @@ const CellGroup = (props) => {
     /* @__PURE__ */ React__default.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,
@@ -2051,7 +2051,7 @@ const Cell = (props) => {
     style,
     ...rest
   } = {
-    ...defaultProps$1s,
+    ...defaultProps$1t,
     ...props
   };
   const handleClick = (event) => {
@@ -2084,7 +2084,7 @@ const Cell = (props) => {
     (ctx == null ? void 0 : ctx.divider) ? /* @__PURE__ */ React__default.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;
@@ -3225,7 +3225,7 @@ ConfigProvider.displayName = "NutConfigProvider";
 const pxCheck = (value) => {
   return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
 };
-const defaultProps$1r = {
+const defaultProps$1s = {
   src: "",
   error: true,
   loading: true
@@ -3244,7 +3244,7 @@ const Image$1 = (props) => {
     onLoad,
     onError,
     ...rest
-  } = { ...defaultProps$1r, ...props };
+  } = { ...defaultProps$1s, ...props };
   const [innerLoading, setInnerLoading] = useState(true);
   const [isError, setIsError] = useState(false);
   const handleLoad = (e) => {
@@ -3304,7 +3304,7 @@ const Image$1 = (props) => {
     }
   ), 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) {
@@ -5047,6 +5047,178 @@ CSSTransition.propTypes = process.env.NODE_ENV !== "production" ? _extends$1({},
   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 = useRef(0);
+  const startY = useRef(0);
+  const deltaX = useRef(0);
+  const deltaY = useRef(0);
+  const offsetX = useRef(0);
+  const offsetY = useRef(0);
+  const direction = 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);
+      }
+    }
+  };
+  useEffect(() => {
+    if (shouldLock) {
+      lock();
+      return () => {
+        unlock();
+      };
+    }
+  }, [shouldLock]);
+}
+const useLockScrollTaro = (shouldLock) => {
+  const refObject = useRef(null);
+  if (getEnv() === "WEB") {
+    useLockScroll(refObject, shouldLock);
+  }
+  return refObject;
+};
 const defaultOverlayProps = {
   ...ComponentDefaults,
   zIndex: 1e3,
@@ -5077,30 +5249,18 @@ const Overlay = (props) => {
   };
   const [innerVisible, setInnerVisible] = useState(visible);
   const classPrefix2 = `nut-overlay`;
+  const nodeRef = useLockScrollTaro(!!props.lockScroll && innerVisible);
   useEffect(() => {
     if (visible) {
       setInnerVisible(true);
     } else {
       setInnerVisible(false);
     }
-    lock();
   }, [visible]);
-  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);
@@ -5115,6 +5275,7 @@ const Overlay = (props) => {
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(
     CSSTransition$1,
     {
+      nodeRef,
       classNames: `${classPrefix2}-slide`,
       unmountOnExit: true,
       timeout: duration,
@@ -5125,6 +5286,7 @@ const Overlay = (props) => {
     /* @__PURE__ */ React__default.createElement(
       View,
       {
+        ref: nodeRef,
         className: classes,
         style: styles,
         ...rest,
@@ -5138,7 +5300,7 @@ const Overlay = (props) => {
 Overlay.defaultProps = defaultOverlayProps;
 Overlay.displayName = "NutOverlay";
 const DataContext$1 = createContext({});
-const defaultProps$1q = {
+const defaultProps$1r = {
   ...ComponentDefaults,
   span: "24",
   offset: "0",
@@ -5146,7 +5308,7 @@ const defaultProps$1q = {
 };
 const Col = (props) => {
   const { className, style, span, offset, children, onClick } = {
-    ...defaultProps$1q,
+    ...defaultProps$1r,
     ...props
   };
   const [colName, setColName] = useState("");
@@ -5178,9 +5340,9 @@ const Col = (props) => {
     children
   );
 };
-Col.defaultProps = defaultProps$1q;
+Col.defaultProps = defaultProps$1r;
 Col.displayName = "NutCol";
-const defaultProps$1p = {
+const defaultProps$1q = {
   ...ComponentDefaults,
   contentPosition: "center",
   direction: "horizontal"
@@ -5188,7 +5350,7 @@ const defaultProps$1p = {
 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({
@@ -5203,14 +5365,14 @@ const Divider = (props) => {
   });
   return /* @__PURE__ */ React__default.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__default.createContext(gridContext);
-const defaultProps$1o = {
+const defaultProps$1p = {
   text: "",
   columns: 4,
   gap: 0,
@@ -5236,7 +5398,7 @@ const GridItem = (props) => {
     onClick,
     ...rest
   } = {
-    ...defaultProps$1o,
+    ...defaultProps$1p,
     ...props
   };
   const classPrefix2 = "nut-grid-item";
@@ -5294,9 +5456,9 @@ const GridItem = (props) => {
     /* @__PURE__ */ React__default.createElement("div", { className: contentClass() }, children && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children), text && /* @__PURE__ */ React__default.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,
@@ -5317,7 +5479,7 @@ const Grid = (props) => {
     className,
     onClick,
     ...rest
-  } = { ...defaultProps$1n, ...props };
+  } = { ...defaultProps$1o, ...props };
   const childrenDom = React__default.Children.toArray(children);
   const classPrefix2 = "nut-grid";
   const rootClass = () => {
@@ -5347,18 +5509,18 @@ const Grid = (props) => {
     });
   })));
 };
-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__default.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",
@@ -5378,7 +5540,7 @@ const Row = (props) => {
     gutter,
     onClick
   } = {
-    ...defaultProps$1l,
+    ...defaultProps$1m,
     ...props
   };
   const getClass = (prefix, type22) => {
@@ -5410,15 +5572,15 @@ const Row = (props) => {
     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(
@@ -5433,7 +5595,7 @@ const Space = (props) => {
     return child !== null && child !== void 0 && /* @__PURE__ */ React__default.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;
@@ -5511,28 +5673,7 @@ const getRectByTaro = async (element) => {
   }
   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
@@ -5549,7 +5690,7 @@ const Sticky = (props) => {
     className,
     onChange,
     ...rest
-  } = { ...defaultProps$1j, ...props };
+  } = { ...defaultProps$1k, ...props };
   const stickyRef = useRef(null);
   const rootRef = useRef(null);
   const [rootRect, setRootRect] = useState({});
@@ -5655,9 +5796,9 @@ const Sticky = (props) => {
     )
   );
 };
-Sticky.defaultProps = defaultProps$1j;
+Sticky.defaultProps = defaultProps$1k;
 Sticky.displayName = "NutSticky";
-const defaultProps$1i = {
+const defaultProps$1j = {
   ...ComponentDefaults,
   threshold: 200,
   zIndex: 900,
@@ -5665,7 +5806,7 @@ const defaultProps$1i = {
 };
 const BackTop = (props) => {
   const { children, threshold, zIndex, className, duration, style, onClick } = {
-    ...defaultProps$1i,
+    ...defaultProps$1j,
     ...props
   };
   const classPrefix2 = "nut-backtop";
@@ -5703,10 +5844,10 @@ const BackTop = (props) => {
     children || /* @__PURE__ */ React__default.createElement(a$2, { width: 19, height: 19, className: "nut-backtop-main" })
   );
 };
-BackTop.defaultProps = defaultProps$1i;
+BackTop.defaultProps = defaultProps$1j;
 BackTop.displayName = "NutBackTop";
 const elevatorContext = createContext({});
-const defaultProps$1h = {
+const defaultProps$1i = {
   ...ComponentDefaults,
   height: "200px",
   floorKey: "title",
@@ -5733,7 +5874,7 @@ const Elevator = (props) => {
     children,
     ...rest
   } = {
-    ...defaultProps$1h,
+    ...defaultProps$1i,
     ...props
   };
   const classPrefix2 = "nut-elevator";
@@ -5945,10 +6086,10 @@ const Elevator = (props) => {
     })
   ))) : null, sticky && scrollY > 0 ? /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__list__fixed` }, /* @__PURE__ */ React__default.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: "",
@@ -5976,7 +6117,7 @@ const FixedNav = (props) => {
     content,
     ...rest
   } = {
-    ...defaultProps$1g,
+    ...defaultProps$1h,
     ...props
   };
   const classPrefix2 = "nut-fixednav";
@@ -6028,9 +6169,9 @@ const FixedNav = (props) => {
     /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__btn`, onClick: () => onUpdateValue() }, content || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(a$j, { color: "#fff" }), /* @__PURE__ */ React__default.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: "",
@@ -6042,8 +6183,8 @@ const defaultProps$1f = {
 };
 const NavBar = (props) => {
   const {
-    right,
-    left,
+    right: right2,
+    left: left2,
     className,
     style,
     back,
@@ -6053,7 +6194,7 @@ const NavBar = (props) => {
     zIndex,
     onBackClick
   } = {
-    ...defaultProps$1f,
+    ...defaultProps$1g,
     ...props
   };
   const classPrefix2 = "nut-navbar";
@@ -6072,13 +6213,13 @@ const NavBar = (props) => {
         onClick: (e) => onBackClick(e)
       },
       back
-    ), left);
+    ), left2);
   };
   const renderContent = () => {
     return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__title` }, children);
   };
   const renderRight = () => {
-    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__right` }, right);
+    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__right` }, right2);
   };
   const renderWrapper = () => {
     return /* @__PURE__ */ React__default.createElement("div", { className: cls, style: styles() }, renderLeft(), renderContent(), renderRight());
@@ -6090,9 +6231,9 @@ const NavBar = (props) => {
   const cls = classNames(classPrefix2, classes, className);
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, fixed && placeholder ? /* @__PURE__ */ React__default.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: "",
@@ -6113,7 +6254,7 @@ const defaultProps$1e = {
   onCloseIconClick: (e) => true,
   ...defaultOverlayProps
 };
-let _zIndex = 1100;
+const _zIndex = 1100;
 const Popup = (props) => {
   const {
     children,
@@ -6128,7 +6269,7 @@ const Popup = (props) => {
     closeable,
     closeIconPosition,
     closeIcon,
-    left,
+    left: left2,
     title,
     style,
     transition,
@@ -6144,11 +6285,13 @@ const Popup = (props) => {
     afterShow,
     afterClose,
     onClick
-  } = { ...defaultProps$1e, ...props };
-  const [index, setIndex] = useState(zIndex || _zIndex);
+  } = { ...defaultProps$1f, ...props };
+  let innerIndex = zIndex || _zIndex;
+  const [index, setIndex] = useState(innerIndex);
   const [innerVisible, setInnerVisible] = useState(visible);
   const [showChildren, setShowChildren] = useState(true);
   const [transitionName, setTransitionName] = useState("");
+  const refObject = useLockScrollTaro(innerVisible && lockScroll);
   const classPrefix2 = "nut-popup";
   const baseStyle = {
     zIndex: index
@@ -6174,9 +6317,7 @@ const Popup = (props) => {
   const open2 = () => {
     if (!innerVisible) {
       setInnerVisible(true);
-      if (props.zIndex === void 0) {
-        setIndex(++_zIndex);
-      }
+      setIndex(++innerIndex);
     }
     if (destroyOnClose) {
       setShowChildren(true);
@@ -6232,7 +6373,7 @@ const Popup = (props) => {
     return null;
   };
   const renderTitle = () => {
-    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, position === "bottom" && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, left && /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-left-icon` }, left), title && /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-title` }, title)));
+    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, position === "bottom" && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, left2 && /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-left-icon` }, left2), title && /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-title` }, title)));
   };
   const renderPop = () => {
     return /* @__PURE__ */ React__default.createElement(
@@ -6248,9 +6389,11 @@ const Popup = (props) => {
       /* @__PURE__ */ React__default.createElement(
         View,
         {
+          ref: refObject,
           style: popStyles,
           className: popClassName,
-          onClick: onHandleClick
+          onClick: onHandleClick,
+          catchMove: lockScroll
         },
         renderTitle(),
         renderIcon(),
@@ -6281,10 +6424,10 @@ const Popup = (props) => {
   }, [position, transition]);
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, renderToContainer(portal, renderNode()));
 };
-Popup.defaultProps = defaultProps$1e;
+Popup.defaultProps = defaultProps$1f;
 Popup.displayName = "NutPopup";
 const OffsetContext = createContext(20);
-const defaultProps$1d = {
+const defaultProps$1e = {
   ...ComponentDefaults,
   position: "left",
   width: "80%"
@@ -6301,7 +6444,7 @@ const SideNavBar = (props) => {
     onClose,
     ...rest
   } = {
-    ...defaultProps$1d,
+    ...defaultProps$1e,
     ...props
   };
   const indent = props.indent ? Number(props.indent) : 20;
@@ -6341,7 +6484,7 @@ const SideNavBar = (props) => {
     )))
   );
 };
-SideNavBar.defaultProps = defaultProps$1d;
+SideNavBar.defaultProps = defaultProps$1e;
 SideNavBar.displayName = "NutSideNavBar";
 const SideNavBarItem = (props) => {
   const classPrefix2 = "nut-subsidenavbar";
@@ -6360,13 +6503,13 @@ const SideNavBarItem = (props) => {
     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] = useState(open2);
@@ -6376,8 +6519,8 @@ const SubSideNavBar = (props) => {
     (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
@@ -6385,8 +6528,8 @@ const SubSideNavBar = (props) => {
       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;
@@ -6444,7 +6587,7 @@ function usePropsValue({
   );
   return [stateRef.current, setState];
 }
-const defaultProps$1b = {
+const defaultProps$1c = {
   ...ComponentDefaults,
   value: "",
   dot: false,
@@ -6454,8 +6597,8 @@ const defaultProps$1b = {
   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";
@@ -6476,15 +6619,15 @@ const Badge = (props) => {
   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__default.createElement("div", { className: classes, style }, typeof value === "object" && value && /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__icon` }, value), /* @__PURE__ */ React__default.createElement("div", null, children), /* @__PURE__ */ React__default.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,
@@ -6510,11 +6653,11 @@ const TabbarItem = (props) => {
     dot,
     max,
     top,
-    right,
+    right: right2,
     handleClick,
     ...rest
   } = {
-    ...defaultProps$1a,
+    ...defaultProps$1b,
     ...props
   };
   const classPrefix2 = "nut-tabbar-item";
@@ -6530,7 +6673,7 @@ const TabbarItem = (props) => {
     dot,
     max,
     top,
-    right,
+    right: right2,
     color: activeColor
   };
   return /* @__PURE__ */ React__default.createElement(
@@ -6547,7 +6690,7 @@ const TabbarItem = (props) => {
     icon ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(Badge, { ...badgeProps }, /* @__PURE__ */ React__default.createElement("div", { className: boxPrefix }, icon)), /* @__PURE__ */ React__default.createElement("div", { className: titleClass }, title)) : /* @__PURE__ */ React__default.createElement(Badge, { ...badgeProps }, /* @__PURE__ */ React__default.createElement("div", { className: titleClass }, title))
   );
 };
-const defaultProps$19 = {
+const defaultProps$1a = {
   ...ComponentDefaults,
   defaultValue: 0,
   fixed: false,
@@ -6570,7 +6713,7 @@ const Tabbar = (props) => {
     style,
     onSwitch
   } = {
-    ...defaultProps$19,
+    ...defaultProps$1a,
     ...props
   };
   const classPrefix2 = "nut-tabbar";
@@ -6605,17 +6748,17 @@ const Tabbar = (props) => {
     (fixed || safeArea) && /* @__PURE__ */ React__default.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";
@@ -6641,7 +6784,7 @@ function requestAniFrame() {
   };
 }
 const requestAniFrame$1 = requestAniFrame();
-const defaultProps$17 = {
+const defaultProps$18 = {
   ...ComponentDefaults,
   tabStyle: {},
   name: "",
@@ -6669,7 +6812,7 @@ const Tabs = (props) => {
     autoHeight,
     ...rest
   } = {
-    ...defaultProps$17,
+    ...defaultProps$18,
     ...props
   };
   const [value, setValue] = usePropsValue({
@@ -6782,11 +6925,11 @@ const Tabs = (props) => {
           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;
         }
         nextTick(() => {
           scrollWithAnimation.current = true;
@@ -6886,10 +7029,10 @@ const Tabs = (props) => {
     return React__default.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,
@@ -6908,7 +7051,7 @@ const ExistRender = (props) => {
     onSelect,
     onSwitch,
     ...rest
-  } = { ...defaultProps$16, ...props };
+  } = { ...defaultProps$17, ...props };
   const classPrefix2 = "nut-address";
   const selectedExist = (item) => {
     existList.forEach((list, index) => {
@@ -7070,7 +7213,7 @@ class Tree {
   }
 }
 const Tree$1 = Tree;
-const defaultProps$15 = {
+const defaultProps$16 = {
   ...ComponentDefaults,
   activeColor: "",
   activeIcon: "checklist",
@@ -7114,7 +7257,7 @@ const InternalCascader = (props, ref) => {
     onClose,
     onChange,
     onPathChange
-  } = { ...defaultProps$15, ...props };
+  } = { ...defaultProps$16, ...props };
   const [tabvalue, setTabvalue] = useState("c1");
   const [optionsData, setOptionsData] = useState([]);
   const isLazy = () => state.configs.lazy && Boolean(state.configs.onLoad);
@@ -7411,9 +7554,9 @@ const InternalCascader = (props, ref) => {
   ) : renderTabs());
 };
 const Cascader = React__default.forwardRef(InternalCascader);
-Cascader.defaultProps = defaultProps$15;
+Cascader.defaultProps = defaultProps$16;
 Cascader.displayName = "NutCascader";
-const defaultProps$14 = {
+const defaultProps$15 = {
   ...ComponentDefaults,
   visible: false,
   type: "custom",
@@ -7430,7 +7573,7 @@ const CustomRender = (props) => {
     height,
     options,
     title,
-    left,
+    left: left2,
     value,
     defaultValue,
     optionKey,
@@ -7440,7 +7583,7 @@ const CustomRender = (props) => {
     onPathChange,
     ...rest
   } = {
-    ...defaultProps$14,
+    ...defaultProps$15,
     ...props
   };
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, type4 === "custom" && /* @__PURE__ */ React__default.createElement(
@@ -7450,7 +7593,7 @@ const CustomRender = (props) => {
       value,
       defaultValue,
       title,
-      left,
+      left: left2,
       options,
       format: format2,
       optionKey,
@@ -7465,7 +7608,7 @@ const CustomRender = (props) => {
     }
   ));
 };
-const defaultProps$13 = {
+const defaultProps$14 = {
   ...ComponentDefaults,
   defaultValue: [],
   type: "custom",
@@ -7507,7 +7650,7 @@ const InternalAddress = (props, ref) => {
     onSwitch,
     ...rest
   } = {
-    ...defaultProps$13,
+    ...defaultProps$14,
     ...props
   };
   const classPrefix2 = "nut-address";
@@ -7598,7 +7741,7 @@ const InternalAddress = (props, ref) => {
   ));
 };
 const Address = forwardRef(InternalAddress);
-Address.defaultProps = defaultProps$13;
+Address.defaultProps = defaultProps$14;
 Address.displayName = "NutAddress";
 const Utils = {
   /**
@@ -7848,7 +7991,7 @@ const isEnd = (day, days) => {
 const isStartAndEnd = (days) => {
   return days.length >= 2 && Utils.isEqual(days[0], days[1]);
 };
-const defaultProps$12 = {
+const defaultProps$13 = {
   ...ComponentDefaults,
   type: "single",
   autoBackfill: false,
@@ -7908,7 +8051,7 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
     onUpdate,
     onDayClick,
     onPageChange
-  } = { ...defaultProps$12, ...props };
+  } = { ...defaultProps$13, ...props };
   const weekdays = locale.calendaritem.weekdays;
   const weeks = [
     ...weekdays.slice(firstDayOfWeek, 7),
@@ -8249,6 +8392,8 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
     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) {
@@ -8453,9 +8598,9 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
   };
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.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,
@@ -8518,7 +8663,7 @@ const Calendar = React__default.forwardRef((props, ref) => {
     onConfirm,
     onDayClick,
     onPageChange
-  } = { ...defaultProps$11, ...props };
+  } = { ...defaultProps$12, ...props };
   const calendarRef = useRef(null);
   const close2 = () => {
     onClose && onClose();
@@ -8592,8 +8737,387 @@ const Calendar = React__default.forwardRef((props, ref) => {
     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: url2 }) => {
+  const style = {
+    background: `url('${url2}') no-repeat center`,
+    backgroundSize: "100% 100%",
+    width: "18px",
+    height: "18px"
+  };
+  return /* @__PURE__ */ React__default.createElement(View, { style });
+};
+const Left = () => /* @__PURE__ */ React__default.createElement(Icon, { url: left });
+const Right = () => /* @__PURE__ */ React__default.createElement(Icon, { url: right });
+const DoubleLeft = () => /* @__PURE__ */ React__default.createElement(Icon, { url: doubleLeft });
+const DoubleRight = () => /* @__PURE__ */ React__default.createElement(Icon, { url: doubleRight });
+const convertDateToDay = (date4) => {
+  return date4 ? {
+    year: date4.getFullYear(),
+    month: date4.getMonth() + 1,
+    date: date4.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__default.forwardRef((props, ref) => {
+  const { locale } = useConfig$1();
+  const {
+    style,
+    type: type4,
+    value,
+    defaultValue,
+    firstDayOfWeek,
+    startDate,
+    endDate,
+    disableDay,
+    renderDay,
+    renderDayTop,
+    renderDayBottom,
+    onDayClick,
+    onPageChange,
+    onChange
+  } = { ...defaultProps$11, ...props };
+  const [month, setMonth] = useState(() => {
+    let date4 = new Date(Date.now());
+    const val = value || defaultValue;
+    if (Array.isArray(val)) {
+      if (val.length) {
+        date4 = val[0];
+      }
+    } else if (val) {
+      date4 = val;
+    }
+    return {
+      year: date4.getFullYear(),
+      month: date4.getMonth() + 1
+    };
+  });
+  const [days, setDays] = useState([]);
+  const valueToRange = (val) => {
+    if (Array.isArray(val)) {
+      return val.map((date4) => {
+        return convertDateToDay(date4);
+      });
+    }
+    return val ? [convertDateToDay(val)] : [];
+  };
+  const rangeTovalue = (range3) => {
+    if (Array.isArray(range3)) {
+      return range3.map((day) => {
+        return convertDayToDate(day);
+      });
+    }
+    return range3 ? [convertDayToDate(range3)] : [];
+  };
+  const [innerValue, setInnerValue] = useState(() => {
+    const val = value || defaultValue ? valueToRange(value || defaultValue) : [];
+    return val;
+  });
+  useEffect(() => {
+    const val = value || defaultValue ? valueToRange(value || defaultValue) : [];
+    setInnerValue(val);
+  }, [value]);
+  const change = (v) => {
+    setInnerValue(v);
+    if (type4 === "single") {
+      const date4 = convertDayToDate(v[0]);
+      onChange == null ? void 0 : onChange(date4);
+    } else if (type4 === "multiple" || type4 === "range" || type4 === "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;
+  };
+  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 (type4 === "single" || type4 === "multiple") {
+      for (const val of innerValue) {
+        if (isSameDay(day, val)) {
+          return true;
+        }
+      }
+    } else if (type4 === "range" && innerValue.length === 1 && isSameDay(innerValue[0], day)) {
+      return true;
+    }
+    return false;
+  };
+  const isStart2 = (day) => {
+    return (type4 === "range" || type4 === "week") && innerValue.length === 2 && isSameDay(day, innerValue[0]);
+  };
+  const isEnd2 = (day) => {
+    return (type4 === "range" || type4 === "week") && innerValue.length === 2 && isSameDay(day, innerValue[1]);
+  };
+  const isMid = (day) => {
+    if (type4 === "range" || type4 === "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__default.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 (type4) {
+      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__default.createElement("div", { className: "nut-calendarcard-header" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-calendarcard-header-left" }, /* @__PURE__ */ React__default.createElement("div", { className: "double-left", onClick: () => jump(-12) }, /* @__PURE__ */ React__default.createElement(DoubleLeft, null)), /* @__PURE__ */ React__default.createElement("div", { className: "left", onClick: () => jump(-1) }, /* @__PURE__ */ React__default.createElement(Left, null))), /* @__PURE__ */ React__default.createElement("div", { className: "nut-calendarcard-header-title" }, monthTitle(month.year, month.month)), /* @__PURE__ */ React__default.createElement("div", { className: "nut-calendarcard-header-right" }, /* @__PURE__ */ React__default.createElement("div", { className: "right", onClick: () => jump(1) }, /* @__PURE__ */ React__default.createElement(Right, null)), /* @__PURE__ */ React__default.createElement("div", { className: "double-right", onClick: () => jump(12) }, /* @__PURE__ */ React__default.createElement(DoubleRight, null))));
+  };
+  const [weekHeader] = 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__default.createElement("div", { className: "nut-calendarcard-content" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-calendarcard-days" }, weekHeader.map((day) => {
+      return /* @__PURE__ */ React__default.createElement(
+        "div",
+        {
+          className: classNames("nut-calendarcard-day", "header", {
+            weekend: day.key === 0 || day.key === 6
+          }),
+          key: day.key
+        },
+        day.name
+      );
+    })), /* @__PURE__ */ React__default.createElement("div", { className: "nut-calendarcard-days" }, days.map((day) => /* @__PURE__ */ React__default.createElement(
+      "div",
+      {
+        className: classNames(
+          "nut-calendarcard-day",
+          day.type,
+          getClasses(day)
+        ),
+        key: `${day.year}-${day.month}-${day.date}`,
+        onClick: () => handleDayClick(day)
+      },
+      /* @__PURE__ */ React__default.createElement("div", { className: "nut-calendarcard-day-top" }, renderDayTop ? renderDayTop(day) : ""),
+      /* @__PURE__ */ React__default.createElement("div", { className: "nut-calendarcard-day-inner" }, renderDay ? renderDay(day) : day.date),
+      /* @__PURE__ */ React__default.createElement("div", { className: "nut-calendarcard-day-bottom" }, renderDayBottom ? renderDayBottom(day) : "")
+    ))));
+  };
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement("div", { className: "nut-calendarcard", style }, renderHeader(), renderContent()));
+});
+CalendarCard.defaultProps = defaultProps$11;
+CalendarCard.displayName = "NutCalendarCard";
 const CheckboxGroupContext = createContext(null);
 const Context$1 = CheckboxGroupContext;
 const defaultProps$10 = {
@@ -8817,84 +9341,6 @@ const Checkbox = (props) => {
 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] = useState(0);
-  const [startY, SetStartY] = useState(0);
-  const [moveX, SetMoveX] = useState(0);
-  const [moveY, SetMoveY] = useState(0);
-  const [deltaX, SetDeltaX] = useState(0);
-  const [deltaY, SetDeltaY] = useState(0);
-  const [offsetX, SetOffsetX] = useState(0);
-  const [offsetY, SetOffsetY] = useState(0);
-  const [direction, SetDirection] = 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,
@@ -8918,7 +9364,7 @@ const InternalPickerPanel = (props, ref) => {
   let timer;
   const listRef = useRef(null);
   const rollerRef = useRef(null);
-  const PickerPanelRef = useRef(null);
+  const pickerPanelRef = useRef(null);
   const [startTime, setStartTime] = useState(0);
   const [startY, setStartY] = useState(0);
   const transformY = useRef(0);
@@ -8964,11 +9410,11 @@ const InternalPickerPanel = (props, ref) => {
     }
   };
   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;
   };
@@ -8978,13 +9424,13 @@ const InternalPickerPanel = (props, ref) => {
       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);
@@ -9031,9 +9477,7 @@ const InternalPickerPanel = (props, ref) => {
     setChooseValue(scrollDistance);
   };
   const preventDefault2 = (event, isStopPropagation) => {
-    if (!passiveSupported && (typeof event.cancelable !== "boolean" || event.cancelable)) {
-      event.preventDefault();
-    }
+    event.preventDefault();
     if (isStopPropagation) {
       event.stopPropagation();
     }
@@ -9074,56 +9518,56 @@ const InternalPickerPanel = (props, ref) => {
     stopMomentum,
     moving: moving.current
   }));
-  return /* @__PURE__ */ React__default.createElement(
+  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__default.createElement("div", { className: "nut-picker-list", ref: pickerPanelRef }, /* @__PURE__ */ React__default.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__default.createElement(
-      "div",
-      {
-        className: "nut-picker-roller",
-        ref: rollerRef,
-        style: threeDimensional ? touchRollerStyle() : touchTileStyle(),
-        onTransitionEnd: stopMomentum
-      },
-      threeDimensional && options.map((item, index) => {
-        return /* @__PURE__ */ React__default.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__default.createElement(React__default.Fragment, null, item.text ? item.text : item)
-        );
-      }),
-      !threeDimensional && options.map((item, index) => {
-        return /* @__PURE__ */ React__default.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__default.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__default.createElement(React__default.Fragment, null, item.text ? item.text : item)
-        );
-      })
-    ),
-    /* @__PURE__ */ React__default.createElement("div", { className: "nut-picker-mask" }),
-    /* @__PURE__ */ React__default.createElement("div", { className: "nut-picker-indicator", ref: listRef })
-  );
+          key: item.value ? item.value : index
+        },
+        /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, item.text ? item.text : item)
+      );
+    }),
+    !threeDimensional && options.map((item, index) => {
+      return /* @__PURE__ */ React__default.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__default.createElement(React__default.Fragment, null, item.text ? item.text : item)
+      );
+    })
+  ), /* @__PURE__ */ React__default.createElement("div", { className: "nut-picker-mask" }), /* @__PURE__ */ React__default.createElement("div", { className: "nut-picker-indicator", ref: listRef }));
 };
 const PickerPanel = React__default.forwardRef(InternalPickerPanel);
 const PickerPanel$1 = PickerPanel;
@@ -9158,6 +9602,7 @@ const InternalPicker = (props, ref) => {
     visible,
     title,
     options = [],
+    popupProps = {},
     defaultValue = [],
     className,
     style,
@@ -9414,6 +9859,7 @@ const InternalPicker = (props, ref) => {
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, typeof children === "function" && children(selectedValue), /* @__PURE__ */ React__default.createElement(
     Popup,
     {
+      ...popupProps,
       visible: innerVisible,
       position: "bottom",
       afterClose: () => {
@@ -9486,6 +9932,7 @@ const DatePicker = (props) => {
     visible,
     title,
     defaultValue,
+    pickerProps = {},
     formatter,
     onClose,
     onConfirm,
@@ -9766,6 +10213,7 @@ const DatePicker = (props) => {
     options.length && /* @__PURE__ */ React__default.createElement(
       Picker$1,
       {
+        ...pickerProps,
         title,
         visible,
         options,
@@ -12589,12 +13037,12 @@ const Range = (props) => {
     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);
@@ -12623,11 +13071,11 @@ const Range = (props) => {
     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();
     }
@@ -12850,8 +13298,8 @@ const SearchBar = (props) => {
     clearable,
     readOnly,
     autoFocus,
-    right,
-    left,
+    right: right2,
+    left: left2,
     leftIn,
     rightIn,
     onChange,
@@ -12869,10 +13317,11 @@ const SearchBar = (props) => {
     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;
@@ -12885,7 +13334,7 @@ const SearchBar = (props) => {
     onBlur && (onBlur == null ? void 0 : onBlur(value2, event));
   };
   useEffect(() => {
-    setValue(props.value);
+    setValue(props.value || "");
   }, [props.value]);
   useEffect(() => {
     autoFocus && forceFocus();
@@ -12919,9 +13368,9 @@ const SearchBar = (props) => {
     return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__leftin ${classPrefix2}__icon` }, leftIn);
   };
   const renderLeft = () => {
-    if (!left)
+    if (!left2)
       return null;
-    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__left` }, left);
+    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__left` }, left2);
   };
   const renderRightIn = () => {
     if (!rightIn)
@@ -12929,9 +13378,9 @@ const SearchBar = (props) => {
     return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__rightin ${classPrefix2}__icon` }, rightIn);
   };
   const renderRight = () => {
-    if (!right)
+    if (!right2)
       return null;
-    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__right` }, right);
+    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__right` }, right2);
   };
   const handleClear = () => {
     return /* @__PURE__ */ React__default.createElement(
@@ -12948,8 +13397,8 @@ const SearchBar = (props) => {
       return;
     }
     setValue("");
-    onClear && onClear(event);
     forceFocus();
+    onClear && onClear(event);
   };
   const onKeypress = (e) => {
     if (e.key === "Enter" || e.keyCode === 13) {
@@ -14281,6 +14730,7 @@ const BaseDialog = (props) => {
       }
     }
   );
+  const refObject = useLockScrollTaro(!!(visible && lockScroll));
   const renderFooter = () => {
     if (footer === null)
       return "";
@@ -14333,6 +14783,7 @@ const BaseDialog = (props) => {
     View,
     {
       style: { display: visible ? "block" : "none" },
+      ref: refObject,
       catchMove: lockScroll
     },
     /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, overlay ? /* @__PURE__ */ React__default.createElement(
@@ -14411,14 +14862,14 @@ const Drag = (props) => {
   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 } = getSystemInfoSync();
       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();
@@ -14812,9 +15263,7 @@ const NoticeBar = (props) => {
         scrollList.current = [].concat(childs);
       } else {
         scrollList.current = [].concat(list);
-        setTimeout(() => {
-          startRollEasy();
-        }, Number(duration));
+        startRollEasy();
       }
     } else {
       initScrollWrap();
@@ -14943,11 +15392,9 @@ const NoticeBar = (props) => {
   }, [ready]);
   useEffect(() => {
     if (isVertical && children) {
-      setTimeout(() => {
-        init();
-        stopAutoPlay();
-        autoplay();
-      }, 300);
+      init();
+      stopAutoPlay();
+      autoplay();
     }
   }, [children, container == null ? void 0 : container.current]);
   const stopAutoPlay = () => {
@@ -15000,6 +15447,9 @@ const NoticeBar = (props) => {
   };
   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);
@@ -15345,7 +15795,7 @@ const Popover = (props) => {
     }
     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;
@@ -15359,18 +15809,18 @@ const Popover = (props) => {
         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`;
         }
@@ -15568,7 +16018,13 @@ const PullToRefresh = (p) => {
       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
         )
       );
@@ -15882,6 +16338,7 @@ const Swipe = forwardRef((props, instanceRef) => {
   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 }));
@@ -15893,24 +16350,26 @@ const Swipe = forwardRef((props, instanceRef) => {
     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
       );
@@ -15918,13 +16377,14 @@ const Swipe = forwardRef((props, instanceRef) => {
     }
   };
   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) => {
@@ -15977,11 +16437,12 @@ const Swipe = forwardRef((props, instanceRef) => {
     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);
     }
   };
   useImperativeHandle(instanceRef, () => ({
@@ -17287,13 +17748,13 @@ const Ellipsis = (props) => {
     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, type4 = "") => {
+  const tailorContent = (left2, right2, type4 = "") => {
     const threeDotWidth = symbolTextWidth;
     const direc = direction === "middle" && type4 ? type4 : 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") {
@@ -18492,8 +18953,8 @@ const Tour = (props) => {
     });
   };
   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 = {
@@ -19213,7 +19674,7 @@ const TrendArrow = (props) => {
     digits,
     symbol,
     zero,
-    left,
+    left: left2,
     sync,
     color,
     riseColor,
@@ -19259,8 +19720,8 @@ const TrendArrow = (props) => {
     };
     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__default.createElement(
       "span",
       {
@@ -19270,7 +19731,7 @@ const TrendArrow = (props) => {
       calcRate
     );
   };
-  return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2} ${className}`, style, ...rest }, !left && renderContent(!left), Number(value) !== 0 && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, rateTrend.current ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, riseIcon || /* @__PURE__ */ React__default.createElement(a, { color: calcIconProps.color })) : /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, dropIcon || /* @__PURE__ */ React__default.createElement(a$1, { color: calcIconProps.color }))), left && renderContent(!left));
+  return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2} ${className}`, style, ...rest }, !left2 && renderContent(!left2), Number(value) !== 0 && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, rateTrend.current ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, riseIcon || /* @__PURE__ */ React__default.createElement(a, { color: calcIconProps.color })) : /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, dropIcon || /* @__PURE__ */ React__default.createElement(a$1, { color: calcIconProps.color }))), left2 && renderContent(!left2));
 };
 TrendArrow.defaultProps = defaultProps$1;
 TrendArrow.displayName = "NutTrendArrow";
@@ -19418,6 +19879,7 @@ export {
   Barrage,
   Button,
   Calendar,
+  CalendarCard,
   CalendarItem,
   Card,
   Cascader,