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
16 changes: 0 additions & 16 deletions components/TodoModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -252,22 +252,6 @@ const TodoModal = ({
<Text>{t('components.todoModal.changeTime')}</Text>
</Button>
</View>
{/* <View>
<Button
accessoryLeft={inboxIcon}
status="basic"
style={styles.button}
onPress={() => {
handleLogEvent(TODOMODAL_MOVETOINBOX_CLICK_EVENT, {
time: new Date().toISOString(),
userId: userId,
todoId: item.id,
});
}}
>
<Text>{t('components.todoModal.putInbox')}</Text>
</Button>
</View> */}
</View>
</Card>
</Modal>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ interface TodoListItemProps extends RenderItemParams<Todo> {
bottomSheetRef: React.MutableRefObject<any>;
subTodoInputActivated: boolean;
setSubTodoInputActivated: React.SetStateAction<boolean>;
categoryId: number;
}

const TodoListItem: React.FC<TodoListItemProps> = ({
Expand Down
9 changes: 8 additions & 1 deletion components/todayView/dailyTodos/DailyTodos.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,14 @@ const DailyTodos = ({ todosData, categoryId }) => {
};

const renderTodo = ({ item, drag, isActive }) => {
return <DailyTodo item={item} drag={drag} isActive={isActive} />;
return (
<DailyTodo
item={item}
drag={drag}
isActive={isActive}
categoryId={categoryId}
/>
);
};

return (
Expand Down
3 changes: 2 additions & 1 deletion components/todayView/dailyTodos/dailyTodo/DailyTodo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -49,6 +49,7 @@ const DailyTodo = ({ item, drag, isActive }) => {
getIndex={() => 0}
onEdit={handleEdit}
setSubTodoInputActivated={setSubTodoInputActivated}
categoryId={categoryId}
/>
<SubTodoInfo
itemNumber={item.children ? item.children.length : 0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { Icon, ListItem, Text } from '@ui-kitten/components';
import React from 'react';
import { Pressable, StyleSheet, View } from 'react-native';
import { RenderItemParams } from 'react-native-draggable-flatlist';
import { moderateScale, scale, verticalScale } from 'react-native-size-matters';
import { Todo } from '../../../../../types/todo';
import EditableTextField from '../../../../common/molecules/EditableTextField';
import TodoMoreMenu from './todoMoreMenu/TodoMoreMenu';
import useTodoListItem from './useTodoListItem';
import { moderateScale, scale, verticalScale } from 'react-native-size-matters';

interface TodoListItemProps extends RenderItemParams<Todo> {
isEditing: boolean;
Expand All @@ -21,6 +21,7 @@ interface TodoListItemProps extends RenderItemParams<Todo> {
bottomSheetRef: React.MutableRefObject<any>;
subTodoInputActivated: boolean;
setSubTodoInputActivated: React.SetStateAction<boolean>;
categoryId: number;
}

const TodoListItem: React.FC<TodoListItemProps> = ({
Expand All @@ -33,6 +34,7 @@ const TodoListItem: React.FC<TodoListItemProps> = ({
setIsSubTodoGenerateModalVisible,
onEdit,
setSubTodoInputActivated,
categoryId,
}) => {
const {
theme,
Expand Down Expand Up @@ -69,6 +71,7 @@ const TodoListItem: React.FC<TodoListItemProps> = ({
onEdit={onEdit}
item={item}
setSubTodoInputActivated={setSubTodoInputActivated}
categoryId={categoryId}
/>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const TodoMoreMenu = ({
onEdit,
item,
setSubTodoInputActivated,
categoryId,
}) => {
const {
handleEditPress,
Expand All @@ -64,6 +65,7 @@ const TodoMoreMenu = ({
onEdit,
item,
setSubTodoInputActivated,
categoryId,
});
const [visible, setVisible] = useState(false);
const { t } = useTranslation();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { CategoryContext } from '@/contexts/CategoryContext';
import { LoginContext } from '@/contexts/LoginContext';
import {
useTodoDeleteMutation,
Expand All @@ -20,8 +19,8 @@ const useTodoMoreMenu = ({
onEdit = () => {},
setIsSubTodoGenerateModalVisible,
setSubTodoInputActivated,
categoryId,
}) => {
const { selectedCategory } = useContext(CategoryContext);
const { userId } = useContext(LoginContext);

const { mutate: updateTodoDate } = useTodoUpdateMutation();
Expand All @@ -39,7 +38,7 @@ const useTodoMoreMenu = ({
const updatedTodo = {
date: kstDate,
todo_id: item.id,
category_id: selectedCategory,
category_id: categoryId,
};
updateTodoDate(updatedTodo);
};
Expand Down
Loading