From 3c3bc4174302f93a1ab099fe940c42745c5c1e60 Mon Sep 17 00:00:00 2001
From: makss <makss@users.noreply.github.com>
Date: Thu, 28 Sep 2023 02:00:02 +0300
Subject: [PATCH 1/2] Added bootstrap5 class form-select

---
 src/resources/views/crud/fields/enum.blade.php              | 2 +-
 src/resources/views/crud/fields/select.blade.php            | 2 +-
 src/resources/views/crud/fields/select_from_array.blade.php | 2 +-
 src/resources/views/crud/fields/select_grouped.blade.php    | 2 +-
 src/resources/views/crud/fields/select_multiple.blade.php   | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/resources/views/crud/fields/enum.blade.php b/src/resources/views/crud/fields/enum.blade.php
index 6d53f31fbd..5c696faaa4 100644
--- a/src/resources/views/crud/fields/enum.blade.php
+++ b/src/resources/views/crud/fields/enum.blade.php
@@ -66,7 +66,7 @@
     @include('crud::fields.inc.translatable_icon')
     <select
         name="{{ $field['name'] }}"
-        @include('crud::fields.inc.attributes')
+        @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
         >
 
         @if ($entity_model::isColumnNullable($field['name']))
diff --git a/src/resources/views/crud/fields/select.blade.php b/src/resources/views/crud/fields/select.blade.php
index 869669fd00..bc55c17faf 100644
--- a/src/resources/views/crud/fields/select.blade.php
+++ b/src/resources/views/crud/fields/select.blade.php
@@ -25,7 +25,7 @@
         @if(isset($field['prefix'])) <span class="input-group-text">{!! $field['prefix'] !!}</span> @endif
         <select
             name="{{ $field['name'] }}"
-            @include('crud::fields.inc.attributes')
+            @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
             >
 
             @if ($field['allows_null'])
diff --git a/src/resources/views/crud/fields/select_from_array.blade.php b/src/resources/views/crud/fields/select_from_array.blade.php
index 170f44c3e4..c4af5239ec 100644
--- a/src/resources/views/crud/fields/select_from_array.blade.php
+++ b/src/resources/views/crud/fields/select_from_array.blade.php
@@ -10,7 +10,7 @@
     @if($field['multiple'])<input type="hidden" name="{{ $field['name'] }}" value="" @if(in_array('disabled', $field['attributes'] ?? [])) disabled @endif />@endif
     <select
         name="{{ $field['name'] }}@if ($field['multiple'])[]@endif"
-        @include('crud::fields.inc.attributes')
+        @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
         @if ($field['multiple'])multiple bp-field-main-input @endif
         >
 
diff --git a/src/resources/views/crud/fields/select_grouped.blade.php b/src/resources/views/crud/fields/select_grouped.blade.php
index bcd08732bb..8f290245a6 100644
--- a/src/resources/views/crud/fields/select_grouped.blade.php
+++ b/src/resources/views/crud/fields/select_grouped.blade.php
@@ -21,7 +21,7 @@
         @if(isset($field['prefix'])) <div class="input-group-prepend"><span class="input-group-text">{!! $field['prefix'] !!}</span></div> @endif
         <select
             name="{{ $field['name'] }}"
-            @include('crud::fields.inc.attributes', ['default_class' =>  'form-control'])
+            @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
             >
 
                 @if ($field['allows_null'])
diff --git a/src/resources/views/crud/fields/select_multiple.blade.php b/src/resources/views/crud/fields/select_multiple.blade.php
index 96d801fa99..03bc99b849 100644
--- a/src/resources/views/crud/fields/select_multiple.blade.php
+++ b/src/resources/views/crud/fields/select_multiple.blade.php
@@ -22,9 +22,8 @@
     {{-- To make sure a value gets submitted even if the "select multiple" is empty, we need a hidden input --}}
     <input type="hidden" name="{{ $field['name'] }}" value="" @if(in_array('disabled', $field['attributes'] ?? [])) disabled @endif />
     <select
-    	class="form-control"
         name="{{ $field['name'] }}[]"
-        @include('crud::fields.inc.attributes')
+        @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
         bp-field-main-input
     	multiple>
 

