From da55f0cdabf6b8d7a3c19376634c50a796eba379 Mon Sep 17 00:00:00 2001
From: Darren Coutts <couttsdarren@outlook.com>
Date: Tue, 2 Jul 2024 12:43:31 +0000
Subject: [PATCH] Tidy up

---
 .../views/components/checkables.blade.php     | 31 ++++++++++---------
 resources/views/components/form.blade.php     |  2 +-
 resources/views/components/input.blade.php    |  4 +--
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/resources/views/components/checkables.blade.php b/resources/views/components/checkables.blade.php
index 6914741..871e3e0 100644
--- a/resources/views/components/checkables.blade.php
+++ b/resources/views/components/checkables.blade.php
@@ -1,21 +1,24 @@
-<fieldset class="mb-4">
-    <legend class="{!! $labelAttributes !!}">{{ $label }}</legend>
+{{-- {{ $type == 'checkbox' ? '[]' : '' }} --}}
 
-    @foreach ($options as $value => $title)
-    @php
-        app(\AppKit\Formulate\Id::class)->startBlock($name);
-    @endphp
+<fieldset>
+    <legend class="font-medium text-gray-900 leading-6 dark:text-white">{{ $label }}</legend>
 
-    <div class="{{ $loop->last ? '' : 'mb-2 ' }}flex items-center">
-        <x-formulate-input type="{{ $type }}" name="{{ $name }}{{ $type == 'checkbox' ? '[]' : '' }}" :label="$title" :value="$value" ignoreFieldGroup />
-        <label for="" class="ml-2">{{ $title }}</label>
+    <div class="space-y-2">
+        @foreach ($options as $value => $label)
+        @php
+            app(\AppKit\Formulate\Id::class)->startBlock($label);
+            $id = app(\AppKit\Formulate\Id::class)->get($label);
+        @endphp
+        <div class="flex items-center">
+            <x-formulate-input :$type :$name :$id :$label :$value ignoreFieldGroup />
+            <x-appkit::label :for="$id" :$label class="ml-2" />
+        </div>
+        @endforeach
+        @php
+            app(\AppKit\Formulate\Id::class)->endBlock();
+        @endphp
     </div>
 
-    @endforeach
-    @php
-        app(\AppKit\Formulate\Id::class)->endBlock();
-    @endphp
-
     @if (isset($errors) && $errors->has($name))
     <div class="{{ config('formulate.classes.field_error') }}">{{ $errors->first($name) }}</div>
     @endif
diff --git a/resources/views/components/form.blade.php b/resources/views/components/form.blade.php
index 7bf3db6..e5d494c 100644
--- a/resources/views/components/form.blade.php
+++ b/resources/views/components/form.blade.php
@@ -11,5 +11,5 @@
     <div class="{{ config('formulate.classes.form_error') }}">{{ config('formulate.form_error_message') }}</div>
     @endif
 
-    <div class="space-y-4">{{ $slot }}</div>
+    <div class="space-y-6">{{ $slot }}</div>
 </form>
diff --git a/resources/views/components/input.blade.php b/resources/views/components/input.blade.php
index 300b5c2..5f18480 100644
--- a/resources/views/components/input.blade.php
+++ b/resources/views/components/input.blade.php
@@ -1,5 +1,3 @@
 <x-dynamic-component component="{{ !$field->ignoreFieldGroup ? 'formulate-field-group' : 'formulate-blank' }}" :$field>
-    {{-- <input type="{{ $type }}" name="{{ $name }}{{ $multiple ? '[]' : '' }}" id="{{ $id }}" value="{{ is_string($value) ? $value: '' }}" {!! (($type == 'checkbox' || $type == 'radio') && $checked) ? 'checked="checked"' : '' !!} {!! ($required) ? 'required="required"' : '' !!} {!! $attributes !!} /> --}}
-
-    <x-appkit::input type="{{ $type }}" name="{{ $name }}" value="{{ is_string($value) ? $value: '' }}" {{ $attributes }} />
+    <x-appkit::input :$type :$name value="{{ is_string($value) ? $value : '' }}" {{ $attributes }} />
 </x-dynamic-component>