From bb01d373bb3de7aa469a16222bbb0bd863c9b81f Mon Sep 17 00:00:00 2001
From: Michael Aerni <hello@michaelaerni.ch>
Date: Sat, 24 Jul 2021 10:58:25 +0200
Subject: [PATCH] Make `show_label` available to all fieldtypes

---
 README.md                                         |  2 +-
 resources/views/antlers/fields/input.antlers.html | 12 ++++++++----
 .../views/antlers/fields/select.antlers.html      | 15 +++++++++++----
 .../views/antlers/fields/textarea.antlers.html    | 12 ++++++++----
 resources/views/blade/fields/input.blade.php      | 12 ++++++++----
 resources/views/blade/fields/select.blade.php     | 15 +++++++++++----
 resources/views/blade/fields/textarea.blade.php   | 12 ++++++++----
 7 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index da3ca5e4..331fee6e 100644
--- a/README.md
+++ b/README.md
@@ -320,7 +320,7 @@ There are multiple configuration options for your form fields:
 | `default`       | `array`, `boolean`, `integer`, `string` | All fieldtypes        | Set the field's default value |
 | `inline`        | `boolean`                               | `checkboxes`, `radio` | Set to `true` to display the fields inline |
 | `placeholder`   | `string`                                | `input`, `textarea`   | Set the field's placeholder value |
-| `show_label`    | `boolean`                               | `checkboxes`, `radio` | Set to `false` to hide the field's label and instructions. This can be useful for single checkboxes, eg. `Accept terms and conditions`. |
+| `show_label`    | `boolean`                               | All fieldtypes        | Set to `false` to hide the field's label and instructions. This can be useful for single checkboxes, eg. `Accept terms and conditions`. |
 | `width`         | `integer`                               | All fieldtypes        | Set the desired width of the field. |
 
 ## Events
diff --git a/resources/views/antlers/fields/input.antlers.html b/resources/views/antlers/fields/input.antlers.html
index 2d1a1324..4751d863 100644
--- a/resources/views/antlers/fields/input.antlers.html
+++ b/resources/views/antlers/fields/input.antlers.html
@@ -1,8 +1,12 @@
-<label for="{{ handle ?? fields[field].handle }}" class="block text-sm font-medium text-gray-700">
-    {{ label ?? fields[field].label }}
-</label>
+{{ if show_label ?? fields[field].show_label }}
+    <div class="mb-1">
+        <label for="{{ handle ?? fields[field].handle }}" class="block text-sm font-medium text-gray-700">
+            {{ label ?? fields[field].label }}
+        </label>
+    </div>
+{{ /if }}
 
-<div class="mt-1">
+<div>
     <input
         id="{{ handle ?? fields[field].handle }}"
         name="{{ handle ?? fields[field].handle }}"
diff --git a/resources/views/antlers/fields/select.antlers.html b/resources/views/antlers/fields/select.antlers.html
index 4d1c6b1d..be8c805b 100644
--- a/resources/views/antlers/fields/select.antlers.html
+++ b/resources/views/antlers/fields/select.antlers.html
@@ -1,8 +1,15 @@
-<label for="{{ handle ?? fields[field].handle }}" class="block text-sm font-medium text-gray-700">
-    {{ label ?? fields[field].label }}
-</label>
+{{ if show_label ?? fields[field].show_label }}
+    <div class="mb-1">
+        <label for="{{ handle ?? fields[field].handle }}" class="block font-medium text-gray-700 {{ instructions || fields[field].instructions ? 'text-base' : 'text-sm' }}">
+            {{ label ?? fields[field].label }}
+        </label>
+        {{ if instructions || fields[field].instructions }}
+            <p class="mb-4 text-sm text-gray-500">{{ instructions ?? fields[field].instructions }}</p>
+        {{ /if }}
+    </div>
+{{ /if }}
 
-<div class="mt-1">
+<div>
     <select
         id="{{ handle ?? fields[field].handle }}"
         name="{{ handle ?? fields[field].handle }}"
diff --git a/resources/views/antlers/fields/textarea.antlers.html b/resources/views/antlers/fields/textarea.antlers.html
index c299025b..053ae5fe 100644
--- a/resources/views/antlers/fields/textarea.antlers.html
+++ b/resources/views/antlers/fields/textarea.antlers.html
@@ -1,8 +1,12 @@
-<label for="{{ handle ?? fields[field].handle }}" class="block text-sm font-medium text-gray-700">
-    {{ label ?? fields[field].label }}
-</label>
+{{ if show_label ?? fields[field].show_label }}
+    <div class="mb-1">
+        <label for="{{ handle ?? fields[field].handle }}" class="block text-sm font-medium text-gray-700">
+            {{ label ?? fields[field].label }}
+        </label>
+    </div>
+{{ /if }}
 
-<div class="mt-1">
+<div>
     <textarea
         id="{{ handle ?? fields[field].handle }}"
         name="{{ handle ?? fields[field].handle }}"
diff --git a/resources/views/blade/fields/input.blade.php b/resources/views/blade/fields/input.blade.php
index d6fa861c..316c41c6 100644
--- a/resources/views/blade/fields/input.blade.php
+++ b/resources/views/blade/fields/input.blade.php
@@ -1,8 +1,12 @@
-<label for="{{ $field['handle'] }}" class="block text-sm font-medium text-gray-700">
-    {{ $field['label'] }}
-</label>
+@if ($field['show_label'])
+    <div class="mb-1">
+        <label for="{{ $field['handle'] }}" class="block text-sm font-medium text-gray-700">
+            {{ $field['label'] }}
+        </label>
+    </div>
+@endif
 
-<div class="mt-1">
+<div>
     <input
         id="{{ $field['handle'] }}"
         name="{{ $field['handle'] }}"
diff --git a/resources/views/blade/fields/select.blade.php b/resources/views/blade/fields/select.blade.php
index 4e7ebfb4..a6c3d8f8 100644
--- a/resources/views/blade/fields/select.blade.php
+++ b/resources/views/blade/fields/select.blade.php
@@ -1,8 +1,15 @@
-<label for="{{ $field['handle'] }}" class="block text-sm font-medium text-gray-700">
-    {{ $field['label'] }}
-</label>
+@if ($field['show_label'])
+    <div class="mb-1">
+        <label for="{{ $field['handle'] }}" class="block font-medium text-gray-700 @if ($field['instructions']) text-base @else text-sm @endif">
+            {{ $field['label'] }}
+        </label>
+        @if ($field['instructions'])
+            <p class="mb-4 text-sm text-gray-500">{{ $field['instructions'] }}</p>
+        @endif
+    </div>
+@endif
 
-<div class="mt-1">
+<div>
     <select
         id="{{ $field['handle'] }}"
         name="{{ $field['handle'] }}"
diff --git a/resources/views/blade/fields/textarea.blade.php b/resources/views/blade/fields/textarea.blade.php
index e712afc9..4108973d 100644
--- a/resources/views/blade/fields/textarea.blade.php
+++ b/resources/views/blade/fields/textarea.blade.php
@@ -1,8 +1,12 @@
-<label for="{{ $field['handle'] }}" class="block text-sm font-medium text-gray-700">
-    {{ $field['label'] }}
-</label>
+@if ($field['show_label'])
+    <div class="mb-1">
+        <label for="{{ $field['handle'] }}" class="block text-sm font-medium text-gray-700">
+            {{ $field['label'] }}
+        </label>
+    </div>
+@endif
 
-<div class="mt-1">
+<div>
     <textarea
         id="{{ $field['handle'] }}"
         name="{{ $field['handle'] }}"