Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/packages/calendarcard/calendarcard.taro.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useEffect, useState } from 'react'
import React, { useCallback, useEffect, useState, useRef } from 'react'
import classNames from 'classnames'
import { View } from '@tarojs/components'
import { ArrowLeft, ArrowRight, DoubleLeft, DoubleRight } from './icon.taro'
Expand Down Expand Up @@ -50,7 +50,7 @@ export const CalendarCard = React.forwardRef<
onPageChange,
onChange,
} = { ...defaultProps, ...props }

const onPageChangeRef = useRef(onPageChange)
// 当前月份信息
const [month, setMonth] = useState<CalendarCardMonth>(() => {
let date = new Date(Date.now())
Expand Down Expand Up @@ -133,11 +133,15 @@ export const CalendarCard = React.forwardRef<
[firstDayOfWeek]
)

useEffect(() => {
onPageChangeRef.current = onPageChange
}, [onPageChange])

useEffect(() => {
const newDays = getDays(month)
setDays(newDays)
onPageChange?.(month)
}, [month, getDays, onPageChange, firstDayOfWeek])
onPageChangeRef.current?.(month)
}, [month, getDays, firstDayOfWeek])

const isSameDay = (day1: CalendarCardDay, day2: CalendarCardDay) => {
return (
Expand Down
12 changes: 9 additions & 3 deletions src/packages/calendarcard/calendarcard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useEffect, useState } from 'react'
import React, { useCallback, useEffect, useState, useRef } from 'react'
import classNames from 'classnames'
import { ArrowLeft, ArrowRight, DoubleLeft, DoubleRight } from './icon'
import { ComponentDefaults } from '@/utils/typings'
Expand Down Expand Up @@ -50,6 +50,8 @@ export const CalendarCard = React.forwardRef<
onChange,
} = { ...defaultProps, ...props }

const onPageChangeRef = useRef(onPageChange)

// 当前月份信息
const [month, setMonth] = useState<CalendarCardMonth>(() => {
let date = new Date(Date.now())
Expand Down Expand Up @@ -132,11 +134,15 @@ export const CalendarCard = React.forwardRef<
[firstDayOfWeek]
)

useEffect(() => {
onPageChangeRef.current = onPageChange
}, [onPageChange])

useEffect(() => {
const newDays = getDays(month)
setDays(newDays)
onPageChange?.(month)
}, [month, getDays, onPageChange, firstDayOfWeek])
onPageChangeRef.current?.(month)
}, [month, getDays, firstDayOfWeek])

const isSameDay = (day1: CalendarCardDay, day2: CalendarCardDay) => {
return (
Expand Down
Loading