@momo-kits/calendar 0.79.6-beta.3 → 0.79.6-beta.4

package/Day.tsx

@@ -155,7 +155,7 @@ class Day extends Component<DayProps> {
     let lunarTextColor = theme.colors.text.hint;
     let priceColor = theme.colors.text.default;
 
-    if (this.isWeekEnd) {
+    if (this.isWeekEnd || this.isSolarHoliday || this.isLunarHoliday) {
       textColor = theme.colors.error.primary;
       priceColor = theme.colors.error.primary;
     }

package/Month.tsx

@@ -4,7 +4,7 @@ import {View} from 'react-native';
 import moment from 'moment';
 import Moment from 'moment';
 import Day from './Day';
-import {Spacing} from '@momo-kits/foundation';
+import {scaleSize, Spacing} from '@momo-kits/foundation';
 import {MonthProps} from './types';
 import {ContainerContext} from './index';
 
@@ -44,6 +44,7 @@ export default class Month extends PureComponent<MonthProps> {
         flexDirection: 'row',
         alignItems: 'center',
         marginBottom: Spacing.XS,
+        height: scaleSize(48),
       }}
       key={`row${index}`}>
       {dayList.map((item, i) => {

package/MonthList.tsx

@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component, useCallback} from 'react';
 import {FlatList, Platform} from 'react-native';
 import moment from 'moment';
 import Moment from 'moment';
@@ -238,6 +238,12 @@ export default class MonthList extends Component<
     index,
   });
 
+  componentDidMount() {
+    setTimeout(() => {
+      this.scrollToMonth(this.currentDate);
+    }, 250);
+  }
+
   render() {
     const {priceList} = this.props;
     return (
@@ -256,10 +262,10 @@ export default class MonthList extends Component<
             onViewableItemsChanged={this.getCurrentVisibleMonth}
             onScrollToIndexFailed={() => {}}
             scrollEnabled
-            initialNumToRender={1}
+            removeClippedSubviews
+            initialNumToRender={3}
             maxToRenderPerBatch={MAX_RENDER_PER_BATCH}
             windowSize={1}
-            contentContainerStyle={{paddingTop: 5}}
             initialScrollIndex={this.currentScrollIndex}
             getItemLayout={(data, index) =>
               this.getItemLayout(data, index, size.width)

package/TabHeader.tsx

@@ -30,9 +30,7 @@ export default class TabHeader extends React.Component<
 
   onChangeTab = () => {
     const {onChangeTab, id} = this.props;
-    if (onChangeTab) {
-      onChangeTab(id);
-    }
+    onChangeTab?.(id);
   };
 
   updateView = (date: Moment.Moment, activeTab: boolean) => {

package/index.tsx

@@ -88,9 +88,9 @@ class Calendar extends Component<CalendarProps, CalendarState> {
   }
 
   onChangeTab = (idTab: number) => {
-    this.props.onChangeTab && this.props.onChangeTab(idTab);
-
+    this.props.onChangeTab?.(idTab);
     this.tabSelected = idTab;
+
     if (this.cellHeader1.current && this.cellHeader2.current) {
       this.cellHeader1.current.setActiveTab(idTab === 0);
       this.cellHeader2.current.setActiveTab(idTab === 1);
@@ -183,9 +183,9 @@ class Calendar extends Component<CalendarProps, CalendarState> {
     ) {
       this.doubleDate.second = this.selectedDate;
       this.cellHeader2.current.updateView(this.selectedDate, false);
-      this.cellHeader1.current?.setActiveTab(true);
+      this.cellHeader1?.current?.setActiveTab(true);
       this.tabSelected = 0;
-      this.calendarPicker.current?.setDoubleDateAndTabIndex(
+      this.calendarPicker?.current?.setDoubleDateAndTabIndex(
         this.doubleDate.first,
         this.doubleDate.second,
         this.tabSelected,
@@ -205,8 +205,8 @@ class Calendar extends Component<CalendarProps, CalendarState> {
       this.doubleDate.first = this.selectedDate;
       this.doubleDate.second = null;
 
-      this.cellHeader1.current?.updateView(this.selectedDate, false);
-      this.cellHeader2.current?.updateView(null, false);
+      this.cellHeader1?.current?.updateView(this.selectedDate, false);
+      this.cellHeader2?.current?.updateView(null, false);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/calendar",
-    "version": "0.79.6-beta.3",
+    "version": "0.79.6-beta.4",
     "private": false,
     "main": "index.tsx",
     "peerDependencies": {

package/types.ts

@@ -72,7 +72,7 @@ export type CalendarProps = {
   isOffLunar?: boolean;
   isHideHoliday?: boolean;
   isHiddenSwitch?: boolean;
-  isShowLunar?: boolean;
+  isShowLunar: boolean;
   priceList?: PriceListData;
   labelFrom?: string;
   labelTo?: string;