wip

README.md

@@ -66,7 +66,9 @@ use Saade\FilamentFullCalendar\Widgets\FullCalendarWidget;
 
 class CalendarWidget extends FullCalendarWidget
 {
-
+    /**
+     * Return events that should be rendered statically on calendar first render.
+     */
     public function getViewData(): array
     {
         return [
@@ -84,10 +86,22 @@ class CalendarWidget extends FullCalendarWidget
             ]
         ];
     }
+
+    /**
+     * FullCalendar will call this function whenever it needs new event data.
+     * This is triggered when the user clicks prev/next or switches views on the calendar.
+     */
+    public function fetchEvents(array $fetchInfo, array $ignorableIds): array
+    {
+        // You can use $fetchInfo to filter events by date, and $ignorableIds to ignore already displayed events.
+        return [];
+    }
 }
 ```
 
-> You should return an array of FullCalendar [EventObject](https://fullcalendar.io/docs/event-object).
+You can use one or both methods to fetch events.
+
+> Both methods should retun an array of [EventObject](https://fullcalendar.io/docs/event-object).
 
 
 <br>
@@ -132,7 +146,7 @@ return [
 
 # Listening for events
 
-The only events supported right now are: [EventClick](https://fullcalendar.io/docs/eventClick) and [EventDrop](https://fullcalendar.io/docs/eventDrop)
+The only event-related events supported right now are: [EventClick](https://fullcalendar.io/docs/eventClick) and [EventDrop](https://fullcalendar.io/docs/eventDrop)
 
 They're commented out by default so livewire does not spam requests without they being used. You are free to paste them in your `CalendarWidget` class. See: [FiresEvents](https://github.com/saade/filament-fullcalendar/blob/main/src/Widgets/Concerns/FiresEvents.php)
 
@@ -171,7 +185,14 @@ The process of saving and editing the event is up to you, since this plugin does
 
 ## Creating Events:
 
-Override the `createEvent` function in your widget class, and you are ready to go!
+Events can be created in two ways.
+
+- Clicking on a day (default)
+- Selecting a date range (click and drag across calendar days) (you need to opt-in for this, set `selectable => true` in the config file.)
+
+This will open the Create Event modal.
+
+When the create form gets submitted, it will call the `createEvent` function on your widget. Be sure to add the snippet below to your calendar class.
 
 ```php
 public function createEvent(array $data): void
@@ -200,7 +221,11 @@ protected static function getCreateEventFormSchema(): array
 
 ## Editing Events:
 
-Override the `editEvent` function in your widget class, and you are ready to go!
+Events can be edited by clicking on an event on the calendar.
+
+This will open the Edit Event modal.
+
+When the edit form gets submitted, it will call the `editEvent` function on your widget. Be sure to add the snippet below to your calendar class.
 
 ```php
 public function editEvent(array $data): void
@@ -271,6 +296,50 @@ public function yourMethod(): void
 
 <br>
 
+# Filtering events based on the calendar view
+
+If you want to filter your events based on the days that are currently shown in the calendar, you can implement the `fetchInfo()` method from the [CanFetchEvents](https://github.com/saade/filament-fullcalendar/blob/main/src/Widgets/Concerns/CanFetchEvents.php) trait. Add the following code to your calendar widget:
+
+```php
+/**
+ * FullCalendar will call this function whenever it needs new event data.
+ * This is triggered when the user clicks prev/next or switches views.
+ *
+ * @see https://fullcalendar.io/docs/events-function
+ * @param array $fetchInfo start and end date of the current view
+ * @param array $ignorableIds ids of the events that are already loaded and should be ignored
+ */
+public function fetchEvents(array $fetchInfo, array $ignorableIds): array
+{
+    return [];
+}
+```
+
+you can filter events based on the timespan `$fetchInfo['start']` and `$fetchInfo['end']`.
+> **Warning**
+>
+> Keep in mind that returning events that are already in the calendar, can cause duplicates. You should filter them out using the `$ignorableIds` ids.
+
+example:
+```php
+public function fetchEvents(array $fetchInfo, array $ignorableIds): array
+{
+    $schedules = Appointment::query()
+        ->where([
+            ['start_at', '>=', $fetchInfo['start']],
+            ['end_at', '<', $fetchInfo['end']],
+        ])
+        ->whereNotIn('id', $ignorableIds)
+        ->get();
+
+    $data = $schedules->map( ... );
+
+    return $data;
+}
+```
+
+<br>
+
 ## Testing
 
 ```bash

resources/views/fullcalendar.blade.php

@@ -1,4 +1,4 @@
-@php($locale = strtolower(str_replace('_', '-', $this->getConfig()['locale'])))
+@php($locale = strtolower(str_replace('_', '-', $this->config('locale', config('app.locale')))))
 
 <x-filament::widget>
     <x-filament::card>
