Skip to content

Commit 567dc6c

Browse files
committed
Merge branch 'feature-filter-label' of https://github.com/DeltaSystems/laravel-livewire-tables into DeltaSystems-feature-filter-label
2 parents ded47bc + ccca701 commit 567dc6c

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

resources/views/bootstrap-4/includes/filter-pills.blade.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
wire:key="filter-pill-{{ $key }}"
99
class="badge badge-pill badge-info d-inline-flex align-items-center"
1010
>
11-
{{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }}
11+
{{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}:
12+
@if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options'))
13+
{{ $customFilters[$key]->options()[$value] ?? $value }}
14+
@else
15+
{{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }}
16+
@endif
1217

1318
<a
1419
href="#"

resources/views/bootstrap-5/includes/filter-pills.blade.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
wire:key="filter-pill-{{ $key }}"
99
class="badge rounded-pill bg-info d-inline-flex align-items-center"
1010
>
11-
{{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }}
11+
{{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}:
12+
@if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options'))
13+
{{ $customFilters[$key]->options()[$value] ?? $value }}
14+
@else
15+
{{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }}
16+
@endif
1217

1318
<a
1419
href="#"

resources/views/tailwind/includes/filter-pills.blade.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
wire:key="filter-pill-{{ $key }}"
99
class="inline-flex items-center py-0.5 pl-2 pr-0.5 rounded-full text-xs font-medium bg-indigo-100 text-indigo-700"
1010
>
11-
{{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }}
11+
{{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}:
12+
@if(isset($customFilters[$key]) && method_exists($customFilters[$key], 'options'))
13+
{{ $customFilters[$key]->options()[$value] ?? $value }}
14+
@else
15+
{{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }}
16+
@endif
1217

1318
<button
1419
wire:click="removeFilter('{{ $key }}')"

src/Traits/WithFilters.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Database\Eloquent\Builder;
66
use Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities;
77
use Rappasoft\LaravelLivewireTables\Views\Column;
8+
use Rappasoft\LaravelLivewireTables\Views\Filter;
89

910
/**
1011
* Trait WithFilters.
@@ -79,7 +80,7 @@ public function resetAll(): void
7980
/**
8081
* Define the filters array
8182
*
82-
* @return array
83+
* @return Filter[]
8384
*/
8485
public function filters(): array
8586
{

0 commit comments

Comments
 (0)