Orders events by time among all calendar views regardless of calendar

2026-02-04 16:04:25 -05:00 · 2026-02-04 16:04:25 -05:00 · c7ac146fab
commit c7ac146fab
parent 7ba5041ba6
1 changed files with 7 additions and 2 deletions
--- a/app/Services/Calendar/CalendarViewBuilder.php
+++ b/app/Services/Calendar/CalendarViewBuilder.php
@ -28,7 +28,7 @@ class CalendarViewBuilder
        $gridStartMinutes = $daytimeHours ? ((int) $daytimeHours['start'] * 60) : 0;
        $gridEndMinutes = $daytimeHours ? ((int) $daytimeHours['end'] * 60) : (24 * 60);

-        return $events->flatMap(function ($e) use (
+        $payloads = $events->flatMap(function ($e) use (
            $calendarMap,
            $uiFormat,
            $view,
@ -151,7 +151,12 @@ class CalendarViewBuilder
                    'duration'        => $placement['duration'],
                ];
            })->filter()->values();
-        })->keyBy('occurrence_id');
+        })->filter();
+
+        // ensure chronological ordering across calendars for all views
+        return $payloads
+            ->sortBy('start')
+            ->keyBy('occurrence_id');
    }

    /**