Prepare help texts

pascalbaljet · pascalbaljet · commit 8693afc223de · 2022-08-24T16:24:38.000+02:00
diff --git a/resources/views/form/checkbox.blade.php b/resources/views/form/checkbox.blade.php
@@ -1,8 +1,8 @@
 <div {{ $attributes->only(['v-if', 'v-show', 'class']) }}>
     <label class="flex items-center">
-        <input {{ $attributes->except(['v-if', 'v-show', 'class'])->class([
+        <input {{ $attributes->except(['v-if', 'v-show', 'class'])->class(
             'rounded border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 disabled:opacity-50'
-        ])->merge([
+        )->merge([
             'name' => $name,
             'value' => $value,
             'type' => 'checkbox',
@@ -19,6 +19,7 @@
         </span>
     </label>
 
+    @includeWhen($help, 'splade::form.help', ['help' => $help])
     @includeWhen($showErrors, 'splade::form.error', ['name' => $validationKey()])
 </div>
 
diff --git a/resources/views/form/file.blade.php b/resources/views/form/file.blade.php
@@ -6,9 +6,9 @@
 >
     <template #default="{!! $scope !!}">
         <label class="block">
-            @include('splade::form.label', ['label' => $label])
+            @includeWhen($label, 'splade::form.label', ['label' => $label])
 
-            <div class="@if($label) mt-1 @endif">
+            <div>
                 <a @submit.prevent
                     class="inline-block px-3 py-1 rounded-md border border-gray-300 shadow-sm bg-gray-100 hover:bg-gray-300 relative cursor-pointer">
 
@@ -28,6 +28,8 @@ class="inline-block px-3 py-1 rounded-md border border-gray-300 shadow-sm bg-gra
                     />
                 </a>
 
+                @includeWhen($help, 'splade::form.help', ['help' => $help])
+
                 <div class="mt-2 text-sm italic">
                     <p v-for="(filename, key) in file.filenames" v-bind:key="key" v-text="filename" />
                 </div>
diff --git a/resources/views/form/group.blade.php b/resources/views/form/group.blade.php
@@ -1,14 +1,14 @@
 <div {{ $attributes->only(['v-if', 'v-show']) }}>
-    @include('splade::form.label', ['label' => $label])
+    @includeWhen($label, 'splade::form.label', ['label' => $label])
 
     <div {{ $attributes->except(['v-if', 'v-show'])->class([
-        'mt-2' => $label,
         'flex flex-wrap space-x-6' => $inline,
         'space-y-1' => !$inline,
     ]) }}
     >
       {{ $slot }}
     </div>
 
+    @includeWhen($help, 'splade::form.help', ['help' => $help])
     @includeWhen($showErrors, 'splade::form.error', ['name' => $validationKey()])
 </div>
diff --git a/resources/views/form/help.blade.php b/resources/views/form/help.blade.php
@@ -0,0 +1 @@
+<p class="text-gray-500 text-sm mt-2">{{ $help }}</p>
diff --git a/resources/views/form/input.blade.php b/resources/views/form/input.blade.php
@@ -5,9 +5,9 @@
     v-model="{{ $vueModel() }}"
 >
     <label class="block">
-        @include('splade::form.label', ['label' => $label])
+        @includeWhen($label, 'splade::form.label', ['label' => $label])
 
-        <div class="@if($label) mt-1 @endif flex rounded-md shadow-sm">
+        <div class="flex rounded-md shadow-sm">
             @if($prepend)
                 <span class="inline-flex items-center px-3 rounded-l-md border border-r-0 border-gray-300 bg-gray-50 text-gray-500">
                     {!! $prepend !!}
@@ -35,5 +35,6 @@
         </div>
     </label>
 
+    @include('splade::form.help', ['help' => $help])
     @includeWhen($showErrors, 'splade::form.error', ['name' => $validationKey()])
 </SpladeInput>
diff --git a/resources/views/form/label.blade.php b/resources/views/form/label.blade.php
@@ -1 +1 @@
-@if($label) <span class="text-gray-700">{{ $label }}</span> @endif
+<span class="block mb-1 text-gray-700">{{ $label }}</span>
diff --git a/resources/views/form/radio.blade.php b/resources/views/form/radio.blade.php
@@ -1,8 +1,8 @@
 <div {{ $attributes->only(['v-if', 'v-show', 'class']) }}>
     <label class="flex items-center">
-        <input {{ $attributes->except(['v-if', 'v-show', 'class'])->class([
+        <input {{ $attributes->except(['v-if', 'v-show', 'class'])->class(
             'rounded-full border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 disabled:opacity-50'
-        ])->merge([
+        )->merge([
             'name' => $name,
             'value' => $value,
             'type' => 'radio',
@@ -19,6 +19,7 @@
         </span>
     </label>
 
+    @includeWhen($help, 'splade::form.help', ['help' => $help])
     @includeWhen($showErrors, 'splade::form.error', ['name' => $validationKey()])
   </div>
 
diff --git a/resources/views/form/select.blade.php b/resources/views/form/select.blade.php
@@ -7,11 +7,10 @@
     v-model="{{ $vueModel() }}"
 >
     <label class="block">
-        @include('splade::form.label', ['label' => $label])
+        @includeWhen($label, 'splade::form.label', ['label' => $label])
 
         <select {{ $attributes->except(['v-if', 'v-show', 'class'])->class([
             'block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 disabled:opacity-50',
-            'mt-1' => $label,
         ])->merge([
             'multiple' => $multiple,
             'name' => $name,
@@ -28,5 +27,6 @@
         </select>
     </label>
 
+    @includeWhen($help, 'splade::form.help', ['help' => $help])
     @includeWhen($showErrors, 'splade::form.error', ['name' => $validationKey()])
 </SpladeSelect>
diff --git a/resources/views/form/submit.blade.php b/resources/views/form/submit.blade.php
@@ -1,6 +1,6 @@
-<button {{ $attributes->class([
+<button {{ $attributes->class(
     'rounded-md shadow-sm bg-indigo-500 hover:bg-indigo-700 text-white font-bold py-2 px-4 focus:outline-none focus:shadow-outline'
-])->merge([
+)->merge([
     'type' => $type
 ]) }}
 >
diff --git a/resources/views/form/textarea.blade.php b/resources/views/form/textarea.blade.php
@@ -4,17 +4,17 @@
     v-model="{{ $vueModel() }}"
 >
     <label class="block">
-        @include('splade::form.label', ['label' => $label])
+        @includeWhen($label, 'splade::form.label', ['label' => $label])
 
-        <textarea {{ $attributes->except(['v-if', 'v-show', 'class', 'autosize'])->class([
-            'block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 disabled:opacity-50',
-            'mt-1' => $label,
-        ])->merge([
+        <textarea {{ $attributes->except(['v-if', 'v-show', 'class', 'autosize'])->class(
+            'block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 disabled:opacity-50'
+        )->merge([
             'name' => $name,
             'v-model' => $vueModel()
         ]) }}
         />
     </label>
 
+    @includeWhen($help, 'splade::form.help', ['help' => $help])
     @includeWhen($showErrors, 'splade::form.error', ['name' => $validationKey()])
 </SpladeTextarea>
diff --git a/src/Components/Form/Checkbox.php b/src/Components/Form/Checkbox.php
@@ -20,6 +20,7 @@ public function __construct(
         public string $label = '',
         public string $validationKey = '',
         public bool $showErrors = true,
+        public string $help = '',
     ) {
         Form::allowAttribute($name);
     }
diff --git a/src/Components/Form/File.php b/src/Components/Form/File.php
@@ -20,7 +20,8 @@ public function __construct(
         public string $validationKey = '',
         public bool $showErrors = true,
         public bool $multiple = false,
-        public string $scope = 'file'
+        public string $scope = 'file',
+        public string $help = '',
     ) {
         Form::allowAttribute($name);
 
diff --git a/src/Components/Form/Group.php b/src/Components/Form/Group.php
@@ -18,7 +18,8 @@ public function __construct(
         public string $label = '',
         public bool $inline = false,
         public string $validationKey = '',
-        public bool $showErrors = true
+        public bool $showErrors = true,
+        public string $help = '',
     ) {
     }
 
diff --git a/src/Components/Form/Input.php b/src/Components/Form/Input.php
@@ -32,7 +32,8 @@ public function __construct(
         public bool $showErrors = true,
         private bool $range = false,
         public string $prepend = '',
-        public string $append = ''
+        public string $append = '',
+        public string $help = '',
     ) {
         if ($date === false && $this->type === 'date' && static::$defaultFlatpickrOptions !== false) {
             $this->date = $date = true;
diff --git a/src/Components/Form/Radio.php b/src/Components/Form/Radio.php
@@ -19,7 +19,8 @@ public function __construct(
         public $value = 1,
         public string $label = '',
         public string $validationKey = '',
-        public bool $showErrors = false
+        public bool $showErrors = false,
+        public string $help = '',
     ) {
         Form::allowAttribute($name);
     }
diff --git a/src/Components/Form/Select.php b/src/Components/Form/Select.php
@@ -28,7 +28,8 @@ public function __construct(
         public bool|array|string $choices = false,
         public string $validationKey = '',
         public bool $showErrors = true,
-        public bool $relation = false
+        public bool $relation = false,
+        public string $help = '',
     ) {
         if (is_bool($placeholder) && $placeholder) {
             $this->placeholder = __('Search') . '...';
diff --git a/src/Components/Form/Textarea.php b/src/Components/Form/Textarea.php
@@ -25,7 +25,8 @@ public function __construct(
         public string $name = '',
         public string $label = '',
         public string $validationKey = '',
-        public bool $showErrors = true
+        public bool $showErrors = true,
+        public string $help = '',
     ) {
         Form::allowAttribute($name);
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<p class="text-gray-500 text-sm mt-2">{{ $help }}</p>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-@if($label) <span class="text-gray-700">{{ $label }}</span> @endif`
	`1`	`+<span class="block mb-1 text-gray-700">{{ $label }}</span>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-<button {{ $attributes->class([`
	`1`	`+<button {{ $attributes->class(`
`2`	`2`	`'rounded-md shadow-sm bg-indigo-500 hover:bg-indigo-700 text-white font-bold py-2 px-4 focus:outline-none focus:shadow-outline'`
`3`		`-])->merge([`
	`3`	`+)->merge([`
`4`	`4`	`'type' => $type`
`5`	`5`	`]) }}`
`6`	`6`	`>`