@momo-kits/calendar 0.89.4 → 0.89.6-rc.1

package/CalendarPro.tsx

@@ -1,6 +1,6 @@
 import React, {Component, createRef} from 'react';
 
-import {Dimensions, ScrollView, View} from 'react-native';
+import {ScrollView, View} from 'react-native';
 import Moment from 'moment';
 import {
   ApplicationContext,
@@ -59,7 +59,7 @@ export default class CalendarPro extends Component<
 
   static getDerivedStateFromProps(
     nextProps: {isShowLunar: any},
-    prevState: {ownUpdate: any; showLunar: any},
+    prevState: {ownUpdate: any; showLunar: any}
   ) {
     if (prevState.ownUpdate) {
       return {
@@ -74,7 +74,7 @@ export default class CalendarPro extends Component<
 
   setDateRange = (
     dateRange: {startDate: any; endDate: any},
-    isScrollToStartDate: any,
+    isScrollToStartDate: any
   ) => {
     if (dateRange && dateRange.startDate && dateRange.endDate) {
       this.setState(
@@ -88,7 +88,7 @@ export default class CalendarPro extends Component<
             : dateRange.endDate;
 
           this.monthListRef?.scrollToMonth(dateScroll);
-        },
+        }
       );
     }
   };
@@ -116,7 +116,8 @@ export default class CalendarPro extends Component<
     if (maxValid && !minValid) {
       min = max.subtract(12, 'months');
     }
-    if (min.isSameOrAfter(max)) return {};
+    if (min.isSame(max) && this.props.isDoubleDateMode) return {};
+    if (min.isAfter(max)) return {};
     this.minDate = min;
     this.maxDate = max;
   };
@@ -154,7 +155,7 @@ export default class CalendarPro extends Component<
 
   executeProcessAfterScrollCalendar = (date: Moment.Moment, key: any) => {
     const holidays: any[] = Object.values(
-      Util.getHolidaysInMonth(Moment(date)),
+      Util.getHolidaysInMonth(Moment(date))
     );
     const {showLunar} = this.state;
     if (this.headerControlRef) {
@@ -186,7 +187,7 @@ export default class CalendarPro extends Component<
   setDoubleDateAndTabIndex = (
     firstDate: Moment.Moment | Date | undefined,
     secondDate?: Moment.Moment | Date | undefined | null,
-    tabSelected?: any,
+    tabSelected?: any
   ) => {
     this.ownSetState({
       startDate: firstDate ? Moment(firstDate) : null,
@@ -349,7 +350,7 @@ export default class CalendarPro extends Component<
                         month: number;
                         highlight: string;
                       },
-                      idx: {toString: () => React.Key | null | undefined},
+                      idx: {toString: () => React.Key | null | undefined}
                     ) => {
                       const labelHoliday = showLunar
                         ? item.mixedLabel || item.label || ''
@@ -378,7 +379,7 @@ export default class CalendarPro extends Component<
                           </Text>
                         </View>
                       );
-                    },
+                    }
                   )}
               </ScrollView>
             )}

package/Day.tsx

