fix(getWeekView): use correct width of overlapping events

Fixes mattlewis92/angular-calendar#784
mattlewis92 · Nov 5, 2018 · 90c820b · 90c820b
1 parent ae81a95
commit 90c820b
Show file tree

Hide file tree

Showing 3 changed files with 5,086 additions and 777 deletions.
diff --git a/src/calendar-utils.ts b/src/calendar-utils.ts
@@ -617,17 +617,44 @@ function getWeekViewHourGrid(
       return { ...hour, segments };
     });
 
+    function getColumnCount(
+      allEvents: DayViewEvent[],
+      prevOverlappingEvents: DayViewEvent[]
+    ): number {
+      const columnCount = Math.max(
+        ...prevOverlappingEvents.map(iEvent => iEvent.left + 1)
+      );
+
+      const nextOverlappingEvents = allEvents
+        .filter(iEvent => iEvent.left >= columnCount)
+        .filter(iEvent => {
+          return (
+            getOverLappingDayViewEvents(
+              prevOverlappingEvents,
+              iEvent.top,
+              iEvent.top + iEvent.height
+            ).length > 0
+          );
+        });
+
+      if (nextOverlappingEvents.length > 0) {
+        return getColumnCount(allEvents, nextOverlappingEvents);
+      } else {
+        return columnCount;
+      }
+    }
+
     return {
       hours,
       date: day.date,
       events: dayView.events.map(event => {
-        const overLappingEvents = getOverLappingDayViewEvents(
+        const columnCount = getColumnCount(
           dayView.events,
-          event.top,
-          event.top + event.height
-        );
-        const columnCount = Math.max(
-          ...overLappingEvents.map(iEvent => iEvent.left + 1)
+          getOverLappingDayViewEvents(
+            dayView.events,
+            event.top,
+            event.top + event.height
+          )
         );
 
         const width = 100 / columnCount;