Skip to content

Outside Filters Implementation for Bootstrap #1926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 6.x
Choose a base branch
from
Open

Outside Filters Implementation for Bootstrap #1926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17cac1d
Implementing outside filters with bootstrap
backstageel May 14, 2025
bc9d06e
Implementing outside filters with bootstrap
backstageel May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions resources/views/components/frameworks/bootstrap5/filter.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
@props([
'columns' => null,
'theme' => null,
'tableName' => null,
'filtersFromColumns' => null,
'showFilters' => false,
])
<div
x-data="{ open: @entangle('showFilters').live }"
class="mt-2 md:mt-0"
>
<div
x-show="open"
x-cloak
x-transition:enter="transform duration-100"
x-transition:enter-start="opacity-0 scale-90"
x-transition:enter-end="opacity-100 scale-100"
x-transition:leave="transform duration-100"
x-transition:leave-start="opacity-100 scale-100"
x-transition:leave-end="opacity-0 scale-90"
class="pg-filter-container"
>
@php
$customConfig = [];
@endphp
<div class="d-grid gap-3" style="grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));">
@foreach ($filtersFromColumns as $column)
@php
$filter = data_get($column, 'filters');
$title = data_get($column, 'title');
$baseClass = data_get($filter, 'baseClass');
$className = str(data_get($filter, 'className'));
@endphp

