Skip to content

Commit 953ebde

Browse files
lrljoelrljoe
committed
Cleanup of Create Command, and other items
1 parent 14f9db3 commit 953ebde

File tree

28 files changed

+410
-245
lines changed

28 files changed

+410
-245
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ src/Views/Filters/Traits/IsExternalArrayFilter.php.bk
2727
src/Views/Filters/Traits/IsExternalFilter.php.bk
2828
devguide.md
2929
retired.md
30+
*.php.bk

‎docs/columns/styling.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,3 +300,12 @@ public function configure(): void
300300
});
301301
}
302302
```
303+
304+
### via Attributes Callback
305+
306+
### Enabling/Disabling whitespace-wrap
307+
308+
```php
309+
Column::make("Name", "name")
310+
->wrapText(),
311+
```

‎phpstan.neon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ parameters:
2222
- src/Traits/WithData.php
2323
- identifier: empty.offset
2424
paths:
25-
- src/Traits/Filters/Helpers/FilterMenuHelpers.php
25+
- src/Features/Filters/Traits/Helpers/FilterMenuHelpers.php
2626
- identifier: isset.offset
2727
paths:
28-
- src/Traits/Filters/Helpers/FilterMenuHelpers.php
28+
- src/Features/Filters/Traits/Helpers/FilterMenuHelpers.php
2929
- message: '# \$view of function view expects view-string\|null, string given.#'

‎resources/css/laravel-livewire-tables.css‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,45 @@ label[dir=rtl] .range-slider {
412412
border-color: #000 transparent #000 transparent;
413413
}
414414

415+
.loader-spinner {
416+
border: 5px solid #FFF;
417+
border-bottom-color: transparent;
418+
border-radius: 50%;
419+
display: inline-block;
420+
box-sizing: border-box;
421+
animation: rotation 1s linear infinite;
422+
}
423+
424+
@keyframes rotation {
425+
0% {
426+
transform: rotate(0deg);
427+
}
428+
100% {
429+
transform: rotate(360deg);
430+
}
431+
}
432+
433+
.lds-hourglass-sm {
434+
display: inline-block;
435+
436+
}
437+
438+
.lds-hourglass-sm:after {
439+
content: " ";
440+
display: block;
441+
border-radius: 50%;
442+
width: 0;
443+
height: 0;
444+
margin: 2px;
445+
box-sizing: border-box;
446+
border-color: #fff transparent #fff transparent;
447+
animation: lds-hourglass 1.2s infinite
448+
}
449+
450+
.dark .lds-hourglass-sm:after {
451+
border: 12px solid #FFF;
452+
border-color: #000 transparent #000 transparent
453+
}
415454

416455
@keyframes lds-hourglass {
417456
0% {

‎resources/css/laravel-livewire-tables.min.css‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,23 @@ label[dir=rtl] .range-slider {
388388
.superhide {
389389
display: none;
390390
}
391+
.loader-spinner {
392+
border: 5px solid #FFF;
393+
border-bottom-color: transparent;
394+
border-radius: 50%;
395+
display: inline-block;
396+
box-sizing: border-box;
397+
animation: rotation 1s linear infinite;
398+
}
399+
400+
@keyframes rotation {
401+
0% {
402+
transform: rotate(0deg);
403+
}
404+
100% {
405+
transform: rotate(360deg);
406+
}
407+
}
391408

392409
.lds-hourglass {
393410
display: inline-block;
@@ -413,6 +430,28 @@ label[dir=rtl] .range-slider {
413430
}
414431

415432

433+
.lds-hourglass-sm {
434+
display: inline-block;
435+
436+
}
437+
438+
.lds-hourglass-sm:after {
439+
content: " ";
440+
display: block;
441+
border-radius: 50%;
442+
width: 0;
443+
height: 0;
444+
margin: 2px;
445+
box-sizing: border-box;
446+
border-color: #fff transparent #fff transparent;
447+
animation: lds-hourglass 1.2s infinite
448+
}
449+
450+
.dark .lds-hourglass-sm:after {
451+
border: 12px solid #FFF;
452+
border-color: #000 transparent #000 transparent
453+
}
454+
416455
@keyframes lds-hourglass {
417456
0% {
418457
transform: rotate(0);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
@if($isTailwind || $isTailwind4)
77
<x-heroicon-m-chevron-down class="-mr-1 ml-2 h-5 w-5" />
88
@endif
9-
</x-livewire-tables::forms.button>
9+
</x-livewire-tables::forms.button>
10+
11+

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
@aware([ 'dataTableFingerprint','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 w-full rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $isTailwind && ($attributes['default-styling'] ?? 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),
11+
'tw4ph mt-1 w-full 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/body.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
->merge()
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),
9-
'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),
9+
'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),
1010
'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),

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@aware([ 'rowIndex', 'rowID','isTailwind','isTailwind4','isBootstrap', 'collapsingColumnInfo'])
2-
@props(['column' => null, 'colIndex' => null, 'customAttributes' => [], 'displayMinimisedOnReorder' => false, 'hideUntilReorder' => false])
2+
@props(['column' => null, 'isHtml' => false, 'wrapText' => false, 'colIndex' => null, 'customAttributes' => [], 'displayMinimisedOnReorder' => false, 'hideUntilReorder' => false])
33

44
<td {{ $attributes
55
->merge($customAttributes)
@@ -9,6 +9,11 @@
99
->class([
1010
'px-6 py-4 whitespace-nowrap text-sm font-medium dark:text-white' => $isTailwind && ($customAttributes['default'] ?? true),
1111
'tw4ph px-6 py-4 whitespace-nowrap text-sm font-medium dark:text-white' => $isTailwind4 && ($customAttributes['default'] ?? true),
12+
13+
'whitespace-wrap' => ($wrapText || $isHtml) && $isTailwind && ($customAttributes['default'] ?? true),
14+
'whitespace-nowrap' => (!$wrapText && !$isHtml) && $isTailwind && ($customAttributes['default'] ?? true),
15+
16+
'px-6 py-4 text-sm font-medium dark:text-white' => $isTailwind && ($customAttributes['default'] ?? true),
1217
1318
'' => $isBootstrap && ($customAttributes['default'] ?? true),
1419
])

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,34 @@
11
@aware(['isTailwind','isTailwind4','isBootstrap', 'collapsingColumnInfo', 'tableRowDetails'])
2-
@props(['colIndex', 'isHtml' => false, 'isClickable' => false, 'customAttributes' => ['default' => true]])
2+
@props(['colIndex', 'isHtml' => false, 'wrapText' => false, 'isClickable' => false, 'customAttributes' => ['default' => true, 'default-colors' => true, 'default-styling' => true]])
33

44
<td {{
55
$attributes->merge($isClickable ? $tableRowDetails['tdAttribs'] : [])->merge($customAttributes)
66
->class([
7-
'whitespace-wrap' => $isHtml && $isTailwind && ($customAttributes['default'] ?? true),
8-
'whitespace-nowrap' => !$isHtml && $isTailwind && ($customAttributes['default'] ?? true),
9-
'px-6 py-4 text-sm font-medium dark:text-white' => $isTailwind && ($customAttributes['default'] ?? true),
7+
'whitespace-wrap' => $wrapText && $isTailwind,
8+
])
9+
->class([
10+
'whitespace-wrap' => (!$wrapText && $isHtml) && $isTailwind && ($customAttributes['default-styling'] ?? true),
11+
'whitespace-nowrap' => (!$wrapText && !$isHtml) && $isTailwind && ($customAttributes['default-styling'] ?? true),
12+
13+
'px-6 py-4 text-sm font-medium' => $isTailwind && ($customAttributes['default-styling'] ?? true),
14+
'dark:text-white' => $isTailwind && ($customAttributes['default-colors'] ?? true),
15+
16+
1017
'cursor-pointer' => $isTailwind && ($isClickable && ($tableRowDetails['url'] !== null && ($tableRowDetails['attributes']['default'] ?? true))),
11-
'tw4ph whitespace-wrap' => $isHtml && $isTailwind4 && ($customAttributes['default'] ?? true),
12-
'tw4ph whitespace-nowrap' => !$isHtml && $isTailwind4 && ($customAttributes['default'] ?? true),
13-
'tw4ph px-6 py-4 text-sm font-medium dark:text-white' => $isTailwind4 && ($customAttributes['default'] ?? true),
18+
19+
'tw4ph whitespace-wrap' => (!$wrapText && $isHtml) && $isTailwind4 && ($customAttributes['default-styling'] ?? true),
20+
'tw4ph whitespace-nowrap' => (!$wrapText && !$isHtml) && $isTailwind4 && ($customAttributes['default-styling'] ?? true),
21+
22+
'tw4ph px-6 py-4 text-sm font-medium' => $isTailwind4 && ($customAttributes['default-styling'] ?? true),
23+
'tw4ph dark:text-white' => $isTailwind4 && ($customAttributes['default-colors'] ?? true),
24+
1425
'tw4ph cursor-pointer' => $isTailwind4 && ($isClickable && ($tableRowDetails['url'] !== null && ($tableRowDetails['attributes']['default'] ?? true))),
1526
1627
'' => $isBootstrap && ($customAttributes['default'] ?? true),
1728
'laravel-livewire-tables-cursor' => $isBootstrap && $isClickable,
1829
])
1930
->class($collapsingColumnInfo['collapsingColumnClasses'][$colIndex] ?? '')
20-
->except(['default','default-styling','default-colors'])
31+
->except(['default','default-colors','default-styling'])
2132
}}
2233
>
2334
{{ $slot }}

0 commit comments

Comments
 (0)