From ead765ab4482c43d370030f296e0a4bed985257c Mon Sep 17 00:00:00 2001
From: Eduard Lupacescu <lupacescueduard@gmail.com>
Date: Sat, 30 Aug 2025 16:51:56 +0300
Subject: [PATCH 1/2] fix: fixing searchable key

---
 src/Filters/SearchablesCollection.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Filters/SearchablesCollection.php b/src/Filters/SearchablesCollection.php
index f9c2c84b9..8f3f87035 100644
--- a/src/Filters/SearchablesCollection.php
+++ b/src/Filters/SearchablesCollection.php
@@ -28,17 +28,18 @@ public function __construct($items = [])
             } elseif ($searchable instanceof Filter) {
                 // Other Filter instance - keep it
                 $unified[] = $searchable;
-            } elseif (is_string($searchable)) {
-                // String column name (including string callables like "MyClass::method")
-                $filter = new SearchableFilter;
-                $filter->setColumn($searchable);
-                $unified[] = $filter;
             } elseif (is_string($key) && ! is_numeric($key)) {
                 // Array key is the field name
                 $filter = new SearchableFilter;
                 $filter->setColumn($key);
                 $unified[] = $filter;
-            } elseif (is_callable($searchable)) {
+            } elseif (is_string($searchable)) {
+                // String column name (including string callables like "MyClass::method")
+                $filter = new SearchableFilter;
+                $filter->setColumn($searchable);
+                $unified[] = $filter;
+            }
+            elseif (is_callable($searchable)) {
                 // Non-string callables (closures, arrays, invokables)
                 $filter = new SearchableFilter;
                 $filter->usingClosure($searchable);

From c57ee741a98b110ffad28e183e355acc644f425c Mon Sep 17 00:00:00 2001
From: binaryk <binaryk@users.noreply.github.com>
Date: Sat, 30 Aug 2025 13:52:24 +0000
Subject: [PATCH 2/2] Fix styling

---
 src/Filters/SearchablesCollection.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Filters/SearchablesCollection.php b/src/Filters/SearchablesCollection.php
index 8f3f87035..225b2803d 100644
--- a/src/Filters/SearchablesCollection.php
+++ b/src/Filters/SearchablesCollection.php
@@ -38,8 +38,7 @@ public function __construct($items = [])
                 $filter = new SearchableFilter;
                 $filter->setColumn($searchable);
                 $unified[] = $filter;
-            }
-            elseif (is_callable($searchable)) {
+            } elseif (is_callable($searchable)) {
                 // Non-string callables (closures, arrays, invokables)
                 $filter = new SearchableFilter;
                 $filter->usingClosure($searchable);