Ensure step validation errors aren’t reset

aerni · Apr 27, 2024 · 09e4487 · 09e4487
1 parent 2e51cf8
commit 09e4487
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/src/Form/Step.php b/src/Form/Step.php
@@ -2,11 +2,12 @@
 
 namespace Aerni\LivewireForms\Form;
 
-use Aerni\LivewireForms\Enums\StepStatus;
-use Aerni\LivewireForms\Fields\Field;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
 use Livewire\Livewire;
+use Illuminate\Support\Str;
+use Illuminate\Support\Collection;
+use Aerni\LivewireForms\Fields\Field;
+use Aerni\LivewireForms\Enums\StepStatus;
+use Illuminate\Support\MessageBag;
 
 class Step
 {
@@ -88,7 +89,7 @@ public function validate(): bool
             return false;
         }
 
-        $errorBag = Livewire::current()->getErrorBag();
+        Livewire::current()->storeAllStepErrors();
 
         $rules = $this->fields()
             ->mapWithKeys(fn (Field $field) => $field->rules())
@@ -101,7 +102,7 @@ public function validate(): bool
         * This leads to error messages of other steps being reset as well.
         * To prevent this, we restore the previous error bag after the validation.
         */
-        Livewire::current()->setErrorBag($errorBag);
+        Livewire::current()->restoreAllStepErrors();
 
         return true;
     }

diff --git a/src/Livewire/Concerns/HandlesValidation.php b/src/Livewire/Concerns/HandlesValidation.php
@@ -2,8 +2,12 @@
 
 namespace Aerni\LivewireForms\Livewire\Concerns;
 
+use Illuminate\Support\MessageBag;
+
 trait HandlesValidation
 {
+    public array $allStepErrors = [];
+
     public function bootHandlesValidation(): void
     {
         /**
@@ -18,6 +22,25 @@ public function bootHandlesValidation(): void
         });
     }
 
+    public function storeAllStepErrors(): void
+    {
+        $currentErrors = $this->getErrorBag()->messages();
+
+        $stepFields = $this->currentStep()->fields()->map->key()->flip();
+
+        $resolvedErrors = collect($stepFields)->diffKeys($currentErrors);
+
+        $this->allStepErrors = collect($this->allStepErrors)
+            ->merge($currentErrors)
+            ->diffKeys($resolvedErrors)
+            ->toArray();
+    }
+
+    public function restoreAllStepErrors(): void
+    {
+        $this->setErrorBag(new MessageBag($this->allStepErrors));
+    }
+
     protected function rules(): array
     {
         return $this->fields