@momo-kits/calendar 0.80.3 → 0.80.4

package/CalendarPro.tsx

@@ -291,7 +291,7 @@ export default class CalendarPro extends Component<
                         },
                       ]}
                       key={item}>
-                      {Util.mapWeeKDate(item)}
+                      {translate(Util.mapWeeKDate(item))}
                     </Text>
                   ))}
                 </View>

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;

package/HeaderControl.tsx

@@ -1,13 +1,14 @@
 import React, {
   forwardRef,
   ForwardRefRenderFunction,
+  useContext,
   useImperativeHandle,
   useState,
 } from 'react';
 import {TouchableOpacity, View} from 'react-native';
 import moment from 'moment';
 import Moment from 'moment';
-import {Icon, Text} from '@momo-kits/foundation';
+import {ApplicationContext, Icon, Text} from '@momo-kits/foundation';
 
 import Util from './Util';
 import {HeaderControlProps, HeaderControlRef} from './types';
@@ -17,6 +18,7 @@ const HeaderControl: ForwardRefRenderFunction<
   HeaderControlRef,
   HeaderControlProps
 > = ({onPressBackArrow, onPressNextArrow, selectedDate}, ref) => {
+  const {translate} = useContext(ApplicationContext);
   const [info, setInfo] = useState<{date: Moment.Moment}>({
     date: moment(selectedDate || new Date()),
   });
@@ -30,8 +32,8 @@ const HeaderControl: ForwardRefRenderFunction<
   };
 
   if (info && info.date) {
-    const headerFormat = `${Util.mapMonth(
-      info.date.month() + 1,
+    const headerFormat = `${translate(
+      Util.mapMonth(info.date.month() + 1),
     )}/${info.date.year()}`;
     return (
       <View style={styles.headerControlContainer}>

package/Util.ts

@@ -1,6 +1,4 @@
 import moment from 'moment';
-
-import {SwitchLanguage} from '@momo-kits/core';
 import LunarDateConverter from './LunarDateConverter';
 import holiday from './holidayData';
 
@@ -108,15 +106,7 @@ const sortByDate = arr => {
 module.exports = {
   WEEKDAYS: ['T2', 'T3', 'T4', 'T5', 'T6', 'T7', 'CN'],
 
-  WEEKDAYSFROMMOMENT: [
-    SwitchLanguage.sun,
-    SwitchLanguage.mon,
-    SwitchLanguage.tue,
-    SwitchLanguage.wed,
-    SwitchLanguage.thu,
-    SwitchLanguage.fri,
-    SwitchLanguage.sat,
-  ],
+  WEEKDAYSFROMMOMENT: ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'],
 
   WEEKDAYSNAME: [
     'Thứ 2',
@@ -148,33 +138,24 @@ module.exports = {
   MAX_COLUMNS: 7,
 
   mapWeeKDate(i) {
-    const date = [
-      '',
-      SwitchLanguage.mon,
-      SwitchLanguage.tue,
-      SwitchLanguage.wed,
-      SwitchLanguage.thu,
-      SwitchLanguage.fri,
-      SwitchLanguage.sat,
-      SwitchLanguage.sun,
-    ];
+    const date = ['', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun'];
     return date[i];
   },
 
   mapMonth(i) {
     const month = new Map([
-      [1, SwitchLanguage.jan],
-      [2, SwitchLanguage.feb],
-      [3, SwitchLanguage.mar],
-      [4, SwitchLanguage.apr],
-      [5, SwitchLanguage.may],
-      [6, SwitchLanguage.jun],
-      [7, SwitchLanguage.jul],
-      [8, SwitchLanguage.aug],
-      [9, SwitchLanguage.sep],
-      [10, SwitchLanguage.oct],
-      [11, SwitchLanguage.nov],
-      [12, SwitchLanguage.dec],
+      [1, 'jan'],
+      [2, 'feb'],
+      [3, 'mar'],
+      [4, 'apr'],
+      [5, 'may'],
+      [6, 'jun'],
+      [7, 'jul'],
+      [8, 'aug'],
+      [9, 'sep'],
+      [10, 'oct'],
+      [11, 'nov'],
+      [12, 'dec'],
     ]);
     return month.get(i);
   },

package/index.tsx

@@ -1,5 +1,5 @@
 import React, {Component, createContext, RefObject} from 'react';
-import {Dimensions, LayoutChangeEvent, ScrollView, View} from 'react-native';
+import {Dimensions, LayoutChangeEvent, View} from 'react-native';
 import moment from 'moment';
 import {
   ApplicationContext,
@@ -422,19 +422,18 @@ class Calendar extends Component<CalendarProps, CalendarState> {
     const {
       isOffLunar,
       isHideHoliday,
-      isHiddenSwitch,
       isShowLunar,
       onCallbackCalendar,
       priceList,
       labelFrom,
       labelTo,
       isHideLabel,
-      minDate,
-      maxDate,
+      minDate = minDateDefault,
+      maxDate = maxDateDefault,
       doubleDate,
-      isHideHeaderPanel,
       style,
       disabledDays = [],
+      hideHeaderTab = false,
     } = this.props;
     const {isDoubleDateMode, containerWidth} = this.state;
     const {theme} = this.context;
@@ -446,13 +445,16 @@ class Calendar extends Component<CalendarProps, CalendarState> {
         }}>
         <View onLayout={this.onLayout} style={[style, styles.scrollView]}>
           <View
-            style={{
-              backgroundColor: theme.colors.background.surface,
-              borderRadius: Radius.XS,
-              marginBottom: Spacing.S,
-            }}>
-            {!isHiddenSwitch && this.renderSwitchReturnSelection()}
-            {!isHideHeaderPanel && this.renderHeaderPanel(theme)}
+            style={[
+              {
+                backgroundColor: theme.colors.background.surface,
+                borderRadius: Radius.XS,
+                marginBottom: Spacing.S,
+              },
+              hideHeaderTab && styles.invisible,
+            ]}>
+            {this.renderSwitchReturnSelection()}
+            {this.renderHeaderPanel(theme)}
           </View>
           <CalendarPro
             priceList={priceList}

package/package.json

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

package/styles.ts

@@ -112,4 +112,12 @@ export default StyleSheet.create({
     borderTopRightRadius: Radius.XS,
     borderBottomRightRadius: Radius.XS,
   },
+
+  invisible: {
+    height: 0,
+    width: 0,
+    padding: 0,
+    marginBottom: 0,
+    overflow: 'hidden',
+  },
 });

package/types.ts

@@ -72,7 +72,6 @@ export type CalendarProps = {
   headerTo?: string;
   isOffLunar?: boolean;
   isHideHoliday?: boolean;
-  isHiddenSwitch?: boolean;
   isShowLunar?: boolean;
   priceList?: PriceListData;
   labelFrom?: string;
@@ -80,9 +79,9 @@ export type CalendarProps = {
   isHideLabel?: boolean;
   minDate?: Date;
   maxDate?: Date;
-  isHideHeaderPanel?: boolean;
   style?: ViewStyle | ViewStyle[];
   disabledDays?: Date[];
+  hideHeaderTab?: boolean;
 };
 
 export type CalendarProRef = {