Added support Enum for Select field

resources/views/fields/select.blade.php

@@ -1,20 +1,22 @@
 @component($typeForm, get_defined_vars())
     <div data-controller="select"
-        data-select-placeholder="{{$attributes['placeholder'] ?? ''}}"
-        data-select-allow-empty="{{ $allowEmpty }}"
-        data-select-message-notfound="{{ __('No results found') }}"
-        data-select-allow-add="{{ var_export($allowAdd, true) }}"
-        data-select-message-add="{{ __('Add') }}"
+         data-select-placeholder="{{$attributes['placeholder'] ?? ''}}"
+         data-select-allow-empty="{{ $allowEmpty }}"
+         data-select-message-notfound="{{ __('No results found') }}"
+         data-select-allow-add="{{ var_export($allowAdd, true) }}"
+         data-select-message-add="{{ __('Add') }}"
     >
+
         <select {{ $attributes }}>
             @foreach($options as $key => $option)
                 <option value="{{$key}}"
                         @isset($value)
                             @if (is_array($value) && in_array($key, $value)) selected
-                            @elseif (isset($value[$key]) && $value[$key] == $option) selected
+                            @elseif ( !($value instanceof \UnitEnum) && isset($value[$key]) && $value[$key] == $option) selected
+                            @elseif ( ($value instanceof \UnitEnum) && !$isOptionList && $key == $value->value) selected
                             @elseif (!$isOptionList && $key == $value) selected
                             @endif
-                        @endisset
+                    @endisset
                 >{{$option}}</option>
             @endforeach
         </select>

tests/App/ExemplarServiceProvider.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\ServiceProvider;
 use Orchid\Platform\Dashboard;
 use Orchid\Tests\App\Fields\BaseSelectScreen;
+use Orchid\Tests\App\Fields\SelectFromEnumFieldScreen;
 use Orchid\Tests\App\Screens\AsyncHeaderButtonActionScreen;
 use Orchid\Tests\App\Screens\ConfirmScreen;
 use Orchid\Tests\App\Screens\DependentListenerModalScreen;
@@ -53,6 +54,7 @@ public function boot(Dashboard $dashboard, Router $router): void
 
                 // Fields
                 $route->screen('fields/base-select-screen', BaseSelectScreen::class)->name('base-select-screen');
+                $route->screen('fields/select-from-enum-field-screen', SelectFromEnumFieldScreen::class)->name('select-from-enum-field-screen');
 
                 //issue 2517
                 $route->screen('item/{parentId}/addChild', ItemAddChildScreen::class)->name('item.addchild');

tests/App/Fields/SelectFromEnumFieldScreen.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Orchid\Tests\App\Fields;
+
+use Orchid\Screen\Fields\Select;
+use Orchid\Tests\App\Role;
+use Orchid\Tests\App\Screens\BaseFieldScreen;
+
+class SelectFromEnumFieldScreen extends BaseFieldScreen
+{
+    /**
+     * @return string[]
+     */
+    public function query(): array
+    {
+        return [
+            'item' => Role::find(1),
+        ];
+    }
+
+    /**
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function fields(): array
+    {
+        return [
+            Select::make('item.name')
+                ->options([
+                    'admin' => 'Admin',
+                    'user'  => 'User',
+                ]),
+
+        ];
+    }
+}

tests/Feature/Platform/SelectFromEnumFieldTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Orchid\Tests\Feature\Platform;
+
+use Orchid\Platform\Models\Role;
+use Orchid\Tests\App\Enums\RoleNames;
+use Orchid\Tests\App\Role as RoleWithEnum;
+use Orchid\Tests\TestFeatureCase;
+
+class SelectFromEnumFieldTest extends TestFeatureCase
+{
+    /**
+     * @var RoleWithEnum
+     */
+    private $role;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Role::factory()->create([
+            'name' => RoleNames::Admin->value,
+        ]);
+        $this->role = RoleWithEnum::find(1);
+    }
+
+    public function testBase(): void
+    {
+        $this
+            ->actingAs($this->createAdminUser())
+            ->get(route('test.select-from-enum-field-screen'))
+            ->assertSuccessful()
+            ->assertSee(RoleNames::Admin->name);
+    }
+}