From c1a359ccb83052817a8ee1ec909eb39c6d1e0c3a Mon Sep 17 00:00:00 2001
From: makss <makss@users.noreply.github.com>
Date: Thu, 28 Sep 2023 12:54:47 +0300
Subject: [PATCH 2/2] added form-control class

---
 src/resources/views/crud/fields/enum.blade.php              | 2 +-
 src/resources/views/crud/fields/select.blade.php            | 2 +-
 src/resources/views/crud/fields/select_from_array.blade.php | 2 +-
 src/resources/views/crud/fields/select_grouped.blade.php    | 2 +-
 src/resources/views/crud/fields/select_multiple.blade.php   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/resources/views/crud/fields/enum.blade.php b/src/resources/views/crud/fields/enum.blade.php
index 5c696faaa4..e39c617a2a 100644
--- a/src/resources/views/crud/fields/enum.blade.php
+++ b/src/resources/views/crud/fields/enum.blade.php
@@ -66,7 +66,7 @@
     @include('crud::fields.inc.translatable_icon')
     <select
         name="{{ $field['name'] }}"
-        @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
+        @include('crud::fields.inc.attributes', ['default_class' => 'form-control form-select'])
         >
 
         @if ($entity_model::isColumnNullable($field['name']))
diff --git a/src/resources/views/crud/fields/select.blade.php b/src/resources/views/crud/fields/select.blade.php
index bc55c17faf..b67d32b80f 100644
--- a/src/resources/views/crud/fields/select.blade.php
+++ b/src/resources/views/crud/fields/select.blade.php
@@ -25,7 +25,7 @@
         @if(isset($field['prefix'])) <span class="input-group-text">{!! $field['prefix'] !!}</span> @endif
         <select
             name="{{ $field['name'] }}"
-            @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
+            @include('crud::fields.inc.attributes', ['default_class' => 'form-control form-select'])
             >
 
             @if ($field['allows_null'])
diff --git a/src/resources/views/crud/fields/select_from_array.blade.php b/src/resources/views/crud/fields/select_from_array.blade.php
index c4af5239ec..6913dcacfd 100644
--- a/src/resources/views/crud/fields/select_from_array.blade.php
+++ b/src/resources/views/crud/fields/select_from_array.blade.php
@@ -10,7 +10,7 @@
     @if($field['multiple'])<input type="hidden" name="{{ $field['name'] }}" value="" @if(in_array('disabled', $field['attributes'] ?? [])) disabled @endif />@endif
     <select
         name="{{ $field['name'] }}@if ($field['multiple'])[]@endif"
-        @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
+        @include('crud::fields.inc.attributes', ['default_class' => 'form-control form-select'])
         @if ($field['multiple'])multiple bp-field-main-input @endif
         >
 
diff --git a/src/resources/views/crud/fields/select_grouped.blade.php b/src/resources/views/crud/fields/select_grouped.blade.php
index 8f290245a6..a65dd2a045 100644
--- a/src/resources/views/crud/fields/select_grouped.blade.php
+++ b/src/resources/views/crud/fields/select_grouped.blade.php
@@ -21,7 +21,7 @@
         @if(isset($field['prefix'])) <div class="input-group-prepend"><span class="input-group-text">{!! $field['prefix'] !!}</span></div> @endif
         <select
             name="{{ $field['name'] }}"
-            @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
+            @include('crud::fields.inc.attributes', ['default_class' => 'form-control form-select'])
             >
 
                 @if ($field['allows_null'])
diff --git a/src/resources/views/crud/fields/select_multiple.blade.php b/src/resources/views/crud/fields/select_multiple.blade.php
index 03bc99b849..13b122c5b5 100644
--- a/src/resources/views/crud/fields/select_multiple.blade.php
+++ b/src/resources/views/crud/fields/select_multiple.blade.php
@@ -23,7 +23,7 @@
     <input type="hidden" name="{{ $field['name'] }}" value="" @if(in_array('disabled', $field['attributes'] ?? [])) disabled @endif />
     <select
         name="{{ $field['name'] }}[]"
-        @include('crud::fields.inc.attributes', ['default_class' => 'form-select'])
+        @include('crud::fields.inc.attributes', ['default_class' => 'form-control form-select'])
         bp-field-main-input
     	multiple>