@nutui/nutui-react-taro 3.0.15 → 3.0.17-beta.0

package/dist/nutui.react.umd.js

@@ -4565,8 +4565,8 @@
       return {
         day: k + 1,
         type: type2,
-        preYear,
-        preMonth
+        year: preYear,
+        month: preMonth
       };
     });
     return months.slice(preDates - days);
@@ -7290,13 +7290,13 @@
     renderDay: void 0,
     renderDayTop: void 0,
     renderDayBottom: void 0,
-    onConfirm: function(data2) {
+    onConfirm: function() {
     },
     onUpdate: function() {
     },
-    onDayClick: function(data2) {
+    onDayClick: function() {
     },
-    onPageChange: function(data2) {
+    onPageChange: function() {
     }
   });
   var CalendarItem = /* @__PURE__ */ React.forwardRef(function(props, ref) {
@@ -7418,7 +7418,7 @@
       if (yearNum > 0) {
         monthNum += 12 * yearNum;
       }
-      if (monthNum <= 0) {
+      if (monthNum < 0) {
         monthNum = 1;
       }
       setMonthsNum(monthNum);
@@ -15727,9 +15727,10 @@
     var _useState8 = _sliced_to_array(React.useState(null), 2), isCanScroll = _useState8[0], SetIsCanScroll = _useState8[1];
     var isVertical = direction === "vertical";
     var _useState9 = _sliced_to_array(React.useState(null), 2), rect = _useState9[0], setRect = _useState9[1];
-    var active2 = 0;
+    var activeRef = React.useRef(0);
     var _useState10 = _sliced_to_array(React.useState(false), 2), ready = _useState10[0], setReady = _useState10[1];
     var container = React.useRef(null);
+    var _useState11 = _sliced_to_array(React.useState(false), 2), isContainerReady = _useState11[0], setIsContainerReady = _useState11[1];
     var innerRef = React.useRef(null);
     var swiperRef = React.useRef({
       moving: false,
@@ -15739,8 +15740,8 @@
       offset: 0,
       size: 0
     });
-    var _useState11 = _sliced_to_array(React.useState([]), 2), childOffset = _useState11[0], setChildOffset = _useState11[1];
-    var _useState12 = _sliced_to_array(React.useState(0), 2), offset = _useState12[0], setOffset = _useState12[1];
+    var _useState12 = _sliced_to_array(React.useState([]), 2), childOffset = _useState12[0], setChildOffset = _useState12[1];
+    var _useState13 = _sliced_to_array(React.useState(0), 2), offset = _useState13[0], setOffset = _useState13[1];
     var _useMemo = React.useMemo(function() {
       var childCount2 = 0;
       var childs2 = React.Children.map(children, function(child) {
@@ -15777,7 +15778,9 @@
       return function() {
         clearInterval(timer);
       };
-    }, []);
+    }, [
+      childs
+    ]);
     React.useEffect(function() {
       initScrollWrap();
     }, [
@@ -15894,7 +15897,7 @@
       marginTop: animate ? "-".concat(height2, "px") : ""
     };
     var init = function() {
-      var active3 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
+      var activeIndex = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
       if (!(container === null || container === void 0 ? void 0 : container.current)) return;
       setTimeout(/* @__PURE__ */ _async_to_generator(function() {
         var rects, _active, _height, targetOffset;
@@ -15907,17 +15910,17 @@
               ];
             case 1:
               rects = _state.sent();
-              _active = Math.max(Math.min(childCount - 1, active3), 0);
+              _active = Math.max(Math.min(childCount - 1, activeIndex), 0);
               _height = rects === null || rects === void 0 ? void 0 : rects.height;
               trackSize = childCount * Number(_height);
               targetOffset = getOffset(_active);
-              swiperRef.current.moving = true;
-              if (ready) {
-                swiperRef.current.moving = false;
-              }
-              active3 = _active;
+              activeRef.current = _active;
               setRect(rects);
               setOffset(targetOffset);
+              setChildOffset(new Array(childCount).fill(0));
+              swiperRef.current.moving = true;
+              setStyle(targetOffset, rects);
+              swiperRef.current.moving = false;
               setReady(true);
               return [
                 2
@@ -15928,7 +15931,6 @@
     };
     React.useEffect(function() {
       if (ready) {
-        stopAutoPlay();
         autoplay();
       }
       return function() {
@@ -15938,17 +15940,18 @@
       ready
     ]);
     React.useEffect(function() {
-      if (isVertical && children) {
-        init();
+      if (isVertical && children && isContainerReady) {
         stopAutoPlay();
-        autoplay();
+        setReady(false);
+        init();
       }
     }, [
       children,
-      container === null || container === void 0 ? void 0 : container.current
+      isContainerReady
     ]);
     var stopAutoPlay = function() {
       clearTimeout(swiperRef.current.autoplayTimer);
+      swiperRef.current.moving = false;
       swiperRef.current.autoplayTimer = null;
     };
     var autoplay = function() {
@@ -15964,21 +15967,24 @@
       if (childCount <= 1) return;
       var targetActive = getActive(pace);
       var targetOffset = getOffset(targetActive, offset2);
-      if (Array.isArray(children) && children[0] && targetOffset !== minOffset) {
-        var rightBound = targetOffset < minOffset;
-        childOffset[0] = rightBound ? trackSize : 0;
-      }
-      if (Array.isArray(children) && children[childCount - 1] && targetOffset !== 0) {
-        var leftBound = targetOffset > 0;
-        childOffset[childCount - 1] = leftBound ? -trackSize : 0;
-      }
-      setChildOffset(childOffset);
-      active2 = targetActive;
+      setChildOffset(function(prevChildOffset) {
+        var newChildOffset = _to_consumable_array(prevChildOffset);
+        if (Array.isArray(children) && children[0] && targetOffset !== minOffset) {
+          var rightBound = targetOffset < minOffset;
+          newChildOffset[0] = rightBound ? trackSize : 0;
+        }
+        if (Array.isArray(children) && children[childCount - 1] && targetOffset !== 0) {
+          var leftBound = targetOffset > 0;
+          newChildOffset[childCount - 1] = leftBound ? -trackSize : 0;
+        }
+        return newChildOffset;
+      });
+      activeRef.current = targetActive;
       setOffset(targetOffset);
-      getStyle(targetOffset);
+      setStyle(targetOffset);
     };
     var next = function() {
-      resettPosition();
+      resetPosition();
       requestFrame(function() {
         requestFrame(function() {
           swiperRef.current.moving = false;
@@ -15991,15 +15997,16 @@
     var handleItemClick = function(event, value2) {
       onItemClick && onItemClick(event, value2);
     };
-    var getStyle = function() {
-      var moveOffset = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : offset;
+    var setStyle = function() {
+      var moveOffset = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : offset, currentRect = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : rect;
       var target = innerRef.current;
       if (!target) {
         return;
       }
       var _offset = 0;
-      var val2 = ((rect === null || rect === void 0 ? void 0 : rect.height) || 0) - height2;
-      _offset = moveOffset + Number(active2 === childCount - 1 && val2 / 2);
+      var containerHeight = (currentRect === null || currentRect === void 0 ? void 0 : currentRect.height) || height2;
+      var val2 = containerHeight - Number(height2);
+      _offset = moveOffset + Number(activeRef.current === childCount - 1 && val2 / 2);
       target.style.transitionDuration = "".concat(swiperRef.current.moving ? 0 : duration, "ms");
       target.style.height = "".concat(Number(height2) * (childCount + 1), "px");
       target.style.transform = "translate3D(0,".concat(_offset, "px,0)");
@@ -16017,15 +16024,16 @@
       return style2;
     };
     var getActive = function(pace) {
+      var currentActive = activeRef.current;
       if (pace) {
-        var _active = active2 + pace;
+        var _active = currentActive + pace;
         return range2(_active, -1, childCount);
       }
-      return active2;
+      return currentActive;
     };
-    var getOffset = function(active3) {
+    var getOffset = function(active2) {
       var offset2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
-      var currentPosition = active3 * Number(height2);
+      var currentPosition = active2 * Number(height2);
       var targetOffset = offset2 - currentPosition;
       return targetOffset;
     };
@@ -16035,14 +16043,15 @@
     var range2 = function(num, min, max) {
       return Math.min(Math.max(num, min), max);
     };
-    var resettPosition = function() {
+    var resetPosition = function() {
+      var currentActive = activeRef.current;
       swiperRef.current.moving = true;
-      if (active2 <= -1) {
+      if (currentActive <= -1) {
         move({
           pace: childCount
         });
       }
-      if (active2 >= childCount) {
+      if (currentActive >= childCount) {
         move({
           pace: -childCount
         });
@@ -16056,6 +16065,20 @@
         stopAutoPlay();
       };
     }, []);
+    var hasVerticalContent = React.useMemo(function() {
+      if (!isVertical) return false;
+      if (children) return (childs === null || childs === void 0 ? void 0 : childs.length) > 0;
+      return (list === null || list === void 0 ? void 0 : list.length) > 0;
+    }, [
+      isVertical,
+      childs,
+      list,
+      children
+    ]);
+    var containerRefCallback = React.useCallback(function(ref) {
+      container.current = ref;
+      setIsContainerReady(true);
+    }, []);
     return /* @__PURE__ */ React.createElement(components.View, {
       className: cls,
       style
@@ -16080,10 +16103,10 @@
       onClick: onClickIcon
     }, rightIcon || /* @__PURE__ */ React.createElement(IconSVG$p, {
       size: 12
-    })) : null) : null, showNoticeBar && scrollList.current.length > 0 && isVertical ? /* @__PURE__ */ React.createElement(components.View, {
+    })) : null) : null, showNoticeBar && hasVerticalContent && isVertical ? /* @__PURE__ */ React.createElement(components.View, {
       className: "nut-noticebar-vertical",
       style: barStyle,
-      ref: container,
+      ref: containerRefCallback,
       onClick: handleClick
     }, leftIcon ? /* @__PURE__ */ React.createElement(components.View, {
       className: "nut-noticebar-box-left-icon"
@@ -16701,7 +16724,7 @@
     return /* @__PURE__ */ React.createElement(components.View, {
       className: classes,
       style: props.style,
-      catchMove: true,
+      catchMove: props.catchMove,
       onTouchStart: handleTouchStart,
       onTouchMove: handleTouchMove,
       onTouchEnd: handleTouchEnd
@@ -18778,6 +18801,12 @@
     }, [
       children
     ]);
+    React.useEffect(function() {
+      setInnerValue(current || defaultValue);
+    }, [
+      defaultValue,
+      current
+    ]);
     var renderIndicator = function() {
       if (/* @__PURE__ */ React.isValidElement(indicator)) return indicator;
       if (indicator || indicatorDots) {
@@ -18886,7 +18915,27 @@
     }
   });
   var ImagePreview = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$h, props), value2 = _$_object_spread.value, className = _$_object_spread.className, style = _$_object_spread.style, images = _$_object_spread.images, videos = _$_object_spread.videos, visible = _$_object_spread.visible, defaultValue = _$_object_spread.defaultValue, indicatorColor = _$_object_spread.indicatorColor, pagination = _$_object_spread.pagination, indicator = _$_object_spread.indicator, autoPlay = _$_object_spread.autoPlay, closeOnContentClick = _$_object_spread.closeOnContentClick, closeIcon = _$_object_spread.closeIcon, closeIconPosition = _$_object_spread.closeIconPosition, showMenuByLongpress = _$_object_spread.showMenuByLongpress, onClose = _$_object_spread.onClose, onChange = _$_object_spread.onChange;
+    var _mergeProps = mergeProps(defaultProps$h, props), value2 = _mergeProps.value, className = _mergeProps.className, style = _mergeProps.style, images = _mergeProps.images, videos = _mergeProps.videos, visible = _mergeProps.visible, defaultValue = _mergeProps.defaultValue, indicatorColor = _mergeProps.indicatorColor, pagination = _mergeProps.pagination, indicator = _mergeProps.indicator, autoPlay = _mergeProps.autoPlay, loop = _mergeProps.loop, closeOnContentClick = _mergeProps.closeOnContentClick, closeIcon = _mergeProps.closeIcon, closeIconPosition = _mergeProps.closeIconPosition, showMenuByLongpress = _mergeProps.showMenuByLongpress, onClose = _mergeProps.onClose, onChange = _mergeProps.onChange;
+    _object_without_properties(_mergeProps, [
+      "value",
+      "className",
+      "style",
+      "images",
+      "videos",
+      "visible",
+      "defaultValue",
+      "indicatorColor",
+      "pagination",
+      "indicator",
+      "autoPlay",
+      "loop",
+      "closeOnContentClick",
+      "closeIcon",
+      "closeIconPosition",
+      "showMenuByLongpress",
+      "onClose",
+      "onChange"
+    ]);
     var classPrefix2 = "nut-imagepreview";
     var ref = React.useRef(null);
     var _usePropsValue = _sliced_to_array(usePropsValue({
@@ -19017,9 +19066,10 @@
       onTouchEnd,
       onTouchCancel: onTouchEnd
     }, /* @__PURE__ */ React.createElement(InnerSwiper, {
-      autoPlay,
+      autoplay: autoPlay,
+      loop,
+      direction: "horizontal",
       className: "".concat(classPrefix2, "-swiper"),
-      loop: true,
       height: "100%",
       style: {
         display: showPop ? "block" : "none",
@@ -19027,7 +19077,6 @@
         width: "100%",
         height: "100%"
       },
-      direction: "horizontal",
       onChange: function(e) {
         return slideChangeEnd(e.detail.current);
       },