@momo-kits/calendar 0.79.6-beta.9 → 0.80.1

package/MonthList.tsx

@@ -242,7 +242,7 @@ export default class MonthList extends Component<
   componentDidMount() {
     setTimeout(() => {
       this.scrollToMonth(this.currentDate);
-    }, 250);
+    }, 500);
   }
 
   render() {

package/index.tsx

@@ -5,6 +5,7 @@ import {
   ApplicationContext,
   Radius,
   scaleSize,
+  Spacing,
   Switch,
   Text,
 } from '@momo-kits/foundation';
@@ -412,6 +413,12 @@ class Calendar extends Component<CalendarProps, CalendarState> {
   };
 
   render() {
+    const currentDate = new Date();
+    const minDateDefault = new Date(currentDate);
+    const maxDateDefault = new Date(currentDate);
+    minDateDefault.setFullYear(minDateDefault.getFullYear() - 1);
+    maxDateDefault.setFullYear(maxDateDefault.getFullYear() + 1);
+
     const {
       isOffLunar,
       isHideHoliday,
@@ -437,11 +444,12 @@ class Calendar extends Component<CalendarProps, CalendarState> {
           width: containerWidth,
           height: priceList ? scaleSize(48) : scaleSize(34),
         }}>
-        <ScrollView onLayout={this.onLayout} style={[styles.scrollView, style]}>
+        <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)}
@@ -465,7 +473,7 @@ class Calendar extends Component<CalendarProps, CalendarState> {
             isOffLunar={isOffLunar}
             disabledDays={disabledDays}
           />
-        </ScrollView>
+        </View>
       </ContainerContext.Provider>
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/calendar",
-    "version": "0.79.6-beta.9",
+    "version": "0.80.1",
     "private": false,
     "main": "index.tsx",
     "peerDependencies": {
@@ -14,4 +14,4 @@
     "dependencies": {
         "moment": "^2.24.0"
     }
-}
+}

package/styles.ts

@@ -21,7 +21,6 @@ export default StyleSheet.create({
     marginTop: Spacing.S,
   },
   scrollView: {
-    flex: 1,
     backgroundColor: 'transparent',
     alignSelf: 'center',
     width: '100%',
@@ -58,9 +57,7 @@ export default StyleSheet.create({
     marginTop: Spacing.S,
   },
   container: {
-    flex: 1,
     backgroundColor: 'white',
-    marginTop: Spacing.S,
     borderRadius: Radius.XS,
   },
   blueSeperator: {

package/types.ts

@@ -60,28 +60,28 @@ export type DoubleDate = {
 };
 
 export type CalendarProps = {
-  doubleDate: DoubleDate;
-  selectedDate: Moment.Moment;
-  mode: 'doubleDate' | 'singleDate';
-  id: number;
-  onChangeTab: (id: number) => void;
-  onDateChange: (date: DoubleDate | Date) => void;
-  onCTAStateChange: (b: boolean) => void;
-  onCallbackCalendar: (type: string, isDoubleDateMode: boolean) => void;
+  doubleDate?: DoubleDate;
+  selectedDate?: Moment.Moment;
+  mode?: 'doubleDate' | 'singleDate';
+  id?: number;
+  onChangeTab?: (id: number) => void;
+  onDateChange?: (date: DoubleDate | Date) => void;
+  onCTAStateChange?: (b: boolean) => void;
+  onCallbackCalendar?: (type: string, isDoubleDateMode: boolean) => void;
   headerFrom?: string;
   headerTo?: string;
   isOffLunar?: boolean;
   isHideHoliday?: boolean;
   isHiddenSwitch?: boolean;
-  isShowLunar: boolean;
+  isShowLunar?: boolean;
   priceList?: PriceListData;
   labelFrom?: string;
   labelTo?: string;
   isHideLabel?: boolean;
-  minDate: Date;
-  maxDate: Date;
+  minDate?: Date;
+  maxDate?: Date;
   isHideHeaderPanel?: boolean;
-  style: ViewStyle | ViewStyle[];
+  style?: ViewStyle | ViewStyle[];
   disabledDays?: Date[];
 };