@@ -7,13 +7,12 @@
             x-data=""
             x-init='
                 document.addEventListener("DOMContentLoaded", function() {
-                    var initial = true;
                     const config = @json($this->getConfig());
-                    const eventsData = @json($events);
                     const locale = "{{ $locale }}";
-                    @if($this->isLazyLoad())
-                        const cachedEventIds = [];
-                    @endif
+                    const events = @json($events);
+                    const cachedEventIds = [
+                        ...events.map(event => event.id),
+                    ];
 
                     const eventClick = function ({ event, jsEvent }) {
                         if( event.url ) {
@@ -45,53 +44,40 @@
                         @endif
                     }
 
+                    const fetchEvents = function ({ start, end }, successCallback, failureCallback) {
+                        @if( $this::canFetchEvents() )
+                            return $wire.fetchEvents({ start, end }, cachedEventIds)
+                                .then(events => {
+                                    // Cache fetched events
+                                    cachedEventIds.push(...events.map(event => event.id));
+
+                                    return successCallback(events);
+                                })
+                                .catch( failureCallback );
+                        @else
+                            return successCallback([]);
+                        @endif
+                    }
+
                     const calendar = new FullCalendar.Calendar($el, {
                         ...config,
                         locale,
                         eventClick,
                         eventDrop,
                         dateClick,
                         select,
-                        @if($this->isLazyLoad())
-                            events: function(fetchInfo, successCallback, failureCallback) {
-                                if(initial){
-                                    initial = false
-
-                                    if(eventsData[0]?.id){
-                                        eventsData.forEach((event) => cachedEventIds.push(event.id))
-                                    }
-
-                                    successCallback(eventsData)
-                                }else{
-                                    $wire.lazyLoadViewData(fetchInfo)
-                                        .then(result => {
-                                            if(result.length == 0) return
-
-                                            if(result[0].id){
-                                                result.forEach((event) => cachedEventIds.indexOf(event.id) != -1 ? null : cachedEventIds.push(event.id) && eventsData.push(event))
-                                                successCallback(eventsData)
-                                            }else{
-                                                successCallback(result)
-                                            }
-                                        })
-                                }
-                            },
-                        @else
-                            events: eventsData,
-                        @endif
+                        eventSources:[
+                            { events },
+                            fetchEvents
+                        ]
                     });
 
                     calendar.render();
 
-                    window.addEventListener("filament-fullcalendar:refresh", (event) => {
+                    window.addEventListener("filament-fullcalendar:refresh", () => {
                         calendar.removeAllEvents();
-                        @unless($this->isLazyLoad())
-                            event.detail.data.map(event => calendar.addEvent(event));
-                        @else
-                            cachedEventIds.splice(0, cachedEventIds.length)
-                            calendar.refetchEvents()
-                            eventsData.splice(0, eventsData.length)
-                        @endunless
+                        cachedEventIds.length = 0;
+                        calendar.refetchEvents();
                     });
                 })
             '></div>

src/Widgets/Concerns/CanFetchEvents.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Saade\FilamentFullCalendar\Widgets\Concerns;
+
+trait CanFetchEvents
+{
+    /**
+     * FullCalendar will call this function whenever it needs new event data. This is triggered when the user clicks prev/next or switches views.
+     *
+     * Commented out so we can save some requests :) Feel free to extend it.
+     *
+     * @see https://fullcalendar.io/docs/events-function
+     * @param array $fetchInfo start and end date of the current view
+     * @param array $ignorableIds ids of the events that are already loaded and should be ignored
+     */
+    // public function fetchEvents(array $fetchInfo, array $ignorableIds): array
+    // {
+    //     return [];
+    // }
+
+    public static function canFetchEvents(): bool
+    {
+        return method_exists(static::class, 'fetchEvents');
+    }
+}

src/Widgets/Concerns/CanRefreshEvents.php

@@ -6,6 +6,6 @@ trait CanRefreshEvents
 {
     protected function refreshEvents(): void
     {
-        $this->dispatchBrowserEvent('filament-fullcalendar:refresh', $this->isLazyLoad() ? null : ['data' => $this->getViewData()]);
+        $this->dispatchBrowserEvent('filament-fullcalendar:refresh');
     }
 }

src/Widgets/FullCalendarWidget.php

@@ -6,11 +6,11 @@
 use Filament\Forms\Contracts\HasForms;
 use Filament\Widgets\Widget;
 use Illuminate\View\View;
+use Saade\FilamentFullCalendar\Widgets\Concerns\CanFetchEvents;
 use Saade\FilamentFullCalendar\Widgets\Concerns\CanManageEvents;
 use Saade\FilamentFullCalendar\Widgets\Concerns\CanRefreshEvents;
 use Saade\FilamentFullCalendar\Widgets\Concerns\FiresEvents;
 use Saade\FilamentFullCalendar\Widgets\Concerns\UsesConfig;
-use Saade\FilamentFullCalendar\Widgets\Concerns\UsesLazyLoad;
 
 class FullCalendarWidget extends Widget implements HasForms
 {
@@ -19,9 +19,9 @@ class FullCalendarWidget extends Widget implements HasForms
     }
 
     use CanRefreshEvents;
+    use CanFetchEvents;
     use FiresEvents;
     use UsesConfig;
-    use UsesLazyLoad;
 
     protected static string $view = 'filament-fullcalendar::fullcalendar';
 
@@ -36,7 +36,7 @@ public function render(): View
     {
         return view(static::$view)
             ->with([
-                'events' => $this->isLazyLoad() ? $this->lazyLoadViewData() : $this->getViewData(),
+                'events' => $this->getViewData(),
             ]);
     }
 }