chore: Calendarをリファクタリング

kufu · Jan 29, 2025 · e9a39e5 · e9a39e5
1 parent 1c2384a
commit e9a39e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/packages/smarthr-ui/src/components/Calendar/Calendar.tsx b/packages/smarthr-ui/src/components/Calendar/Calendar.tsx
@@ -65,20 +65,22 @@ export const Calendar = forwardRef<HTMLDivElement, Props & ElementProps>(
     }, [className])
 
     const formattedFrom = useMemo(() => {
-      const day = dayjs(getFromDate(from))
+      const date = getFromDate(from)
+      const day = dayjs(date)
 
       return {
         day,
-        date: day.toDate(),
+        date,
         year: day.year(),
       }
     }, [from])
     const formattedTo = useMemo(() => {
-      const day = dayjs(getToDate(to))
+      const date = getToDate(to)
+      const day = dayjs(date)
 
       return {
         day,
-        date: day.toDate(),
+        date,
         year: day.year(),
       }
     }, [to])

diff --git a/packages/smarthr-ui/src/components/Calendar/CalendarTable.tsx b/packages/smarthr-ui/src/components/Calendar/CalendarTable.tsx
@@ -73,12 +73,8 @@ export const CalendarTable: FC<Props & ElementProps> = ({
         <tbody>
           {current.months.map((week, weekIndex) => (
             <tr key={weekIndex}>
-              {week.map((date, dateIndex) => {
-                if (!date) {
-                  return <NullTd key={dateIndex} className={styles.td} />
-                }
-
-                return (
+              {week.map((date, dateIndex) =>
+                date ? (
                   <SelectTdButton
                     key={dateIndex}
                     date={date}
@@ -90,8 +86,10 @@ export const CalendarTable: FC<Props & ElementProps> = ({
                     onClick={onSelectDate}
                     styles={styles}
                   />
-                )
-              })}
+                ) : (
+                  <NullTd key={dateIndex} className={styles.td} />
+                ),
+              )}
             </tr>
           ))}
         </tbody>