Fix invalid validate

foxws · Jul 13, 2024 · 4b3ca71 · 4b3ca71
1 parent 196799f
commit 4b3ca71
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/Support/Html/Elements/Validate.php b/src/Support/Html/Elements/Validate.php
@@ -11,10 +11,9 @@ class Validate extends BaseElement
 
     public function message(?string $message = null): static
     {
+        $element = Span::create();
+
         return $this
-            ->addChild($message, Span::create()
-                ->class('text-error-500')
-                ->text($message)
-            );
+            ->addChild($element->class('text-error-500')->text($message));
     }
 }
diff --git a/src/Support/Html/Mixins/HtmlExtendedMixin.php b/src/Support/Html/Mixins/HtmlExtendedMixin.php
@@ -4,18 +4,23 @@
 
 use Foxws\WireUse\Support\Html\Elements\Icon;
 use Foxws\WireUse\Support\Html\Elements\Validate;
+use Illuminate\Support\MessageBag;
 use Livewire\Form as Livewire;
 use Spatie\Html\Elements\Form;
 
 class HtmlExtendedMixin
 {
     protected ?Livewire $form = null;
 
+    protected ?MessageBag $errorBag = null;
+
     public function wireForm(): mixed
     {
         return function (Livewire $form, ?string $action = null) {
             $this->form = $form;
 
+            $this->errorBag = $form->getErrorBag();
+
             return Form::create()
                 ->attributeIf($action, 'wire:submit', $action);
         };
@@ -26,6 +31,8 @@ public function closeWireForm(): mixed
         return function () {
             $this->form = null;
 
+            $this->errorBag = null;
+
             return Form::create()->close();
         };
     }
@@ -40,14 +47,14 @@ public function icon(): mixed
     public function validate(): mixed
     {
         return function (string $field, ?string $message = null) {
-            $messageBag = $this->form?->getErrorBag();
+            $hasMessage = $this->errorBag?->has($field);
 
-            $hasMessage = $messageBag?->has($field);
+            $message ??= $this->errorBag?->first($field);
 
             return Validate::create()
                 ->classUnless($hasMessage, 'hidden')
                 ->classIfNotNull($hasMessage, 'block py-1 text-sm')
-                ->messageIf($hasMessage, $message ?? $messageBag->first($field));
+                ->messageIf($hasMessage, $message);
         };
     }
 }