From 16bc99eb0cf9c1645cab40ded4c190f3ddf9043e Mon Sep 17 00:00:00 2001
From: pascalbaljet <pascal@pascalbaljet.nl>
Date: Mon, 1 Nov 2021 14:53:44 +0100
Subject: [PATCH 1/3] Select placeholder

---
 resources/views/bootstrap-4/form-select.blade.php  | 11 +++++++++++
 resources/views/bootstrap-5/form-select.blade.php  | 11 +++++++++++
 resources/views/tailwind-2/form-select.blade.php   | 11 +++++++++++
 resources/views/tailwind/form-select.blade.php     | 11 +++++++++++
 src/Components/FormSelect.php                      | 14 +++++++++++++-
 .../Feature/{SelectSlotTest.php => SelectTest.php} | 13 ++++++++++++-
 tests/Feature/views/select-placeholder.blade.php   |  5 +++++
 7 files changed, 74 insertions(+), 2 deletions(-)
 rename tests/Feature/{SelectSlotTest.php => SelectTest.php} (54%)
 create mode 100644 tests/Feature/views/select-placeholder.blade.php

diff --git a/resources/views/bootstrap-4/form-select.blade.php b/resources/views/bootstrap-4/form-select.blade.php
index d0ab123..57206e1 100644
--- a/resources/views/bootstrap-4/form-select.blade.php
+++ b/resources/views/bootstrap-4/form-select.blade.php
@@ -12,11 +12,22 @@
             multiple
         @endif
 
+        @if($placeholder)
+            placeholder="{{ $placeholder }}"
+        @endif
+
         @if($label && !$attributes->get('id'))
             id="{{ $id() }}"
         @endif
 
         {!! $attributes->merge(['class' => 'form-control ' . ($hasError($name) ? 'is-invalid' : '')]) !!}>
+
+        @if($placeholder)
+            <option value="" disabled @if($nothingSelected()) selected="selected" @endif>
+                {{ $placeholder }}
+            </option>
+        @endif
+
         @forelse($options as $key => $option)
             <option value="{{ $key }}" @if($isSelected($key)) selected="selected" @endif>
                 {{ $option }}
diff --git a/resources/views/bootstrap-5/form-select.blade.php b/resources/views/bootstrap-5/form-select.blade.php
index b037867..4c51724 100644
--- a/resources/views/bootstrap-5/form-select.blade.php
+++ b/resources/views/bootstrap-5/form-select.blade.php
@@ -15,12 +15,23 @@
             multiple
         @endif
 
+        @if($placeholder)
+            placeholder="{{ $placeholder }}"
+        @endif
+
         @if($label && !$attributes->get('id'))
             id="{{ $id() }}"
         @endif
 
         {!! $attributes->merge(['class' => 'form-select' . ($hasError($name) ? ' is-invalid' : '')]) !!}
     >
+
+        @if($placeholder)
+            <option value="" disabled @if($nothingSelected()) selected="selected" @endif>
+                {{ $placeholder }}
+            </option>
+        @endif
+
         @forelse($options as $key => $option)
             <option value="{{ $key }}" @if($isSelected($key)) selected="selected" @endif>
                 {{ $option }}
diff --git a/resources/views/tailwind-2/form-select.blade.php b/resources/views/tailwind-2/form-select.blade.php
index 77d59ae..74f63e3 100644
--- a/resources/views/tailwind-2/form-select.blade.php
+++ b/resources/views/tailwind-2/form-select.blade.php
@@ -13,9 +13,20 @@
                 multiple
             @endif
 
+            @if($placeholder)
+                placeholder="{{ $placeholder }}"
+            @endif
+
             {!! $attributes->merge([
                 'class' => ($label ? 'mt-1' : '') . ' block w-full'
             ]) !!}>
+
+            @if($placeholder)
+                <option value="" disabled @if($nothingSelected()) selected="selected" @endif>
+                    {{ $placeholder }}
+                </option>
+            @endif
+
             @forelse($options as $key => $option)
                 <option value="{{ $key }}" @if($isSelected($key)) selected="selected" @endif>
                     {{ $option }}
diff --git a/resources/views/tailwind/form-select.blade.php b/resources/views/tailwind/form-select.blade.php
index 0799f43..91e3ad9 100644
--- a/resources/views/tailwind/form-select.blade.php
+++ b/resources/views/tailwind/form-select.blade.php
@@ -13,9 +13,20 @@
                 multiple
             @endif
 
+            @if($placeholder)
+                placeholder="{{ $placeholder }}"
+            @endif
+
             {!! $attributes->merge([
                 'class' => ($label ? 'mt-1' : '') . ' block w-full ' . ($multiple ? 'form-multiselect' : 'form-select')
             ]) !!}>
+
+            @if($placeholder)
+                <option value="" disabled @if($nothingSelected()) selected="selected" @endif>
+                    {{ $placeholder }}
+                </option>
+            @endif
+
             @forelse($options as $key => $option)
                 <option value="{{ $key }}" @if($isSelected($key)) selected="selected" @endif>
                     {{ $option }}
diff --git a/src/Components/FormSelect.php b/src/Components/FormSelect.php
index b76280a..45d7b5d 100644
--- a/src/Components/FormSelect.php
+++ b/src/Components/FormSelect.php
@@ -17,6 +17,7 @@ class FormSelect extends Component
     public $selectedKey;
     public bool $multiple;
     public bool $floating;
