From ff1e326c726dc62c52aa3a715a969a9a2cbb9ccc Mon Sep 17 00:00:00 2001 From: dooohun Date: Mon, 8 Apr 2024 14:43:07 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=97=B0=EC=82=B0=20=EC=88=9C?= =?UTF-8?q?=EC=84=9C=EB=A5=BC=20=EB=AA=85=ED=99=95=ED=95=98=EA=B2=8C=20?= =?UTF-8?q?=ED=91=9C=ED=98=84=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=EA=B4=84=ED=98=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Reservation/view/Week/index.tsx | 12 ++++++------ src/page/Reservation/view/Week/styles.ts | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/page/Reservation/view/Week/index.tsx b/src/page/Reservation/view/Week/index.tsx index c2d6d99..d480db5 100644 --- a/src/page/Reservation/view/Week/index.tsx +++ b/src/page/Reservation/view/Week/index.tsx @@ -98,10 +98,10 @@ export default function Week({ currentDate, setCurrentDate }: WeekProps) { const [startHourTo, startMinuteTo] = dragStart.timeTo.split(':').map(Number); const [endHourFrom, endMinuteFrom] = dragEnd.timeFrom.split(':').map(Number); const [endHourTo, endMinuteTo] = dragEnd.timeTo.split(':').map(Number); - if (startHourFrom < endHourTo || (startHourFrom === endHourTo && startMinuteFrom <= endMinuteTo)) { + if (startHourFrom < endHourTo || ((startHourFrom === endHourTo) && (startMinuteFrom <= endMinuteTo))) { startDateTime.current = `${selectedYear}-${dragStart.day} ${dragStart.timeFrom}`; endDateTime.current = `${selectedYear}-${dragEnd.day} ${dragEnd.timeTo}`; - } else if (endHourFrom < startHourTo || (endHourFrom === startHourTo && endMinuteFrom <= startMinuteTo)) { + } else if (endHourFrom < startHourTo || ((endHourFrom === startHourTo) && (endMinuteFrom <= startMinuteTo))) { startDateTime.current = `${selectedYear}-${dragEnd.day} ${dragEnd.timeFrom}`; endDateTime.current = `${selectedYear}-${dragStart.day} ${dragStart.timeTo}`; } @@ -157,9 +157,9 @@ export default function Week({ currentDate, setCurrentDate }: WeekProps) { const [endHourFrom, endMinuteFrom] = dragEnd.timeFrom.split(':').map(Number); const [endHourTo, endMinuteTo] = dragEnd.timeTo.split(':').map(Number); // 위에서 아래로 드래그를 할 때, else if는 아래에서 위로 드래그할 때 - if (startHourFrom < endHourTo || (startHourFrom === endHourTo && startMinuteFrom <= endMinuteTo)) { + if (startHourFrom < endHourTo || ((startHourFrom === endHourTo) && (startMinuteFrom <= endMinuteTo))) { setSelectionRange((prev) => [...prev, { start: { time: dragStart.timeFrom, day: dragStart.day }, end: { time: dragEnd.timeTo, day: dragEnd.day } }]); - } else if (endHourFrom < startHourTo || (endHourFrom === startHourTo && endMinuteFrom <= startMinuteTo)) { + } else if (endHourFrom < startHourTo || ((endHourFrom === startHourTo) && (endMinuteFrom <= startMinuteTo))) { setSelectionRange((prev) => [...prev, { start: { time: dragEnd.timeFrom, day: dragEnd.day }, end: { time: dragStart.timeTo, day: dragStart.day } }]); } setDragging(false); @@ -192,8 +192,8 @@ export default function Week({ currentDate, setCurrentDate }: WeekProps) { const currentTimeInMinutesFrom = Number(timeFrom.slice(0, 2)) * 60 + Number(timeFrom.slice(3)); const currentTimeInMinutesTo = Number(timeTo.slice(0, 2)) * 60 + Number(timeTo.slice(3)); return start.day === weekDates[dayIndex]?.date && end.day === weekDates[dayIndex]?.date - && ((startTimeInMinutes <= currentTimeInMinutesFrom && currentTimeInMinutesTo <= endTimeInMinutes) - || (endTimeInMinutes <= currentTimeInMinutesTo && currentTimeInMinutesFrom <= startTimeInMinutes)); + && (((startTimeInMinutes <= currentTimeInMinutesFrom) && (currentTimeInMinutesTo <= endTimeInMinutes)) + || ((endTimeInMinutes <= currentTimeInMinutesTo) && (currentTimeInMinutesFrom <= startTimeInMinutes))); }); if (!isSelected && new Date(`${selectedYear}-${day} ${timeTo}`) < new Date()) { openSnackBar({ type: 'error', message: '지난 시간은 선택할 수 없습니다.' }); diff --git a/src/page/Reservation/view/Week/styles.ts b/src/page/Reservation/view/Week/styles.ts index f2a0d7c..91e8568 100644 --- a/src/page/Reservation/view/Week/styles.ts +++ b/src/page/Reservation/view/Week/styles.ts @@ -71,8 +71,8 @@ export const selectedCell = ({ const endTimeInMinutes = Number(end.time.slice(0, 2)) * 60 + Number(end.time.slice(3)); return dayMatch - && ((startTimeInMinutes <= currentTimeFrom && currentTimeTo <= endTimeInMinutes) - || (endTimeInMinutes <= currentTimeTo && currentTimeFrom <= startTimeInMinutes)); + && (((startTimeInMinutes <= currentTimeFrom) && (currentTimeTo <= endTimeInMinutes)) + || ((endTimeInMinutes <= currentTimeTo) && (currentTimeFrom <= startTimeInMinutes))); }); const dragStartTimeFrom = dragStart ? Number(dragStart.timeFrom.slice(0, 2)) * 60 + Number(dragStart.timeFrom.slice(3)) : 0; @@ -80,8 +80,8 @@ export const selectedCell = ({ const dragStartTimeTo = dragStart ? Number(dragStart.timeTo.slice(0, 2)) * 60 + Number(dragStart.timeTo.slice(3)) : 0; const dragEndTimeTo = dragEnd ? Number(dragEnd.timeTo.slice(0, 2)) * 60 + Number(dragEnd.timeTo.slice(3)) : 0; const isDragOver = dragStart && dragEnd && day === dragStart.day && day === dragEnd.day - && ((dragStartTimeFrom <= currentTimeFrom && currentTimeTo <= dragEndTimeTo) - || (dragEndTimeFrom <= currentTimeFrom && currentTimeTo <= dragStartTimeTo)); + && (((dragStartTimeFrom <= currentTimeFrom) && (currentTimeTo <= dragEndTimeTo)) + || ((dragEndTimeFrom <= currentTimeFrom) && (currentTimeTo <= dragStartTimeTo))); const baseStyle = css` position: relative;