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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { useState } from "react";
import { useEffect, useState } from "react";

import type { TodoTimerStatusTypes } from "@/api/common/todo-schema";
import type { ReactNode } from "react";
Expand Down Expand Up @@ -38,6 +38,10 @@ export const TodayTodoCardContainer = ({
}: TodayTodoCardContainerProps) => {
const [isHovered, setIsHovered] = useState(false);

useEffect(() => {
if (isCompleted) setIsHovered(false);
}, [isCompleted]);

const isPlaying = timerStatus === "RUNNING";
const isDimmed = isCompleted && !isHovered;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
} from "@/api/generated/endpoints/timer/timer";
import {
getGetTodoDetailQueryKey,
useChangeSubtaskStatus,
useChangeTodoStatus,
} from "@/api/generated/endpoints/todo/todo";
import { useActiveTimer } from "@/hooks/use-active-timer";
Expand Down Expand Up @@ -42,6 +43,7 @@ export const useTodayTodoList = (
const queryClient = useQueryClient();
const { data: activeTimer } = useActiveTimer();
const { mutate: changeTodoStatus } = useChangeTodoStatus();
const { mutate: changeSubtaskStatus } = useChangeSubtaskStatus();
const { mutate: stopTimer } = useStopTimer();
const { invalidateTimerState, invalidateTimeBoxes } =
useTimerQueryInvalidation();
Expand Down Expand Up @@ -177,21 +179,40 @@ export const useTodayTodoList = (
};

const handleSubTodoCheck = (todoId: number, subtaskId: number) => {
// TODO: API
const todo = todos.find((t) => t.todoId === todoId);
const subtask = todo?.subtasks.find((s) => s.subtaskId === subtaskId);
if (!subtask) return;

const completed = !subtask.completed;
const dateKey = todo?.date;
if (!dateKey) return;

const previous = todos;
setTodos((prev) =>
prev.map((todo) =>
todo.todoId === todoId
prev.map((t) =>
t.todoId === todoId
? {
...todo,
subtasks: todo.subtasks.map((s) =>
s.subtaskId === subtaskId
? { ...s, completed: !s.completed }
: s,
...t,
subtasks: t.subtasks.map((s) =>
s.subtaskId === subtaskId ? { ...s, completed } : s,
),
}
: todo,
: t,
),
);

changeSubtaskStatus(
{ todoId, subtaskId, data: { isCompleted: completed } },
{
onSuccess: () => {
invalidateTodayView();
invalidateTodoDetail(todoId, dateKey);
},
onError: () => {
setTodos(previous);
},
},
);
};

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ export const TodayTodoCard = ({
<li key={sub.id} className="flex items-center gap-2">
<div
role="none"
className="inline-flex items-center"
onClick={stopPropagation}
onKeyDown={stopPropagation}
>
Expand All @@ -150,7 +151,12 @@ export const TodayTodoCard = ({
onChange={() => onSubTodoCheck(sub.id)}
/>
</div>
<span className={cn("typo-body-r-12", style.subText)}>
<span
className={cn(
"typo-body-r-12",
sub.isDone ? "text-timo-gray-500" : style.subText,
)}
>
{sub.text}
</span>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

import { useQueryClient } from "@tanstack/react-query";

import { getGetHomeQueryKey } from "@/api/generated/endpoints/home/home";
import {
getGetHomeQueryKey,
getGetTodayQueryKey,
} from "@/api/generated/endpoints/home/home";
import { useDeleteTodo } from "@/api/generated/endpoints/todo/todo";

export interface DeleteTodoSubmitHandlers {
Expand All @@ -23,6 +26,7 @@ export const useDeleteTodoSubmit = () => {
{
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: getGetHomeQueryKey() });
queryClient.invalidateQueries({ queryKey: getGetTodayQueryKey() });
onSuccess();
},
onError,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { useQueryClient } from "@tanstack/react-query";
import type { ErrorType } from "@/api/client/custom-instance";
import type { ErrorDto, TodoUpdateRequest } from "@/api/generated/models";

import { getGetHomeQueryKey } from "@/api/generated/endpoints/home/home";
import {
getGetHomeQueryKey,
getGetTodayQueryKey,
} from "@/api/generated/endpoints/home/home";
import {
getGetTodoDetailQueryKey,
useUpdateTodo,
Expand Down Expand Up @@ -35,6 +38,7 @@ export const useUpdateTodoSubmit = () => {
{
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: getGetHomeQueryKey() });
queryClient.invalidateQueries({ queryKey: getGetTodayQueryKey() });
queryClient.invalidateQueries({
queryKey: getGetTodoDetailQueryKey(todoId, { date }),
});
Expand Down
Loading