diff --git a/src/components/pages/post-meetup/modals/date-picker-modal/calendar/calendar-footer/index.tsx b/src/components/pages/post-meetup/modals/date-picker-modal/calendar/calendar-footer/index.tsx index 0bddbe80..d0694aff 100644 --- a/src/components/pages/post-meetup/modals/date-picker-modal/calendar/calendar-footer/index.tsx +++ b/src/components/pages/post-meetup/modals/date-picker-modal/calendar/calendar-footer/index.tsx @@ -16,7 +16,7 @@ export const CalendarFooter = ({ const { selectedDates } = useContextDays(); return ( -
+
{selectedDates[0].getFullYear()}년 {selectedDates[0].getMonth() + 1}월 {selectedDates[0].getDate()}일 @@ -24,8 +24,7 @@ export const CalendarFooter = ({ {hours}:{minutes} - AM - PM + {meridiem}
); }; diff --git a/src/components/pages/post-meetup/modals/date-picker-modal/calendar/index.tsx b/src/components/pages/post-meetup/modals/date-picker-modal/calendar/index.tsx index 18455ff4..a6842b38 100644 --- a/src/components/pages/post-meetup/modals/date-picker-modal/calendar/index.tsx +++ b/src/components/pages/post-meetup/modals/date-picker-modal/calendar/index.tsx @@ -7,6 +7,7 @@ import { DatePickerStateProvider } from '@rehookify/datepicker'; import { CalendarFooter } from '@/components/pages/post-meetup/modals/date-picker-modal/calendar/calendar-footer'; import { DatePicker } from '@/components/pages/post-meetup/modals/date-picker-modal/calendar/date-picker'; import { TimePicker } from '@/components/pages/post-meetup/modals/date-picker-modal/calendar/time-picker'; +import { AnimateDynamicHeight } from '@/components/shared'; interface Props { currentTab: 'date' | 'time'; @@ -25,7 +26,7 @@ export const Calendar = ({ currentTab, dateFieldValue, updateDateField }: Props) const prevDate = dateFieldValue ? new Date(dateFieldValue) : null; const [selectedDates, onDatesChange] = useState([prevDate ?? nowDate]); const [selectedTime, onTimeChange] = useState(() => - prevDate ? prevDateTo12Hour(prevDate) : { hours: '01', minutes: '00', meridiem: 'AM' }, + prevDate ? prevDateTo12Hour(prevDate) : { hours: '12', minutes: '00', meridiem: 'AM' }, ); useEffect(() => { @@ -59,17 +60,17 @@ export const Calendar = ({ currentTab, dateFieldValue, updateDateField }: Props) }, }} > - - - - - - onTimeChange((prev) => ({ ...prev, [type]: val }))} - /> - - + + + + + + onTimeChange((prev) => ({ ...prev, [type]: val }))} + /> + + diff --git a/src/components/pages/post-meetup/modals/date-picker-modal/calendar/time-picker/index.tsx b/src/components/pages/post-meetup/modals/date-picker-modal/calendar/time-picker/index.tsx index 50fa5f6f..83410bde 100644 --- a/src/components/pages/post-meetup/modals/date-picker-modal/calendar/time-picker/index.tsx +++ b/src/components/pages/post-meetup/modals/date-picker-modal/calendar/time-picker/index.tsx @@ -39,7 +39,9 @@ export const TimePicker = ({ selectedTime, onTimeChange }: Props) => { }; const TIME_SELECTORS = Object.freeze({ - hours: Array.from({ length: 12 }, (_, idx) => (idx + 1).toString().padStart(2, '0')), + hours: ['12'].concat( + Array.from({ length: 11 }, (_, idx) => (idx + 1).toString().padStart(2, '0')), + ), minutes: Array.from({ length: 12 }, (_, idx) => (idx * 5).toString().padStart(2, '0')), meridiem: ['AM', 'PM'], }); diff --git a/src/components/pages/post-meetup/modals/date-picker-modal/index.tsx b/src/components/pages/post-meetup/modals/date-picker-modal/index.tsx index 33890dfb..eb433c26 100644 --- a/src/components/pages/post-meetup/modals/date-picker-modal/index.tsx +++ b/src/components/pages/post-meetup/modals/date-picker-modal/index.tsx @@ -25,7 +25,7 @@ export const DatePickerModal = ({ field }: Props) => {