@momo-kits/calendar 0.121.0-rc.8 → 0.121.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Day.tsx +4 -2
- package/MonthList.tsx +1 -1
- package/TabHeader.tsx +2 -2
- package/index.tsx +2 -0
- package/package.json +1 -1
package/Day.tsx
CHANGED
|
@@ -114,9 +114,11 @@ const Day: React.FC<DayProps> = props => {
|
|
|
114
114
|
<RNText
|
|
115
115
|
style={{
|
|
116
116
|
position: 'absolute',
|
|
117
|
-
top: Spacing.XS,
|
|
118
|
-
right: Spacing.XS,
|
|
117
|
+
top: scaleSize(Spacing.XS),
|
|
118
|
+
right: scaleSize(Spacing.XS),
|
|
119
119
|
color: lunarTextColor,
|
|
120
|
+
fontSize: scaleSize(8),
|
|
121
|
+
lineHeight: scaleSize(12),
|
|
120
122
|
}}>
|
|
121
123
|
{lunarDate.lunarDay === 1
|
|
122
124
|
? `${lunarDate.lunarDay}/${lunarDate.lunarMonth}`
|
package/MonthList.tsx
CHANGED
|
@@ -159,7 +159,7 @@ const MonthList = forwardRef<MonthListRef, MonthListProps>((props, ref) => {
|
|
|
159
159
|
const renderItem = useCallback(
|
|
160
160
|
({item, index}: {item: {date: Moment; dateList: any[]}; index: number}) => {
|
|
161
161
|
const keyMonth = moment(item.date).format('YYYY-MM');
|
|
162
|
-
const priceListDate = priceList?.[keyMonth];
|
|
162
|
+
const priceListDate = priceList?.[keyMonth]?.day;
|
|
163
163
|
return (
|
|
164
164
|
<Month
|
|
165
165
|
{...restProps}
|
package/TabHeader.tsx
CHANGED
|
@@ -54,10 +54,10 @@ export default class TabHeader extends React.Component<
|
|
|
54
54
|
? this.defaultDate.format('DD/MM/YYYY')
|
|
55
55
|
: '';
|
|
56
56
|
const dayOfWeekFromState = date
|
|
57
|
-
? `${translate(Util.WEEKDAYSFROMMOMENT[date.day()])}
|
|
57
|
+
? `${translate(Util.WEEKDAYSFROMMOMENT[date.day()])}, `
|
|
58
58
|
: '';
|
|
59
59
|
const dayOfWeekFromDefault = this.defaultDate
|
|
60
|
-
? `${translate(Util.WEEKDAYSFROMMOMENT[this.defaultDate.day()])}
|
|
60
|
+
? `${translate(Util.WEEKDAYSFROMMOMENT[this.defaultDate.day()])},`
|
|
61
61
|
: '';
|
|
62
62
|
|
|
63
63
|
return (
|
package/index.tsx
CHANGED
|
@@ -232,6 +232,8 @@ const Calendar: React.FC<CalendarProps> = props => {
|
|
|
232
232
|
onCTAStateChange?.(false);
|
|
233
233
|
onDateChange?.({first: doubleDate.current.first!, second: null});
|
|
234
234
|
} else {
|
|
235
|
+
// Reset second date when switching to single mode
|
|
236
|
+
doubleDate.current.second = null;
|
|
235
237
|
props.onCTAStateChange?.(true);
|
|
236
238
|
if (doubleDate.current.first) {
|
|
237
239
|
cellHeaderSingle.current?.updateView(doubleDate.current.first, true);
|