diff --git a/components/TodoModal.jsx b/components/TodoModal.jsx index 160e314..2ece996 100644 --- a/components/TodoModal.jsx +++ b/components/TodoModal.jsx @@ -252,22 +252,6 @@ const TodoModal = ({ {t('components.todoModal.changeTime')} - {/* - - */} diff --git a/components/inboxView/inboxTodos/inboxTodo/todoListItem/TodoListItem.tsx b/components/inboxView/inboxTodos/inboxTodo/todoListItem/TodoListItem.tsx index 7099e44..d325777 100644 --- a/components/inboxView/inboxTodos/inboxTodo/todoListItem/TodoListItem.tsx +++ b/components/inboxView/inboxTodos/inboxTodo/todoListItem/TodoListItem.tsx @@ -20,6 +20,7 @@ interface TodoListItemProps extends RenderItemParams { bottomSheetRef: React.MutableRefObject; subTodoInputActivated: boolean; setSubTodoInputActivated: React.SetStateAction; + categoryId: number; } const TodoListItem: React.FC = ({ diff --git a/components/todayView/dailyTodos/DailyTodos.tsx b/components/todayView/dailyTodos/DailyTodos.tsx index c5162dd..61a8e45 100644 --- a/components/todayView/dailyTodos/DailyTodos.tsx +++ b/components/todayView/dailyTodos/DailyTodos.tsx @@ -54,7 +54,14 @@ const DailyTodos = ({ todosData, categoryId }) => { }; const renderTodo = ({ item, drag, isActive }) => { - return ; + return ( + + ); }; return ( diff --git a/components/todayView/dailyTodos/dailyTodo/DailyTodo.jsx b/components/todayView/dailyTodos/dailyTodo/DailyTodo.jsx index 986e5a2..b26ef72 100644 --- a/components/todayView/dailyTodos/dailyTodo/DailyTodo.jsx +++ b/components/todayView/dailyTodos/dailyTodo/DailyTodo.jsx @@ -10,7 +10,7 @@ import SubTodoList from './subTodoList/SubTodoList'; import TodoListItem from './todoListItem/TodoListItem'; import useDailyTodo from './useDailyTodo'; -const DailyTodo = ({ item, drag, isActive }) => { +const DailyTodo = ({ item, drag, isActive, categoryId }) => { const { isEditing, setIsEditing, @@ -49,6 +49,7 @@ const DailyTodo = ({ item, drag, isActive }) => { getIndex={() => 0} onEdit={handleEdit} setSubTodoInputActivated={setSubTodoInputActivated} + categoryId={categoryId} /> { isEditing: boolean; @@ -21,6 +21,7 @@ interface TodoListItemProps extends RenderItemParams { bottomSheetRef: React.MutableRefObject; subTodoInputActivated: boolean; setSubTodoInputActivated: React.SetStateAction; + categoryId: number; } const TodoListItem: React.FC = ({ @@ -33,6 +34,7 @@ const TodoListItem: React.FC = ({ setIsSubTodoGenerateModalVisible, onEdit, setSubTodoInputActivated, + categoryId, }) => { const { theme, @@ -69,6 +71,7 @@ const TodoListItem: React.FC = ({ onEdit={onEdit} item={item} setSubTodoInputActivated={setSubTodoInputActivated} + categoryId={categoryId} /> ); }; diff --git a/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/TodoMoreMenu.tsx b/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/TodoMoreMenu.tsx index f6c8fa6..f5e308a 100644 --- a/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/TodoMoreMenu.tsx +++ b/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/TodoMoreMenu.tsx @@ -53,6 +53,7 @@ const TodoMoreMenu = ({ onEdit, item, setSubTodoInputActivated, + categoryId, }) => { const { handleEditPress, @@ -64,6 +65,7 @@ const TodoMoreMenu = ({ onEdit, item, setSubTodoInputActivated, + categoryId, }); const [visible, setVisible] = useState(false); const { t } = useTranslation(); diff --git a/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/useTodoMoreMenu.tsx b/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/useTodoMoreMenu.tsx index dea7a21..7578ca8 100644 --- a/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/useTodoMoreMenu.tsx +++ b/components/todayView/dailyTodos/dailyTodo/todoListItem/todoMoreMenu/useTodoMoreMenu.tsx @@ -1,4 +1,3 @@ -import { CategoryContext } from '@/contexts/CategoryContext'; import { LoginContext } from '@/contexts/LoginContext'; import { useTodoDeleteMutation, @@ -20,8 +19,8 @@ const useTodoMoreMenu = ({ onEdit = () => {}, setIsSubTodoGenerateModalVisible, setSubTodoInputActivated, + categoryId, }) => { - const { selectedCategory } = useContext(CategoryContext); const { userId } = useContext(LoginContext); const { mutate: updateTodoDate } = useTodoUpdateMutation(); @@ -39,7 +38,7 @@ const useTodoMoreMenu = ({ const updatedTodo = { date: kstDate, todo_id: item.id, - category_id: selectedCategory, + category_id: categoryId, }; updateTodoDate(updatedTodo); };