+    public string $placeholder;
 
     /**
      * Create a new component instance.
@@ -32,12 +33,14 @@ public function __construct(
         bool $multiple = false,
         bool $showErrors = true,
         bool $manyRelation = false,
-        bool $floating = false
+        bool $floating = false,
+        string $placeholder = ''
     ) {
         $this->name         = $name;
         $this->label        = $label;
         $this->options      = $options;
         $this->manyRelation = $manyRelation;
+        $this->placeholder  = $placeholder;
 
         if ($this->isNotWired()) {
             $inputName = Str::before($name, '[]');
@@ -64,4 +67,13 @@ public function isSelected($key): bool
 
         return in_array($key, Arr::wrap($this->selectedKey));
     }
+
+    public function nothingSelected(): bool
+    {
+        if ($this->isWired()) {
+            return false;
+        }
+
+        return is_array($this->selectedKey) ? empty($this->selectedKey) : is_null($this->selectedKey);
+    }
 }
diff --git a/tests/Feature/SelectSlotTest.php b/tests/Feature/SelectTest.php
similarity index 54%
rename from tests/Feature/SelectSlotTest.php
rename to tests/Feature/SelectTest.php
index c05bdfe..3f3f96b 100644
--- a/tests/Feature/SelectSlotTest.php
+++ b/tests/Feature/SelectTest.php
@@ -4,7 +4,7 @@
 
 use ProtoneMedia\LaravelFormComponents\Tests\TestCase;
 
-class SelectSlotTest extends TestCase
+class SelectTest extends TestCase
 {
     /** @test */
     public function it_shows_the_slot_if_the_options_are_empty()
@@ -16,4 +16,15 @@ public function it_shows_the_slot_if_the_options_are_empty()
             ->seeElement('option[value="b"]')
             ->seeElement('option[value="c"]');
     }
+
+    /** @test */
+    public function it_can_render_a_placeholder()
+    {
+        $this->registerTestRoute('select-placeholder');
+
+        $this->visit('/select-placeholder')
+            ->seeElement('option[value=""][selected="selected"]')
+            ->seeElement('option[value="a"]')
+            ->seeElement('option[value="b"]');
+    }
 }
diff --git a/tests/Feature/views/select-placeholder.blade.php b/tests/Feature/views/select-placeholder.blade.php
new file mode 100644
index 0000000..4205f30
--- /dev/null
+++ b/tests/Feature/views/select-placeholder.blade.php
@@ -0,0 +1,5 @@
+<x-form>
+    <x-form-select name="select" placeholder="Choose..." :options="['a' => 'a', 'b' => 'b']"></x-form-select>
+
+    <x-form-submit />
+</x-form>
\ No newline at end of file

From b157e823b0dcf875f0846b1bf5469eed1d86e3dc Mon Sep 17 00:00:00 2001
From: pascalbaljet <pascal@pascalbaljet.nl>
Date: Mon, 1 Nov 2021 15:02:50 +0100
Subject: [PATCH 2/3] Update README.md

---
 README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 7e43670..f0d820c 100644
--- a/README.md
+++ b/README.md
@@ -318,6 +318,21 @@ If you want a select element where multiple options can be selected, add the `mu
 <x-form-select name="country_code[]" :options="$countries" multiple :default="['be', 'nl']" />
 ```
 
+You may add a `placeholder` attribute to the select element. This will prepend a disabled option. This feature was added in v3.2.0. If you're upgrading from a previous version *and* you published the Blade views, you should republish them *or* update them manually.
+
+```blade
+<x-form-select name="country_code" placeholder="Choose..." />
+```
+
+Rendered HTML:
+
+```html
+<select>
+    <option value="" disabled>Choose...</option>
+    <!-- other options... -->
+</select>
+```
+
 #### Using Eloquent relationships
 
 This package has built-in support for `BelongsToMany`, `MorphMany`, and `MorphToMany` relationships. To utilize this feature, you must add both the `multiple` and `many-relation` attribute to the select element.

From ae65b423a92f9ad92b06a5f82e6b1b4c1ca69f1c Mon Sep 17 00:00:00 2001
From: pascalbaljet <pascal@pascalbaljet.nl>
Date: Mon, 1 Nov 2021 15:04:05 +0100
Subject: [PATCH 3/3] Docs

---
 CHANGELOG.md | 4 ++++
 README.md    | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee90cef..cea4dcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-form-components` will be documented in this file
 
+## 3.2.0 - 2021-11-01
+
+- Support for `select` placeholder
+
 ## 3.1.0 - 2021-11-01
 
 - Support for Date Casting
diff --git a/README.md b/README.md
index f0d820c..912ec99 100644
--- a/README.md
+++ b/README.md
@@ -318,7 +318,9 @@ If you want a select element where multiple options can be selected, add the `mu
 <x-form-select name="country_code[]" :options="$countries" multiple :default="['be', 'nl']" />
 ```
 
-You may add a `placeholder` attribute to the select element. This will prepend a disabled option. This feature was added in v3.2.0. If you're upgrading from a previous version *and* you published the Blade views, you should republish them *or* update them manually.
+You may add a `placeholder` attribute to the select element. This will prepend a disabled option.
+
+This feature was added in v3.2.0. If you're upgrading from a previous version *and* you published the Blade views, you should republish them *or* update them manually.
 
 ```blade
 <x-form-select name="country_code" placeholder="Choose..." />