Error bag support

Author: pascalbaljet

resources/views/bootstrap-4/form-errors.blade.php

@@ -1,4 +1,4 @@
-@error($name)
+@error($name, $bag)
     <div {!! $attributes->merge(['class' => 'invalid-feedback']) !!}>
         {{ $message }}
     </div>

resources/views/tailwind/form-errors.blade.php

@@ -1,4 +1,4 @@
-@error($name)
+@error($name, $bag)
     <p {!! $attributes->merge(['class' => 'text-red-500 text-xs italic']) !!}>
         {{ $message }}
     </p>

src/Components/FormErrors.php

@@ -2,17 +2,22 @@
 
 namespace ProtoneMedia\LaravelFormComponents\Components;
 
+use Illuminate\Support\Str;
+
 class FormErrors extends Component
 {
     public string $name;
+    public string $bag;
 
     /**
      * Create a new component instance.
      *
      * @return void
      */
-    public function __construct(string $name)
+    public function __construct(string $name, string $bag = 'default')
     {
-        $this->name = str_replace(['[', ']'], ['.', ''], $name);
+        $this->name = str_replace(['[', ']'], ['.', ''], Str::before($name, '[]'));
+
+        $this->bag = $bag;
     }
 }

src/Components/FormSelect.php

@@ -3,6 +3,7 @@
 namespace ProtoneMedia\LaravelFormComponents\Components;
 
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 class FormSelect extends Component
 {
@@ -34,9 +35,11 @@ public function __construct(
         $this->options = $options;
 
         if ($this->isNotWired()) {
-            $default = $this->getBoundValue($bind, $name) ?: $default;
+            $inputName = Str::before($name, '[]');
 
-            $this->selectedKey = old($name, $default);
+            $default = $this->getBoundValue($bind, $inputName) ?: $default;
+
+            $this->selectedKey = old($inputName, $default);
         }
 
         $this->multiple   = $multiple;

src/Components/HandlesValidationErrors.php

@@ -2,7 +2,9 @@
 
 namespace ProtoneMedia\LaravelFormComponents\Components;
 
+use Illuminate\Contracts\Support\MessageBag;
 use Illuminate\Support\Facades\View;
+use Illuminate\Support\Str;
 use Illuminate\Support\ViewErrorBag;
 
 trait HandlesValidationErrors
@@ -24,6 +26,19 @@ public function hasErrorAndShow(string $name, string $bag = 'default'): bool
             : false;
     }
 
+    /**
+     * Getter for the ErrorBag.
+     *
+     * @param string $bag
+     * @return \Illuminate\Contracts\Support\MessageBag
+     */
+    protected function getErrorBag(string $bag = 'default'): MessageBag
+    {
+        $bags = View::shared('errors', fn () => request()->session()->get('errors', new ViewErrorBag));
+
+        return $bags->getBag($bag);
+    }
+
     /**
      * Returns a boolean wether the given attribute has an error.
      *
@@ -33,10 +48,10 @@ public function hasErrorAndShow(string $name, string $bag = 'default'): bool
      */
     public function hasError(string $name, string $bag = 'default'): bool
     {
-        $errors = View::shared('errors', fn () => request()->session()->get('errors', new ViewErrorBag));
+        $name = str_replace(['[', ']'], ['.', ''], Str::before($name, '[]'));
 
-        $name = str_replace(['[', ']'], ['.', ''], $name);
+        $errorBag = $this->getErrorBag($bag);
 
-        return $errors->getBag($bag)->has($name);
+        return $errorBag->has($name) || $errorBag->has($name . '.*');
     }
 }

tests/Feature/ChekboxTest.php

@@ -21,13 +21,13 @@ public function it_check_the_right_element_as_default()
     public function it_does_check_the_right_input_element_after_a_validation_error()
     {
         $this->registerTestRoute('checkbox-validation', function (Request $request) {
-            $data = $request->validate([
+            $request->validate([
                 'checkbox'   => 'required|array',
                 'checkbox.*' => 'in:a',
             ]);
         });
 
-        $this->visit('/checkbox-validation?check=b')
+        $this->visit('/checkbox-validation')
             ->seeElement('input[value="a"]:not(:checked)')
             ->seeElement('input[value="b"]:checked')
             ->press('Submit')

tests/Feature/MultipleSelectTest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace ProtoneMedia\LaravelFormComponents\Tests\Feature;
+
+use Illuminate\Http\Request;
+use ProtoneMedia\LaravelFormComponents\Tests\TestCase;
+
+class MultipleSelectTest extends TestCase
+{
+    /** @test */
+    public function it_posts_all_selected_options()
+    {
+        $this->registerTestRoute('multiple-select-keys', function (Request $request) {
+            $request->validate([
+                'select' => 'required|string',
+            ]);
+        });
+
+        $this->visit('/multiple-select-keys?both=yes')
+            ->seeElement('option[value="be"]:selected')
+            ->seeElement('option[value="nl"]:selected')
+            ->press('Submit')
+            ->seeElement('option[value="be"]:selected')
+            ->seeElement('option[value="nl"]:selected')
+            ->seeText('The select must be a string.');
+    }
+}

tests/Feature/views/checkbox-validation.blade.php

@@ -1,10 +1,10 @@
-<x-form action="/checkbox-validation">
+<x-form>
     <x-form-group>
-        <x-form-checkbox name="checkbox[]" value="a" :default="request()->query('check') == 'a'" />
+        <x-form-checkbox name="checkbox[]" value="a" />
     </x-form-group>
 
     <x-form-group>
-        <x-form-checkbox name="checkbox[]" value="b" :default="request()->query('check') == 'b'" />
+        <x-form-checkbox name="checkbox[]" value="b" :default="old() ? false : true" />
     </x-form-group>
 
     <x-form-submit />

tests/Feature/views/multiple-select-keys.blade.php

@@ -0,0 +1,7 @@
+<x-form>
+    <x-form-select multiple name="select[]" :default="(old() ? null : ['be', 'nl'])"
+        :options="['be' => 'Belgium', 'nl' => 'The Netherlands']" />
+
+    <x-form-input name="another_field" />
+    <x-form-submit />
+</x-form>