wip

Author: iamgergo

src/Fields/Date.php

@@ -154,13 +154,13 @@ public function resolveFormat(Request $request, Model $model): ?string
     /**
      * Set the filterable attribute.
      */
-    public function filterable(?Closure $callback = null, bool|Closure $search = false): static
+    public function filterable(bool|Closure $value = true, ?Closure $callback = null): static
     {
         $callback ??= function (Request $request, Builder $query, mixed $value, string $attribute): Builder {
             return $query->whereDate($query->qualifyColumn($attribute), $value);
         };
 
-        return parent::filterable($callback, $search);
+        return parent::filterable($value, $callback);
     }
 
     /**

src/Fields/Field.php

@@ -117,6 +117,16 @@ abstract class Field implements Arrayable, JsonSerializable
      */
     protected bool|Closure $searchable = false;
 
+    /**
+     * The filter query resolver callback.
+     */
+    protected ?Closure $searchQueryResolver = null;
+
+    /**
+     * Indicates if the field is filterable.
+     */
+    protected bool|Closure $filterable = false;
+
     /**
      * The filter query resolver callback.
      */
@@ -317,25 +327,37 @@ public function isSortable(): bool
      */
     public function searchable(bool|Closure $value = true, ?Closure $callback = null): static
     {
-        $callback ??= function (Request $request, Builder $query, mixed $value, string $attribute): Builder {
+        $this->searchable = $value;
+
+        $this->searchQueryResolver = $callback ?: function (Request $request, Builder $query, mixed $value, string $attribute): Builder {
             return $query->where($query->qualifyColumn($attribute), 'like', "%{$value}%", 'or');
         };
 
-        return $this->filterable($callback, $value);
+        return $this;
     }
 
     /**
      * Determine if the field is searchable.
      */
     public function isSearchable(): bool
     {
-        if (! $this->isFilterable()) {
+        if ($this->computed) {
             return false;
         }
 
         return $this->searchable instanceof Closure ? call_user_func($this->searchable) : $this->searchable;
     }
 
+    /**
+     * Resolve the search query.
+     */
+    public function resolveSearchQuery(Request $request, Builder $query, mixed $value): Builder
+    {
+        return $this->isSearchable()
+            ? call_user_func_array($this->searchQueryResolver, [$request, $query, $value, $this->getModelAttribute()])
+            : $query;
+    }
+
     /**
      * Set the translatable attribute.
      */
@@ -361,9 +383,9 @@ public function isTranslatable(): bool
     /**
      * Set the filterable attribute.
      */
-    public function filterable(?Closure $callback = null, bool|Closure $search = false): static
+    public function filterable(bool|Closure $value = true, ?Closure $callback = null): static
     {
-        $this->searchable = $search;
+        $this->filterable = $value;
 
         $this->filterQueryResolver = $callback ?: function (Request $request, Builder $query, mixed $value, string $attribute): Builder {
             return $query->where($query->qualifyColumn($attribute), $value);
@@ -377,7 +399,11 @@ public function filterable(?Closure $callback = null, bool|Closure $search = fal
      */
     public function isFilterable(): bool
     {
-        return ! $this->computed && $this->filterQueryResolver instanceof Closure;
+        if ($this->computed) {
+            return false;
+        }
+
+        return $this->filterable instanceof Closure ? call_user_func($this->filterable) : $this->filterable;
     }
 
     /**

src/Fields/Fields.php

@@ -67,6 +67,14 @@ public function sortable(): static
         return $this->filter->isSortable();
     }
 
+    /**
+     * Filter the filterable fields.
+     */
+    public function filterable(): static
+    {
+        return $this->filter->isFilterable();
+    }
+
     /**
      * Filter the relation fields.
      */

src/Fields/Relation.php

@@ -284,13 +284,13 @@ public function getSearchableColumns(): array
     /**
      * Resolve the filter query.
      */
-    public function resolveFilterQuery(Request $request, Builder $query, mixed $value): Builder
+    public function resolveSearchQuery(Request $request, Builder $query, mixed $value): Builder
     {
-        if (! $this->isFilterable()) {
-            return parent::resolveFilterQuery($request, $query, $value);
+        if (! $this->isSearchable()) {
+            return parent::resolveSearchQuery($request, $query, $value);
         }
 
-        return call_user_func_array($this->filterQueryResolver, [
+        return call_user_func_array($this->searchQueryResolver, [
             $request, $query, $value, $this->getSearchableColumns(),
         ]);
     }

src/Filters/Search.php

@@ -35,7 +35,7 @@ public function apply(Request $request, Builder $query, mixed $value): Builder
 
         return $query->where(function (Builder $query) use ($request, $value): void {
             $this->fields->each(function (Field $field) use ($request, $query, $value): void {
-                $field->resolveFilterQuery($request, $query, $value);
+                $field->resolveSearchQuery($request, $query, $value);
             });
         });
     }

src/Resources/Resource.php

@@ -386,9 +386,7 @@ public function filters(Request $request): array
 
         $sortables = $fields->sortable();
 
-        $filterables = $fields->filter(static function (Field $field): bool {
-            return $field->isFilterable() && ! $field->isSearchable();
-        });
+        $filterables = $fields->filterable();
 
         return array_values(array_filter([
             $searchables->isNotEmpty() ? new Search($searchables) : null,

src/Root.php

@@ -25,7 +25,7 @@ class Root
      *
      * @var string
      */
-    public const string VERSION = '2.6.1';
+    public const string VERSION = '2.6.2';
 
     /**
      * The registered booting callbacks.