Skip to content

Commit 14f9db3

Browse files
lrljoelrljoe
committed
More Tweaks
1 parent 1d2b553 commit 14f9db3

File tree

85 files changed

+1363
-988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1363
-988
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ coverage.xml
2525
src/Views/Filters/Traits/IsExternalArrayFilter.php.bk
2626
.gitignore
2727
src/Views/Filters/Traits/IsExternalFilter.php.bk
28+
devguide.md
29+
retired.md

‎phpstan.neon‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ parameters:
1717
- identifier: argument.templateType
1818
- identifier: new.static
1919
- identifier: function.alreadyNarrowedType
20-
paths:
21-
- src/Views/Filters/MultiSelectDropdownFilter.php
22-
- src/Views/Filters/Traits/HasOptions.php
23-
- src/Views/Traits/Core/HasView.php
2420
- identifier: missingType.generics
2521
paths:
2622
- src/Traits/WithData.php

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
->class([
88
'bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => $isTailwind && ($attributes['default-colors'] ?? true),
99
'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),
10+
'tw4ph bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => $isTailwind4 && ($attributes['default-colors'] ?? true),
1111
'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),
1212
'dropdown-menu dropdown-menu-right w-100' => $isBootstrap4 && ($attributes['default-styling'] ?? true),
1313
'dropdown-menu dropdown-menu-end w-100' => $isBootstrap5 && ($attributes['default-styling'] ?? true),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
->class([
88
'bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => $isTailwind && ($attributes['default-colors'] ?? true),
99
'mt-1 py-1 w-full 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),
10+
'tw4ph bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => $isTailwind4 && ($attributes['default-colors'] ?? true),
1111
'tw4ph mt-1 py-1 w-full rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $isTailwind4 && ($attributes['default-styling'] ?? true),
1212
'dropdown-menu dropdown-menu-right w-100' => $isBootstrap4 && ($attributes['default-styling'] ?? true),
1313
'dropdown-menu dropdown-menu-end w-100' => $isBootstrap5 && ($attributes['default-styling'] ?? true),

‎resources/views/components/shared/button-icon.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
->class([
77
'text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:focus:text-white dark:focus:bg-gray-600 dark:hover:bg-gray-600' => $isTailwind && ($attributes['default-colors'] ?? true),
88
'flex flex-cols w-full px-4 py-2 text-sm focus:outline-none items-left text-left gap-2' => $isTailwind && ($attributes['default-styling'] ?? true),
9-
'twp4 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:hover:bg-gray-600' => $isTailwind4 && ($attributes['default-colors'] ?? true),
10-
'twp4 block w-full px-4 py-2 text-sm leading-5 focus:outline-none flex items-center space-x-2' => $isTailwind4 && ($attributes['default-styling'] ?? true),
9+
'tw4ph text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:hover:bg-gray-600' => $isTailwind4 && ($attributes['default-colors'] ?? true),
10+
'tw4ph block w-full px-4 py-2 text-sm leading-5 focus:outline-none flex items-center space-x-2' => $isTailwind4 && ($attributes['default-styling'] ?? true),
1111
])
1212
->except(['default-colors','default-styling'])
1313
}}>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
@endif
2424
</ul>
2525
@elseif($isTailwind)
26-
<div x-cloak x-show="filterPopoverOpen"
26+
<div wire:key="toolbaritem-filterpopover" x-cloak x-show="filterPopoverOpen" x-anchor.bottom-start="$refs.filterToolbarButton"
2727
{{
2828
$attributes
2929
->merge($filterPopoverAttributes)
@@ -40,7 +40,7 @@
4040
])
4141
->class([
4242
'w-full md:w-56' => $filterPopoverAttributes['default-width'] ?? true,
43-
'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,
43+
'mt-2 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $filterPopoverAttributes['default-styling'] ?? true,
4444
'bg-white divide-gray-100 ring-black dark:bg-gray-700 dark:text-white dark:divide-gray-600' => $filterPopoverAttributes['default-colors'] ?? true,
4545
])
4646
->except(['x-cloak', 'x-show', 'default','default-width', 'default-styling','default-colors'])
@@ -63,7 +63,7 @@
6363
@endif
6464
</div>
6565
@elseif($isTailwind4)
66-
<div x-cloak x-show="filterPopoverOpen"
66+
<div x-cloak x-show="filterPopoverOpen" x-anchor.bottom-start="$refs.filterToolbarButton"
6767
{{
6868
$attributes
6969
->merge($filterPopoverAttributes)
@@ -80,7 +80,7 @@
8080
])
8181
->class([
8282
'w-full md:w-56' => $filterPopoverAttributes['default-width'] ?? true,
83-
'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,
83+
'mt-2 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $filterPopoverAttributes['default-styling'] ?? true,
8484
'bg-white divide-gray-100 ring-black dark:bg-gray-700 dark:text-white dark:divide-gray-600' => $filterPopoverAttributes['default-colors'] ?? true,
8585
])
8686
->except(['x-cloak', 'x-show', 'default','default-width', 'default-styling','default-colors'])

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
@foreach($this->getLeftToolbarItems as $index => $toolbarItem)
1919
@include($toolbarItem['view'], array_merge(['wire:key' => $dataTableFingerprint.'-toolbarItem-left-'.$index], $toolbarItem['attributes']))
2020
@endforeach
21-
2221
</div>
2322

2423
<div x-cloak x-show="!currentlyReorderingStatus"

‎resources/views/includes/bulkactions/item.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
->class([
99
'text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:focus:text-white dark:focus:bg-gray-600 dark:hover:bg-gray-600' => $isTailwind && ($attributes['default-colors'] ?? true),
1010
'flex flex-cols w-full px-4 py-2 text-sm focus:outline-none items-left text-left gap-2' => $isTailwind && ($attributes['default-styling'] ?? true),
11-
'twp4 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:hover:bg-gray-600' => $isTailwind4 && ($attributes['default-colors'] ?? true),
12-
'twp4 block w-full px-4 py-2 text-sm leading-5 focus:outline-none flex items-center space-x-2' => $isTailwind4 && ($attributes['default-styling'] ?? true),
11+
'tw4ph text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:hover:bg-gray-600' => $isTailwind4 && ($attributes['default-colors'] ?? true),
12+
'tw4ph block w-full px-4 py-2 text-sm leading-5 focus:outline-none flex items-center space-x-2' => $isTailwind4 && ($attributes['default-styling'] ?? true),
1313
1414
])
1515
->except(['default-colors','default-styling'])

‎resources/views/includes/columns/boolean.blade.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
@class(
1111
[
1212
'inline-block h-5 w-5 text-green-500' => $isTailwind,
13+
'tw4ph inline-block h-5 w-5 text-green-500' => $isTailwind4,
1314
'd-inline-block text-success laravel-livewire-tables-btn-small' => $isBootstrap
1415
]
1516
)
@@ -18,6 +19,7 @@
1819
<x-heroicon-o-check-circle @class(
1920
[
2021
'inline-block h-5 w-5 text-red-500' => $isTailwind,
22+
'tw4ph inline-block h-5 w-5 text-red-500' => $isTailwind4,
2123
'd-inline-block text-danger laravel-livewire-tables-btn-small' => $isBootstrap
2224
]
2325
)
@@ -36,6 +38,7 @@
3638
<x-heroicon-o-x-circle @class(
3739
[
3840
'inline-block h-5 w-5 text-green-500' => $isTailwind,
41+
'tw4ph inline-block h-5 w-5 text-green-500' => $isTailwind4,
3942
'd-inline-block text-success laravel-livewire-tables-btn-small' => $isBootstrap
4043
]
4144
)
@@ -44,6 +47,7 @@
4447
<x-heroicon-o-x-circle @class(
4548
[
4649
'inline-block h-5 w-5 text-red-500' => $isTailwind,
50+
'tw4ph inline-block h-5 w-5 text-red-500' => $isTailwind4,
4751
'd-inline-block text-danger laravel-livewire-tables-btn-small' => $isBootstrap
4852
]
4953
)

‎resources/views/includes/offline.blade.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,21 @@
1515
</div>
1616
</div>
1717
</div>
18+
@elseif($isTailwind4)
19+
<div wire:offline.class.remove="hidden" class="hidden">
20+
<div class="rounded-md bg-red-100 p-4 mb-4 dark:border-red-800 dark:bg-red-500">
21+
<div class="flex">
22+
<div class="flex-shrink-0">
23+
<x-heroicon-s-x-circle class="h-5 w-5 text-red-400 dark:text-white" />
24+
</div>
25+
<div class="ml-3">
26+
<h3 class="text-sm font-medium text-red-800 dark:text-white">
27+
{{ __($localisationPath.'You are not connected to the internet') }}.
28+
</h3>
29+
</div>
30+
</div>
31+
</div>
32+
</div>
1833
@elseif ($isBootstrap)
1934
<div wire:offline.class.remove="d-none" class="d-none">
2035
<div class="alert alert-danger d-flex align-items-center">

0 commit comments

Comments
 (0)