Merge pull request #16 from portavice/fixes

Fix display of disabled navigation items and value of disabled form fields
portavice · Mar 20, 2024 · 4114892 · 4114892
2 parents 4603418 + e8d122b
commit 4114892
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Move PHPDoc comments outside of `@props` block
+- Display of disabled navigation items (`<x-bs::nav.item :disabled="true">`)
+- Set the value of disabled form fields even if the value is not contained in the old values
 
 
 ## Version 1.1.1 (2024-01-05)

diff --git a/resources/views/components/form/field.blade.php b/resources/views/components/form/field.blade.php
@@ -83,7 +83,9 @@
     }
 
     // Override selected value and apply cast.
-    $value = ValueHelper::value($name, $value, $fromQuery, $cast);
+    if (!$disabled) {
+        $value = ValueHelper::value($name, $value, $fromQuery, $cast);
+    }
 
     $showFeedback = true;
 @endphp

diff --git a/resources/views/components/nav/item.blade.php b/resources/views/components/nav/item.blade.php
@@ -37,12 +37,12 @@
         ->class([
             'nav-link',
             'active' => $active,
+            'disabled' => $disabled,
             'dropdown-toggle' => $hasDropdown,
         ])
         ->merge([
             'aria-current' => $active ? 'page' : null,
             'aria-disabled' => $disabled ? 'true' : null,
-            'disabled' => $disabled,
         ]) }}>{{ $slot }}</a>
     @if($hasDropdown)
         <ul {{ $dropdown->attributes

diff --git a/tests/Feature/Form/FormField/FormFieldValuesFilledFromOldTest.php b/tests/Feature/Form/FormField/FormFieldValuesFilledFromOldTest.php
@@ -16,6 +16,21 @@ public function testFormFieldFilledWithOldValue(array $old, string $html, string
         $this->assertBladeRendersToHtml($html, $this->bladeView($blade, $data));
     }
 
+    /**
+     * @dataProvider formDataProvider
+     */
+    public function testDisabledFormFieldHasValueEvenIfNotInOldValues(array $old): void
+    {
+        $this->mockOld($old);
+        $this->assertBladeRendersToHtml(
+            '<div class="mb-3">
+                <label for="count" class="form-label">Count</label>
+                <input id="count" name="count" type="number" value="42" class="form-control" disabled/>
+            </div>',
+            '<x-bs::form.field name="count" type="number" :disabled="true" value="42">Count</x-bs::form.field>'
+        );
+    }
+
     public static function formDataProvider(): array
     {
         return [

diff --git a/tests/Feature/NavTest.php b/tests/Feature/NavTest.php
@@ -33,12 +33,22 @@ public function testNavItemRendersCorrectlyForCurrentPage(): void
         $this->mockRequest('http://localhost/current-page');
         $this->assertBladeRendersToHtml(
             '<li class="nav-item">
-                <a aria-current="page"  class="nav-link active" href="http://localhost/current-page">Current Page</a>
+                <a aria-current="page" class="nav-link active" href="http://localhost/current-page">Current Page</a>
             </li>',
             $this->bladeView('<x-bs::nav.item href="http://localhost/current-page">Current Page</x-bs::nav.item>')
         );
     }
 
+    public function testDisabledNavItemRendersCorrectly(): void
+    {
+        $this->assertBladeRendersToHtml(
+            '<li class="nav-item">
+                <a aria-disabled="true" class="nav-link disabled" href="http://localhost/">Page</a>
+            </li>',
+            $this->bladeView('<x-bs::nav.item href="http://localhost/" :disabled="true">Page</x-bs::nav.item>')
+        );
+    }
+
     public function testNavDropdownRendersCorrectly(): void
     {
         $this->assertBladeRendersToHtml(