@nutui/nutui-react-taro 2.7.7 → 2.7.9

package/dist/esm/{calendaritem.taro-BGbbuJOS.js → calendaritem.taro-DveeC4_t.js}

@@ -3,7 +3,7 @@ import classNames from "classnames";
 import { ScrollView } from "@tarojs/components";
 import Taro, { nextTick } from "@tarojs/taro";
 import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
-import { U as Utils, g as getPreMonthDates, a as getDaysStatus, b as getCurrMonthData } from "./date-CYwRNlGq.js";
+import { i as isEqual, d as date2Str, a as getNumTwoBit, g as getDateString, c as compareDate, b as getPreMonthDates, e as getDaysStatus, f as getMonthDays, h as getCurrMonthData, j as getWeekDate, k as getWhatDay, l as formatResultDate } from "./date-BmUWlDuN.js";
 import { r as requestAniFrame } from "./raf-Di10dXPS.js";
 import { u as useConfig } from "./configprovider.taro-C3WyeHSO.js";
 import { u as usePropsValue } from "./use-props-value-SH9krhkx.js";
@@ -14,35 +14,37 @@ const splitDate = (date) => {
 const isMultiple = (day, days) => {
   if (days.length > 0) {
     return days.some((item) => {
-      return Utils.isEqual(item, day);
+      return isEqual(item, day);
     });
   }
   return false;
 };
 const isCurrDay = (month, day) => {
   const date = `${month.curData[0]}/${month.curData[1]}/${day}`;
-  return Utils.isEqual(date, Utils.date2Str(/* @__PURE__ */ new Date(), "/"));
+  return isEqual(date, date2Str(/* @__PURE__ */ new Date(), "/"));
 };
 const getCurrDate = (day, month) => {
-  return `${month.curData[0]}/${month.curData[1]}/${Utils.getNumTwoBit(+day.day)}`;
+  return `${month.curData[0]}/${month.curData[1]}/${getNumTwoBit(+day.day)}`;
 };
 const isStart = (day, days) => {
-  return Utils.isEqual(days[0], day);
+  return isEqual(days[0], day);
 };
 const isEnd = (day, days) => {
-  return Utils.isEqual(days[1], day);
+  return isEqual(days[1], day);
 };
 const isStartAndEnd = (days) => {
-  return days.length >= 2 && Utils.isEqual(days[0], days[1]);
+  return days.length >= 2 && isEqual(days[0], days[1]);
 };
-const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { type: "single", autoBackfill: false, popup: true, title: "", startDate: Utils.getDay(0), endDate: Utils.getDay(365), showToday: true, startText: "", endText: "", confirmText: "", showTitle: true, showSubTitle: true, scrollAnimation: true, firstDayOfWeek: 0, disableDate: (date) => false, renderHeaderButtons: void 0, renderDay: void 0, renderDayTop: void 0, renderDayBottom: void 0, onConfirm: (data) => {
+const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { type: "single", autoBackfill: false, popup: true, title: "", startDate: getDateString(0), endDate: getDateString(365), showToday: true, startText: "", endText: "", confirmText: "", showTitle: true, showSubTitle: true, scrollAnimation: true, firstDayOfWeek: 0, disableDate: (date) => false, renderHeaderButtons: void 0, renderDay: void 0, renderDayTop: void 0, renderDayBottom: void 0, onConfirm: (data) => {
 }, onUpdate: () => {
 }, onDayClick: (data) => {
 }, onPageChange: (data) => {
 } });
 const CalendarItem = React__default.forwardRef((props, ref) => {
   const { locale } = useConfig();
-  const { style, className, children, popup, type, autoBackfill, title, defaultValue, startDate, endDate, showToday, startText, endText, confirmText, showTitle, showSubTitle, scrollAnimation, firstDayOfWeek, disableDate, renderHeaderButtons, renderDay, renderDayTop, renderDayBottom, renderBottomButton, value, onConfirm, onUpdate, onDayClick, onPageChange } = Object.assign(Object.assign({}, defaultProps), props);
+  const { style, className, children, popup, type, autoBackfill, title, value, defaultValue, startDate, endDate, showToday, startText, endText, confirmText, showTitle, showSubTitle, scrollAnimation, firstDayOfWeek, disableDate, renderHeaderButtons, renderDay, renderDayTop, renderDayBottom, renderBottomButton, onConfirm, onUpdate, onDayClick, onPageChange } = Object.assign(Object.assign({}, defaultProps), props);
+  const classPrefix = "nut-calendar";
+  const dayPrefix = "nut-calendar-day";
   const weekdays = locale.calendaritem.weekdays;
   const weeks = [
     ...weekdays.slice(firstDayOfWeek, 7),
@@ -56,19 +58,13 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
   const [monthDefaultRange, setMonthDefaultRange] = useState([]);
   const [scrollTop, setScrollTop] = useState(0);
   const [scrollWithAnimation, setScrollWithAnimation] = useState(false);
-  const propStartDate = startDate || Utils.getDay(0);
-  const propEndDate = endDate || Utils.getDay(365);
+  const propStartDate = startDate || getDateString(0);
+  const propEndDate = endDate || getDateString(365);
   const startDates = splitDate(propStartDate);
   const endDates = splitDate(propEndDate);
   const [state] = useState({
     currDateArray: []
   });
-  const getMonthsPanel = () => {
-    return monthsPanel.current;
-  };
-  const getMonthsRef = () => {
-    return monthsRef.current;
-  };
   const resetDefaultValue = () => {
     if (defaultValue || Array.isArray(defaultValue) && defaultValue.length > 0) {
       return type !== "single" ? [...defaultValue] : defaultValue;
@@ -88,9 +84,7 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
   const viewAreaRef = useRef(null);
   const [avgHeight, setAvgHeight] = useState(0);
   let viewHeight = 0;
-  const classPrefix = "nut-calendar";
-  const dayPrefix = "nut-calendar-day";
-  const getMonthData = (curData, monthNum, type2) => {
+  const getMonthData = (curData, monthNum) => {
     let i = 0;
     let date = curData;
     const monthData = monthsData;
@@ -101,12 +95,12 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
         ...getPreMonthDates("prev", y, m, firstDayOfWeek),
         ...getDaysStatus("active", y, m)
       ];
-      const cssHeight = 39 + (days.length > 35 ? 384 : 320);
       let scrollTop2 = 0;
       if (monthData.length > 0) {
         const monthEle = monthData[monthData.length - 1];
         scrollTop2 = monthEle.scrollTop + monthEle.cssHeight;
       }
+      const cssHeight = 39 + (days.length > 35 ? 384 : 320);
       const monthInfo = {
         curData: date,
         title: monthTitle(y, m),
@@ -114,10 +108,8 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
         cssHeight,
         scrollTop: scrollTop2
       };
-      {
-        if (!endDates || !Utils.compareDate(`${endDates[0]}/${endDates[1]}/${Utils.getMonthDays(endDates[0], endDates[1])}`, `${curData[0]}/${curData[1]}/${curData[2]}`)) {
-          monthData.push(monthInfo);
-        }
+      if (!endDates || !compareDate(`${endDates[0]}/${endDates[1]}/${getMonthDays(endDates[0], endDates[1])}`, `${curData[0]}/${curData[1]}/${curData[2]}`)) {
+        monthData.push(monthInfo);
       }
       date = getCurrMonthData("next", y, m);
     } while (i++ < monthNum);
@@ -125,9 +117,9 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
   };
   const setReachedYearMonthInfo = (current) => {
     const currentMonthsData = monthsData[current];
-    const [year, month] = currentMonthsData.curData;
     if (currentMonthsData.title === yearMonthTitle)
       return;
+    const [year, month] = currentMonthsData.curData;
     onPageChange && onPageChange([year, month, `${year}-${month}`]);
     setYearMonthTitle(currentMonthsData.title);
   };
@@ -153,75 +145,67 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
     setTranslateY(monthsData[start].scrollTop);
     setReachedYearMonthInfo(current);
   };
-  const getMonthNum = () => {
-    let monthNum = Number(endDates[1]) - Number(startDates[1]);
-    const yearNum = Number(endDates[0]) - Number(startDates[0]);
-    if (yearNum > 0) {
-      monthNum += 12 * yearNum;
-    }
-    if (monthNum <= 0) {
-      monthNum = 1;
-    }
-    setMonthsNum(monthNum);
-    return monthNum;
-  };
   const setDefaultDate = () => {
     let defaultData = [];
-    if (type === "range" && Array.isArray(currentDate)) {
-      if (currentDate.length > 0) {
-        if (propStartDate && Utils.compareDate(currentDate[0], propStartDate)) {
-          currentDate.splice(0, 1, propStartDate);
-        }
-        if (propEndDate && Utils.compareDate(propEndDate, currentDate[1])) {
-          currentDate.splice(1, 1, propEndDate);
-        }
-        defaultData = [
-          ...splitDate(currentDate[0]),
-          ...splitDate(currentDate[1])
-        ];
+    if (type === "single" && typeof currentDate === "string") {
+      if (!currentDate.length) {
+        return defaultData;
       }
-    } else if (type === "multiple" && Array.isArray(currentDate)) {
-      if (currentDate.length > 0) {
-        const defaultArr = [];
-        const obj = {};
-        currentDate.forEach((item) => {
-          if (propStartDate && !Utils.compareDate(item, propStartDate) && propEndDate && !Utils.compareDate(propEndDate, item)) {
-            if (!Object.hasOwnProperty.call(obj, item)) {
-              defaultArr.push(item);
-              obj[item] = item;
-            }
-          }
-        });
-        currentDate.splice(0) && currentDate.push(...defaultArr);
-        defaultData = [...splitDate(defaultArr[0])];
+      if (compareDate(currentDate, propStartDate)) {
+        defaultData = [...splitDate(propStartDate)];
+      } else if (!compareDate(currentDate, propEndDate)) {
+        defaultData = [...splitDate(propEndDate)];
+      } else {
+        defaultData = [...splitDate(currentDate)];
       }
-    } else if (type === "week" && Array.isArray(currentDate)) {
-      if (currentDate.length > 0) {
-        const [y, m, d] = splitDate(currentDate[0]);
-        const weekArr = Utils.getWeekDate(y, m, d, firstDayOfWeek);
-        currentDate.splice(0) && currentDate.push(...weekArr);
-        if (propStartDate && Utils.compareDate(currentDate[0], propStartDate)) {
-          currentDate.splice(0, 1, propStartDate);
+      return defaultData;
+    }
+    if (Array.isArray(currentDate) && currentDate.length) {
+      switch (type) {
+        case "range": {
+          if (compareDate(currentDate[0], propStartDate)) {
+            currentDate[0] = propStartDate;
+          }
+          if (compareDate(propEndDate, currentDate[1])) {
+            currentDate[1] = propEndDate;
+          }
+          defaultData = [
+            ...splitDate(currentDate[0]),
+            ...splitDate(currentDate[1])
+          ];
+          break;
         }
-        if (propEndDate && Utils.compareDate(propEndDate, currentDate[1])) {
-          currentDate.splice(1, 1, propEndDate);
+        case "multiple": {
+          const defaultArr = [];
+          const obj = {};
+          currentDate.forEach((item) => {
+            if (!compareDate(item, propStartDate) && !compareDate(propEndDate, item)) {
+              if (!Object.hasOwnProperty.call(obj, item)) {
+                defaultArr.push(item);
+                obj[item] = item;
+              }
+            }
+          });
+          currentDate.splice(0, currentDate.length, ...defaultArr);
+          defaultData = [...splitDate(defaultArr[0])];
+          break;
         }
-        defaultData = [
-          ...splitDate(currentDate[0]),
-          ...splitDate(currentDate[1])
-        ];
-      }
-    } else if (currentDate) {
-      if (currentDate.length > 0) {
-        if (propStartDate && Utils.compareDate(currentDate, propStartDate)) {
-          defaultData = [...splitDate(propStartDate)];
-        } else if (propEndDate && !Utils.compareDate(currentDate, propEndDate)) {
-          defaultData = [...splitDate(propEndDate)];
-        } else {
-          defaultData = [...splitDate(currentDate)];
+        case "week": {
+          const [y, m, d] = splitDate(currentDate[0]);
+          const weekArr = getWeekDate(y, m, d, firstDayOfWeek);
+          currentDate.splice(0, currentDate.length, ...weekArr);
+          if (compareDate(currentDate[0], propStartDate)) {
+            currentDate.splice(0, 1, propStartDate);
+          }
+          if (compareDate(propEndDate, currentDate[1])) {
+            currentDate.splice(1, 1, propEndDate);
+          }
+          defaultData = [
+            ...splitDate(currentDate[0]),
+            ...splitDate(currentDate[1])
+          ];
+          break;
         }
-      } else {
-        defaultData = [];
       }
     }
     return defaultData;
@@ -244,43 +228,49 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
       const date = /* @__PURE__ */ new Date();
       const year = date.getFullYear();
       const month = date.getMonth() + 1;
-      const index = monthsData.findIndex((item) => {
-        return +item.curData[0] === year && +item.curData[1] === month;
-      });
-      if (index > -1) {
+      const index = monthsData.findIndex((item) => +item.curData[0] === year && +item.curData[1] === month);
+      if (index > -1)
         current = index;
-      }
     }
     return {
       current,
       lastCurrent
     };
   };
-  const renderCurrentDate = () => {
-    const defaultData = setDefaultDate();
-    const current = getCurrentIndex(defaultData);
-    if (defaultData.length > 0) {
-      if (type === "range") {
-        chooseDay({ day: defaultData[2], type: "active" }, monthsData[current.current], true);
-        chooseDay({ day: defaultData[5], type: "active" }, monthsData[current.lastCurrent], true);
-      } else if (type === "week") {
-        chooseDay({ day: defaultData[2], type: "curr" }, monthsData[current.current], true);
-      } else if (type === "multiple") {
+  const renderCurrentDate = (defaultData, current) => {
+    if (!defaultData.length)
+      return;
+    const date = monthsData[current.current];
+    switch (type) {
+      case "range": {
+        handleDayClick({ day: defaultData[2], type: "active" }, date);
+        handleDayClick({ day: defaultData[5], type: "active" }, monthsData[current.lastCurrent]);
+        break;
+      }
+      case "week": {
+        handleDayClick({ day: defaultData[2], type: "curr" }, date);
+        break;
+      }
+      case "multiple": {
         [...currentDate].forEach((item) => {
           const dateArr = splitDate(item);
           let currentIndex = current.current;
-          monthsData.forEach((item2, index) => {
-            if (item2.title === monthTitle(dateArr[0], dateArr[1])) {
-              currentIndex = index;
-            }
-          });
-          chooseDay({ day: dateArr[2], type: "active" }, monthsData[currentIndex], true);
+          currentIndex = monthsData.findIndex((item2) => item2.title === monthTitle(dateArr[0], dateArr[1]));
+          handleDayClick({ day: dateArr[2], type: "active" }, monthsData[currentIndex]);
         });
-      } else {
-        chooseDay({ day: defaultData[2], type: "active" }, monthsData[current.current], true);
+        break;
+      }
+      default: {
+        handleDayClick({ day: defaultData[2], type: "active" }, date);
+        break;
       }
     }
-    return current.current;
+  };
+  const getMonthsPanel = () => {
+    return monthsPanel.current;
+  };
+  const getMonthsRef = () => {
+    return monthsRef.current;
   };
   const requestAniFrameFunc = (current, monthNum) => {
     const lastItem = monthsData[monthsData.length - 1];
@@ -289,19 +279,33 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
       if (monthsRef && monthsPanel && viewAreaRef) {
         viewHeight = getMonthsRef().clientHeight;
         getMonthsPanel().style.height = `${containerHeight}px`;
-        getMonthsRef().scrollTop = monthsData[current].scrollTop;
-        setScrollTop(monthsData[current].scrollTop);
+        const currTop = monthsData[current].scrollTop;
+        getMonthsRef().scrollTop = currTop;
+        setScrollTop(currTop);
         nextTick(() => setScrollWithAnimation(true));
       }
     });
     setAvgHeight(Math.floor(containerHeight / (monthNum + 1)));
   };
+  const getMonthNum = () => {
+    let monthNum = Number(endDates[1]) - Number(startDates[1]);
+    const yearNum = Number(endDates[0]) - Number(startDates[0]);
+    if (yearNum > 0)
+      monthNum += 12 * yearNum;
+    if (monthNum <= 0)
+      monthNum = 1;
+    setMonthsNum(monthNum);
+    return monthNum;
+  };
   const initData = () => {
     const monthNum = getMonthNum();
     getMonthData(startDates, monthNum);
-    const current = renderCurrentDate();
-    setDefaultRange(monthNum, current);
-    requestAniFrameFunc(current, monthNum);
+    const defaultData = setDefaultDate();
+    const current = getCurrentIndex(defaultData);
+    const currentIndex = current.current;
+    renderCurrentDate(defaultData, current);
+    setDefaultRange(monthNum, currentIndex);
+    requestAniFrameFunc(currentIndex, monthNum);
   };
   useEffect(() => {
     initData();
@@ -318,9 +322,9 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
     popup && resetRender();
   }, [currentDate]);
   const scrollToDate = (date) => {
-    if (Utils.compareDate(date, propStartDate)) {
+    if (compareDate(date, propStartDate)) {
       date = propStartDate;
-    } else if (!Utils.compareDate(date, propEndDate)) {
+    } else if (!compareDate(date, propEndDate)) {
       date = propEndDate;
     }
     const dateArr = splitDate(date);
@@ -341,22 +345,21 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
                 clearInterval(interval);
                 if (monthsRef.current) {
                   monthsRef.current.scrollTop = currTop;
-                  setScrollTop(monthsRef.current.scrollTop);
+                  setScrollTop(currTop);
                 }
               }
             }, 40);
           } else {
             monthsRef.current.scrollTop = currTop;
-            setScrollTop(monthsRef.current.scrollTop);
+            setScrollTop(currTop);
           }
         }
       }
     });
   };
   const monthsViewScroll = (e) => {
-    if (monthsData.length <= 1) {
+    if (monthsData.length <= 1)
       return;
-    }
     const scrollTop2 = e.target.scrollTop;
     Taro.getEnv() === "WEB" && setScrollTop(scrollTop2);
     let current = Math.floor(scrollTop2 / avgHeight);
@@ -367,16 +370,13 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
     const nextTop = monthsData[current + 1].scrollTop;
     const nextHeight = monthsData[current + 1].cssHeight;
     if (current === 0) {
-      if (scrollTop2 >= nextTop) {
+      if (scrollTop2 >= nextTop)
         current += 1;
-      }
     } else if (current > 0 && current < monthsNum - 1) {
-      if (scrollTop2 >= nextTop) {
+      if (scrollTop2 >= nextTop)
         current += 1;
-      }
-      if (scrollTop2 < monthsData[current].scrollTop) {
+      if (scrollTop2 < monthsData[current].scrollTop)
         current -= 1;
-      }
     } else {
       const viewPosition = Math.round(scrollTop2 + viewHeight);
       if (current + 1 <= monthsNum && viewPosition >= nextTop + nextHeight) {
@@ -391,90 +391,102 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
   React__default.useImperativeHandle(ref, () => ({
     scrollToDate
   }));
+  const isDisable = (day, month) => {
+    if (day.type !== "active")
+      return true;
+    const dateStr = getCurrDate(day, month);
+    if (compareDate(dateStr, propStartDate))
+      return true;
+    if (compareDate(propEndDate, dateStr))
+      return true;
+    return false;
+  };
   const getClasses = (day, month) => {
     const dateStr = getCurrDate(day, month);
-    if (day.type === "active") {
-      if (propStartDate && Utils.compareDate(dateStr, propStartDate) || propEndDate && Utils.compareDate(propEndDate, dateStr)) {
-        return `${dayPrefix}-disabled`;
+    if (isDisable(day, month))
+      return `${dayPrefix}-disabled`;
+    const activeCls = `${dayPrefix}-active`;
+    if (type === "range" || type === "week") {
+      if (isStart(dateStr, currentDate))
+        return `${activeCls} active-start`;
+      if (isEnd(dateStr, currentDate)) {
+        return `${activeCls} active-end`;
       }
-      if (type === "range" || type === "week") {
-        if (isStart(dateStr, currentDate) || isEnd(dateStr, currentDate)) {
-          return `${dayPrefix}-active ${isStart(dateStr, currentDate) ? "active-start" : ""} ${isEnd(dateStr, currentDate) ? "active-end" : ""}`;
-        }
-        if (Array.isArray(currentDate) && Object.values(currentDate).length === 2 && Utils.compareDate(currentDate[0], dateStr) && Utils.compareDate(dateStr, currentDate[1])) {
-          if (disableDate(day)) {
-            return `${dayPrefix}-choose-disabled`;
-          }
-          return `${dayPrefix}-choose`;
-        }
-      } else if (type === "multiple" && isMultiple(dateStr, currentDate) || !Array.isArray(currentDate) && Utils.isEqual(currentDate, dateStr)) {
-        return `${dayPrefix}-active`;
+      if (currentDate.length === 2 && compareDate(currentDate[0], dateStr) && compareDate(dateStr, currentDate[1])) {
+        return disableDate(day) ? `${dayPrefix}-choose-disabled` : `${dayPrefix}-choose`;
       }
-      if (disableDate(day)) {
-        return `${dayPrefix}-disabled`;
-      }
-      return null;
+    } else if (type === "multiple" && isMultiple(dateStr, currentDate) || !Array.isArray(currentDate) && isEqual(currentDate, dateStr)) {
+      return activeCls;
     }
-    return `${dayPrefix}-disabled`;
+    if (disableDate(day))
+      return `${dayPrefix}-disabled`;
+    return null;
   };
-  const chooseDay = (day, month, isFirst) => {
-    if (getClasses(day, month) === `${dayPrefix}-disabled`) {
+  const handleDayClick = (day, month, isFirst = true) => {
+    if (isDisable(day, month) || disableDate(day))
       return;
-    }
     const days = [...month.curData];
     const [y, m] = month.curData;
-    days[2] = typeof day.day === "number" ? Utils.getNumTwoBit(day.day) : day.day;
+    days[2] = typeof day.day === "number" ? getNumTwoBit(day.day) : day.day;
     days[3] = `${days[0]}/${days[1]}/${days[2]}`;
-    days[4] = Utils.getWhatDay(+days[0], +days[1], +days[2]);
-    if (type === "multiple") {
-      if (currentDate.length > 0) {
-        let hasIndex = "";
-        currentDate.forEach((item, index) => {
-          if (item === days[3]) {
-            hasIndex = index;
+    days[4] = getWhatDay(+days[0], +days[1], +days[2]);
+    const newDate = days[3];
+    switch (type) {
+      case "multiple": {
+        if (Array.isArray(currentDate)) {
+          if (currentDate.length > 0) {
+            const hasIndex = currentDate.findIndex((item) => item === newDate);
+            if (isFirst) {
+              state.currDateArray.push([...days]);
+            } else if (hasIndex > -1) {
+              currentDate.splice(hasIndex, 1);
+              state.currDateArray.splice(hasIndex, 1);
+            } else {
+              currentDate.push(newDate);
+              state.currDateArray.push([...days]);
+            }
+          } else {
+            currentDate.push(newDate);
+            state.currDateArray = [[...days]];
           }
-        });
-        if (isFirst) {
-          state.currDateArray.push([...days]);
-        } else if (hasIndex !== "") {
-          currentDate.splice(hasIndex, 1);
-          state.currDateArray.splice(hasIndex, 1);
-        } else {
-          currentDate.push(days[3]);
-          state.currDateArray.push([...days]);
         }
-      } else {
-        currentDate.push(days[3]);
-        state.currDateArray = [[...days]];
+        break;
       }
-    } else if (type === "range") {
-      const curDataLength = Object.values(currentDate).length;
-      if (curDataLength === 2 || curDataLength === 0) {
-        Array.isArray(currentDate) && currentDate.splice(0) && currentDate.push(days[3]);
-        state.currDateArray = [[...days]];
-      } else if (Utils.compareDate(currentDate[0], days[3])) {
-        Array.isArray(currentDate) && currentDate.push(days[3]);
-        state.currDateArray = [...state.currDateArray, [...days]];
-      } else {
-        Array.isArray(currentDate) && currentDate.unshift(days[3]);
-        state.currDateArray = [[...days], ...state.currDateArray];
+      case "range": {
+        if (Array.isArray(currentDate)) {
+          if (currentDate.length === 2 || currentDate.length === 0) {
+            currentDate.splice(0, currentDate.length, newDate);
+            state.currDateArray = [[...days]];
+          } else if (compareDate(currentDate[0], newDate)) {
+            currentDate.push(newDate);
+            state.currDateArray = [...state.currDateArray, [...days]];
+          } else {
+            currentDate.unshift(newDate);
+            state.currDateArray = [[...days], ...state.currDateArray];
+          }
+        }
+        break;
       }
-    } else if (type === "week") {
-      const weekArr = Utils.getWeekDate(y, m, `${day.day}`, firstDayOfWeek);
-      if (propStartDate && Utils.compareDate(weekArr[0], propStartDate)) {
-        weekArr.splice(0, 1, propStartDate);
+      case "week": {
+        const weekArr = getWeekDate(y, m, `${day.day}`, firstDayOfWeek);
+        if (compareDate(weekArr[0], propStartDate)) {
+          weekArr[0] = propStartDate;
+        }
+        if (compareDate(propEndDate, weekArr[1])) {
+          weekArr[1] = propEndDate;
+        }
+        currentDate.splice(0, currentDate.length, ...weekArr);
+        state.currDateArray = [
+          formatResultDate(weekArr[0]),
+          formatResultDate(weekArr[1])
+        ];
+        break;
       }
-      if (propEndDate && Utils.compareDate(propEndDate, weekArr[1])) {
-        weekArr.splice(1, 1, propEndDate);
+      default: {
+        setCurrentDate(newDate);
+        state.currDateArray = [...days];
+        break;
       }
-      Array.isArray(currentDate) && currentDate.splice(0) && currentDate.push(...weekArr);
-      state.currDateArray = [
-        Utils.formatResultDate(weekArr[0]),
-        Utils.formatResultDate(weekArr[1])
-      ];
-    } else {
-      setCurrentDate(days[3]);
-      state.currDateArray = [...days];
     }
     if (!isFirst) {
       onDayClick && onDayClick(state.currDateArray);
@@ -493,10 +505,10 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
       }
     }
   };
-  const classes = classNames({
+  const classes = classNames(classPrefix, {
     [`${classPrefix}-title`]: !popup,
     [`${classPrefix}-nofooter`]: !!autoBackfill
-  }, classPrefix, className);
+  }, className);
   const headerClasses = classNames({
     [`${classPrefix}-header`]: true,
     [`${classPrefix}-header-title`]: !popup
@@ -517,6 +529,31 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
       React__default.createElement("div", { className: `${classPrefix}-weeks`, ref: weeksPanel }, weeks.map((item) => React__default.createElement("div", { className: `${classPrefix}-week-item`, key: item }, item)))
     );
   };
+  const renderItem = (month, day, index) => {
+    const startTip = isStartTip(day, month);
+    const endTip = isEndTip(day, month);
+    const noStartNorEnd = !startTip && !endTip;
+    return React__default.createElement(
+      "div",
+      { className: classNames("nut-calendar-day", getClasses(day, month)), onClick: () => handleDayClick(day, month, false), key: index },
+      React__default.createElement("div", { className: `${classPrefix}-day-day` }, renderDay ? renderDay(day) : day.day),
+      !startTip && renderDayTop && React__default.createElement("div", { className: `${classPrefix}-day-info-top` }, renderDayTop(day)),
+      noStartNorEnd && renderDayBottom && React__default.createElement("div", { className: `${classPrefix}-day-info-bottom` }, renderDayBottom(day)),
+      noStartNorEnd && isCurrDay(month, day.day) && !renderDayBottom && showToday && React__default.createElement("div", { className: `${classPrefix}-day-info-curr` }, locale.calendaritem.today),
+      startTip && React__default.createElement("div", { className: classNames("nut-calendar-day-info", {
+        "nut-calendar-day-info-top": isStartAndEnd(currentDate)
+      }) }, startText || locale.calendaritem.start),
+      endTip && React__default.createElement("div", { className: `${classPrefix}-day-info` }, endText || locale.calendaritem.end)
+    );
+  };
+  const renderPanel = (month, key) => {
+    return React__default.createElement(
+      "div",
+      { className: `${classPrefix}-month`, key },
+      React__default.createElement("div", { className: `${classPrefix}-month-title` }, month.title),
+      React__default.createElement("div", { className: `${classPrefix}-days` }, month.monthData.map((day, i) => renderItem(month, day, i)))
+    );
+  };
   const renderContent = () => {
     return React__default.createElement(
       ScrollView,
@@ -525,26 +562,7 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
         "div",
         { className: `${classPrefix}-pannel`, ref: monthsPanel },
         React__default.createElement("div", { className: "viewArea", ref: viewAreaRef, style: { transform: `translateY(${translateY}px)` } }, monthsData.slice(monthDefaultRange[0], monthDefaultRange[1]).map((month, key) => {
-          return React__default.createElement(
-            "div",
-            { className: `${classPrefix}-month`, key },
-            React__default.createElement("div", { className: `${classPrefix}-month-title` }, month.title),
-            React__default.createElement("div", { className: `${classPrefix}-days` }, month.monthData.map((day, i) => React__default.createElement(
-              "div",
-              { className: [
-                `${classPrefix}-day`,
-                getClasses(day, month)
-              ].join(" "), onClick: () => {
-                chooseDay(day, month);
-              }, key: i },
-              React__default.createElement("div", { className: `${classPrefix}-day-day` }, renderDay ? renderDay(day) : day.day),
-              !isStartTip(day, month) && renderDayTop && React__default.createElement("div", { className: `${classPrefix}-day-info-top` }, renderDayTop(day)),
-              !isStartTip(day, month) && !isEndTip(day, month) && renderDayBottom && React__default.createElement("div", { className: `${classPrefix}-day-info-bottom` }, renderDayBottom(day)),
-              !isStartTip(day, month) && !isEndTip(day, month) && !renderDayBottom && showToday && isCurrDay(month, day.day) && React__default.createElement("div", { className: `${classPrefix}-day-info-curr` }, locale.calendaritem.today),
-              isStartTip(day, month) && React__default.createElement("div", { className: `${classPrefix}-day-info ${isStartAndEnd(currentDate) ? `${classPrefix}-day-info-top` : ""}` }, startText || locale.calendaritem.start),
-              isEndTip(day, month) && React__default.createElement("div", { className: `${classPrefix}-day-info` }, endText || locale.calendaritem.end)
-            )))
-          );
+          return renderPanel(month, key);
         }))
       )
     );