Skip to content

Commit 081279e

Browse files
lrljoelrljoe
committed
Tweaks to Computed Properties
1 parent 64b54a3 commit 081279e

File tree

14 files changed

+121
-109
lines changed

14 files changed

+121
-109
lines changed

‎resources/views/components/includes/actions.blade.php‎ renamed to ‎resources/views/components/actions/actions.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@php($showActionsInToolbar = $this->showActionsInToolbar())
55
@php($actions = $this->getActions())
66

7-
@if($showActionsInToolbar && count($actions) >= 2)
7+
@if($showActionsInToolbar && ($this->showActionsAsDropdown || count($actions) >= 5))
88

99
<x-livewire-tables::dropdown.wrapper>
1010
{{-- The Button Used To Toggle The Menu --}}

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
wire:key="bookingitemstable-table-{{ rand(5828,458218) }}"
1919
>
2020
<x-livewire-tables::thead />
21+
2122
@php($currentRows = $this->getRows)
23+
2224
@if(count($currentRows) > 0)
2325
@tableloop ($currentRows as $rowIndex => $row)
2426
@php($rowPk = $row->{$primaryKey})

‎resources/views/components/tools/sorting-pills.blade.php‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<span
1717
wire:key="{{ $tableName }}-sorting-pill-{{ $columnSelectName }}"
1818
{{
19-
$attributes->merge($this->getSortingPillsItemAttributes())
19+
$attributes->merge($this->getSortingPillsItemAttributes)
2020
->class([
21-
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 capitalize' => $this->getSortingPillsItemAttributes()['default-styling'],
22-
'bg-indigo-100 text-indigo-800 dark:bg-indigo-200 dark:text-indigo-900' => $this->getSortingPillsItemAttributes()['default-colors'],
21+
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 capitalize' => $this->getSortingPillsItemAttributes['default-styling'],
22+
'bg-indigo-100 text-indigo-800 dark:bg-indigo-200 dark:text-indigo-900' => $this->getSortingPillsItemAttributes['default-colors'],
2323
])
2424
->except(['default-styling', 'default-colors'])
2525
}}
@@ -30,10 +30,10 @@
3030
wire:click="clearSort('{{ $columnSelectName }}')"
3131
type="button"
3232
{{
33-
$attributes->merge($this->getSortingPillsClearSortButtonAttributes())
33+
$attributes->merge($this->getSortingPillsClearSortButtonAttributes)
3434
->class([
35-
'flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none' => $this->getSortingPillsClearSortButtonAttributes()['default-styling'],
36-
'text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white' => $this->getSortingPillsClearSortButtonAttributes()['default-colors'],
35+
'flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none' => $this->getSortingPillsClearSortButtonAttributes['default-styling'],
36+
'text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white' => $this->getSortingPillsClearSortButtonAttributes['default-colors'],
3737
])
3838
->except(['default-styling', 'default-colors'])
3939
}}
@@ -50,10 +50,10 @@ class="focus:outline-none active:outline-none"
5050
>
5151
<span
5252
{{
53-
$attributes->merge($this->getSortingPillsClearAllButtonAttributes())
53+
$attributes->merge($this->getSortingPillsClearAllButtonAttributes)
5454
->class([
55-
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium' => $this->getSortingPillsClearAllButtonAttributes()['default-styling'],
56-
'bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900' => $this->getSortingPillsClearAllButtonAttributes()['default-colors'],
55+
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium' => $this->getSortingPillsClearAllButtonAttributes['default-styling'],
56+
'bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900' => $this->getSortingPillsClearAllButtonAttributes['default-colors'],
5757
])
5858
->except(['default-styling', 'default-colors'])
5959
}}
@@ -80,10 +80,10 @@ class="focus:outline-none active:outline-none"
8080
<span
8181
wire:key="{{ $tableName }}-sorting-pill-{{ $columnSelectName }}"
8282
{{
83-
$attributes->merge($this->getSortingPillsItemAttributes())
83+
$attributes->merge($this->getSortingPillsItemAttributes)
8484
->class([
85-
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 capitalize' => $this->getSortingPillsItemAttributes()['default-styling'],
86-
'bg-indigo-100 text-indigo-800 dark:bg-indigo-200 dark:text-indigo-900' => $this->getSortingPillsItemAttributes()['default-colors'],
85+
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 capitalize' => $this->getSortingPillsItemAttributes['default-styling'],
86+
'bg-indigo-100 text-indigo-800 dark:bg-indigo-200 dark:text-indigo-900' => $this->getSortingPillsItemAttributes['default-colors'],
8787
])
8888
->except(['default-styling', 'default-colors'])
8989
}}
@@ -94,10 +94,10 @@ class="focus:outline-none active:outline-none"
9494
wire:click="clearSort('{{ $columnSelectName }}')"
9595
type="button"
9696
{{
97-
$attributes->merge($this->getSortingPillsClearSortButtonAttributes())
97+
$attributes->merge($this->getSortingPillsClearSortButtonAttributes)
9898
->class([
99-
'flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none' => $this->getSortingPillsClearSortButtonAttributes()['default-styling'],
100-
'text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white' => $this->getSortingPillsClearSortButtonAttributes()['default-colors'],
99+
'flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none' => $this->getSortingPillsClearSortButtonAttributes['default-styling'],
100+
'text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white' => $this->getSortingPillsClearSortButtonAttributes['default-colors'],
101101
])
102102
->except(['default-styling', 'default-colors'])
103103
}}
@@ -114,10 +114,10 @@ class="focus:outline-none active:outline-none"
114114
>
115115
<span
116116
{{
117-
$attributes->merge($this->getSortingPillsClearAllButtonAttributes())
117+
$attributes->merge($this->getSortingPillsClearAllButtonAttributes)
118118
->class([
119-
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium' => $this->getSortingPillsClearAllButtonAttributes()['default-styling'],
120-
'bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900' => $this->getSortingPillsClearAllButtonAttributes()['default-colors'],
119+
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium' => $this->getSortingPillsClearAllButtonAttributes['default-styling'],
120+
'bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900' => $this->getSortingPillsClearAllButtonAttributes['default-colors'],
121121
])
122122
->except(['default-styling', 'default-colors'])
123123
}}
@@ -144,9 +144,9 @@ class="focus:outline-none active:outline-none"
144144
<span
145145
wire:key="{{ $tableName . '-sorting-pill-' . $columnSelectName }}"
146146
{{
147-
$attributes->merge($this->getSortingPillsItemAttributes())
147+
$attributes->merge($this->getSortingPillsItemAttributes)
148148
->class([
149-
'badge badge-pill badge-info d-inline-flex align-items-center' => $this->getSortingPillsItemAttributes()['default-styling'],
149+
'badge badge-pill badge-info d-inline-flex align-items-center' => $this->getSortingPillsItemAttributes['default-styling'],
150150
])
151151
->except(['default-styling', 'default-colors'])
152152
}}
@@ -157,9 +157,9 @@ class="focus:outline-none active:outline-none"
157157
href="#"
158158
wire:click="clearSort('{{ $columnSelectName }}')"
159159
{{
160-
$attributes->merge($this->getSortingPillsClearSortButtonAttributes())
160+
$attributes->merge($this->getSortingPillsClearSortButtonAttributes)
161161
->class([
162-
'text-white ml-2' => $this->getSortingPillsClearSortButtonAttributes()['default-styling'],
162+
'text-white ml-2' => $this->getSortingPillsClearSortButtonAttributes['default-styling'],
163163
])
164164
->except(['default-styling', 'default-colors'])
165165
}}
@@ -174,9 +174,9 @@ class="focus:outline-none active:outline-none"
174174
href="#"
175175
wire:click.prevent="clearSorts"
176176
{{
177-
$attributes->merge($this->getSortingPillsClearAllButtonAttributes())
177+
$attributes->merge($this->getSortingPillsClearAllButtonAttributes)
178178
->class([
179-
'badge badge-pill badge-light' => $this->getSortingPillsClearAllButtonAttributes()['default-styling'],
179+
'badge badge-pill badge-light' => $this->getSortingPillsClearAllButtonAttributes['default-styling'],
180180
])
181181
->except(['default-styling', 'default-colors'])
182182
}}
@@ -202,9 +202,9 @@ class="focus:outline-none active:outline-none"
202202
<span
203203
wire:key="{{ $tableName }}-sorting-pill-{{ $columnSelectName }}"
204204
{{
205-
$attributes->merge($this->getSortingPillsItemAttributes())
205+
$attributes->merge($this->getSortingPillsItemAttributes)
206206
->class([
207-
'badge rounded-pill bg-info d-inline-flex align-items-center' => $this->getSortingPillsItemAttributes()['default-styling'],
207+
'badge rounded-pill bg-info d-inline-flex align-items-center' => $this->getSortingPillsItemAttributes['default-styling'],
208208
])
209209
->except(['default-styling', 'default-colors'])
210210
}}
@@ -215,9 +215,9 @@ class="focus:outline-none active:outline-none"
215215
href="#"
216216
wire:click="clearSort('{{ $columnSelectName }}')"
217217
{{
218-
$attributes->merge($this->getSortingPillsClearSortButtonAttributes())
218+
$attributes->merge($this->getSortingPillsClearSortButtonAttributes)
219219
->class([
220-
'text-white ms-2' => $this->getSortingPillsClearSortButtonAttributes()['default-styling'],
220+
'text-white ms-2' => $this->getSortingPillsClearSortButtonAttributes['default-styling'],
221221
])
222222
->except(['default-styling', 'default-colors'])
223223
}}
@@ -232,9 +232,9 @@ class="focus:outline-none active:outline-none"
232232
href="#"
233233
wire:click.prevent="clearSorts"
234234
{{
235-
$attributes->merge($this->getSortingPillsClearAllButtonAttributes())
235+
$attributes->merge($this->getSortingPillsClearAllButtonAttributes)
236236
->class([
237-
'badge rounded-pill bg-light text-dark text-decoration-none' => $this->getSortingPillsClearAllButtonAttributes()['default-styling'],
237+
'badge rounded-pill bg-light text-dark text-decoration-none' => $this->getSortingPillsClearAllButtonAttributes['default-styling'],
238238
])
239239
->except(['default-styling', 'default-colors'])
240240
}}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
'flex' => ($isTailwind && !$searchViewAttributes['icon']['hasSearchIcon']),
99
'tw4ph rounded-md shadow-sm' => $isTailwind4,
1010
'tw4ph flex' => ($isTailwind4 && !$searchViewAttributes['icon']['hasSearchIcon']),
11-
1211
'relative inline-flex flex-row' => $searchViewAttributes['icon']['hasSearchIcon'],
1312
])>
1413

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
@aware([ 'tableName','isTailwind','isTailwind4','isBootstrap', 'toolBarAttributes'])
1+
@aware([ 'tableName','isTailwind','isTailwind4','isBootstrap'])
22
@props([])
33

