Merge branch 'feature-searchable' of https://github.com/DeltaSystems/laravel-livewire-tables into DeltaSystems-feature-searchable

# Conflicts:
#	src/Traits/WithFilters.php
#	tests/DataTableComponentTest.php

Author: rappasoft

README.md

@@ -351,7 +351,16 @@ The search is a special built-in filter that is managed by the component, but yo
 
 ```php
 Column::make('Type')
-	->searchable()
+	->searchable(),
+```
+
+You can also pass a callback for more control:
+
+```php
+Column::make('Type')
+	->searchable(function (Builder $query, $searchTerm) {
+        $query->orWhere(...);
+    }),
 ```
 
 Sometimes the default search behavior may not meet your requirements. If this is the case, skip using the searchable() method on columns and define your own behavior directly on the query.

src/Traits/WithFilters.php

@@ -223,7 +223,7 @@ public function applySearchFilter(Builder $query): Builder
                     // If the column has a search callback, just use that
                     if ($column->hasSearchCallback()) {
                         // Call the callback
-                        ($column->getSearchCallback())($query, $search);
+                        ($column->getSearchCallback())($subQuery, $search);
                     } elseif (! $hasRelation || $selectedColumn) { // If the column isn't a relation or if it was previously selected
                         $whereColumn = $selectedColumn ?? $column->column();
 

tests/DataTableComponentTest.php

@@ -94,6 +94,13 @@ public function search_filter_remove(): void
         $this->assertEquals(5, $this->table->rows->total());
     }
 
+    /** @test */
+    public function search_filter_callback(): void
+    {
+        $this->table->filters['search'] = '2';
+        $this->assertEquals(1, $this->table->getRowsProperty()->total());
+    }
+
     /** @test */
     public function search_filter_alt_query()
     {

tests/Http/Livewire/PetsTable.php

@@ -25,7 +25,9 @@ public function columns(): array
             Column::make('Name', 'name')
                 ->searchable(),
             Column::make('Age', 'age')
-                ->searchable(),
+                ->searchable(function (Builder $query, $search) {
+                    $query->orWhere('age', '=', $search);
+                }),
             Column::make('Last Visit', 'last_visit')
                 ->searchable(),
             Column::make('Species', 'species.name')

tests/TestCase.php

@@ -40,7 +40,7 @@ protected function setUp(): void
         Pet::insert([
             [ 'id' => 1, 'name' => 'Cartman', 'age' => 22, 'species_id' => 1, 'breed_id' => 4 ],
             [ 'id' => 2, 'name' => 'Tux', 'age' => 8, 'species_id' => 1, 'breed_id' => 4 ],
-            [ 'id' => 3, 'name' => 'May', 'age' => 3, 'species_id' => 2, 'breed_id' => 102 ],
+            [ 'id' => 3, 'name' => 'May', 'age' => 2, 'species_id' => 2, 'breed_id' => 102 ],
             [ 'id' => 4, 'name' => 'Ben', 'age' => 5, 'species_id' => 3, 'breed_id' => 200 ],
             [ 'id' => 5, 'name' => 'Chico', 'age' => 7, 'species_id' => 3, 'breed_id' => 202 ],
         ]);