From 6768782bc39715534bc754af73731aef3d200f4b Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Mon, 31 Oct 2022 13:32:25 +0000
Subject: [PATCH] wip

---
 .../views/components/form/actions.blade.php        |  2 +-
 packages/app/src/Resources/Pages/CreateRecord.php  |  4 ++--
 packages/app/src/Resources/Pages/EditRecord.php    |  4 ++--
 packages/app/src/Resources/Pages/Page.php          |  9 +++++++--
 packages/app/src/Resources/Pages/ViewRecord.php    |  4 ++--
 .../resources/js/components/date-time-picker.js    |  2 +-
 .../views/components/date-time-picker.blade.php    | 14 ++++++++++++--
 .../src/Pages/SettingsPage.php                     |  2 +-
 8 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/packages/app/resources/views/components/form/actions.blade.php b/packages/app/resources/views/components/form/actions.blade.php
index bdbd9263a8..132d6d2e6b 100644
--- a/packages/app/resources/views/components/form/actions.blade.php
+++ b/packages/app/resources/views/components/form/actions.blade.php
@@ -6,7 +6,7 @@
 
 <x-filament-actions::actions
     :actions="$actions"
-    :alignment="$alignment ?? static::getFormActionsAlignment()"
+    :alignment="$alignment ?? $this->getFormActionsAlignment()"
     :full-width="$fullWidth"
     class="filament-form-actions"
 />
diff --git a/packages/app/src/Resources/Pages/CreateRecord.php b/packages/app/src/Resources/Pages/CreateRecord.php
index 3a30898b3c..1a5a9a95c6 100644
--- a/packages/app/src/Resources/Pages/CreateRecord.php
+++ b/packages/app/src/Resources/Pages/CreateRecord.php
@@ -194,8 +194,8 @@ class CreateRecord extends Page
                 ->context('create')
                 ->model($this->getModel())
                 ->statePath('data')
-                ->columns(static::$formHasInlineLabels ? 1 : 2)
-                ->inlineLabel(static::$formHasInlineLabels),
+                ->columns($this->hasInlineFormLabels() ? 1 : 2)
+                ->inlineLabel($this->hasInlineFormLabels()),
         );
     }
 
diff --git a/packages/app/src/Resources/Pages/EditRecord.php b/packages/app/src/Resources/Pages/EditRecord.php
index 76a36c4472..54fa8f79c6 100644
--- a/packages/app/src/Resources/Pages/EditRecord.php
+++ b/packages/app/src/Resources/Pages/EditRecord.php
@@ -274,8 +274,8 @@ class EditRecord extends Page
                 ->context('edit')
                 ->model($this->getRecord())
                 ->statePath('data')
-                ->columns(static::$formHasInlineLabels ? 1 : 2)
-                ->inlineLabel(static::$formHasInlineLabels),
+                ->columns($this->hasInlineFormLabels() ? 1 : 2)
+                ->inlineLabel($this->hasInlineFormLabels()),
         );
     }
 
diff --git a/packages/app/src/Resources/Pages/Page.php b/packages/app/src/Resources/Pages/Page.php
index c08fb88541..91d202f4cd 100644
--- a/packages/app/src/Resources/Pages/Page.php
+++ b/packages/app/src/Resources/Pages/Page.php
@@ -16,7 +16,7 @@ abstract class Page extends BasePage
 
     public static string $formActionsAlignment = 'left';
 
-    public static bool $formHasInlineLabels = false;
+    public static bool $hasInlineFormLabels = false;
 
     public static function route(string $path): PageRegistration
     {
@@ -96,8 +96,13 @@ abstract class Page extends BasePage
         static::$formActionsAlignment = 'right';
     }
 
-    public static function getFormActionsAlignment(): string
+    public function getFormActionsAlignment(): string
     {
         return static::$formActionsAlignment;
     }
+
+    public function hasInlineFormLabels(): bool
+    {
+        return static::$hasInlineFormLabels;
+    }
 }