<div class="{{ $baseClass }}">
@if ($className->contains('FilterMultiSelect'))
<x-livewire-powergrid::inputs.select
:inline="false"
:theme="$theme"
:table-name="$tableName"
:filter="$filter"
:title="$title"
:initial-values="data_get(data_get($filter, 'multi_select'), data_get($filter, 'field'), [])"
/>
@elseif ($className->contains(['FilterDateTimePicker', 'FilterDatePicker']))
@includeIf(theme_style($theme, 'filterDatePicker.view'), [
'filter' => $filter,
'tableName' => $tableName,
'classAttr' => 'w-100',
'type' => $className->contains('FilterDateTimePicker') ? 'datetime' : 'date',
])
@elseif ($className->contains(['FilterSelect', 'FilterEnumSelect']))
@includeIf(theme_style($theme, 'filterSelect.view'), [
'filter' => $filter,
])
@elseif ($className->contains('FilterNumber'))
@includeIf(theme_style($theme, 'filterNumber.view'), [
'filter' => $filter,
])
@elseif ($className->contains('FilterInputText'))
@includeIf(theme_style($theme, 'filterInputText.view'), [
'filter' => $filter,
])
@elseif ($className->contains('FilterBoolean'))
@includeIf(theme_style($theme, 'filterBoolean.view'), [
'filter' => $filter,
])
@elseif ($className->contains('FilterDynamic'))
<x-dynamic-component
:component="data_get($filter, 'component', '')"
:attributes="new \Illuminate\View\ComponentAttributeBag(data_get($filter, 'attributes', []))"
/>
@endif
</div>
@endforeach
</div>
</div>
</div>
7 changes: 4 additions & 3 deletions resources/views/components/frameworks/bootstrap5/filters/boolean.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
:attributes="new \Illuminate\View\ComponentAttributeBag($params)"
/>
@else
<div
class="{{ theme_style($theme, 'filterBoolean.base') }}"
>
<div class="mb-2">
@if (!$inline)
<label class="form-label fw-semibold mb-1">{{ $title ?? '' }}</label>
@endif
<select
style="{{ data_get($column, 'headerStyle') }}"
class="{{ $selectClasses }}"
Expand Down
39 changes: 23 additions & 16 deletions resources/views/components/frameworks/bootstrap5/filters/date-picker.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,28 @@
wire:ignore.self
x-data="pgFlatpickr(@js($params))"
>
<div
class="{{ theme_style($theme, 'filterDatePicker.base') }}"
>
<form autocomplete="off">
<input
id="input_{{ $field }}"
x-ref="rangeInput"
wire:model="filters.{{ $type }}.{{ $field }}.formatted"
autocomplete="off"
data-field="{{ $field }}"
class="{{ theme_style($theme, 'filterDatePicker.input') }} {{ data_get($column, 'headerClass') }}"
type="text"
readonly
placeholder="{{ trans('livewire-powergrid::datatable.placeholders.select') }}"
/>
</form>
<div class="mb-2">
@if (!$inline)
<label class="form-label fw-semibold mb-1">{{ $title ?? '' }}</label>
@endif
<div class="d-flex flex-row gap-2 align-items-center">
<div
class="{{ theme_style($theme, 'filterDatePicker.base') }}"
>
<form autocomplete="off">
<input
id="input_{{ $field }}"
x-ref="rangeInput"
wire:model="filters.{{ $type }}.{{ $field }}.formatted"
autocomplete="off"
data-field="{{ $field }}"
class="{{ theme_style($theme, 'filterDatePicker.input') }} {{ data_get($column, 'headerClass') }}"
type="text"
readonly
placeholder="{{ trans('livewire-powergrid::datatable.placeholders.select') }}"
/>
</form>
</div>
</div>
</div>
</div>
19 changes: 9 additions & 10 deletions resources/views/components/frameworks/bootstrap5/filters/input-text.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,14 @@
:attributes="new \Illuminate\View\ComponentAttributeBag($params)"
/>
@else
<div
class="{{ theme_style($theme, 'filterInputText.base') }}"
>
@if ($showSelectOptions)
<div class="relative">
<div class="{{ theme_style($theme, 'filterInputText.base') }}">
@if (!$inline)
<label class="form-label fw-semibold mb-1">{{ $title }}</label>
@endif
<div class="d-flex flex-row gap-2 align-items-center">
@if ($showSelectOptions)
<select
class="{{ $selectClasses }}"
class="form-select form-select-sm w-auto"
style="{{ data_get($column, 'headerStyle') }}"
{{ $defaultAttributes['selectAttributes'] }}
>
Expand All @@ -64,17 +65,15 @@ class="{{ $selectClasses }}"
>{{ trans('livewire-powergrid::datatable.input_text_options.' . $value) }}</option>
@endforeach
</select>
</div>
@endif
<div class="mt-1">
@endif
<input
wire:key="input-{{ $field }}"
data-id="{{ $field }}"
@if (isset($enabledFilters[$field]['disabled']) && boolval($enabledFilters[$field]['disabled']) === true) disabled
@else
{{ $defaultAttributes['inputAttributes'] }} @endif
type="text"
class="{{ $inputClasses }}"
class="form-control form-control-sm"
placeholder="{{ $placeholder }}"
/>
</div>
Expand Down
43 changes: 23 additions & 20 deletions resources/views/components/frameworks/bootstrap5/filters/number.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,29 @@
:attributes="new \Illuminate\View\ComponentAttributeBag($params)"
/>
@else
<div
class="{{ theme_style($theme, 'filterNumber.base') }}"
>
<div>
<input
{{ $defaultAttributes['inputStartAttributes'] }}
@if ($inline) style="{{ data_get($column, 'headerStyle') }}" @endif
type="text"
class="{{ $filterClasses }}"
placeholder="{{ $placeholder['min'] ?? __('Min') }}"
>
</div>
<div class="mt-1">
<input
{{ $defaultAttributes['inputEndAttributes'] }}
@if ($inline) style="{{ data_get($column, 'headerStyle') }}" @endif
type="text"
class="{{ $filterClasses }}"
placeholder="{{ $placeholder['max'] ?? __('Max') }}"
>
<div class="mb-2">
@if (!$inline)
<label class="form-label fw-semibold mb-1">{{ $title ?? '' }}</label>
@endif
<div class="d-flex flex-row gap-2 align-items-center">
<div>
<input
{{ $defaultAttributes['inputStartAttributes'] }}
@if ($inline) style="{{ data_get($column, 'headerStyle') }}" @endif
type="text"
class="{{ $filterClasses }}"
placeholder="{{ $placeholder['min'] ?? __('Min') }}"
>
</div>
<div class="mt-1">
<input
{{ $defaultAttributes['inputEndAttributes'] }}
@if ($inline) style="{{ data_get($column, 'headerStyle') }}" @endif
type="text"
class="{{ $filterClasses }}"
placeholder="{{ $placeholder['max'] ?? __('Max') }}"
>
</div>
</div>
</div>
@endif
59 changes: 32 additions & 27 deletions resources/views/components/frameworks/bootstrap5/filters/select.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,39 @@
:attributes="new \Illuminate\View\ComponentAttributeBag($params)"
/>
@else
<div
class="{{ theme_style($theme, 'filterSelect.base') }}"
>
<select
class="{{ $filterClasses }}"
style="{{ data_get($column, 'headerStyle') }}"
{{ $defaultAttributes['selectAttributes'] }}
<div class="mb-2">
@if (!$inline)
<label class="form-label fw-semibold mb-1">{{ $title ?? '' }}</label>
@endif
<div
class="{{ theme_style($theme, 'filterSelect.base') }}"
>
<select
class="{{ $filterClasses }}"
style="{{ data_get($column, 'headerStyle') }}"
{{ $defaultAttributes['selectAttributes'] }}
>

