Fix for #20

Author: pascalbaljet

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to `laravel-form-components` will be documented in this file
 
+## 2.1.2 - 2020-09-29
+
+- Bugfix for multiple checkbox/radio elements with the same name
+
+## 2.1.1 - 2020-09-29
+
+- Bugfix for select options with numeric keys
+
 ## 2.1.0 - 2020-09-14
 
 - Select elements now support a slot

src/Components/FormCheckbox.php

@@ -2,6 +2,9 @@
 
 namespace ProtoneMedia\LaravelFormComponents\Components;
 
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+
 class FormCheckbox extends Component
 {
     use HandlesValidationErrors;
@@ -30,12 +33,19 @@ public function __construct(
         $this->value      = $value;
         $this->showErrors = $showErrors;
 
-        if (old($name)) {
-            $this->checked = true;
+        $inputName = Str::before($name, '[]');
+
+        if ($oldData = old($inputName)) {
+            $this->checked = in_array($value, Arr::wrap($oldData));
         }
 
         if (!session()->hasOldInput() && $this->isNotWired()) {
-            $boundValue = $this->getBoundValue($bind, $name);
+            $boundValue = $this->getBoundValue($bind, $inputName);
+
+            if (is_array($boundValue)) {
+                $this->checked = in_array($value, $boundValue);
+                return;
+            }
 
             $this->checked = is_null($boundValue) ? $default : $boundValue;
         }

tests/Feature/ChekboxTest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace ProtoneMedia\LaravelFormComponents\Tests\Feature;
+
+use Illuminate\Http\Request;
+use ProtoneMedia\LaravelFormComponents\Tests\TestCase;
+
+class ChekboxTest extends TestCase
+{
+    /** @test */
+    public function it_check_the_right_element_as_default()
+    {
+        $this->registerTestRoute('default-checkbox');
+
+        $this->visit('/default-checkbox')
+            ->seeElement('input[value="a"]:checked')
+            ->seeElement('input[value="b"]:not(:checked)');
+    }
+
+    /** @test */
+    public function it_does_check_the_right_input_element_after_a_validation_error()
+    {
+        $this->registerTestRoute('checkbox-validation', function (Request $request) {
+            $data = $request->validate([
+                'checkbox'   => 'required|array',
+                'checkbox.*' => 'in:a',
+            ]);
+        });
+
+        $this->visit('/checkbox-validation?check=b')
+            ->seeElement('input[value="a"]:not(:checked)')
+            ->seeElement('input[value="b"]:checked')
+            ->press('Submit')
+            ->seeElement('input[value="a"]:not(:checked)')
+            ->seeElement('input[value="b"]:checked');
+    }
+}

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

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

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

@@ -0,0 +1,17 @@
+@php
+$target = ['checkbox' => ['a']];
+@endphp
+
+<x-form>
+    @bind($target)
+    <x-form-group>
+        <x-form-checkbox name="checkbox[]" value="a" />
+    </x-form-group>
+
+    <x-form-group>
+        <x-form-checkbox name="checkbox[]" value="b" />
+    </x-form-group>
+    @endbind
+
+    <x-form-submit />
+</x-form>