Fix: direct value has precedence over model binding

gbalduzzi · gbalduzzi · commit 1e3d7ff51e39 · 2025-01-22T14:46:34.000+01:00
diff --git a/src/Components/BaseFormInput.php b/src/Components/BaseFormInput.php
@@ -28,14 +28,16 @@ public function __construct(string $name, ?string $oldReference = null, ?string
         $this->modelField = $modelField ?: $name;
 
         $valueToLoad = $this->loadFromOld();
+        $override = true;
 
         if ($valueToLoad === null) {
             $valueToLoad = $this->loadFromModel();
+            $override = false;
         }
 
         if ($valueToLoad !== null) {
             try {
-                $this->load($valueToLoad);
+                $this->load($valueToLoad, $override);
 
             } catch (\TypeError $e) {
                 // Wrong variable type
@@ -46,7 +48,7 @@ public function __construct(string $name, ?string $oldReference = null, ?string
     /**
      * Method called when a value is found, either from the binded model or the `old()` input
      */
-    abstract public function load(mixed $value): void;
+    abstract public function load(mixed $value, bool $override): void;
 
     protected function loadFromModel(): mixed
     {
diff --git a/src/Components/Checkbox.php b/src/Components/Checkbox.php
@@ -28,8 +28,12 @@ public function __construct(
         parent::__construct($name);
     }
 
-    public function load(mixed $value): void
+    public function load(mixed $value, bool $override): void
     {
+        if (!$override && $this->checked !== null) {
+            return;
+        }
+
         $this->checked = boolval($value);
     }
 
diff --git a/src/Components/Input.php b/src/Components/Input.php
@@ -25,8 +25,12 @@ public function __construct(
         parent::__construct($name);
     }
 
-    public function load(mixed $value): void
+    public function load(mixed $value, bool $override): void
     {
+        if (!$override && $this->value !== null) {
+            return;
+        }
+
         $this->value = $this->parse($value);
     }
 
diff --git a/src/Components/MultiSelect.php b/src/Components/MultiSelect.php
@@ -37,17 +37,22 @@ public function __construct(
 
         $this->fieldName = "{$name}[]";
 
-        $this->load($value);
+        $this->load($value, false);
 
         parent::__construct($name);
 
     }
 
-    public function load(mixed $value): void
+    public function load(mixed $value, bool $override): void
     {
+        if (!$override && $this->value) {
+            return;
+        }
+
         if (is_a($value, Collection::class)) {
             $value = $value->toArray();
         }
+
         $this->value = $value ?: [];
     }
 
diff --git a/src/Components/Radio.php b/src/Components/Radio.php
@@ -20,8 +20,12 @@ public function __construct(
         parent::__construct($name);
     }
 
-    public function load(mixed $value): void
+    public function load(mixed $value, bool $override): void
     {
+        if (!$override && $this->checked !== null) {
+            return;
+        }
+
         $value = EnumConverter::enumToValue($value);
 
         $this->checked = $value === $this->value;
diff --git a/src/Components/SearchSelect.php b/src/Components/SearchSelect.php
@@ -37,8 +37,12 @@ public function __construct(
 
     }
 
-    public function load(mixed $value): void
+    public function load(mixed $value, bool $override): void
     {
+        if (!$override && $this->value !== null) {
+            return;
+        }
+
         $this->value = $this->parse($value);
     }
 
diff --git a/src/Components/Select.php b/src/Components/Select.php
@@ -33,8 +33,12 @@ public function __construct(
 
     }
 
-    public function load(mixed $value): void
+    public function load(mixed $value, bool $override): void
     {
+        if (!$override && $this->value !== null) {
+            return;
+        }
+
         $this->value = $this->parse($value);
     }
 
diff --git a/src/Components/Textarea.php b/src/Components/Textarea.php
@@ -25,8 +25,12 @@ public function __construct(
 
     }
 
-    public function load(mixed $value): void
+    public function load(mixed $value, bool $override): void
     {
+        if (!$override && $this->value !== null) {
+            return;
+        }
+
         $this->value = $this->parse($value);
     }
 
diff --git a/tests/Feature/Components/CheckboxTest.php b/tests/Feature/Components/CheckboxTest.php
@@ -31,7 +31,7 @@
 
         bindModel($testModel);
 
-        $checkbox = new Checkbox(name: 'enabled', checked: false);
+        $checkbox = new Checkbox(name: 'enabled');
 
         expect($checkbox->checked)->toBeTrue();
     });
@@ -96,7 +96,6 @@
 
         $view = $this->blade(
             '<x-bs::checkbox name="enabled" />',
-            ['checked' => true]
         );
 
         expect($view)->assertSee('checked');
diff --git a/tests/Feature/Components/InputTest.php b/tests/Feature/Components/InputTest.php
@@ -38,7 +38,7 @@
         $testModel = new TestModel(['email' => 'test_model@example.com']);
         bindModel($testModel);
 
-        $input = new Input(name: 'email', value: 'test@example.com');
+        $input = new Input(name: 'email');
 
         expect($input->value)->toBe('test_model@example.com');
     });
@@ -57,6 +57,16 @@
         expect($input->value)->toBe('test_old@example.com');
     });
 
