Skip to content

Commit cdb4578

Browse files
lrljoelrljoe
committed
Further Adjustments - Note Pagination Broken
1 parent 4c0e3ea commit cdb4578

29 files changed

+640
-214
lines changed

‎resources/lang/json/en.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"livewire-tables::Actions": "Actions",
23
"livewire-tables::All": "All",
34
"livewire-tables::All Columns": "All Columns",
45
"livewire-tables::Applied Filters": "Applied Filters",

‎resources/lang/php/en/core.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
return [
4+
'Actions' => 'Actions',
45
'All' => 'All',
56
'All Columns' => 'All Columns',
67
'Applied Filters' => 'Applied Filters',

‎resources/views/components/bulk-actions/menu/body.blade.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
@aware([ 'tableName','isTailwind','isTailwind4','isBootstrap','isBootstrap4','isBootstrap5', 'localisationPath'])
2+
{{-- This is used for the Bulk Actions Dropdown Menu Body --}}
3+
<div :aria-expanded="open"
4+
{{
5+
$attributes
6+
->merge()
7+
->class([
8+
'bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => $isTailwind && ($attributes['default-colors'] ?? true),
9+
'mt-1 py-1 w-full md:w-48 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $isTailwind && ($attributes['default-styling'] ?? true),
10+
'twph4 bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => $isTailwind && ($attributes['default-colors'] ?? true),
11+
'tw4ph mt-1 py-1 w-full md:w-48 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $isTailwind4 && ($attributes['default-styling'] ?? true),
12+
'dropdown-menu dropdown-menu-right w-100' => $isBootstrap4 && ($attributes['default-styling'] ?? true),
13+
'dropdown-menu dropdown-menu-end w-100' => $isBootstrap5 && ($attributes['default-styling'] ?? true),
14+
])
15+
->except(['default','default-styling','default-colors'])
16+
}}
17+
>
18+
{{ $slot }}
19+
</div>

‎resources/views/components/bulk-actions/menu/button.blade.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@aware(['isTailwind','isTailwind4', 'localisationPath'])
2+
{{-- This is used for the Bulk Actions Dropdown Menu Button --}}
3+
<x-livewire-tables::forms.button {{ $attributes }}>
4+
{{ __($localisationPath.'Bulk Actions') }}
5+
6+
@if($isTailwind || $isTailwind4)
7+
<x-heroicon-m-chevron-down class="-mr-1 ml-2 h-5 w-5" />
8+
@endif
9+
</x-livewire-tables::forms.button>

‎resources/views/components/dropdown/body.blade.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
@aware([ 'tableName','isTailwind','isTailwind4','isBootstrap','isBootstrap4','isBootstrap5', 'localisationPath'])
2+
{{-- This is used for the Dropdown Menu Body --}}
3+
<div :aria-expanded="open"
4+
{{
5+
$attributes
6+
->merge()
7+
->class([
8+
'bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => $isTailwind && ($attributes['default-colors'] ?? true),
9+
'mt-1 py-1 w-full md:w-48 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $isTailwind && ($attributes['default-styling'] ?? true),
10+
'twph4 bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => $isTailwind && ($attributes['default-colors'] ?? true),
11+
'tw4ph mt-1 py-1 w-full md:w-48 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $isTailwind4 && ($attributes['default-styling'] ?? true),
12+
'dropdown-menu dropdown-menu-right w-100' => $isBootstrap4 && ($attributes['default-styling'] ?? true),
13+
'dropdown-menu dropdown-menu-end w-100' => $isBootstrap5 && ($attributes['default-styling'] ?? true),
14+
])
15+
->except(['default','default-styling','default-colors'])
16+
}}
17+
>
18+
{{ $slot }}
19+
</div>

‎resources/views/components/dropdown/button.blade.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@aware(['isTailwind','isTailwind4','isBootstrap','isBootstrap4','isBootstrap5'])
2+
{{-- This is used for Buttons --}}
3+
<button
4+
{{
5+
$attributes->merge()
6+
->class([
7+
'btn dropdown-toggle d-block d-md-inline' => $isBootstrap && ($attributes['default-styling'] ?? true),
8+
'border-gray-300 bg-white text-gray-700 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' => $isTailwind && ($attributes['default-colors'] ?? true),
9+
'inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && ($attributes['default-styling'] ?? true),
10+
'tw4ph border-gray-300 bg-white text-gray-700 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' => $isTailwind4 && ($attributes['default-colors'] ?? true),
11+
'tw4ph inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind4 && ($attributes['default-styling'] ?? true),
12+
])
13+
->except(['default','default-styling','default-colors'])
14+
}}
15+
>
16+
{{ $slot }}
17+
</button>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@aware(['isTailwind','isTailwind4','isBootstrap','isBootstrap4','isBootstrap5'])
2+
<div x-data="{ open: false, childElementOpen: false }" x-cloak
3+
@class([
4+
'w-full md:w-auto mb-4 md:mb-0' => $isTailwind,
5+
'tw4ph w-full md:w-auto mb-4 md:mb-0' => $isTailwind4,
6+
'mb-3 mb-md-0' => $isBootstrap,
7+
])
8+
>
9+
<div @class([
10+
'relative inline-block text-left z-10 w-full md:w-auto' => $isTailwind,
11+
'tw4ph relative inline-block text-left z-10 w-full md:w-auto' => $isTailwind4,
12+
'dropdown d-block d-md-inline' => $isBootstrap,
13+
])
14+
>
15+
{{ $slot }}
16+
</div>
17+
</div>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@aware(['isTailwind','isTailwind4','isBootstrap','isBootstrap4','isBootstrap5'])
2+
{{-- This is used for Buttons --}}
3+
<button
4+
{{
5+
$attributes->merge()
6+
->class([
7+
'btn dropdown-toggle d-block d-md-inline' => $isBootstrap && ($attributes['default-styling'] ?? true),
8+
'border-gray-300 bg-white text-gray-700 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' => $isTailwind && ($attributes['default-colors'] ?? true),
9+
'inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && ($attributes['default-styling'] ?? true),
10+
'tw4ph border-gray-300 bg-white text-gray-700 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' => $isTailwind4 && ($attributes['default-colors'] ?? true),
11+
'tw4ph inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind4 && ($attributes['default-styling'] ?? true),
12+
])
13+
->except(['default','default-styling','default-colors'])
14+
}}
15+
>
16+
{{ $slot }}
17+
</button>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@aware(['tableName','primaryKey', 'isTailwind', 'isTailwind4','isBootstrap', 'isBootstrap4', 'isBootstrap5'])
2-
@props(['checkboxAttributes'])
3-
<input x-cloak
2+
@props(['checkboxAttributes', 'shouldCheck' => false])
3+
<input x-cloak @checked($shouldCheck)
44
{{
5-
$attributes->merge($checkboxAttributes)->class([
5+
$attributes->merge(['type' => 'checkbox'])->merge($checkboxAttributes)->class([
66
// Tailwind 3
77
'border-gray-300 text-indigo-600 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' => $isTailwind && ($checkboxAttributes['default-colors'] ?? ($checkboxAttributes['default'] ?? true)),
88
'rounded shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($checkboxAttributes['default-styling'] ?? ($checkboxAttributes['default'] ?? true)),
@@ -15,4 +15,4 @@
1515
'form-check-input' => ($isBootstrap5) && ($checkboxAttributes['default'] ?? true),
1616
])->except(['default','default-styling','default-colors'])
1717
}}
18-
/>
18+
/>

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

Lines changed: 50 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,54 @@
1-
@aware(['isTailwind', 'isTailwind4', 'isBootstrap'])
1+
@aware(['isTailwind', 'isTailwind4', 'isBootstrap', 'tableName', 'localisationPath'])
22
@php($actionWrapperAttributes = $this->getActionWrapperAttributes())
33
@php($actionsPosition = $this->getActionsPosition())
44
@php($showActionsInToolbar = $this->showActionsInToolbar())
5+
@php($actions = $this->getActions())
56

6-
<div {{ $attributes
7-
->merge($actionWrapperAttributes)
8-
->class([
9-
'flex flex-cols py-2 space-x-2' => $isTailwind && ($actionWrapperAttributes['default-styling'] ?? true),
10-
'' => $isTailwind && ($actionWrapperAttributes['default-colors'] ?? true),
11-
'tw4ph flex flex-cols py-2 space-x-2' => $isTailwind4 && ($actionWrapperAttributes['default-styling'] ?? true),
12-
'tw4ph ' => $isTailwind4 && ($actionWrapperAttributes['default-colors'] ?? true),
13-
14-
15-
16-
'd-flex flex-cols py-2 space-x-2' => $isBootstrap && ($actionWrapperAttributes['default-styling'] ?? true),
17-
'' => $isBootstrap && ($actionWrapperAttributes['default-colors'] ?? true),
18-
19-
// All
20-
'justify-start' => $actionsPosition === 'left',
21-
'justify-center' => $actionsPosition === 'center',
22-
'justify-end' => $actionsPosition === 'right',
23-
'pl-2' => $showActionsInToolbar && $actionsPosition === 'left',
24-
'pr-2' => $showActionsInToolbar && $actionsPosition === 'right',
25-
])
26-
->except(['default','default-styling','default-colors'])
27-
}} >
28-
@foreach($this->getActions() as $action)
29-
{{ $action->render() }}
30-
@endforeach
31-
</div>
7+
@if($showActionsInToolbar && count($actions) >= 2)
8+
9+
<x-livewire-tables::dropdown.wrapper>
10+
{{-- The Button Used To Toggle The Menu --}}
11+
<x-livewire-tables::dropdown.button id="{{ $tableName }}-actionsDropdownButton" aria-controls="{{ $tableName }}-actionsDropdownBody" {{ $attributes->merge($this->getActionsButtonAttributes) }}>
12+
{{ __($localisationPath.'Actions') }}
13+
14+
@if($isTailwind || $isTailwind4)
15+
<x-heroicon-m-chevron-down class="-mr-1 ml-2 h-5 w-5" />
16+
@endif
17+
</x-livewire-tables::dropdown.button>
18+
19+
{{-- The Body of The Menu --}}
20+
<x-livewire-tables::dropdown.body id="{{ $tableName }}-actionsDropdownBody" aria-labelledby="{{ $tableName }}-actionsDropdownButton" {{ $attributes->merge($this->getActionsMenuAttributes) }}>
21+
@foreach($actions as $action)
22+
{{ $action->setInMenu(true)->render() }}
23+
@endforeach
24+
</x-livewire-tables::dropdown.body>
25+
</x-livewire-tables::dropdown.wrapper>
26+
27+
@else
28+
<div {{ $attributes
29+
->merge($actionWrapperAttributes)
30+
->class([
31+
'flex flex-cols py-2 space-x-2' => $isTailwind && ($actionWrapperAttributes['default-styling'] ?? true),
32+
'' => $isTailwind && ($actionWrapperAttributes['default-colors'] ?? true),
33+
'tw4ph flex flex-cols py-2 space-x-2' => $isTailwind4 && ($actionWrapperAttributes['default-styling'] ?? true),
34+
'tw4ph ' => $isTailwind4 && ($actionWrapperAttributes['default-colors'] ?? true),
35+
36+
'd-flex flex-cols py-2 space-x-2' => $isBootstrap && ($actionWrapperAttributes['default-styling'] ?? true),
37+
'' => $isBootstrap && ($actionWrapperAttributes['default-colors'] ?? true),
38+
39+
// All
40+
'justify-start' => $actionsPosition === 'left',
41+
'justify-center' => $actionsPosition === 'center',
42+
'justify-end' => $actionsPosition === 'right',
43+
'pl-2' => $showActionsInToolbar && $actionsPosition === 'left',
44+
'pr-2' => $showActionsInToolbar && $actionsPosition === 'right',
45+
])
46+
->except(['default','default-styling','default-colors'])
47+
}} >
48+
49+
@foreach($actions as $action)
50+
{{ $action->render() }}
51+
@endforeach
52+
53+
</div>
54+
@endif

0 commit comments

Comments
 (0)