From d3c201d31002cc5c2aa04d16f0513c3c0ddb7acd Mon Sep 17 00:00:00 2001
From: ShamazinGG <nikbelikita1@yandex.ru>
Date: Fri, 12 Apr 2024 01:01:52 +0300
Subject: [PATCH 1/4] fix Select filter resets after apply others

---
 resources/views/fields/select.blade.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/resources/views/fields/select.blade.php b/resources/views/fields/select.blade.php
index 92d86cc71..1faa1edd6 100644
--- a/resources/views/fields/select.blade.php
+++ b/resources/views/fields/select.blade.php
@@ -8,14 +8,11 @@
     >
         <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 ($key == $value) selected
-                            @endif
-                        @endisset
-                >{{$option}}</option>
+                <option value="{{ $key }}"
+                        @if(isset($value) && ((is_array($value) && in_array($key, $value)) || $key == $value))
+                            selected
+                        @endif
+                >{{ $option }}</option>
             @endforeach
         </select>
     </div>

From 9078c68d84752b78d9b39f9a8c656b7d0e216032 Mon Sep 17 00:00:00 2001
From: ShamazinGG <nikbelikita1@yandex.ru>
Date: Fri, 12 Apr 2024 12:54:27 +0300
Subject: [PATCH 2/4] fix condition

---
 resources/views/fields/select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/fields/select.blade.php b/resources/views/fields/select.blade.php
index 1faa1edd6..0dc603b21 100644
--- a/resources/views/fields/select.blade.php
+++ b/resources/views/fields/select.blade.php
@@ -9,7 +9,7 @@
         <select {{ $attributes }}>
             @foreach($options as $key => $option)
                 <option value="{{ $key }}"
-                        @if(isset($value) && ((is_array($value) && in_array($key, $value)) || $key == $value))
+                        @if(isset($value) && ((is_array($value) && in_array($key, $value)) || (!is_array($value) && $key == $value)))
                             selected
                         @endif
                 >{{ $option }}</option>

From 3f1ef64fe0eed3c153ee8f66020e9ed3f861a7a4 Mon Sep 17 00:00:00 2001
From: ShamazinGG <nikbelikita1@yandex.ru>
Date: Fri, 12 Apr 2024 13:04:13 +0300
Subject: [PATCH 3/4] fix condition

---
 resources/views/fields/select.blade.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/views/fields/select.blade.php b/resources/views/fields/select.blade.php
index 0dc603b21..c2610b53e 100644
--- a/resources/views/fields/select.blade.php
+++ b/resources/views/fields/select.blade.php
@@ -9,8 +9,7 @@
         <select {{ $attributes }}>
             @foreach($options as $key => $option)
                 <option value="{{ $key }}"
-                        @if(isset($value) && ((is_array($value) && in_array($key, $value)) || (!is_array($value) && $key == $value)))
-                            selected
+                        @if(isset($value) && ((is_array($value) && in_array($key, $value)) || (!is_array($value) && $key == $value))) selected
                         @endif
                 >{{ $option }}</option>
             @endforeach

From 9f3251728efd1084be64fb64672cb227f62d7c42 Mon Sep 17 00:00:00 2001
From: ShamazinGG <nikbelikita1@yandex.ru>
Date: Fri, 12 Apr 2024 14:32:25 +0300
Subject: [PATCH 4/4] fix selected condition to array_keys

---
 resources/views/fields/select.blade.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/views/fields/select.blade.php b/resources/views/fields/select.blade.php
index c2610b53e..afb4b922a 100644
--- a/resources/views/fields/select.blade.php
+++ b/resources/views/fields/select.blade.php
@@ -9,8 +9,7 @@
         <select {{ $attributes }}>
             @foreach($options as $key => $option)
                 <option value="{{ $key }}"
-                        @if(isset($value) && ((is_array($value) && in_array($key, $value)) || (!is_array($value) && $key == $value))) selected
-                        @endif
+                        @if (in_array($key, array_keys((array)$value))) selected @endif
                 >{{ $option }}</option>
             @endforeach
         </select>