@momo-kits/calendar 0.80.9 → 0.81.1

package/CalendarPro.tsx

@@ -13,12 +13,15 @@ import MonthList from './MonthList';
 import HeaderControl from './HeaderControl';
 import LunarDateConverter from './LunarDateConverter';
 import Util from './Util';
-import {CalendarProProps, CalendarProState, HeaderControlRef} from './types';
+import {
+  CalendarProProps,
+  CalendarProState,
+  HeaderControlRef,
+  Holidays,
+} from './types';
 import {ContainerContext} from './index';
 import styles from './styles';
 
-const widthScreen = Dimensions.get('window').width;
-
 export default class CalendarPro extends Component<
   CalendarProProps,
   CalendarProState
@@ -50,6 +53,7 @@ export default class CalendarPro extends Component<
       holidays: [],
       ownUpdate: false,
     };
+    // @ts-ignore
     this.converter = new LunarDateConverter();
   }
 
@@ -117,16 +121,16 @@ export default class CalendarPro extends Component<
     this.maxDate = max;
   };
 
-  onChoose = (day: Date) => {
+  onChoose = (day: Moment.Moment) => {
     const {startDate, tabSelected} = this.state;
     const {isDoubleDateMode, onDateChange} = this.props;
     if (isDoubleDateMode) {
       if (tabSelected === 1) {
-        if (startDate && day >= startDate) {
+        if (startDate && day >= Moment(startDate)) {
           this.ownSetState({
             endDate: day,
           });
-        } else if (startDate && day < startDate) {
+        } else if (startDate && day < Moment(startDate)) {
           this.ownSetState({
             startDate: day,
             endDate: null,
@@ -149,7 +153,7 @@ export default class CalendarPro extends Component<
   };
 
   executeProcessAfterScrollCalendar = (date: Moment.Moment, key: any) => {
-    const holidays: {lunar: number; mixedLabel: string}[] = Object.values(
+    const holidays: any[] = Object.values(
       Util.getHolidaysInMonth(Moment(date)),
     );
     const {showLunar} = this.state;
@@ -180,9 +184,9 @@ export default class CalendarPro extends Component<
   };
 
   setDoubleDateAndTabIndex = (
-    firstDate: Moment.Moment | undefined,
-    secondDate: Moment.Moment | undefined,
-    tabSelected: any,
+    firstDate: Moment.Moment | Date | undefined,
+    secondDate?: Moment.Moment | Date | undefined | null,
+    tabSelected?: any,
   ) => {
     this.ownSetState({
       startDate: firstDate ? Moment(firstDate) : null,
@@ -194,7 +198,7 @@ export default class CalendarPro extends Component<
   toggleLunarDate = () => {
     const {showLunar, holidays} = this.state;
     const {onCallbackCalendar} = this.props;
-    let data: {lunar: number; mixedLabel: string}[] = [];
+    let data: Holidays[] = [];
     const nextStateShowLunar = !showLunar;
     if (!nextStateShowLunar) {
       data = holidays?.filter(item => !item.lunar || item.mixedLabel);

package/Day.tsx

@@ -13,7 +13,7 @@ import {ContainerContext} from './index';
 import styles from './styles';
 
 class Day extends Component<DayProps> {
-  isFocus: boolean;
+  isFocus?: boolean;
   isValid?: boolean;
   isMid?: boolean;
   isStart?: boolean;
@@ -40,29 +40,6 @@ class Day extends Component<DayProps> {
     onChoose && onChoose(date);
   };
 
-  findHoliday = (
-    date: {date: () => any; month: () => number},
-    holidays: any[],
-  ) => {
-    if (date && holidays && holidays.length > 0) {
-      const day = date.date();
-      const month = date.month() + 1;
-      return holidays.find(item => item.day === day && item.month === month);
-    }
-    return null;
-  };
-
-  checkHoliday = (
-    date: {date: () => any; month: () => number},
-    holidays: any[],
-  ) => {
-    const holiday = this.findHoliday(date, holidays);
-    return {
-      solarHoliday: !!(holiday && !holiday.lunar),
-      lunarHoliday: !!(holiday && holiday.lunar),
-    };
-  };
-
   statusCheck = (props?: DayProps) => {
     const {
       startDate,

package/HeaderControl.tsx

@@ -32,8 +32,8 @@ const HeaderControl: ForwardRefRenderFunction<
   };
 
   if (info && info.date) {
-    const headerFormat = `${translate(
-      Util.mapMonth(info.date.month() + 1),
+    const headerFormat = `${translate?.(
+      Util.mapMonth(info.date.month() + 1) || '',
     )}/${info.date.year()}`;
     return (
       <View style={styles.headerControlContainer}>

package/LunarDateConverter.ts

@@ -1,20 +1,17 @@
-/* eslint-disable func-names */
-
-/* eslint-disable no-bitwise */
-function Lunar() {
+function Lunar(this: any) {
   this.isleap = false;
   this.lunarDay = 0;
   this.lunarMonth = 0;
   this.lunarYear = 0;
 }
 
-function Solar() {
+function Solar(this: any) {
   this.solarDay = 0;
   this.solarMonth = 0;
   this.solarYear = 0;
 }
 
-function LunarSolarConverter() {
+function LunarSolarConverter(this: any) {
   this.lunar_month_days = [
     1887, 0x1694, 0x16aa, 0x4ad5, 0xab6, 0xc4b7, 0x4ae, 0xa56, 0xb52a, 0x1d2a,
     0xd54, 0x75aa, 0x156a, 0x1096d, 0x95c, 0x14ae, 0xaa4d, 0x1a4c, 0x1b2a,
@@ -79,7 +76,7 @@ function LunarSolarConverter() {
   /**
    * @return {number}
    */
-  this.GetBitInt = function (data, length, shift) {
+  this.GetBitInt = function (data: number, length: number, shift: number) {
     return (data & (((1 << length) - 1) << shift)) >> shift;
   };
 
@@ -87,40 +84,54 @@ function LunarSolarConverter() {
   /**
    * @return {number}
    */
-  this.SolarToInt = function (y, m, d) {
+  this.SolarToInt = function (y: number, m: number, d: number) {
     m = (m + 9) % 12;
-    y = parseInt(y) - parseInt(m / 10);
+    y = parseInt(String(y)) - parseInt(String(m / 10));
     return (
       365 * y +
-      parseInt(y / 4) -
-      parseInt(y / 100) +
-      parseInt(y / 400) +
-      parseInt((m * 306 + 5) / 10) +
+      parseInt(String(y / 4)) -
+      parseInt(String(y / 100)) +
+      parseInt(String(y / 400)) +
+      parseInt(String((m * 306 + 5) / 10)) +
       (d - 1)
     );
   };
 
-  this.SolarFromInt = function (g) {
-    let y = parseInt((10000 * g + 14780) / 3652425);
+  this.SolarFromInt = function (g: number) {
+    let y = parseInt(String((10000 * g + 14780) / 3652425));
     let ddd =
-      g - (365 * y + parseInt(y / 4) - parseInt(y / 100) + parseInt(y / 400));
+      g -
+      (365 * y +
+        parseInt(String(y / 4)) -
+        parseInt(String(y / 100)) +
+        parseInt(String(y / 400)));
     if (ddd < 0) {
       y--;
       ddd =
-        g - (365 * y + parseInt(y / 4) - parseInt(y / 100) + parseInt(y / 400));
+        g -
+        (365 * y +
+          parseInt(String(y / 4)) -
+          parseInt(String(y / 100)) +
+          parseInt(String(y / 400)));
     }
-    const mi = parseInt((100 * ddd + 52) / 3060);
+    const mi = parseInt(String((100 * ddd + 52) / 3060));
     const mm = ((mi + 2) % 12) + 1;
-    y += parseInt((mi + 2) / 12);
-    const dd = ddd - parseInt((mi * 306 + 5) / 10) + 1;
+    y += parseInt(String((mi + 2) / 12));
+    const dd = ddd - parseInt(String((mi * 306 + 5) / 10)) + 1;
+    // @ts-ignore
     const solar = new Solar();
-    solar.solarYear = parseInt(y);
-    solar.solarMonth = parseInt(mm);
-    solar.solarDay = parseInt(dd);
+    solar.solarYear = parseInt(String(y));
+    solar.solarMonth = parseInt(String(mm));
+    solar.solarDay = parseInt(String(dd));
     return solar;
   };
 
-  this.LunarToSolar = function (lunar) {
+  this.LunarToSolar = function (lunar: {
+    lunarYear: number;
+    isleap: any;
+    lunarMonth: number;
+    lunarDay: number;
+  }) {
     const days =
       this.lunar_month_days[lunar.lunarYear - this.lunar_month_days[0]];
     const leap = this.GetBitInt(days, 4, 13);
@@ -147,7 +158,12 @@ function LunarSolarConverter() {
     return this.SolarFromInt(this.SolarToInt(y, m, d) + offset - 1);
   };
 
-  this.SolarToLunar = function (solar) {
+  this.SolarToLunar = function (solar: {
+    solarYear: number;
+    solarMonth: number;
+    solarDay: number;
+  }) {
+    // @ts-ignore
     const lunar = new Lunar();
     let index = solar.solarYear - this.solar_1_1[0];
     const data =
@@ -179,7 +195,7 @@ function LunarSolarConverter() {
         break;
       }
     }
-    const lunarD = parseInt(offset);
+    const lunarD = parseInt(String(offset));
     lunar.lunarYear = lunarY;
     lunar.lunarMonth = lunarM;
     lunar.isleap = false;
@@ -195,4 +211,4 @@ function LunarSolarConverter() {
   };
 }
 
-module.exports = LunarSolarConverter;
+export default LunarSolarConverter;

package/LunarService.ts

@@ -1,10 +1,11 @@
-const removeFractionalPart = number => parseInt(number);
+const removeFractionalPart = (number: string | number) =>
+  parseInt(String(number));
 
 /* Compute the (integral) Julian day number of day dd/mm/yyyy, i.e., the number
  * of days between 1/1/4713 BC (Julian calendar) and dd/mm/yyyy.
  * Formula from http://www.tondering.dk/claus/calendar.html
  */
-const jdFromDate = (dd, mm, yy) => {
+const jdFromDate = (dd: number, mm: number, yy: number) => {
   let a, y, m, jd;
   a = removeFractionalPart((14 - mm) / 12);
   y = yy + 4800 - a;
@@ -29,7 +30,7 @@ const jdFromDate = (dd, mm, yy) => {
 };
 
 /* Convert a Julian day number to day/month/year. Parameter jd is an integer */
-const jdToDate = jd => {
+const jdToDate = (jd: number) => {
   let a, b, c, d, e, m, day, month, year;
   if (jd > 2299160) {
     // After 5/10/1582, Gregorian calendar
@@ -54,7 +55,7 @@ const jdToDate = jd => {
  * Returns a floating number, e.g., 2415079.9758617813 for k=2 or 2414961.935157746 for k=-2
  * Algorithm from: "Astronomical Algorithms" by Jean Meeus, 1998
  */
-const NewMoon = k => {
+const NewMoon = (k: number) => {
   let T, T2, T3, dr, Jd1, M, Mpr, F, C1, deltat, JdNew;
   T = k / 1236.85; // Time in Julian centuries from 1900 January 0.5
   T2 = T * T;
@@ -100,7 +101,7 @@ const NewMoon = k => {
  * Parameter: floating number jdn, the number of days since 1/1/4713 BC noon
  * Algorithm from: "Astronomical Algorithms" by Jean Meeus, 1998
  */
-const SunLongitude = jdn => {
+const SunLongitude = (jdn: number) => {
   let T, T2, dr, M, L0, DL, L;
   T = (jdn - 2451545.0) / 36525; // Time in Julian centuries from 2000-01-01 12:00:00 GMT
   T2 = T * T;
@@ -124,7 +125,7 @@ const SunLongitude = jdn => {
  * From the day after March equinox and the 1st major term after March equinox, 0 is returned.
  * After that, return 1, 2, 3 ...
  */
-const getSunLongitude = (dayNumber, timeZone) => {
+const getSunLongitude = (dayNumber: number, timeZone: number) => {
   return removeFractionalPart(
     (SunLongitude(dayNumber - 0.5 - timeZone / 24) / Math.PI) * 6,
   );
@@ -133,12 +134,12 @@ const getSunLongitude = (dayNumber, timeZone) => {
 /* Compute the day of the k-th new moon in the given time zone.
  * The time zone if the time difference between local time and UTC: 7.0 for UTC+7:00
  */
-const getNewMoonDay = (k, timeZone) => {
+const getNewMoonDay = (k: number, timeZone: number) => {
   return removeFractionalPart(NewMoon(k) + 0.5 + timeZone / 24);
 };
 
 /* Find the day that starts the luner month 11 of the given year for the given time zone */
-const getLunarMonth11 = (yy, timeZone) => {
+const getLunarMonth11 = (yy: number, timeZone: number) => {
   let k, off, nm, sunLong;
   //off = jdFromDate(31, 12, yy) - 2415021.076998695;
   off = jdFromDate(31, 12, yy) - 2415021;
@@ -152,7 +153,7 @@ const getLunarMonth11 = (yy, timeZone) => {
 };
 
 /* Find the index of the leap month after the month starting on the day a11. */
-const getLeapMonthOffset = (a11, timeZone) => {
+const getLeapMonthOffset = (a11: number, timeZone: number) => {
   let k, last, arc, i;
   k = removeFractionalPart((a11 - 2415021.076998695) / 29.530588853 + 0.5);
   last = 0;
@@ -167,7 +168,12 @@ const getLeapMonthOffset = (a11, timeZone) => {
 };
 
 /* Comvert solar date dd/mm/yyyy to the corresponding lunar date */
-export const convertSolar2Lunar = (dd, mm, yy, timeZone) => {
+export const convertSolar2Lunar = (
+  dd: number,
+  mm: number,
+  yy: number,
+  timeZone: number,
+) => {
   let k,
     dayNumber,
     monthStart,

package/MonthList.tsx

@@ -1,15 +1,16 @@
-import React, {Component, useCallback} from 'react';
+import React, {Component} from 'react';
 import {FlatList, Platform} from 'react-native';
 import moment from 'moment';
 import Moment from 'moment';
 import Month from './Month';
 import LunarDateConverter from './LunarDateConverter';
-import {MonthListProps, MonthListState} from './types';
+import {Holidays, MonthListProps, MonthListState} from './types';
 import {ContainerContext} from './index';
 import {scaleSize, Spacing} from '@momo-kits/foundation';
 
 const MAX_RENDER_PER_BATCH = Platform.OS === 'android' ? 1 : 12;
 
+// @ts-ignore
 const converter = new LunarDateConverter();
 export default class MonthList extends Component<
   MonthListProps,
@@ -20,7 +21,7 @@ export default class MonthList extends Component<
   currentScrollIndex;
   list;
   heightStyle;
-  holidays;
+  holidays?: Holidays[] = [];
   currentKey: any;
 
   constructor(props: MonthListProps) {
@@ -61,9 +62,9 @@ export default class MonthList extends Component<
   };
 
   checkRange = (
-    date: moment.Moment,
-    start: moment.Moment,
-    end: moment.Moment,
+    date?: moment.Moment | null,
+    start?: moment.Moment | null,
+    end?: moment.Moment | null,
   ) => {
     if (!date || !start) return false;
     if (!end) {

package/TabHeader.tsx

@@ -16,7 +16,7 @@ export default class TabHeader extends React.Component<
   TabHeaderState
 > {
   label;
-  defaultDate;
+  defaultDate: Moment.Moment;
 
   static contextType = ApplicationContext;
   constructor(props: TabHeaderProps) {
@@ -25,7 +25,7 @@ export default class TabHeader extends React.Component<
       active: props.activeTab,
     };
     this.label = props.label;
-    this.defaultDate = props.date ? Moment(props.date) : '';
+    this.defaultDate = props.date ? Moment(props.date) : Moment();
   }
 
   onChangeTab = () => {
@@ -33,9 +33,9 @@ export default class TabHeader extends React.Component<
     onChangeTab?.(id);
   };
 
-  updateView = (date: Moment.Moment, activeTab: boolean) => {
+  updateView = (date?: Moment.Moment | Date | null, activeTab?: boolean) => {
     this.setState({
-      date: date ? Moment(date) : '',
+      date: date ? Moment(date) : Moment(),
       active: activeTab,
     });
   };

package/Util.ts

@@ -47,20 +47,20 @@ const I18N_MAP = {
   },
 };
 
-const Solar = momentDate => ({
+const Solar = (momentDate: moment.Moment) => ({
   solarDay: momentDate.date(),
   solarMonth: momentDate.month() + 1,
   solarYear: momentDate.year(),
 });
 
-const formatYYYYMMDD = (dd, mm, yyyy) =>
+const formatYYYYMMDD = (dd: number, mm: number, yyyy: any) =>
   `${yyyy}-${mm < 10 ? `0${mm}` : mm}-${dd < 10 ? `0${dd}` : dd}`;
 
-const formatDDMM = (dd, mm) =>
+const formatDDMM = (dd: number, mm: number) =>
   `${dd < 10 ? `0${dd}` : dd}/${mm < 10 ? `0${mm}` : mm}`;
 
-const groupHolidaysByDate = holidays => {
-  const groupedHolidays = {};
+const groupHolidaysByDate = (holidays: any[]) => {
+  const groupedHolidays: {[key: string]: string[]} = {};
   if (holidays && holidays.length > 0) {
     holidays.forEach(item => {
       const {day, month, lunar, label} = item;
@@ -90,7 +90,7 @@ const groupHolidaysByDate = holidays => {
   return groupedHolidays;
 };
 
-const sortByDate = arr => {
+const sortByDate = (arr: any[]) => {
   if (arr && arr.length > 1) {
     arr.sort((a, b) => {
       if (a.month > b.month || (a.month === b.month && a.day > b.day)) {
@@ -103,7 +103,7 @@ const sortByDate = arr => {
   return groupHolidaysByDate(arr);
 };
 
-module.exports = {
+const Utils = {
   WEEKDAYS: ['T2', 'T3', 'T4', 'T5', 'T6', 'T7', 'CN'],
 
   WEEKDAYSFROMMOMENT: ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'],
@@ -137,12 +137,12 @@ module.exports = {
 
   MAX_COLUMNS: 7,
 
-  mapWeeKDate(i) {
+  mapWeeKDate(i: number) {
     const date = ['', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun'];
     return date[i];
   },
 
-  mapMonth(i) {
+  mapMonth(i: number) {
     const month = new Map([
       [1, 'jan'],
       [2, 'feb'],
@@ -160,7 +160,7 @@ module.exports = {
     return month.get(i);
   },
 
-  mapMonthShorten(i) {
+  mapMonthShorten(i: number) {
     const month = new Map([
       [1, 'Jan'],
       [2, 'Feb'],
@@ -178,40 +178,45 @@ module.exports = {
     return month.get(i);
   },
 
-  getDaysInMonth(month, year) {
+  getDaysInMonth(month: number, year: number) {
     const lastDayOfMonth = new Date(year, month + 1, 0);
     return lastDayOfMonth.getDate();
   },
 
-  getHolidaysInMonth(headerInfo) {
+  getHolidaysInMonth(headerInfo: moment.Moment) {
     if (headerInfo) {
       const today = moment();
+      // @ts-ignore
       const converter = new LunarDateConverter();
       const startDate = moment(headerInfo).startOf('month');
       const endDate = moment(headerInfo).endOf('month');
       const minLunarDate = converter.SolarToLunar(Solar(startDate));
       const maxLunarDate = converter.SolarToLunar(Solar(endDate));
-      const holidays = [];
+      const holidays: any[] = [];
       const currentYear =
         minLunarDate.lunarYear !== maxLunarDate.lunarYear
           ? [minLunarDate.lunarYear, maxLunarDate.lunarYear]
           : minLunarDate.lunarYear;
 
       // Handle Solar holidays
+      // @ts-ignore
       if (holiday.solar[headerInfo.month() + 1]) {
-        holiday.solar[headerInfo.month() + 1].forEach(date => {
-          const dateAsMoment = moment({
-            year: headerInfo.year(),
-            month: date.month - 1,
-            date: date.day,
-          });
-          if (dateAsMoment.isSameOrAfter(today, 'date')) {
-            holidays.push(date);
-          }
-        });
+        // @ts-ignore
+        holiday.solar[headerInfo.month() + 1].forEach(
+          (date: {month: number; day: any}) => {
+            const dateAsMoment = moment({
+              year: headerInfo.year(),
+              month: date.month - 1,
+              date: date.day,
+            });
+            if (dateAsMoment.isSameOrAfter(today, 'date')) {
+              holidays.push(date);
+            }
+          },
+        );
       }
 
-      holiday.lunar.forEach(item => {
+      holiday.lunar.forEach((item: {lunarDay: any; lunarMonth: any}) => {
         if (currentYear instanceof Array) {
           const solar1 = converter.LunarToSolar({
             lunarDay: item.lunarDay,
@@ -284,3 +289,5 @@ module.exports = {
   },
   I18N_MAP,
 };
+
+export default Utils;

package/holidayData.ts

@@ -1,4 +1,4 @@
-module.exports = {
+const holidayData = {
   solar: {
     1: [
       {
@@ -121,3 +121,5 @@ module.exports = {
     },
   ],
 };
+
+export default holidayData;

package/index.tsx

@@ -11,28 +11,22 @@ import {
 } from '@momo-kits/foundation';
 import CalendarPro from './CalendarPro';
 import TabHeader from './TabHeader';
-import {
-  CalendarProps,
-  CalendarProRef,
-  CalendarState,
-  TabHeaderRef,
-} from './types';
+import {CalendarProps, CalendarState} from './types';
 import styles from './styles';
 
 const DOUBLE = 'doubleDate';
-const SINGLE = 'singleDate';
 
 export const ContainerContext = createContext({width: 0, height: 0});
 
 class Calendar extends Component<CalendarProps, CalendarState> {
   static contextType = ApplicationContext;
-  doubleDate;
+  doubleDate: any;
   tabSelected;
-  selectedDate;
-  calendarPicker: RefObject<CalendarProRef>;
-  cellHeader1: RefObject<TabHeaderRef>;
-  cellHeader2: RefObject<TabHeaderRef>;
-  cellHeaderSingle: RefObject<TabHeaderRef>;
+  selectedDate: moment.Moment;
+  calendarPicker: RefObject<CalendarPro>;
+  cellHeader1: RefObject<TabHeader>;
+  cellHeader2: RefObject<TabHeader>;
+  cellHeaderSingle: RefObject<TabHeader>;
   constructor(props: CalendarProps) {
     super(props);
     this.doubleDate = props.doubleDate
@@ -53,10 +47,10 @@ class Calendar extends Component<CalendarProps, CalendarState> {
       isDoubleDateMode: props.mode === DOUBLE,
       containerWidth: Dimensions.get('window').width,
     };
-    this.calendarPicker = React.createRef<CalendarProRef>();
-    this.cellHeader1 = React.createRef();
-    this.cellHeader2 = React.createRef();
-    this.cellHeaderSingle = React.createRef();
+    this.calendarPicker = React.createRef<CalendarPro>();
+    this.cellHeader1 = React.createRef<TabHeader>();
+    this.cellHeader2 = React.createRef<TabHeader>();
+    this.cellHeaderSingle = React.createRef<TabHeader>();
   }
 
   componentDidMount() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/calendar",
-    "version": "0.80.9",
+    "version": "0.81.1",
     "private": false,
     "main": "index.tsx",
     "peerDependencies": {

package/styles.ts

@@ -1,5 +1,5 @@
 import {StyleSheet} from 'react-native';
-import {Colors, Radius, scaleSize, Spacing} from '@momo-kits/foundation';
+import {Colors, Radius, Spacing} from '@momo-kits/foundation';
 
 export default StyleSheet.create({
   //calendar

package/types.ts

@@ -4,6 +4,9 @@ import {ViewStyle} from 'react-native';
 export type Holidays = {
   solar: object;
   lunar: any[];
+  mixedLabel?: string;
+  day?: number;
+  month?: number;
 };
 
 export type PriceInfo = {
@@ -25,15 +28,15 @@ export type PriceListData = {
 };
 
 export type CalendarProProps = {
-  startDate: Date | null;
-  endDate: Date | null;
-  maxDate: Date;
-  minDate: Date;
+  startDate: Moment.Moment;
+  endDate: Moment.Moment;
+  maxDate?: Date;
+  minDate?: Date;
   isShowLunar?: boolean;
   selectedDate: Moment.Moment;
   isDoubleDateMode: boolean;
   onDateChange: (day: Moment.Moment) => void;
-  priceList: PriceListData;
+  priceList?: PriceListData;
   labelFrom?: string;
   labelTo?: string;
   isHideLabel?: boolean;
@@ -44,23 +47,23 @@ export type CalendarProProps = {
 };
 
 export type CalendarProState = {
-  startDate: Date | null;
-  endDate: Date | null;
+  startDate: Moment.Moment;
+  endDate: Moment.Moment;
   showLunar?: boolean;
   tabSelected?: number;
-  holidays: {lunar: number; mixedLabel: string}[];
+  holidays: Holidays[];
   ownUpdate?: boolean;
   temp?: any;
   headerKey?: string;
 };
 
 export type DoubleDate = {
-  first: Date | null;
-  second: Date | null;
+  first: Moment.Moment;
+  second: Moment.Moment;
 };
 
 export type CalendarProps = {
-  doubleDate?: DoubleDate;
+  doubleDate: DoubleDate;
   selectedDate?: Moment.Moment;
   mode?: 'doubleDate' | 'singleDate';
   id?: number;
@@ -114,16 +117,16 @@ export type HeaderControlProps = {
 export type MonthListProps = {
   isDoubleDateMode: boolean;
   selectedDate: Moment.Moment;
-  holidays?: {lunar: number; mixedLabel: string}[];
+  holidays?: Holidays[];
   priceList?: Record<string, any>;
   minDate: Moment.Moment;
   maxDate: Moment.Moment;
-  startDate: Date | null;
-  endDate: Date | null;
+  startDate: Moment.Moment;
+  endDate: Moment.Moment;
   isShowLunar: boolean;
   tabSelected?: number;
   today: Moment.Moment;
-  onChoose: (day: Date) => void;
+  onChoose: (day: Moment.Moment) => void;
   onScrollCalendar?: (info: {
     date: Moment.Moment;
     key: string;
@@ -144,7 +147,7 @@ export type MonthListRef = {
 
 export type MonthProps = {
   dateList: any[];
-  holidays: Holidays;
+  holidays?: Holidays[];
   priceListDate?: Record<string, PriceInfo>;
   month?: any;
   minDate: Moment.Moment;
@@ -174,11 +177,11 @@ export type DayProps = {
   price?: string;
   isBestPrice?: boolean;
   havePriceList: boolean;
-  isDisabled: boolean;
+  isDisabled?: boolean;
 };
 
 export type TabHeaderState = {
-  active: boolean;
+  active?: boolean;
   date?: Moment.Moment;
 };