Replace empty string with null in SchedulerComponent and adjust cell …

…height calculation in MonthTable
aelassas · Jan 27, 2025 · e5fb576 · e5fb576
1 parent 84cc09f
commit e5fb576
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/backend/src/components/scheduler/SchedulerComponent.tsx b/backend/src/components/scheduler/SchedulerComponent.tsx
@@ -23,7 +23,7 @@ const SchedulerComponent = forwardRef<SchedulerRef, unknown>((_, ref) => {
       case 'day':
         return <Day />
       default:
-        return ''
+        return null
     }
   }, [view])
 

diff --git a/backend/src/components/scheduler/components/month/MonthTable.tsx b/backend/src/components/scheduler/components/month/MonthTable.tsx
@@ -61,6 +61,7 @@ const MonthTable = ({ daysList, resource, eachWeekStart }: Props) => {
         resourcedEvents = getResourcedEvents(events, _resource, resourceFields, fields)
       }
       const rows: ReactNode[] = []
+      const cellHeights: number[] = []
 
       for (const startDay of eachWeekStart) {
         const cells = weekDays.map((d) => {
@@ -78,13 +79,17 @@ const MonthTable = ({ daysList, resource, eachWeekStart }: Props) => {
               return false
             })
           const isToday = isTimeZonedToday({ dateLeft: today, timeZone })
+          const _cellHeight = 27 + 26 * todayEvents.length + 17 + 12 + 10
+          cellHeights.push(_cellHeight)
+          // const cellHeight = Math.max(CELL_HEIGHT, ...cellHeights)
+          const cellHeight = CELL_HEIGHT
           return (
-            <span style={{ height: CELL_HEIGHT }} key={d.toString()} className="rs__cell">
+            <span style={{ height: cellHeight }} key={d.toString()} className="rs__cell">
               <Cell
                 start={start}
                 end={end}
                 day={selectedDate}
-                height={CELL_HEIGHT}
+                height={cellHeight}
                 resourceKey={field}
                 resourceVal={_resource ? _resource[field] : null}
                 cellRenderer={cellRenderer}
@@ -135,7 +140,7 @@ const MonthTable = ({ daysList, resource, eachWeekStart }: Props) => {
                       handleGotoDay(e)
                     }
                   }}
-                  cellHeight={CELL_HEIGHT}
+                  cellHeight={cellHeight}
                 />
               </>
             </span>
@@ -147,7 +152,7 @@ const MonthTable = ({ daysList, resource, eachWeekStart }: Props) => {
       return rows
     },
     [
-      CELL_HEIGHT,
+      // CELL_HEIGHT,
       cellRenderer,
       daysList,
       disableGoToDay,