@momo-kits/calendar 0.0.71-beta.25 → 0.0.71-beta.29

package/index.js

@@ -1,4 +1,4 @@
 import Calendar from './src/Calendar';
 import CalendarPicker from './src/calendarPicker/index';
 
-export { Calendar, CalendarPicker };
+export {Calendar, CalendarPicker};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/calendar",
-    "version": "0.0.71-beta.25",
+    "version": "0.0.71-beta.29",
     "private": false,
     "main": "index.js",
     "dependencies": {

package/publish.sh

@@ -26,4 +26,4 @@ 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"}'
+##curl -X POST '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/src/Calendar.js

@@ -409,7 +409,6 @@ class Calendar extends Component {
       maxDate,
       doubleDate,
       isHideHeaderPanel,
-      disabledWeekend,
       style,
     } = this.props;
     const {isDoubleDateMode} = this.state;
@@ -432,7 +431,6 @@ class Calendar extends Component {
           {!isHideHeaderPanel && this.renderHeaderPanel()}
         </View>
         <CalendarPro
-          disabledWeekend={disabledWeekend}
           priceList={priceList}
           ref={this.calendarPicker}
           startDate={doubleDate?.first}

package/src/CalendarPro.js

@@ -60,10 +60,7 @@ export default class CalendarPro extends Component {
   setDateRange = (dateRange, isScrollToStartDate) => {
     if (dateRange && dateRange.startDate && dateRange.endDate) {
       this.setState(
-        {
-          startDate: dateRange.startDate,
-          endDate: dateRange.endDate,
-        },
+        {startDate: dateRange.startDate, endDate: dateRange.endDate},
         () => {
           const dateScroll = isScrollToStartDate
             ? dateRange.startDate
@@ -75,10 +72,7 @@ export default class CalendarPro extends Component {
   };
 
   ownSetState(state) {
-    this.setState({
-      ...state,
-      ownUpdate: true,
-    });
+    this.setState({...state, ownUpdate: true});
   }
 
   loadLabel = (data, type) => {
@@ -156,11 +150,7 @@ export default class CalendarPro extends Component {
     } else {
       data = holidays;
     }
-    this.ownSetState({
-      holidays,
-      temp: data,
-      headerKey: key,
-    });
+    this.ownSetState({holidays, temp: data, headerKey: key});
   };
 
   onScrollCalendar = data => {
@@ -241,17 +231,12 @@ export default class CalendarPro extends Component {
       isHideLabel,
       isHideHoliday,
       isOffLunar,
-      disabledWeekend,
-      isShowLunar,
     } = this.props;
     let priceListFormat = priceList?.outbound;
     if (isDoubleDateMode) {
       priceListFormat =
         tabSelected === 0 ? priceList?.outbound : priceList?.inbound;
     }
-    const isDisabledWeekend =
-      disabledWeekend && !priceList && !isShowLunar && !isDoubleDateMode;
-
     return (
       <View style={styles.container}>
         <View style={styles.viewDate}>
@@ -272,9 +257,7 @@ export default class CalendarPro extends Component {
                     {
                       color:
                         item === 6 || item === 7
-                          ? isDisabledWeekend
-                            ? Colors.red_07
-                            : Colors.red_03
+                          ? Colors.red_03
                           : Colors.black_17,
                     },
                   ]}
@@ -284,7 +267,6 @@ export default class CalendarPro extends Component {
               ))}
             </View>
             <MonthList
-              disabledWeekend={isDisabledWeekend}
               ref="MonthList"
               today={this.today}
               minDate={this.minDate}
@@ -380,22 +362,12 @@ CalendarPro.defaultProps = {
 
 const styles = StyleSheet.create({
   row: {flexDirection: 'row'},
-  txtMonthLunar: {
-    color: Colors.red_03,
-    marginRight: Spacing.S,
-  },
+  txtMonthLunar: {color: Colors.red_03, marginRight: Spacing.S},
   subTextLunar: {
     color: Colors.black_17,
   },
-  contentScroll: {
-    paddingHorizontal: 12,
-    paddingVertical: 10,
-  },
-  iconSelected: {
-    width: 24,
-    height: 24,
-    resizeMode: 'cover',
-  },
+  contentScroll: {paddingHorizontal: 12, paddingVertical: 10},
+  iconSelected: {width: 24, height: 24, resizeMode: 'cover'},
   txtLunar: {
     paddingLeft: 6,
     color: '#222222',

package/src/Day/index.js

@@ -108,8 +108,7 @@ class Day extends Component {
   }
 
   render() {
-    const {date, empty, price, isBestPrice, disabledWeekend} = this.props;
-
+    const {date, empty, price, isBestPrice} = this.props;
     const text = date ? date.date() : '';
     return (
       <View style={style.dayContainer}>
@@ -121,7 +120,6 @@ class Day extends Component {
           ]}>
           {this.isValid && this.isInScope ? (
             <TouchableHighlight
-              disabled={disabledWeekend && this.isWeekEnd}
               style={[
                 style.day,
                 {
@@ -152,7 +150,6 @@ class Day extends Component {
                     this.isWeekEnd && style.weekendDay,
                     this.isSolarHoliday && style.weekendDay,
                     (this.isStart || this.isEnd) && style.focusedText,
-                    this.isWeekEnd && disabledWeekend && style.disabledWeekend,
                   ]}>
                   {text}
                 </Text.Label1>

package/src/Day/style.js

@@ -21,7 +21,6 @@ export default {
     alignItems: 'center',
     height: containerDayHeight,
   },
-  disabledWeekend: {color: Colors.red_07},
   day: {
     width: dayWidth,
     overflow: 'hidden',

package/src/HeaderControl.js

@@ -1,85 +1,79 @@
-import React, { useState, forwardRef, useImperativeHandle } from 'react';
-import { View, TouchableOpacity, StyleSheet } from 'react-native';
+import React, {useState, forwardRef, useImperativeHandle} from 'react';
+import {View, TouchableOpacity, StyleSheet} from 'react-native';
 import moment from 'moment';
-import { Icon, ScaleSize, Text, Colors, Spacing } from '@momo-kits/core-v2';
+import {Icon, ScaleSize, Text, Colors, Spacing} from '@momo-kits/core-v2';
 
 import Util from './Util';
 
 const HeaderControl = forwardRef(
-    ({ onPressBackArrow, onPressNextArrow, selectedDate }, ref) => {
-        const [info, setInfo] = useState({
-            date: moment(selectedDate || new Date()),
-        });
+  ({onPressBackArrow, onPressNextArrow, selectedDate}, ref) => {
+    const [info, setInfo] = useState({
+      date: moment(selectedDate || new Date()),
+    });
 
-        useImperativeHandle(ref, () => ({
-            onUpdateInfo,
-        }));
+    useImperativeHandle(ref, () => ({
+      onUpdateInfo,
+    }));
 
-        const onUpdateInfo = (date) => {
-            setInfo(date);
-        };
+    const onUpdateInfo = date => {
+      setInfo(date);
+    };
 
-        if (info && info.date) {
-            const headerFormat = `${Util.mapMonth(
-                info.date.month() + 1,
-            )}/${info.date.year()}`;
-            return (
-                <View style={styles.container}>
-                    <TouchableOpacity
-                        style={styles.btnLeft}
-                        onPress={onPressBackArrow}>
-                        <Icon
-                            name="24_arrow_chevron_left_small"
-                            tintColor={Colors.black_17}
-                            style={styles.icon}
-                        />
-                    </TouchableOpacity>
-                    <Text.HeaderText2
-                        weight="semibold"
-                        style={styles.txtHeader}>
-                        {headerFormat}
-                    </Text.HeaderText2>
-                    <TouchableOpacity
-                        style={styles.btnRight}
-                        onPress={onPressNextArrow}>
-                        <Icon
-                            name="24_arrow_chevron_right_small"
-                            tintColor={Colors.black_17}
-                            style={styles.icon}
-                        />
-                    </TouchableOpacity>
-                </View>
-            );
-        }
-        return <View />;
-    },
+    if (info && info.date) {
+      const headerFormat = `${Util.mapMonth(
+        info.date.month() + 1,
+      )}/${info.date.year()}`;
+      return (
+        <View style={styles.container}>
+          <TouchableOpacity style={styles.btnLeft} onPress={onPressBackArrow}>
+            <Icon
+              name="24_arrow_chevron_left_small"
+              tintColor={Colors.black_17}
+              style={styles.icon}
+            />
+          </TouchableOpacity>
+          <Text.HeaderText2 weight="semibold" style={styles.txtHeader}>
+            {headerFormat}
+          </Text.HeaderText2>
+          <TouchableOpacity style={styles.btnRight} onPress={onPressNextArrow}>
+            <Icon
+              name="24_arrow_chevron_right_small"
+              tintColor={Colors.black_17}
+              style={styles.icon}
+            />
+          </TouchableOpacity>
+        </View>
+      );
+    }
+    return <View />;
+  },
 );
 
 export default HeaderControl;
 const styles = StyleSheet.create({
-    icon: { width: 24, height: 24, resizeMode: 'contain' },
-    txtHeader: {
-        // fontSize: 15,
-        textAlign: 'center',
-    },
-    btnRight: {
-        width: 36,
-        height: 36,
-        justifyContent: 'center',
-        alignItems: 'center',
-    },
-    btnLeft: {
-        width: 36,
-        height: 36,
-        justifyContent: 'center',
-        alignItems: 'center',
-    },
-    container: {
-        height: ScaleSize(44),
-        flexDirection: 'row',
-        justifyContent: 'space-between',
-        backgroundColor: Colors.blue_10,
-        alignItems: 'center',
-        borderRadius: 4,
-    },
+  icon: {width: 24, height: 24, resizeMode: 'contain'},
+  txtHeader: {
+    // fontSize: 15,
+    textAlign: 'center',
+  },
+  btnRight: {
+    width: 36,
+    height: 36,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  btnLeft: {
+    width: 36,
+    height: 36,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  container: {
+    height: ScaleSize(44),
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    backgroundColor: Colors.blue_10,
+    alignItems: 'center',
+    borderRadius: 4,
+  },
 });