44
<div {{
5-
$toolBarAttributes->merge()
5+
$attributes->merge($this->getToolBarAttributes)
66
->class([
7-
'md:flex md:justify-between mb-4 px-4 md:p-0' => (($isTailwind) && ($toolBarAttributes['default-styling'] ?? true)),
8-
'd-md-flex justify-content-between mb-3' => (($isBootstrap) && ($toolBarAttributes['default-styling'] ?? true)),
7+
'md:flex md:justify-between mb-4 px-4 md:p-0' => (($isTailwind) && ($this->getToolBarAttributes['default-styling'] ?? true)),
8+
'd-md-flex justify-content-between mb-3' => (($isBootstrap) && ($this->getToolBarAttributes['default-styling'] ?? true)),
99
])
1010
->except(['default','default-styling','default-colors'])
1111
}}
@@ -29,15 +29,15 @@
2929
@endif
3030

3131
@if ($this->showSearchField())
32-
<x-livewire-tables::tools.toolbar.items.search.search :searchViewAttributes="$this->getSearchViewAttributes()" />
32+
<x-livewire-tables::tools.toolbar.items.search :searchViewAttributes="$this->getSearchViewAttributes()" />
3333
@endif
3434

3535
@if ($this->showFiltersButton())
3636
<x-livewire-tables::tools.toolbar.items.filter-button />
3737
@endif
3838