+    it('gives priority to value', function () {
+
+        $testModel = new TestModel(['email' => 'test_model@example.com']);
+        bindModel($testModel);
+
+        $input = new Input(name: 'email', value: 'test@example.com');
+
+        expect($input->value)->toBe('test@example.com');
+    });
+
 });
 
 describe('Renders correctly', function () {
diff --git a/tests/Feature/Components/MultiSelectTest.php b/tests/Feature/Components/MultiSelectTest.php
@@ -39,7 +39,7 @@
         $testModel = new TestModel(['countries' => ['it', 'us']]);
         bindModel($testModel);
 
-        $input = new MultiSelect(name: 'countries', value: ['de', 'fr'], options: TEST_OPTIONS);
+        $input = new MultiSelect(name: 'countries', options: TEST_OPTIONS);
 
         expect($input->value)->toBe(['it', 'us']);
     });
@@ -58,6 +58,16 @@
         expect($input->value)->toBe(['it', 'fr']);
     });
 
+    it('gives priority to value', function () {
+
+        $testModel = new TestModel(['countries' => ['it', 'us']]);
+        bindModel($testModel);
+
+        $input = new MultiSelect(name: 'countries', value: ['de', 'fr'], options: TEST_OPTIONS);
+
+        expect($input->value)->toBe(['de', 'fr']);
+    });
+
 });
 
 describe('Renders correctly', function () {
diff --git a/tests/Feature/Components/RadioTest.php b/tests/Feature/Components/RadioTest.php
@@ -31,7 +31,7 @@
         $testModel = new TestModel(['role' => 'Admin']);
         bindModel($testModel);
 
-        $radio = new Radio(name: 'role', value: 'Admin', checked: false);
+        $radio = new Radio(name: 'role', value: 'Admin');
 
         expect($radio->checked)->toBeTrue();
     });
@@ -50,6 +50,15 @@
         expect($radio->checked)->toBeTrue();
     });
 
+    it('gives priority to value', function () {
+
+        $testModel = new TestModel(['role' => 'Admin']);
+        bindModel($testModel);
+
+        $radio = new Radio(name: 'role', value: 'Admin', checked: false);
+
+        expect($radio->checked)->toBeFalse();
+    });
 });
 
 describe('Renders correctly', function () {
diff --git a/tests/Feature/Components/SearchSelectTest.php b/tests/Feature/Components/SearchSelectTest.php
@@ -40,7 +40,7 @@
         $testModel = new TestModel(['country' => 'us']);
         bindModel($testModel);
 
-        $input = new SearchSelect(name: 'country', value: 'de', options: TEST_OPTIONS);
+        $input = new SearchSelect(name: 'country', options: TEST_OPTIONS);
 
         expect($input->value)->toBe('us');
     });
@@ -58,6 +58,16 @@
 
         expect($input->value)->toBe('it');
     });
+
+    it('gives priority to value', function () {
+
+        $testModel = new TestModel(['country' => 'us']);
+        bindModel($testModel);
+
+        $input = new SearchSelect(name: 'country', value: 'de', options: TEST_OPTIONS);
+
+        expect($input->value)->toBe('de');
+    });
 });
 
 describe('Renders correctly', function () {
diff --git a/tests/Feature/Components/SelectTest.php b/tests/Feature/Components/SelectTest.php
@@ -40,7 +40,7 @@
         $testModel = new TestModel(['country' => 'it']);
         bindModel($testModel);
 
-        $input = new Select(name: 'country', value: 'de', options: TEST_OPTIONS);
+        $input = new Select(name: 'country', options: TEST_OPTIONS);
 
         expect($input->value)->toBe('it');
     });
@@ -59,6 +59,16 @@
         expect($input->value)->toBe('it');
     });
 
