Merge pull request #404 from LifeSG/fix-time-slot-bar-week

Fix TimeSlotBarWeek bugs
LifeSG · Jan 31, 2024 · fb4496b · fb4496b
2 parents aadc72f + c20b845
commit fb4496b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/time-slot-bar-week/time-slot-bar-week-days.tsx b/src/time-slot-bar-week/time-slot-bar-week-days.tsx
@@ -90,7 +90,7 @@ export const TimeSlotBarWeekDays = ({
     // React spring animation configuration
     const { height: actualHeight, ref: cellsRef } = useResizeDetector();
     const height = maxVisibleCellHeight
-        ? expandAll
+        ? actualHeight < maxVisibleCellHeight || expandAll
             ? actualHeight
             : maxVisibleCellHeight
         : actualHeight;
@@ -316,7 +316,9 @@ export const TimeSlotBarWeekDays = ({
                 }
                 break;
         }
-        return cellsArray.filter((slot) => !isEmpty(slot));
+        return cellsArray.filter(
+            (slot) => !isEmpty(slot) && slot.cellLength > 0
+        );
     }
 
     // =============================================================================