Skip to content
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

Refactor: #33 DnD 순서 변경 함수 통합 & 가독성을 위한 조건문 변수화 #38

Merged
merged 8 commits into from
Jul 5, 2024
Merged

Refactor: #33 DnD 순서 변경 함수 통합 & 가독성을 위한 조건문 변수화 #38

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
41fc136
Config: #33 react-beautiful-dnd를 계승한 @hello-pangea/dnd 설치
Seok93 Jul 3, 2024
c268db0
Chore: #33 mock 데이터 추가 및 관련 Types 추가 정의
Seok93 Jul 3, 2024
af7d948
Config: #33 ESLint 설정 완화
Seok93 Jul 3, 2024
56f4ef6
Feat: #33 칸반 보드 UI 작성 & 칸반 보드 할일 드래그 앤 드롭 기능 추가
Seok93 Jul 3, 2024
5f3c0e5
UI: #33 ProjectLayout 수정
Seok93 Jul 3, 2024
c51ca00
Formmating: #33 deepClone의 매개변수명 변경
Seok93 Jul 3, 2024
1cac99e
Refactor: #33 DnD 순서변경 함수 통합 & 가독성을 위한 조건식 변수화
Seok93 Jul 3, 2024
bde2eeb
Merge branch 'develop' into feature/#33-kanban-dnd-refactor
Seok93 Jul 4, 2024
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
42 changes: 11 additions & 31 deletions src/pages/project/KanbanPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,28 @@ function parserPrefixId(prefixId: string, delimiter: string = '-') {
return result[result.length - 1];
}

function createChangedTodoForSameStatus(todo: TodoWithStatus[], dropResult: DropResult) {
const { source, draggableId } = dropResult;

const newTodo = deepClone(todo);
const sourceStatusId = Number(parserPrefixId(source.droppableId));
const taskId = Number(parserPrefixId(draggableId));

const { tasks: sourceTasks } = newTodo.find((data) => data.statusId === sourceStatusId)! as TodoWithStatus;
const task = sourceTasks.find((data) => data.taskId === taskId)! as Todo;

sourceTasks.splice(source.index, 1);
sourceTasks.splice(source.index, 0, task);
sourceTasks.forEach((task, index) => (task.order = index + 1));

return newTodo;
}

function createChangedTodoForOtherStatus(todo: TodoWithStatus[], dropResult: DropResult) {
function createChangedTodo(todo: TodoWithStatus[], dropResult: DropResult, isSameStatus: boolean) {
const { source, destination, draggableId } = dropResult;

// ToDo: 메세지 포맷 정하고 수정하기
if (!destination) throw Error('Error: DnD destination is null');

const newTodo = deepClone(todo);
const sourceStatusId = Number(parserPrefixId(source.droppableId));
const destinationStatusId = Number(parserPrefixId(destination.droppableId));
const taskId = Number(parserPrefixId(draggableId));

const newTodo = deepClone(todo);
const { tasks: sourceTasks } = newTodo.find((data) => data.statusId === sourceStatusId)! as TodoWithStatus;
const { tasks: destinationTasks } = newTodo.find((data) => data.statusId === destinationStatusId)! as TodoWithStatus;
const { tasks: destinationTasks } = isSameStatus
? { tasks: sourceTasks }
: (newTodo.find((data) => data.statusId === destinationStatusId)! as TodoWithStatus);
const task = sourceTasks.find((data) => data.taskId === taskId)! as Todo;

sourceTasks.splice(source.index, 1);
destinationTasks.splice(destination.index, 0, task);

sourceTasks.forEach((task, index) => {
task.order = index + 1;
});
destinationTasks.forEach((task, index) => {
task.order = index + 1;
});
sourceTasks.forEach((task, index) => (task.order = index + 1));
if (!isSameStatus) destinationTasks.forEach((task, index) => (task.order = index + 1));

return newTodo;
}
Expand All @@ -72,13 +53,12 @@ export default function KanbanPage() {
const { source, destination } = dropResult;

if (!destination) return;
if (source.droppableId === destination.droppableId && source.index === destination.index) return;

const newTodo =
source.droppableId !== destination.droppableId
? createChangedTodoForOtherStatus(todo, dropResult)
: createChangedTodoForSameStatus(todo, dropResult);
const isSameStatus = source.droppableId === destination.droppableId;
const isSameTodo = source.index === destination.index;
if (isSameStatus && isSameTodo) return;

const newTodo = createChangedTodo(todo, dropResult, isSameStatus);
setTodo(newTodo);
};

Expand Down