3939
@if($this->showActionsInToolbarLeft())
40-
<x-livewire-tables::includes.actions/>
40+
<x-livewire-tables::actions />
4141
@endif
4242

4343
@if ($this->hasConfigurableAreaFor('toolbar-left-end'))
@@ -64,7 +64,7 @@
6464
@endif
6565

6666
@if($this->showActionsInToolbarRight())
67-
<x-livewire-tables::includes.actions/>
67+
<x-livewire-tables::actions />
6868
@endif
6969

7070
@if ($this->columnSelectIsEnabled())

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
@aware(['isTailwind','isTailwind4', 'isBootstrap'])
2-
@props(['toolsAttributes', 'toolBarAttributes'])
3-
42

53
<div {{
6-
$attributes->merge(['x-data' => 'tools($wire)'])->merge($toolsAttributes)
4+
$attributes->merge($this->getToolsAttributes)->merge(['x-data' => 'tools($wire)'])
75
->class([
8-
'flex-col' => ($isTailwind && ($toolsAttributes['default-styling'] ?? true)),
9-
'tw4ph flex-col' => ($isTailwind4 && ($toolsAttributes['default-styling'] ?? true)),
10-
'd-flex flex-column' => $isBootstrap && ($toolsAttributes['default-styling'] ?? true),
6+
'flex-col' => ($isTailwind && ($this->getToolsAttributes['default-styling'] ?? true)),
7+
'tw4ph flex-col' => ($isTailwind4 && ($this->getToolsAttributes['default-styling'] ?? true)),
8+
'd-flex flex-column' => $isBootstrap && ($this->getToolsAttributes['default-styling'] ?? true),
119
])
1210
->except(['default','default-styling','default-colors'])
1311
}}
@@ -27,7 +25,7 @@
2725
)
2826

