@nutui/nutui-react-taro 3.0.14 → 3.0.15

package/dist/es/packages/overlay/style-jmapp/style.css

@@ -11,7 +11,6 @@
   width: 100%;
   height: 100%;
   background-color: var(--nutui-overlay-bg-color, var(--nutui-color-surface-overlay));
-  z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
 .nut-overflow-hidden {

package/dist/es/packages/overlay/style-jrkf/overlay.scss

@@ -7,7 +7,6 @@
   width: 100%;
   height: 100%;
   background-color: $overlay-bg-color;
-  z-index: $overlay-zIndex;
 }
 
 .nut-overflow-hidden {

package/dist/es/packages/overlay/style-jrkf/style.css

@@ -11,7 +11,6 @@
   width: 100%;
   height: 100%;
   background-color: var(--nutui-overlay-bg-color, var(--nutui-color-surface-overlay));
-  z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
 .nut-overflow-hidden {

package/dist/es/packages/pickerview/pickerroller.js

@@ -67,7 +67,9 @@ var InternalPickerRoller = function(props, ref) {
     var selectValue = function(move) {
         onSelect === null || onSelect === void 0 ? void 0 : onSelect(options === null || options === void 0 ? void 0 : options[Math.round(-move / lineSpacing.current)], keyIndex);
     };
+    var isScroll = useRef(false);
     var handleTouchStart = function(event) {
+        isScroll.current = true;
         touch.start(event);
         setStartY(touch.deltaY.current);
         setStartTime(Date.now());
@@ -92,6 +94,7 @@ var InternalPickerRoller = function(props, ref) {
         } else {
             handleMove(move, 'end');
         }
+        isScroll.current = false;
         setTimeout(function() {
             touch.reset();
         }, 0);
@@ -211,6 +214,11 @@ var InternalPickerRoller = function(props, ref) {
         handleTouchMove,
         handleTouchEnd
     ]);
+    var onTransitionEnd = function() {
+        if (!isScroll.current) {
+            stopMomentumScroll();
+        }
+    };
     return /*#__PURE__*/ React.createElement(View, {
         className: "nut-pickerview-list",
         ref: pickerRollerRef
@@ -223,7 +231,7 @@ var InternalPickerRoller = function(props, ref) {
         id: "".concat(classPrefix, "-").concat(uuid),
         ref: rollerRef,
         style: threeDimensional ? touchRollerStyle() : touchTiledStyle(),
-        onTransitionEnd: stopMomentumScroll
+        onTransitionEnd: onTransitionEnd
     }, threeDimensional && options.map(function(item, index) {
         var _item_value;
         var _obj;

package/dist/es/types/spec/calendarcard/base.d.ts

@@ -21,6 +21,10 @@ export interface BaseCalendarCard extends BaseProps {
     */
     type: 'single' | 'multiple' | 'range' | 'week'
     /**
+    * 自定义标题
+    */
+    title: ReactNode
+    /**
     * 受控模式下的值，与 onChange 搭配使用
     */
     value: CalendarCardValue

package/dist/es/types/spec/datepicker/base.d.ts

@@ -20,7 +20,7 @@ export interface BaseDatePicker extends BaseProps {
     /**
     * 类时间类型，可选值 date time year-month month-day datehour datetime hour-minutes
     */
-    type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes'
+    type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes' | ''
     /**
     * 每列是否展示中文
     */

package/dist/nutui.react.umd.js

@@ -8091,7 +8091,8 @@
   var prefixCls = "nut-calendarcard";
   var CalendarCard = /* @__PURE__ */ React.forwardRef(function(props, ref) {
     var locale = useConfig().locale;
-    var _$_object_spread = _object_spread({}, defaultProps$15, props), style = _$_object_spread.style, className = _$_object_spread.className, type2 = _$_object_spread.type, value2 = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, firstDayOfWeek = _$_object_spread.firstDayOfWeek, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, disableDay = _$_object_spread.disableDay, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange, onChange = _$_object_spread.onChange;
+    var _$_object_spread = _object_spread({}, defaultProps$15, props), style = _$_object_spread.style, className = _$_object_spread.className, type2 = _$_object_spread.type, title = _$_object_spread.title, value2 = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, firstDayOfWeek = _$_object_spread.firstDayOfWeek, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, disableDay = _$_object_spread.disableDay, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange, onChange = _$_object_spread.onChange;
+    var onPageChangeRef = React.useRef(onPageChange);
     var _useState = _sliced_to_array(React.useState(function() {
       var date2 = new Date(Date.now());
       var val2 = value2 || defaultValue;
@@ -8163,13 +8164,18 @@
       firstDayOfWeek
     ]);
     React.useEffect(function() {
+      onPageChangeRef.current = onPageChange;
+    }, [
+      onPageChange
+    ]);
+    React.useEffect(function() {
+      var _onPageChangeRef_current;
       var newDays = getDays(month);
       setDays(newDays);
-      onPageChange === null || onPageChange === void 0 ? void 0 : onPageChange(month);
+      (_onPageChangeRef_current = onPageChangeRef.current) === null || _onPageChangeRef_current === void 0 ? void 0 : _onPageChangeRef_current.call(onPageChangeRef, month);
     }, [
       month,
       getDays,
-      onPageChange,
       firstDayOfWeek
     ]);
     var isSameDay = function(day1, day2) {
@@ -8448,7 +8454,7 @@
     return days.length > 0 ? /* @__PURE__ */ React.createElement(components.View, {
       className: classNames(prefixCls, className),
       style
-    }, renderHeader(), renderContent()) : null;
+    }, title || renderHeader(), renderContent()) : null;
   });
   CalendarCard.displayName = "NutCalendarCard";
   var CheckboxGroupContext = React.createContext(null);
@@ -8807,7 +8813,9 @@
     var selectValue = function(move) {
       onSelect === null || onSelect === void 0 ? void 0 : onSelect(options === null || options === void 0 ? void 0 : options[Math.round(-move / lineSpacing.current)], keyIndex);
     };
+    var isScroll = React.useRef(false);
     var handleTouchStart = function(event) {
+      isScroll.current = true;
       touch.start(event);
       setStartY(touch.deltaY.current);
       setStartTime(Date.now());
@@ -8832,6 +8840,7 @@
       } else {
         handleMove(move, "end");
       }
+      isScroll.current = false;
       setTimeout(function() {
         touch.reset();
       }, 0);
@@ -8949,6 +8958,11 @@
       handleTouchMove,
       handleTouchEnd
     ]);
+    var onTransitionEnd = function() {
+      if (!isScroll.current) {
+        stopMomentumScroll();
+      }
+    };
     return /* @__PURE__ */ React.createElement(components.View, {
       className: "nut-pickerview-list",
       ref: pickerRollerRef
@@ -8961,7 +8975,7 @@
       id: "".concat(classPrefix2, "-").concat(uuid),
       ref: rollerRef,
       style: threeDimensional ? touchRollerStyle() : touchTiledStyle(),
-      onTransitionEnd: stopMomentumScroll
+      onTransitionEnd
     }, threeDimensional && options.map(function(item, index2) {
       var _item_value;
       var _obj;
@@ -9465,44 +9479,30 @@
   };
   var handlePickerValueChange = function(selectedOptions, selectedValue, index2, type2, defaultDate, handleDateComparison) {
     var rangeType = type2.toLocaleLowerCase();
-    if ([
-      "date",
-      "datetime",
-      "datehour",
-      "month-day",
-      "year-month"
-    ].includes(rangeType)) {
-      var formattedDate = [];
-      selectedValue.forEach(function(item) {
-        formattedDate.push(item);
-      });
-      if (rangeType === "month-day" && formattedDate.length < 3) {
-        formattedDate.unshift(new Date(defaultDate).getFullYear());
-      }
-      if (rangeType === "year-month" && formattedDate.length < 3) {
-        formattedDate.push(new Date(defaultDate).getDate());
-      }
-      var year = Number(formattedDate[0]);
-      var month = Number(formattedDate[1]) - 1;
-      var day = Math.min(Number(formattedDate[2]), getLastDayOfMonth(year, month + 1));
-      var date2 = null;
-      if (rangeType === "date" || rangeType === "month-day" || rangeType === "year-month") {
-        date2 = new Date(year, month, day);
-      } else if (rangeType === "datetime") {
-        date2 = new Date(year, month, day, Number(formattedDate[3]), Number(formattedDate[4]));
-      } else if (rangeType === "datehour") {
-        date2 = new Date(year, month, day, Number(formattedDate[3]));
-      }
-      handleDateComparison(date2, selectedOptions, index2);
+    var formattedDate = [];
+    selectedValue.forEach(function(item) {
+      formattedDate.push(item);
+    });
+    if (rangeType === "month-day" && formattedDate.length < 3) {
+      formattedDate.unshift(new Date(defaultDate).getFullYear());
+    }
+    if (rangeType === "year-month" && formattedDate.length < 3) {
+      formattedDate.push(new Date(defaultDate).getDate());
+    }
+    var year = Number(formattedDate[0]);
+    var month = Number(formattedDate[1]) - 1;
+    var day = Math.min(Number(formattedDate[2]), getLastDayOfMonth(year, month + 1));
+    var date2 = null;
+    if (rangeType === "date" || rangeType === "month-day" || rangeType === "year-month") {
+      date2 = new Date(year, month, day);
+    } else if (rangeType === "datetime") {
+      date2 = new Date(year, month, day, Number(formattedDate[3]), Number(formattedDate[4]));
+    } else if (rangeType === "datehour") {
+      date2 = new Date(year, month, day, Number(formattedDate[3]));
     } else {
-      var _selectedValue = _sliced_to_array(selectedValue, 3), hour = _selectedValue[0], minute = _selectedValue[1], seconds = _selectedValue[2];
-      var currentDate = new Date(defaultDate);
-      var year1 = currentDate.getFullYear();
-      var month1 = currentDate.getMonth();
-      var day1 = currentDate.getDate();
-      var date1 = new Date(year1, month1, day1, Number(hour), Number(minute), rangeType === "time" ? Number(seconds) : 0);
-      handleDateComparison(date1, selectedOptions, index2);
+      date2 = new Date(year, month, day, Number(formattedDate[3]), Number(formattedDate[4]), Number(formattedDate[5]));
     }
+    handleDateComparison(date2, selectedOptions, index2);
   };
   var currentYear$1 = (/* @__PURE__ */ new Date()).getFullYear();
   var defaultProps$10 = _object_spread_props(_object_spread({}, ComponentDefaults), {
@@ -11406,11 +11406,11 @@
         var item = name2 ? _this.context.formInstance.errors[name2] : [];
         var starPosition = _this.context.formInstance.starPosition;
         var renderStar = (required2 || requiredInRules) && /* @__PURE__ */ React.createElement(components.Text, {
-          className: "nut-form-item-label-required required"
+          className: "nut-form-item-label-".concat(starPosition, "-required required")
         }, "*");
         var renderLabel = /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(components.Text, {
           className: "nut-form-item-labeltxt"
-        }, starPosition === "left" ? renderStar : null, label), starPosition === "right" ? renderStar : null);
+        }, starPosition === "left" ? renderStar : null, label, starPosition === "right" ? renderStar : null));
         return /* @__PURE__ */ React.createElement(Cell, {
           className: "".concat(_this.getClassNameWithDirection("nut-form-item"), " ").concat(className),
           style,
@@ -15066,8 +15066,6 @@
       var handleCancel = function(e) {
         e.stopPropagation();
         if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
-        if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
-        onClose();
         onCancel();
       };
       var handleOk = /* @__PURE__ */ function() {
@@ -15152,24 +15150,21 @@
     };
     var renderCloseIcon = function() {
       if (!closeIcon) return null;
-      var handleCancel = function() {
-        if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
+      var handleClose = function() {
         if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
         onClose();
-        onCancel();
       };
       var _obj;
       var closeClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-close"), true), _define_property(_obj, "".concat(classPrefix2, "-close-").concat(closeIconPosition), true), _obj));
       var systomIcon = closeIconPosition !== "bottom" ? /* @__PURE__ */ React.createElement(IconSVG$p, null) : /* @__PURE__ */ React.createElement(IconSVG$n, null);
       return /* @__PURE__ */ React.createElement(components.View, {
         className: closeClasses,
-        onClick: handleCancel
+        onClick: handleClose
       }, /* @__PURE__ */ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     var onHandleClickOverlay = function(e) {
       if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
         var closed = onOverlayClick && onOverlayClick(e);
-        closed && onClose();
         closed && onCancel();
       }
     };
@@ -16006,7 +16001,7 @@
       var val2 = ((rect === null || rect === void 0 ? void 0 : rect.height) || 0) - height2;
       _offset = moveOffset + Number(active2 === childCount - 1 && val2 / 2);
       target.style.transitionDuration = "".concat(swiperRef.current.moving ? 0 : duration, "ms");
-      target.style.height = "".concat(Number(height2) * childCount, "px");
+      target.style.height = "".concat(Number(height2) * (childCount + 1), "px");
       target.style.transform = "translate3D(0,".concat(_offset, "px,0)");
     };
     var itemStyle = function(index2) {