@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 
-import {TouchableOpacity, View} from 'react-native';
+import {Text as RNText, TouchableOpacity, View} from 'react-native';
 import {
   ApplicationContext,
   Colors,
@@ -13,6 +13,7 @@ import {ContainerContext} from './index';
 import styles from './styles';
 
 class Day extends Component<DayProps> {
+  static contextType = ApplicationContext;
   isFocus?: boolean;
   isValid?: boolean;
   isMid?: boolean;
@@ -29,7 +30,6 @@ class Day extends Component<DayProps> {
   isInScope?: boolean;
   diffPrice: any;
 
-  static contextType = ApplicationContext;
   constructor(props: DayProps) {
     super(props);
     this.statusCheck();
@@ -185,18 +185,17 @@ class Day extends Component<DayProps> {
                   disabled={!(this.isValid && this.isInScope)}
                   onPress={this.chooseDay}>
                   {this.lunarDate && this.showLunar && !!text && (
-                    <Text
+                    <RNText
                       style={{
                         position: 'absolute',
                         top: Spacing.XS,
                         right: Spacing.XS,
-                      }}
-                      typography={'label_xs_medium'}
-                      color={lunarTextColor}>
+                        color: lunarTextColor,
+                      }}>
                       {this.lunarDate.lunarDay === 1
                         ? `${this.lunarDate.lunarDay}/${this.lunarDate.lunarMonth}`
                         : this.lunarDate.lunarDay}
-                    </Text>
+                    </RNText>
                   )}
                   <Text typography={'header_s_semibold'} color={textColor}>
                     {text}

package/HeaderControl.tsx

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

package/LunarService.ts

@@ -29,27 +29,6 @@ const jdFromDate = (dd: number, mm: number, yy: number) => {
   return jd;
 };
 
-/* Convert a Julian day number to day/month/year. Parameter jd is an integer */
-const jdToDate = (jd: number) => {
-  let a, b, c, d, e, m, day, month, year;
-  if (jd > 2299160) {
-    // After 5/10/1582, Gregorian calendar
-    a = jd + 32044;
-    b = removeFractionalPart((4 * a + 3) / 146097);
-    c = a - removeFractionalPart((b * 146097) / 4);
-  } else {
-    b = 0;
-    c = jd + 32082;
-  }
-  d = removeFractionalPart((4 * c + 3) / 1461);
-  e = c - removeFractionalPart((1461 * d) / 4);
-  m = removeFractionalPart((5 * e + 2) / 153);
-  day = e - removeFractionalPart((153 * m + 2) / 5) + 1;
-  month = m + 3 - 12 * removeFractionalPart(m / 10);
-  year = b * 100 + d - 4800 + removeFractionalPart(m / 10);
-  return [day, month, year];
-};
-
 /* Compute the time of the k-th new moon after the new moon of 1/1/1900 13:52 UCT
  * (measured as the number of days since 1/1/4713 BC noon UCT, e.g., 2451545.125 is 1/1/2000 15:00 UTC).
  * Returns a floating number, e.g., 2415079.9758617813 for k=2 or 2414961.935157746 for k=-2
@@ -127,7 +106,7 @@ const SunLongitude = (jdn: number) => {
  */
 const getSunLongitude = (dayNumber: number, timeZone: number) => {
   return removeFractionalPart(
-    (SunLongitude(dayNumber - 0.5 - timeZone / 24) / Math.PI) * 6,
+    (SunLongitude(dayNumber - 0.5 - timeZone / 24) / Math.PI) * 6
   );
 };
 
@@ -172,7 +151,7 @@ export const convertSolar2Lunar = (
   dd: number,
   mm: number,
   yy: number,
-  timeZone: number,
+  timeZone: number
 ) => {
   let k,
     dayNumber,

package/TabHeader.tsx

@@ -15,10 +15,10 @@ export default class TabHeader extends React.Component<
   TabHeaderProps,
   TabHeaderState
 > {
+  static contextType = ApplicationContext;
   label;
   defaultDate: Moment.Moment;
 
-  static contextType = ApplicationContext;
   constructor(props: TabHeaderProps) {
     super(props);
     this.state = {

package/index.tsx

@@ -27,6 +27,7 @@ class Calendar extends Component<CalendarProps, CalendarState> {
   cellHeader1: RefObject<TabHeader>;
   cellHeader2: RefObject<TabHeader>;
   cellHeaderSingle: RefObject<TabHeader>;
+
   constructor(props: CalendarProps) {
     super(props);
     this.doubleDate = props.doubleDate
@@ -74,7 +75,7 @@ class Calendar extends Component<CalendarProps, CalendarState> {
         this.calendarPicker.current.setDoubleDateAndTabIndex(
           this.doubleDate.first,
           this.doubleDate.second,
-          this.tabSelected,
+          this.tabSelected
         );
       }
     } else if (this.calendarPicker.current) {
@@ -98,7 +99,7 @@ class Calendar extends Component<CalendarProps, CalendarState> {
       this.calendarPicker.current.setDoubleDateAndTabIndex(
         this.doubleDate.first,
         this.doubleDate.second,
-        this.tabSelected,
+        this.tabSelected
       );
     }
   }
@@ -120,17 +121,17 @@ class Calendar extends Component<CalendarProps, CalendarState> {
         this.tabSelected = 1;
         this.cellHeader1.current.updateView(
           this.selectedDate,
-          this.tabSelected === 0,
+          this.tabSelected === 0
         );
         this.cellHeader2.current.updateView(
           this.doubleDate.second,
-          this.tabSelected === 1,
+          this.tabSelected === 1
         );
         this.cellHeader2.current.setActiveTab(this.tabSelected === 1);
         this.calendarPicker.current.setDoubleDateAndTabIndex(
           this.doubleDate.first,
           this.doubleDate.second,
-          this.tabSelected,
+          this.tabSelected
         );
         if (onDateChange) {
           onDateChange({
@@ -151,7 +152,7 @@ class Calendar extends Component<CalendarProps, CalendarState> {
         this.calendarPicker.current.setDoubleDateAndTabIndex(
           this.doubleDate.first,
           this.doubleDate.second,
-          this.tabSelected,
+          this.tabSelected
         );
         if (onDateChange) {
           onDateChange({
@@ -183,7 +184,7 @@ class Calendar extends Component<CalendarProps, CalendarState> {
       this.calendarPicker?.current?.setDoubleDateAndTabIndex(
         this.doubleDate.first,
         this.doubleDate.second,
-        this.tabSelected,
+        this.tabSelected
       );
       if (onCTAStateChange) {
         onCTAStateChange(!!this.doubleDate.second);
@@ -245,7 +246,7 @@ class Calendar extends Component<CalendarProps, CalendarState> {
         this.calendarPicker.current?.setDoubleDateAndTabIndex(
           this.selectedDate,
           null,
-          this.tabSelected,
+          this.tabSelected
         );
         this.doubleDate.first = moment(this.selectedDate);
         this.doubleDate.second = null;
@@ -256,7 +257,7 @@ class Calendar extends Component<CalendarProps, CalendarState> {
         this.calendarPicker?.current?.setDoubleDateAndTabIndex(
           this.doubleDate.first,
           this.doubleDate.second,
-          this.tabSelected,
+          this.tabSelected
         );
 
         if (onCTAStateChange) {
@@ -301,7 +302,7 @@ class Calendar extends Component<CalendarProps, CalendarState> {
         if (onCallbackCalendar && typeof onCallbackCalendar === 'function') {
           onCallbackCalendar('switch', isDoubleDateMode);
         }
-      },
+      }
     );
   };
 
@@ -377,21 +378,21 @@ class Calendar extends Component<CalendarProps, CalendarState> {
       startDate: moment.Moment | undefined;
       endDate: moment.Moment | undefined;
     },
-    isScrollToStartDate: any,
+    isScrollToStartDate: any
   ) => {
     const {mode, doubleDate = {}} = this.props;
     if (mode === 'doubleDate') {
       this.cellHeader1?.current?.updateView(
         dateRange.startDate,
-        this.tabSelected === 0,
+        this.tabSelected === 0
       );
       this.cellHeader2?.current?.updateView(
         dateRange.endDate,
-        this.tabSelected === 1,
+        this.tabSelected === 1
       );
       this.calendarPicker?.current?.setDateRange(
         dateRange,
-        isScrollToStartDate,
+        isScrollToStartDate
       );
       this.doubleDate = doubleDate
         ? {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/calendar",
-    "version": "0.89.4",
+    "version": "0.89.6-rc.1",
     "private": false,
     "main": "index.tsx",
     "peerDependencies": {
@@ -16,4 +16,4 @@
     "dependencies": {
         "moment": "^2.24.0"
     }
-}
+}

package/publish.sh

@@ -1,29 +1,27 @@
 #!/bin/bash
+
+# Prepare dist files
 rm -rf dist
 mkdir dist
-
-cp . ./dist
-
-# GET VERSION from mck_package.json
-VERSIONSTRING=( v$(jq .version package.json) )
-VERSION=(${VERSIONSTRING//[\"]/})
-echo VERSION: $VERSION
-
-rsync -r --verbose --exclude '*.mdx' --exclude '*Demo.js'  --exclude 'props-type.js' --exclude 'prop-types.js' ./* dist
-
-# #babel component to dist
-#babel ./dist -d dist --copy-files
-
-#copy option
-#cp -r ./src/ dist
-
-
-#npm login
-#publish dist to npm
+rsync -r --exclude=/dist ./* dist
 cd dist
-npm publish --tag beta --access=public
+
+if [ "$1" == "stable" ]; then
+  npm version $(npm view @momo-kits/foundation@stable version)
+  npm version patch
+  npm publish --tag stable --access=public
+elif [ "$1" == "latest" ]; then
+  npm version $(npm view @momo-kits/foundation@latest version)
+  npm publish --tag latest --access=public
+else
+  npm version $(npm view @momo-kits/calendar@beta version)
+  npm version prerelease --preid=beta
+  npm publish --tag beta --access=public
+fi
+
+PACKAGE_NAME=$(npm pkg get name)
+NEW_PACKAGE_VERSION=$(npm pkg get version)
+
+# Clean up
 cd ..
 rm -rf dist
-
-
-##curl -X POST -H 'Content-Type: application/json' 'https://chat.googleapis.com/v1/spaces/AAAAbP8987c/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=UGSFRvk_oYb9uGsAgs31bVvMm6jDkmD8zihGm3eyaQA%3D&threadKey=JoaXTEYaNNkl' -d '{"text": "@momo-kits/calendar new version release: '*"$VERSION"*' https://www.npmjs.com/package/@momo-kits/calendar"}'

package/styles.ts

@@ -1,5 +1,5 @@
 import {StyleSheet} from 'react-native';
-import {Colors, Radius, Spacing} from '@momo-kits/foundation';
+import {Colors, Radius, scaleSize, Spacing} from '@momo-kits/foundation';
 
 export default StyleSheet.create({
   //calendar
@@ -112,7 +112,6 @@ export default StyleSheet.create({
     borderTopRightRadius: Radius.XS,
     borderBottomRightRadius: Radius.XS,
   },
-
   invisible: {
     height: 0,
     width: 0,
@@ -120,4 +119,9 @@ export default StyleSheet.create({
     marginBottom: 0,
     overflow: 'hidden',
   },
+  lunarText: {
+    fontSize: scaleSize(8),
+    lineHeight: scaleSize(12),
+    fontWeight: '500',
+  },
 });