From fd780d1756ba570b7d95079ea308eb11cb5f144c Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Wed, 4 Dec 2024 18:05:37 +1100
Subject: [PATCH] Minor fixes to select component to render HTML helpers

---
 resources/views/components/form/base.blade.php   | 2 +-
 resources/views/components/form/select.blade.php | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/resources/views/components/form/base.blade.php b/resources/views/components/form/base.blade.php
index 6e9a379..7d333fa 100644
--- a/resources/views/components/form/base.blade.php
+++ b/resources/views/components/form/base.blade.php
@@ -22,6 +22,6 @@
 		</span>
 	</div>
 	@isset($helper)
-		<span class="input-helper">{{ $helper }}</span>
+		<span class="input-helper">{!! html_entity_decode($helper) !!}</span>
 	@endif
 </div>
\ No newline at end of file
diff --git a/resources/views/components/form/select.blade.php b/resources/views/components/form/select.blade.php
index cf29001..8432c1e 100644
--- a/resources/views/components/form/select.blade.php
+++ b/resources/views/components/form/select.blade.php
@@ -1,6 +1,6 @@
 <x-form.base {{ $attributes }}>
 	<input type="hidden" id="{{ $name }}_disabled" name="{{ $name }}" value="" disabled>
-	<select class="form-select @error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @required(isset($required)) @disabled(isset($disabled))>
+	<select style="width: 80%" class="form-select @error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @required(isset($required)) @disabled(isset($disabled))>
 		@if(empty($value) || isset($addnew) || isset($choose))
 			<option value=""></option>
 			@isset($addnew)
@@ -51,12 +51,9 @@
 				dropdownAutoWidth: true,
 				width: 'style',
 				allowClear: true,
-				placeholder: '',
+				placeholder: '{{ $placeholder ?? '' }}',
 				@isset($addvalues)
-				tags: true,
-				@isset($placeholder)
-					placeholder: '{{ $placeholder }}',
-				@endisset
+					tags: true,
 				@endisset
 			});
 		});