2927
@if($this->shouldShowToolBar())
30-
<x-livewire-tables::tools.toolbar />
28+
<x-livewire-tables::tools.toolbar />
3129
@endif
3230

3331
@if (

‎resources/views/datatable.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<x-livewire-tables::wrapper :$tableName :$primaryKey :$isTailwind :$isTailwind4 :$isBootstrap :$isBootstrap4 :$isBootstrap5 :$localisationPath :$collapsingColumnDetails :$collapsingColumnButtonExpandAttributes :$collapsingColumnButtonCollapseAttributes :$hasCollapsingColumns :$currentlyReorderingStatus :$hasDisplayLoadingPlaceholder :$coreTableAttributes :$selectedVisibleColumns :$showBulkActionsSections :$showCollapsingColumnSections :$hasTrAttributes :$collapsingColumnInfo :$filterGenericData :$hasTdAttributes >
1212
@if($this->hasActions() && !$this->showActionsInToolbar())
13-
<x-livewire-tables::includes.actions/>
13+
<x-livewire-tables::actions />
1414
@endif
1515

1616
@if($this->shouldShowTools())
@@ -21,7 +21,7 @@
2121
$this->getParametersForConfigurableArea('before-tools')
2222
)
2323

24-
<x-livewire-tables::tools :toolsAttributes="$this->getToolsAttributes()" :toolBarAttributes="$this->getToolBarAttributesBag()" />
24+
<x-livewire-tables::tools />
2525

2626

2727
@includeWhen(

0 commit comments

Comments
 (0)