@if(!data_get($params, 'params.disableOptionAll', false))
<option value="">{{ trans('livewire-powergrid::datatable.select.all') }}</option>
@endif

@php
$computedDatasource = data_get($filter, 'computedDatasource');
$dataSource = filled($computedDatasource)
? $this->{$computedDatasource}
: data_get($filter, 'dataSource');
@endphp

@foreach ($dataSource as $key => $item)
<option
wire:key="select-{{ $tableName }}-{{ $key }}"
value="{{ $item[data_get($filter, 'optionValue')] }}"
>
{{ $item[data_get($filter, 'optionLabel')] }}
</option>
@endforeach
</select>
@if(!data_get($params, 'params.disableOptionAll', false))
<option value="">{{ trans('livewire-powergrid::datatable.select.all') }}</option>
@endif

@php
$computedDatasource = data_get($filter, 'computedDatasource');
$dataSource = filled($computedDatasource)
? $this->{$computedDatasource}
: data_get($filter, 'dataSource');
@endphp

@foreach ($dataSource as $key => $item)
<option
wire:key="select-{{ $tableName }}-{{ $key }}"
value="{{ $item[data_get($filter, 'optionValue')] }}"
>
{{ $item[data_get($filter, 'optionLabel')] }}
</option>
@endforeach
</select>
</div>
</div>
@endif
4 changes: 4 additions & 0 deletions resources/views/components/frameworks/bootstrap5/header.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
@include(data_get($theme, 'root') . '.header.toggle-columns')
@includeIf(data_get($theme, 'root') . '.header.soft-deletes')

@if (config('livewire-powergrid.filter') === 'outside')
@include(data_get($theme, 'root') . '.header.filters')
@endif

@includeWhen(boolval(data_get($setUp, 'header.wireLoading')),
data_get($theme, 'root') . '.header.loading')
</div>
Expand Down
14 changes: 14 additions & 0 deletions resources/views/components/frameworks/bootstrap5/header/filters.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div
wire:key="toggle-filters-{{ $tableName }}')"
id="toggle-filters"
class="d-flex me-2 mt-2 mt-sm-0 gap-2"
>
<button
wire:click="toggleFilters"
type="button"
class="btn btn-light btn-sm border rounded-circle d-flex align-items-center justify-content-center p-2 shadow-sm"
style="width: 36px; height: 36px;"
>
<x-livewire-powergrid::icons.filter class="bi bi-filter" />
</button>
</div>
18 changes: 18 additions & 0 deletions resources/views/components/frameworks/bootstrap5/table-base.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
'enabledFilters' => $enabledFilters,
])
</div>

@if (config('livewire-powergrid.filter') === 'outside')
@php
$filtersFromColumns = $columns
->filter(fn($column) => filled(data_get($column, 'filters')));
@endphp

@if ($filtersFromColumns->count() > 0)
<x-livewire-powergrid::frameworks.bootstrap5.filter
:enabled-filters="$enabledFilters"
:tableName="$tableName"
:columns="$columns"
:filtersFromColumns="$filtersFromColumns"
:theme="$theme"
/>
@endif
@endif

<div
class="{{ theme_style($theme, 'table.layout.div') }}"
>
Expand Down
Loading