Refactor HtmlExtendedMixin to improve code readability and maintainab…

…ility
foxws · Sep 19, 2024 · 097bb3a · 097bb3a
1 parent 0777adf
commit 097bb3a
Showing 1 changed file with 4 additions and 16 deletions.
diff --git a/src/Support/Html/Mixins/HtmlExtendedMixin.php b/src/Support/Html/Mixins/HtmlExtendedMixin.php
@@ -4,8 +4,6 @@
 
 use Foxws\WireUse\Support\Html\Elements\Icon;
 use Foxws\WireUse\Support\Html\Elements\Validate;
-use Illuminate\Support\MessageBag;
-use Illuminate\Validation\ValidationException;
 use Livewire\Form as Livewire;
 use Spatie\Html\Elements\Form;
 use stdClass;
@@ -15,21 +13,11 @@ class HtmlExtendedMixin extends stdClass
 {
     protected ?Livewire $form = null;
 
-    protected ?MessageBag $messageBag = null;
-
     public function wireForm(): mixed
     {
         return function (Livewire $form, ?string $action = null): Form {
             $this->form = $form;
 
-            $this->messageBag = null;
-
-            try {
-                $this->form->validate();
-            } catch (ValidationException $e) {
-                $this->messageBag = $e->validator->errors();
-            }
-
             return Form::create()
                 ->attributeIf($action, 'wire:submit', $action);
         };
@@ -40,21 +28,21 @@ public function closeWireForm(): mixed
         return function (): Form {
             $this->form = null;
 
-            $this->messageBag = null;
-
             return Form::create()->close();
         };
     }
 
     public function error(): mixed
     {
         return function (string $field, ?string $message = null, ?string $format = null): Validate {
-            $hasMessage = $this->messageBag?->has($field) ?? false;
+            $messageBag = $this->form?->getComponent()->getErrorBag();
+
+            $hasMessage = $messageBag?->has($field) ?? false;
 
             return Validate::create()
                 ->classUnless($hasMessage, 'hidden')
                 ->classIf($hasMessage, 'label')
-                ->messageIf($hasMessage, $message ?: $this->messageBag?->first($field, $format));
+                ->messageIf($hasMessage, $message ?: $messageBag?->first($field, $format));
         };
     }