Skip to content

Commit

Permalink
change object to data_get in toggle-columns (#1338)
Browse files Browse the repository at this point in the history
  • Loading branch information
@luanfreitasdev
luanfreitasdev authored Jan 19, 2024
1 parent 7fab9dc commit ef52585
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 36 deletions.
8 changes: 4 additions & 4 deletions resources/views/components/frameworks/bootstrap5/header/toggle-columns.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ class="btn btn-light dropdown-toggle"
<ul class="dropdown-menu">
@foreach ($this->visibleColumns as $column)
<li
wire:click="$dispatch('pg:toggleColumn-{{ $tableName }}', { field: '{{ $column->field }}'})"
wire:key="toggle-column-{{ $column->field }}"
wire:click="$dispatch('pg:toggleColumn-{{ $tableName }}', { field: '{{ data_get($column, 'field') }}'})"
wire:key="toggle-column-{{ data_get($column, 'field') }}"
>
<a
class="dropdown-item"
href="#"
>
@if ($column->hidden === false)
@if (data_get($column, 'hidden') === false)
<x-livewire-powergrid::icons.eye width="20" />
@else
<x-livewire-powergrid::icons.eye-off width="20" />
@endif
{!! $column->title !!}
{!! data_get($column, 'title') !!}
</a>
</li>
@endforeach
Expand Down
14 changes: 7 additions & 7 deletions resources/views/components/frameworks/tailwind/filters/input-text.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
$operators = (array) data_get($filter, 'operators', []);
$placeholder = strval(data_get($filter, 'placeholder'));
$componentAttributes = (array) data_get($filter, 'attributes', []);
$inputTextOptions = \PowerComponents\LivewirePowerGrid\Components\Filters\FilterInputText::getInputTextOperators();
$inputTextOptions = count($operators) > 0 ? $operators : $inputTextOptions;
$showSelectOptions = !(count($inputTextOptions) === 1 && in_array('contains', $inputTextOptions));
$defaultPlaceholder = $column?->placeholder ?: $column?->title;
$defaultPlaceholder = data_get($column, 'placeholder') ?: data_get($column, 'title');
$overridePlaceholder = $placeholder ?: $defaultPlaceholder;
unset($filter['placeholder']);
$defaultAttributes = \PowerComponents\LivewirePowerGrid\Components\Filters\FilterInputText::getWireAttributes($field, $title);
$selectClasses = \Illuminate\Support\Arr::toCssClasses(['power_grid', data_get($theme, 'selectClass'), data_get($column, 'headerClass')]);
$inputClasses = \Illuminate\Support\Arr::toCssClasses(['power_grid', data_get($theme, 'inputClass')]);
$params = array_merge(
[
'showSelectOptions' => $showSelectOptions,
Expand Down
6 changes: 3 additions & 3 deletions resources/views/components/frameworks/tailwind/header/enabled-filters.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@if (count($enabledFilters))
<div class="pg-enabled-filters-base">
@if (count($enabledFilters) > 1)
<span
class="group pg-enabled-filters-span" >
<span class="group pg-enabled-filters-span">
{{ trans('livewire-powergrid::datatable.buttons.clear_all_filters') }}
<div class="relative flex items-center w-2 h-2">
<button
Expand All @@ -18,7 +17,8 @@ class="group pg-enabled-filters-span" >
@isset($filter['label'])
<span
wire:key="enabled-filters-{{ $field }}"
class="group pg-enabled-filters-span" >
class="group pg-enabled-filters-span"
>
{{ $filter['label'] }}
<div class="relative flex items-center w-2 h-2">
<button
Expand Down
10 changes: 5 additions & 5 deletions resources/views/components/frameworks/tailwind/header/toggle-columns.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ class="mt-2 py-2 w-48 bg-white shadow-xl absolute z-10 dark:bg-pg-primary-700"
>
@foreach ($this->visibleColumns as $column)
<div
wire:click="$dispatch('pg:toggleColumn-{{ $tableName }}', { field: '{{ $column->field }}'})"
wire:key="toggle-column-{{ $column->field }}"
class="@if ($column->hidden) opacity-40 bg-pg-primary-300 dark:bg-pg-primary-800 @endif cursor-pointer flex justify-start block px-4 py-2 text-pg-primary-800 hover:bg-pg-primary-50 hover:text-black-200 dark:text-pg-primary-200 dark:hover:bg-gray-900 dark:hover:bg-pg-primary-700"
wire:click="$dispatch('pg:toggleColumn-{{ $tableName }}', { field: '{{ data_get($column, 'field') }}'})"
wire:key="toggle-column-{{ data_get($column, 'field') }}"
@class([data_get($column, 'hidden') => 'opacity-40 bg-pg-primary-300 dark:bg-pg-primary-800', ' cursor-pointer flex justify-start block px-4 py-2 text-pg-primary-800 hover:bg-pg-primary-50 hover:text-black-200 dark:text-pg-primary-200 dark:hover:bg-gray-900 dark:hover:bg-pg-primary-700'])
>
@if (!$column->hidden)
@if (!data_get($column, 'hidden'))
<x-livewire-powergrid::icons.eye class="text-pg-primary-500 dark:text-pg-primary-300" />
@else
<x-livewire-powergrid::icons.eye-off class="text-pg-primary-500 dark:text-pg-primary-300" />
@endif
<div class="ml-2">
{!! $column->title !!}
{!! data_get($column, 'title') !!}
</div>
</div>
@endforeach
Expand Down
34 changes: 17 additions & 17 deletions resources/views/components/inline-filters.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,38 @@
@endphp
@if (config('livewire-powergrid.filter') === 'inline')
<tr
class="{{ $trClasses }}"
style="{{ data_get($theme, 'table.trStyle') }} {{ data_get($theme, 'table.trFiltersStyle') }}"
class="{{ $trClasses }}"
style="{{ data_get($theme, 'table.trStyle') }} {{ data_get($theme, 'table.trFiltersStyle') }}"
>

@if (data_get($setUp, 'detail.showCollapseIcon'))
<td
class="{{ $tdClasses }}"
style="{{ $tdStyles }}"
class="{{ $tdClasses }}"
style="{{ $tdStyles }}"
></td>
@endif
@if ($checkbox)
<td
class="{{ $tdClasses }}"
style="{{ $tdStyles }}"
class="{{ $tdClasses }}"
style="{{ $tdStyles }}"
></td>
@endif

@foreach ($this->visibleColumns as $column)
<td
class="{{ data_get($theme, 'table.tdBodyClass') }}"
wire:key="column-filter-{{ $column->field }}"
style="{{ $column->hidden === true ? 'display:none' : '' }}; {{ data_get($theme, 'table.tdBodyStyle') }}"
class="{{ data_get($theme, 'table.tdBodyClass') }}"
wire:key="column-filter-{{ data_get($column, 'field') }}"
style="{{ data_get($column, 'hidden') === true ? 'display:none' : '' }}; {{ data_get($theme, 'table.tdBodyStyle') }}"
>

@foreach ($column->filters as $key => $filter)
<div wire:key="filter-{{ $column->field }}-{{ $key }}">
@foreach (data_get($column, 'filters') as $key => $filter)
<div wire:key="filter-{{ data_get($column, 'field') }}-{{ $key }}">
@if (str(data_get($filter, 'className'))->contains('FilterMultiSelect'))
<x-livewire-powergrid::inputs.select
:tableName="$tableName"
:filter="$filter"
:theme="data_get($theme, 'filterMultiSelect')"
:initialValues="data_get(data_get($filters, 'multi_select'), data_get($filter, 'field'), [])"
:tableName="$tableName"
:filter="$filter"
:theme="data_get($theme, 'filterMultiSelect')"
:initialValues="data_get(data_get($filters, 'multi_select'), data_get($filter, 'field'), [])"
/>
@endif
@if (str(data_get($filter, 'className'))->contains(['FilterSelect', 'FilterEnumSelect']))
Expand All @@ -75,8 +75,8 @@ class="{{ data_get($theme, 'table.tdBodyClass') }}"
@endif
@if (str(data_get($filter, 'className'))->contains('FilterDynamic'))
<x-dynamic-component
:component="data_get($filter, 'component', '')"
:attributes="new \Illuminate\View\ComponentAttributeBag(
:component="data_get($filter, 'component', '')"
:attributes="new \Illuminate\View\ComponentAttributeBag(
data_get($filter, 'attributes', []),
)"
/>
Expand Down

0 comments on commit ef52585

Please sign in to comment.