Skip to content

Commit cd023fa

Browse files
lrljoelrljoe
committed
Tweaks
1 parent b0f37dd commit cd023fa

File tree

10 files changed

+99
-95
lines changed

10 files changed

+99
-95
lines changed

‎resources/views/components/forms/checkbox.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@aware(['tableName','primaryKey', 'isTailwind', 'isBootstrap', 'isBootstrap4', 'isBootstrap5'])
2-
@props(['checkboxAttributes'])
2+
@props(['checkboxAttributes' => []])
33
<input x-cloak
44
{{
55
$attributes->merge($checkboxAttributes)->class([

‎resources/views/components/table.blade.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@aware(['tableName','isTailwind','isBootstrap', 'currentlyReorderingStatus'])
2-
@props(['bulkActionsTdAttributes','bulkActionsTdCheckboxAttributes'])
32

43
@php($coreTableAttributes = $this->getCoreTableAttributes())
54

‎resources/views/components/table/td/bulk-actions.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@aware([ 'tableName', 'isTailwind', 'rowPk', 'tdAttributes', 'tdCheckboxAttributes', 'showBulkActionsSections'])
1+
@aware([ 'tableName', 'isTailwind', 'rowPk', 'bulkActionsTdAttributes', 'bulkActionsTdCheckboxAttributes', 'showBulkActionsSections'])
22

33
@if ($showBulkActionsSections)
4-
<x-livewire-tables::table.td.plain wire:key="{{ $tableName }}-tbody-td-bulk-actions-td-{{ $rowPk }}" :displayMinimisedOnReorder="true" :customAttributes=$tdAttributes>
4+
<x-livewire-tables::table.td.plain wire:key="{{ $tableName }}-tbody-td-bulk-actions-td-{{ $rowPk }}" :displayMinimisedOnReorder="true" :customAttributes=$bulkActionsTdAttributes>
55
<div @class($isTailwind ? [
66
'inline-flex rounded-md shadow-sm',
77
] : [
@@ -10,7 +10,7 @@
1010
<x-livewire-tables::forms.checkbox
1111
wire:key="{{ $tableName . 'selectedItems-'.$rowPk }}"
1212
value="{{ $rowPk }}"
13-
:checkboxAttributes=$tdCheckboxAttributes
13+
:checkboxAttributes=$bulkActionsTdCheckboxAttributes
1414
/>
1515
</div>
1616
</x-livewire-tables::table.td.plain>

‎resources/views/components/tools.blade.php‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,31 @@
99
->except(['default','default-styling','default-colors'])
1010
}}
1111
>
12-
{{ $slot }}
12+
@if ($this->showSortPillsSection())
13+
<x-livewire-tables::tools.sorting-pills />
14+
@endif
15+
@if($this->showFilterPillsSection())
16+
<x-livewire-tables::tools.filter-pills />
17+
@endif
18+
19+
@includeWhen(
20+
$this->hasConfigurableAreaFor('before-toolbar'),
21+
$this->getConfigurableAreaFor('before-toolbar'),
22+
$this->getParametersForConfigurableArea('before-toolbar')
23+
)
24+
25+
@if($this->shouldShowToolBar())
26+
<x-livewire-tables::tools.toolbar />
27+
@endif
28+
29+
@if ($this->showFilterLayoutSlideDown())
30+
<x-livewire-tables::tools.toolbar.items.filter-slidedown />
31+
@endif
32+
33+
@includeWhen(
34+
$this->hasConfigurableAreaFor('after-toolbar'),
35+
$this->getConfigurableAreaFor('after-toolbar'),
36+
$this->getParametersForConfigurableArea('after-toolbar')
37+
)
38+
1339
</div>

‎resources/views/components/tools/toolbar.blade.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@aware([ 'tableName','isTailwind','isBootstrap'])
22
@props([])
3-
@php($toolBarAttributes = $this->getToolBarAttributesBag)
3+
@php($toolBarAttributes = $this->getToolBarAttributesBag())
44

55
<div
66
{{
@@ -64,12 +64,12 @@
6464
<x-livewire-tables::includes.actions/>
6565
@endif
6666

67-
@if ($this->showBulkActionsDropdownAlpine() && $this->shouldAlwaysHideBulkActionsDropdownOption != true)
67+
@if ($this->showBulkActionsDropdownAlpine() && $this->shouldAlwaysHideBulkActionsDropdownOption() != true)
6868
<x-livewire-tables::tools.toolbar.items.bulk-actions />
6969
@endif
7070

71-
@if ($this->columnSelectIsEnabled)
72-
<x-livewire-tables::tools.toolbar.items.column-select />
71+
@if ($this->columnSelectIsEnabled())
72+
<x-livewire-tables::tools.toolbar.items.column-select :buttonAttributes="$this->getColumnSelectButtonAttributes()" :checkboxAttributes="$this->getColumnSelectMenuOptionCheckboxAttributes()" />
7373
@endif
7474

7575
@if ($this->showPaginationDropdown())

‎resources/views/components/tools/toolbar/items/column-select.blade.php‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@aware([ 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5', 'localisationPath'])
2+
@props(['buttonAttributes' => [], 'checkboxAttributes' => []])
23
@if ($isTailwind)
34
<div class="@if ($this->getColumnSelectIsHiddenOnMobile()) hidden sm:block @elseif ($this->getColumnSelectIsHiddenOnTablet()) hidden md:block @endif mb-4 w-full md:w-auto md:mb-0 md:ml-2">
45
<div
@@ -14,10 +15,10 @@ class="inline-block relative w-full text-left md:w-auto"
1415
x-on:click="open = !open"
1516
type="button"
1617
{{
17-
$attributes->merge($this->getColumnSelectButtonAttributes())
18+
$attributes->merge($buttonAttributes)
1819
->class([
19-
'inline-flex justify-center px-4 py-2 w-full text-sm font-medium rounded-md border shadow-sm focus:ring focus:ring-opacity-50' => $this->getColumnSelectButtonAttributes()['default-styling'],
20-
'text-gray-700 bg-white border-gray-300 hover:bg-gray-50 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600' => $this->getColumnSelectButtonAttributes()['default-colors'],
20+
'inline-flex justify-center px-4 py-2 w-full text-sm font-medium rounded-md border shadow-sm focus:ring focus:ring-opacity-50' => $buttonAttributes['default-styling'] ?? true,
21+
'text-gray-700 bg-white border-gray-300 hover:bg-gray-50 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600' => $buttonAttributes['default-colors'] ?? true,
2122
])
2223
->except(['default-styling', 'default-colors'])
2324
}}
@@ -53,10 +54,10 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa
5354
>
5455
<input
5556
{{
56-
$attributes->merge($this->getColumnSelectMenuOptionCheckboxAttributes())
57+
$attributes->merge($checkboxAttributes)
5758
->class([
58-
'transition duration-150 ease-in-out rounded shadow-sm focus:ring focus:ring-opacity-50 disabled:opacity-50 disabled:cursor-wait' => $this->getColumnSelectMenuOptionCheckboxAttributes()['default-styling'],
59-
'text-indigo-600 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => $this->getColumnSelectMenuOptionCheckboxAttributes()['default-colors'],
59+
'transition duration-150 ease-in-out rounded shadow-sm focus:ring focus:ring-opacity-50 disabled:opacity-50 disabled:cursor-wait' => $checkboxAttributes['default-styling'] ?? true,
60+
'text-indigo-600 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => $checkboxAttributes['default-colors'] ?? true,
6061
])
6162
->except(['default-styling', 'default-colors'])
6263
}}
@@ -80,10 +81,10 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa
8081
>
8182
<input
8283
{{
83-
$attributes->merge($this->getColumnSelectMenuOptionCheckboxAttributes())
84+
$attributes->merge($checkboxAttributes)
8485
->class([
85-
'transition duration-150 ease-in-out rounded shadow-sm focus:ring focus:ring-opacity-50 disabled:opacity-50 disabled:cursor-wait' => $this->getColumnSelectMenuOptionCheckboxAttributes()['default-styling'],
86-
'text-indigo-600 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => $this->getColumnSelectMenuOptionCheckboxAttributes()['default-colors'],
86+
'transition duration-150 ease-in-out rounded shadow-sm focus:ring focus:ring-opacity-50 disabled:opacity-50 disabled:cursor-wait' => $checkboxAttributes['default-styling'] ?? true,
87+
'text-indigo-600 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => $checkboxAttributes['default-colors'] ?? true,
8788
])
8889
->except(['default-styling', 'default-colors'])
8990
}}
@@ -120,9 +121,9 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa
120121
<button
121122
x-on:click="open = !open"
122123
{{
123-
$attributes->merge($this->getColumnSelectButtonAttributes())
124+
$attributes->merge($buttonAttributes)
124125
->class([
125-
'btn dropdown-toggle d-block w-100 d-md-inline' => $this->getColumnSelectButtonAttributes()['default-styling'],
126+
'btn dropdown-toggle d-block w-100 d-md-inline' => $buttonAttributes['default-styling'] ?? true,
126127
])
127128
->except(['default-styling', 'default-colors'])
128129
}}
@@ -160,9 +161,9 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa
160161
wire:loading.attr="disabled"
161162
type="checkbox"
162163
{{
163-
$attributes->merge($this->getColumnSelectMenuOptionCheckboxAttributes())
164+
$attributes->merge($checkboxAttributes)
164165
->class([
165-
'form-check-input' => $this->getColumnSelectMenuOptionCheckboxAttributes()['default-styling'],
166+
'form-check-input' => $checkboxAttributes['default-styling'] ?? true,
166167
])
167168
->except(['default-styling', 'default-colors'])
168169
}}
@@ -205,9 +206,9 @@ class="px-2 {{ $loop->last ? 'mb-0' : 'mb-1' }}"
205206
wire:loading.attr="disabled"
206207
type="checkbox"
207208
{{
208-
$attributes->merge($this->getColumnSelectMenuOptionCheckboxAttributes())
209+
$attributes->merge($checkboxAttributes)
209210
->class([
210-
'form-check-input' => $this->getColumnSelectMenuOptionCheckboxAttributes()['default-styling'],
211+
'form-check-input' => $checkboxAttributes['default-styling'] ?? true,
211212
])
212213
->except(['default-styling', 'default-colors'])
213214
}}

‎resources/views/components/tools/toolbar/items/filter-popover.blade.php‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
@aware(['tableName'])
2-
@if($this->isBootstrap)
1+
@aware(['tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
2+
@php
3+
$filterGenericData = $this->getFilterGenericData();
4+
$filterPopoverAttributes = $this->getFilterPopoverAttributes();
5+
@endphp
6+
@if($isBootstrap)
37
<ul x-cloak {{ $attributes
4-
->merge($this->getFilterPopoverAttributes())
8+
->merge($filterPopoverAttributes)
59
->merge(['role' => 'menu'])
610
->class([
7-
'w-100' => $this->getFilterPopoverAttributes['default-width'] ?? true,
8-
'dropdown-menu mt-md-5' => $this->isBootstrap4,
9-
'dropdown-menu' => $this->isBootstrap5,
11+
'w-100' => $filterPopoverAttributes['default-width'] ?? true,
12+
'dropdown-menu mt-md-5' => $isBootstrap4,
13+
'dropdown-menu' => $isBootstrap5,
1014
]) }} x-bind:class="{ 'show': filterPopoverOpen }">
1115
@tableloop ($this->getVisibleFilters() as $filter)
1216
<div id="{{ $tableName }}-filter-{{ $filter->getKey() }}-wrapper" wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-toolbar" class="p-2">
13-
{{ $filter->setGenericDisplayData($this->getFilterGenericData())->render() }}
17+
{{ $filter->setGenericDisplayData($filterGenericData)->render() }}
1418
</div>
1519
@endtableloop
1620

@@ -23,7 +27,7 @@
2327
<div x-cloak x-show="filterPopoverOpen"
2428
{{
2529
$attributes
26-
->merge($this->getFilterPopoverAttributes())
30+
->merge($filterPopoverAttributes)
2731
->merge([
2832
'role' => 'menu',
2933
'aria-orientation' => 'vertical',
@@ -36,17 +40,17 @@
3640
'x-transition:leave-end' => 'transform opacity-0 scale-95',
3741
])
3842
->class([
39-
'w-full md:w-56' => $this->getFilterPopoverAttributes()['default-width'] ?? true,
40-
'origin-top-left absolute left-0 mt-2 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $this->getFilterPopoverAttributes()['default-styling'] ?? true,
41-
'bg-white divide-gray-100 ring-black dark:bg-gray-700 dark:text-white dark:divide-gray-600' => $this->getFilterPopoverAttributes()['default-colors'] ?? true,
43+
'w-full md:w-56' => $filterPopoverAttributes['default-width'] ?? true,
44+
'origin-top-left absolute left-0 mt-2 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $filterPopoverAttributes['default-styling'] ?? true,
45+
'bg-white divide-gray-100 ring-black dark:bg-gray-700 dark:text-white dark:divide-gray-600' => $filterPopoverAttributes['default-colors'] ?? true,
4246
])
4347
->except(['x-cloak', 'x-show', 'default','default-width', 'default-styling','default-colors'])
4448
}}>
4549

4650
@tableloop ($this->getVisibleFilters() as $filter)
4751
<div class="py-1" role="none">
4852
<div id="{{ $tableName }}-filter-{{ $filter->getKey() }}-wrapper" wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-toolbar" class="block px-4 py-2 text-sm text-gray-700 space-y-1" role="menuitem">
49-
{{ $filter->setGenericDisplayData($this->getFilterGenericData())->render() }}
53+
{{ $filter->setGenericDisplayData($filterGenericData)->render() }}
5054
</div>
5155
</div>
5256
@endtableloop

‎resources/views/components/wrapper.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@props(['component', 'tableName', 'primaryKey', 'isTailwind', 'isBootstrap','isBootstrap4', 'isBootstrap5', 'currentlyReorderingStatus', 'collapsingColumnDetails', 'tdAttributes', 'tdCheckboxAttributes', 'collapsingColumnButtonExpandAttributes', 'collapsingColumnButtonCollapseAttributes', 'hasCollapsingColumns', 'shouldCollapseAlways', 'shouldCollapseOnTablet', 'shouldCollapseOnMobile', 'showBulkActionsSections', 'coreTableAttributes', 'showCollapsingColumnSections', 'selectedVisibleColumns', 'colspanCount', 'columnCollapseInfo'])
1+
@props(['component', 'tableName', 'primaryKey', 'isTailwind', 'isBootstrap','isBootstrap4', 'isBootstrap5', 'hasDisplayLoadingPlaceholder', 'currentlyReorderingStatus', 'collapsingColumnDetails', 'bulkActionsTdAttributes', 'bulkActionsTdCheckboxAttributes', 'collapsingColumnButtonExpandAttributes', 'collapsingColumnButtonCollapseAttributes', 'hasCollapsingColumns', 'shouldCollapseAlways', 'shouldCollapseOnTablet', 'shouldCollapseOnMobile', 'showBulkActionsSections', 'coreTableAttributes', 'showCollapsingColumnSections', 'selectedVisibleColumns', 'colspanCount', 'columnCollapseInfo'])
22
<div wire:key="{{ $tableName }}-wrapper" >
33
<div {{ $attributes->merge($this->getComponentWrapperAttributes()) }}
44
@if ($this->hasRefresh()) wire:poll{{ $this->getRefreshOptions() }} @endif

0 commit comments

Comments
 (0)