Skip to content

Commit 601ea97

Browse files
committed
Minor adjustments
1 parent f40727c commit 601ea97

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed

src/Traits/Filters/HandlesPillsData.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,20 @@ public function getPillDataForFilter(): array
88
{
99
$filters = [];
1010

11-
foreach ($this->getAppliedFiltersWithValuesForPills() as $filterSelectName => $value) {
12-
if (! is_null($filterSelectName)) {
13-
if (! is_null($filter = $this->getFilterByKey($filterSelectName))) {
14-
if ($filter->isEmpty($value)) {
11+
foreach ($this->getAppliedFiltersWithValuesForPills() as $filterSelectName => $value)
12+
{
13+
if (!is_null($filterSelectName))
14+
{
15+
if(!is_null($filter = $this->getFilterByKey($filterSelectName)))
16+
{
17+
if($filter->isEmpty($value))
18+
{
1519
continue;
1620
}
1721
$filterPillValue = $filter->getFilterPillValue($value);
1822
$filterPillTitle = $filter->getFilterPillTitle();
1923

24+
2025
$filters[$filter->getKey()] = [
2126
'filter' => $filter,
2227
'isAnExternalLivewireFilter' => (method_exists($filter, 'isAnExternalLivewireFilter') && $filter->isAnExternalLivewireFilter()),
@@ -27,9 +32,10 @@ public function getPillDataForFilter(): array
2732
];
2833
}
2934
}
30-
35+
3136
}
3237

3338
return $filters;
3439
}
35-
}
40+
41+
}

src/Traits/WithFilters.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
44

55
use Illuminate\Support\Collection;
66
use Livewire\Attributes\Locked;
7-
use Rappasoft\LaravelLivewireTables\Traits\Filters\{HasFilterGenericData, HasFilterMenu, HasFilterPills, HasFilterQueryString, HasFiltersCore, HasFiltersStatus, HasFiltersVisibility};
7+
use Rappasoft\LaravelLivewireTables\Traits\Filters\{HandlesLivewireComponentFilters, HasFilterGenericData, HandlesPillsData, HasFilterMenu, HasFilterPills, HasFilterQueryString, HasFiltersCore, HasFiltersStatus, HasFiltersVisibility};
88

99
trait WithFilters
1010
{
1111
use HasFiltersStatus,
1212
HasFilterGenericData,
1313
HasFilterMenu,
14+
HandlesPillsData,
1415
HasFilterPills,
1516
HasFilterQueryString,
1617
HasFiltersVisibility,
17-
HasFiltersCore;
18+
HasFiltersCore,
19+
HandlesLivewireComponentFilters;
1820

1921
// Set in JS
2022
public array $filterComponents = [];

src/Views/Filters/Traits/IsLivewireComponentFilter.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ trait IsLivewireComponentFilter
88
{
99
public string $livewireComponent = '';
1010

11+
12+
public function isAnExternalLivewireFilter(): bool
13+
{
14+
return true;
15+
}
16+
1117
public function setLivewireComponent(string $livewireComponent): self
1218
{
1319

0 commit comments

Comments
 (0)