+    it('gives priority to value', function () {
+
+        $testModel = new TestModel(['country' => 'it']);
+        bindModel($testModel);
+
+        $input = new Select(name: 'country', value: 'de', options: TEST_OPTIONS);
+
+        expect($input->value)->toBe('de');
+    });
+
 });
 
 describe('Renders correctly', function () {
diff --git a/tests/Feature/Components/TextareaTest.php b/tests/Feature/Components/TextareaTest.php
@@ -30,7 +30,7 @@
         $testModel = new TestModel(['notes' => 'Lorem Ipsum']);
         bindModel($testModel);
 
-        $textarea = new Textarea(name: 'notes', value: 'Ipsum Lorem');
+        $textarea = new Textarea(name: 'notes');
 
         expect($textarea->value)->toBe('Lorem Ipsum');
     });
@@ -49,6 +49,16 @@
         expect($textarea->value)->toBe('Lorem Ipsum old');
     });
 
+    it('gives priority to value', function () {
+
+        $testModel = new TestModel(['notes' => 'Lorem Ipsum']);
+        bindModel($testModel);
+
+        $textarea = new Textarea(name: 'notes', value: 'Ipsum Lorem');
+
+        expect($textarea->value)->toBe('Ipsum Lorem');
+    });
+
 });
 
 describe('Renders correctly', function () {

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,12 @@ public function __construct(`
`28`	`28`	`parent::__construct($name);`
`29`	`29`	`}`
`30`	`30`
`31`		`- public function load(mixed $value): void`
	`31`	`+ public function load(mixed $value, bool $override): void`
`32`	`32`	`{`
	`33`	`+ if (!$override && $this->checked !== null) {`
	`34`	`+ return;`
	`35`	`+ }`
	`36`	`+`
`33`	`37`	`$this->checked = boolval($value);`
`34`	`38`	`}`
`35`	`39`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,12 @@ public function __construct(`
`25`	`25`	`parent::__construct($name);`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function load(mixed $value): void`
	`28`	`+ public function load(mixed $value, bool $override): void`
`29`	`29`	`{`
	`30`	`+ if (!$override && $this->value !== null) {`
	`31`	`+ return;`
	`32`	`+ }`
	`33`	`+`
`30`	`34`	`$this->value = $this->parse($value);`
`31`	`35`	`}`
`32`	`36`
Original file line number	Diff line number	Diff line change
`@@ -37,17 +37,22 @@ public function __construct(`
`37`	`37`
`38`	`38`	`$this->fieldName = "{$name}[]";`
`39`	`39`
`40`		`- $this->load($value);`
	`40`	`+ $this->load($value, false);`
`41`	`41`
`42`	`42`	`parent::__construct($name);`
`43`	`43`
`44`	`44`	`}`
`45`	`45`
`46`		`- public function load(mixed $value): void`
	`46`	`+ public function load(mixed $value, bool $override): void`
`47`	`47`	`{`
	`48`	`+ if (!$override && $this->value) {`
	`49`	`+ return;`
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`if (is_a($value, Collection::class)) {`
`49`	`53`	`$value = $value->toArray();`
`50`	`54`	`}`
	`55`	`+`
`51`	`56`	`$this->value = $value ?: [];`
`52`	`57`	`}`
`53`	`58`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,12 @@ public function __construct(`
`20`	`20`	`parent::__construct($name);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public function load(mixed $value): void`
	`23`	`+ public function load(mixed $value, bool $override): void`
`24`	`24`	`{`
	`25`	`+ if (!$override && $this->checked !== null) {`
	`26`	`+ return;`
	`27`	`+ }`
	`28`	`+`
`25`	`29`	`$value = EnumConverter::enumToValue($value);`
`26`	`30`
`27`	`31`	`$this->checked = $value === $this->value;`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,12 @@ public function __construct(`
`37`	`37`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function load(mixed $value): void`
	`40`	`+ public function load(mixed $value, bool $override): void`
`41`	`41`	`{`
	`42`	`+ if (!$override && $this->value !== null) {`
	`43`	`+ return;`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`$this->value = $this->parse($value);`
`43`	`47`	`}`
`44`	`48`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,12 @@ public function __construct(`
`33`	`33`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function load(mixed $value): void`
	`36`	`+ public function load(mixed $value, bool $override): void`
`37`	`37`	`{`
	`38`	`+ if (!$override && $this->value !== null) {`
	`39`	`+ return;`
	`40`	`+ }`
	`41`	`+`
`38`	`42`	`$this->value = $this->parse($value);`
`39`	`43`	`}`
`40`	`44`