diff --git a/packages/app/src/Resources/Pages/ViewRecord.php b/packages/app/src/Resources/Pages/ViewRecord.php
index 2d9e72646d..34d93996b4 100644
--- a/packages/app/src/Resources/Pages/ViewRecord.php
+++ b/packages/app/src/Resources/Pages/ViewRecord.php
@@ -161,8 +161,8 @@ class ViewRecord extends Page
                 ->disabled()
                 ->model($this->getRecord())
                 ->statePath('data')
-                ->columns(static::$formHasInlineLabels ? 1 : 2)
-                ->inlineLabel(static::$formHasInlineLabels),
+                ->columns($this->hasInlineFormLabels() ? 1 : 2)
+                ->inlineLabel($this->hasInlineFormLabels()),
         );
     }
 
diff --git a/packages/forms/resources/js/components/date-time-picker.js b/packages/forms/resources/js/components/date-time-picker.js
index e466d610d3..3a256a9c6e 100644
--- a/packages/forms/resources/js/components/date-time-picker.js
+++ b/packages/forms/resources/js/components/date-time-picker.js
@@ -380,7 +380,7 @@ export default function dateTimePickerFormComponent({
         },
 
         togglePanelVisibility: function () {
-            if (!this.isOpen()) {
+            if (! this.isOpen()) {
                 this.focusedDate =
                     this.getSelectedDate() ??
                     this.getMinDate() ??
diff --git a/packages/forms/resources/views/components/date-time-picker.blade.php b/packages/forms/resources/views/components/date-time-picker.blade.php
index 6e2b01d1d2..40664e2139 100644
--- a/packages/forms/resources/views/components/date-time-picker.blade.php
+++ b/packages/forms/resources/views/components/date-time-picker.blade.php
@@ -45,6 +45,15 @@
                 'opacity-70 dark:text-gray-300' => $isDisabled(),
             ]) }}
         >
+            <div class="grid grid-cols-7 gap-1">
+                <template x-for="(day, index) in dayLabels" x-bind:key="index">
+                    <div
+                        x-text="day"
+                        class="text-xs font-medium text-center text-gray-800 dark:text-gray-200"
+                    ></div>
+                </template>
+            </div>
+
             <input
                 readonly
                 placeholder="{{ $getPlaceholder() }}"
@@ -85,6 +94,7 @@
                             x-model="focusedMonth"
                             class="grow px-1 py-0 text-lg font-medium text-gray-800 border-0 cursor-pointer focus:ring-0 focus:outline-none dark:bg-gray-700 dark:text-gray-200"
                             dusk="filament.forms.{{ $getStatePath() }}.focusedMonth"
+                            wire:ignore
                         >
                             <template x-for="(month, index) in months">
                                 <option x-bind:value="index" x-text="month"></option>
@@ -100,8 +110,8 @@
                         />
                     </div>
 
-                    <div class="grid grid-cols-7 gap-1">
-                        <template x-for="(day, index) in dayLabels" :key="index">
+                    <div class="grid grid-cols-7 gap-1" wire:ignore>
+                        <template x-for="(day, index) in dayLabels" x-bind:key="index">
                             <div
                                 x-text="day"
                                 class="text-xs font-medium text-center text-gray-800 dark:text-gray-200"
diff --git a/packages/spatie-laravel-settings-plugin/src/Pages/SettingsPage.php b/packages/spatie-laravel-settings-plugin/src/Pages/SettingsPage.php
index 4a310acba4..955d1b01c3 100644
--- a/packages/spatie-laravel-settings-plugin/src/Pages/SettingsPage.php
+++ b/packages/spatie-laravel-settings-plugin/src/Pages/SettingsPage.php
@@ -148,7 +148,7 @@ class SettingsPage extends Page
                 $this->makeForm()
                     ->statePath('data')
                     ->columns(2)
-                    ->inlineLabel(static::$formHasInlineLabels),
+                    ->inlineLabel($this->hasInlineFormLabels()),
             ),
         ];
     }