Skip to content

fix(habit): prevent clicking disabled calendar days #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sajjadmrx merged 1 commit into from
Jul 6, 2026
Merged

fix(habit): prevent clicking disabled calendar days #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 8 additions & 16 deletions src/layouts/widgets/habit/components/habit-calendar-heatmap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@ const isToday = (today: jalaliMoment.Moment, date: jalaliMoment.Moment) => {
)
}

const isPast = (todayGregorian: any, date: jalaliMoment.Moment) => {
const greg = toGregorian(date)
return greg <= todayGregorian
}

const toGregorian = (date: jalaliMoment.Moment): string => {
const d = date.toDate()
return moment(d).format('YYYY-MM-DD')
}

export function HabitCalendar({ habit, color }: HabitCalendarProps) {
const today = jalaliMoment()
const queryClient = useQueryClient()
Expand All @@ -50,8 +40,6 @@ export function HabitCalendar({ habit, color }: HabitCalendarProps) {
return moment(d).format('YYYY-MM-DD')
}

const todayGregorian = toGregorian(today)

const firstDayOfMonth = currentDate.clone().startOf('jMonth').day()
const daysInMonth = currentDate.clone().endOf('jMonth').jDate()
const emptyDays = (firstDayOfMonth + 1) % 7
Expand Down Expand Up @@ -146,18 +134,18 @@ export function HabitCalendar({ habit, color }: HabitCalendarProps) {
const habitData = getHabitData(gregorianDate)
const value = habitData.value
const isDayToday = isToday(today, cellDate)
const isDayPast = isPast(todayGregorian, cellDate)
const clickable = isDayPast && isCurrentMonth

const bgColor = value > 0 ? `${color}22` : ''
let Opacity = isCurrentMonth ? 'opacity-100' : ''

let clickable = true
if (cellDate.isAfter() && !value) {
Opacity = 'opacity-50'
clickable = false
}

if (cellDate.isBefore() && !isCurrentMonth && !value) {
Opacity = 'opacity-50'
clickable = false
}

let indicator = null
Expand Down Expand Up @@ -190,7 +178,11 @@ export function HabitCalendar({ habit, color }: HabitCalendarProps) {
return (
<div
key={`${isCurrentMonth ? 'c' : isPrevMonth ? 'p' : 'n'}-${day}`}
onClick={() => handleDateClick(day, isCurrentMonth, isPrevMonth)}
onClick={() =>
clickable
? handleDateClick(day, isCurrentMonth, isPrevMonth)
: undefined
}
className={`relative rounded-xl transition-all h-10 w-10 mx-auto flex flex-col items-center justify-center ${Opacity} ${clickable ? 'hover:scale-110 cursor-pointer' : 'cursor-not-allowed'} ${isDayToday ? 'border-b scale-110 font-extrabold' : ''}`}
style={{
backgroundColor: bgColor,
Expand Down
Loading