improvements

saade · Jun 27, 2022 · 2da36bf · 2da36bf
1 parent 352d294
commit 2da36bf
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 40 deletions.
diff --git a/...views/modals/create-event-modal.blade.php → ...s/components/create-event-modal.blade.php b/...views/modals/create-event-modal.blade.php → ...s/components/create-event-modal.blade.php
diff --git a/...s/views/modals/edit-event-modal.blade.php → ...ews/components/edit-event-modal.blade.php b/...s/views/modals/edit-event-modal.blade.php → ...ews/components/edit-event-modal.blade.php
diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php
diff --git a/resources/views/fullcalendar.blade.php b/resources/views/fullcalendar.blade.php
@@ -10,29 +10,49 @@
             <x-filament::hr />
         @endif
 
-        <div wire:ignore x-data="" x-init='document.addEventListener("DOMContentLoaded", () => {
-            const calendar = new FullCalendar.Calendar($el, Object.assign(
-                @json($this->getConfig()),
-                {
-                    events: @json($events),
-                    eventClick: ({ event, jsEvent }) => {
-                        if(event.url) {
+        <div
+            wire:ignore
+            x-data=""
+            x-init='
+                document.addEventListener("DOMContentLoaded", function() {
+                    const config = @json($this->getConfig());
+                    const events = @json($events);
+
+                    const eventClick = function ({ event, jsEvent }) {
+                        if( event.url ) {
                             jsEvent.preventDefault();
                             window.open(event.url, "_blank");
                             return false;
                         }
-                        @js($this->isListeningClickEvent()) && window.livewire.find("{{ $this->id }}").onEventClick(event)
-                    },
-                    eventDrop:  ({ event, oldEvent, relatedEvents }) => @js($this->isListeningDropEvent()) && window.livewire.find("{{ $this->id }}").onEventDrop(event, oldEvent, relatedEvents),
-                }
-            ));
-
-            calendar.render();
-        })'>
-        </div>
+
+                        @if ($this::isListeningClickEvent())
+                            $wire.onEventClick(event)
+                        @endif
+                    }
+
+                    const eventDrop = function ({ event, oldEvent, relatedEvents }) {
+                        @if($this::isListeningDropEvent())
+                            $wire.onEventDrop(event, oldEvent, relatedEvents)
+                        @endif
+                    }
+
+                    const calendar = new FullCalendar.Calendar($el, {
+                        ...config,
+                        events,
+                        eventClick,
+                        eventDrop
+                    });
+
+                    calendar.render();
+                })
+            '></div>
     </x-filament::card>
 
-    @includeWhen($this::canCreate(), 'filament-fullcalendar::modals.create-event-modal')
+    @if($this::canCreate())
+        <x:filament-fullcalendar::create-event-modal />
+    @endif
 
-    @includeWhen($this::canEdit(), 'filament-fullcalendar::modals.edit-event-modal')
+    @if($this::canEdit())
+        <x:filament-fullcalendar::edit-event-modal />
+    @endif
 </x-filament::widget>
diff --git a/src/Widgets/Concerns/CanManageEvents.php b/src/Widgets/Concerns/CanManageEvents.php
@@ -7,9 +7,21 @@
 
 trait CanManageEvents
 {
+    use AuthorizesActions;
     use CreateEventForm;
     use EditEventForm;
 
+    protected function setUpForms(): void
+    {
+        if (static::canCreate()) {
+            $this->createEventForm->fill();
+        }
+
+        if (static::canEdit()) {
+            $this->editEventForm->fill();
+        }
+    }
+
     protected function getForms(): array
     {
         return [
@@ -35,8 +47,6 @@ public function onCreateEventClick(): void
             return;
         }
 
-        $this->createEventForm->fill();
-
         $this->dispatchBrowserEvent('open-modal', ['id' => 'fullcalendar--create-event-modal']);
     }
 }
diff --git a/src/Widgets/Concerns/CantManageEvents.php b/src/Widgets/Concerns/CantManageEvents.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Saade\FilamentFullCalendar\Widgets\Concerns;
+
+trait CantManageEvents
+{
+    public static function canCreate(): bool
+    {
+        return false;
+    }
+
+    public static function canEdit(?array $event = null): bool
+    {
+        return false;
+    }
+
+    public static function canDelete(?array $event = null): bool
+    {
+        return false;
+    }
+}
diff --git a/src/Widgets/Concerns/FiresEvents.php b/src/Widgets/Concerns/FiresEvents.php
@@ -15,9 +15,9 @@ trait FiresEvents
     //     //
     // }
 
-    public function isListeningClickEvent(): bool
+    public static function isListeningClickEvent(): bool
     {
-        return method_exists($this, 'onEventClick');
+        return method_exists(static::class, 'onEventClick');
     }
 
     /**
@@ -31,8 +31,8 @@ public function isListeningClickEvent(): bool
     //     //
     // }
 
-    public function isListeningDropEvent(): bool
+    public static function isListeningDropEvent(): bool
     {
-        return method_exists($this, 'onEventDrop');
+        return method_exists(static::class, 'onEventDrop');
     }
 }
diff --git a/src/Widgets/Forms/CreateEventForm.php b/src/Widgets/Forms/CreateEventForm.php
@@ -36,12 +36,8 @@ protected function getCreateEventForm(): array
     {
         return [
             'createEventForm' => $this->makeForm()
-                ->schema(
-                    array_map(
-                        fn ($component) => $component->statePath('createEventFormState'),
-                        static::getCreateEventFormSchema()
-                    )
-                ),
+                ->schema(static::getCreateEventFormSchema())
+                ->statePath('createEventFormState'),
         ];
     }
 }
diff --git a/src/Widgets/Forms/EditEventForm.php b/src/Widgets/Forms/EditEventForm.php
@@ -36,12 +36,8 @@ protected function getEditEventForm(): array
     {
         return [
             'editEventForm' => $this->makeForm()
-                ->schema(
-                    array_map(
-                        fn ($component) => $component->statePath('editEventFormState'),
-                        static::getEditEventFormSchema()
-                    )
-                ),
+                ->schema(static::getEditEventFormSchema())
+                ->statePath('editEventFormState'),
         ];
     }
 }
diff --git a/src/Widgets/FullCalendarWidget.php b/src/Widgets/FullCalendarWidget.php
@@ -6,7 +6,6 @@
 use Filament\Forms\Contracts\HasForms;
 use Filament\Widgets\Widget;
 use Illuminate\View\View;
-use Saade\FilamentFullCalendar\Widgets\Concerns\AuthorizesActions;
 use Saade\FilamentFullCalendar\Widgets\Concerns\CanManageEvents;
 use Saade\FilamentFullCalendar\Widgets\Concerns\FiresEvents;
 use Saade\FilamentFullCalendar\Widgets\Concerns\UsesConfig;
@@ -17,17 +16,16 @@ class FullCalendarWidget extends Widget implements HasForms
         CanManageEvents::getForms insteadof InteractsWithForms;
     }
 
-    use AuthorizesActions;
     use FiresEvents;
     use UsesConfig;
 
     protected static string $view = 'filament-fullcalendar::fullcalendar';
 
     protected int | string | array $columnSpan = 'full';
 
-    public function getViewData(): array
+    public function mount(): void
     {
-        return [];
+        $this->setUpForms();
     }
 
     public function render(): View