Skip to content

Commit f61035b

Browse files
lrljoelrljoe
committed
Tighter class definitions (TW4 Prep)
1 parent 35f9acd commit f61035b

File tree

9 files changed

+87
-66
lines changed

9 files changed

+87
-66
lines changed

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@
44
{{
55
$attributes
66
->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-
'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 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-
])
7+
->class($isTailwind ? [
8+
'bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => ($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' => ($attributes['default-styling'] ?? true),
10+
]: [])
11+
->class($isTailwind4 ? [
12+
'bg-white dark:bg-gray-700 dark:text-white ring-black divide-gray-100 dark:divide-gray-400' => ($attributes['default-colors'] ?? true),
13+
'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' => ($attributes['default-styling'] ?? true),
14+
15+
]: [])
16+
->class($isBootstrap4 ? [
17+
'dropdown-menu dropdown-menu-right w-100' => ($attributes['default-styling'] ?? true),
18+
]: [])
19+
->class($isBootstrap5 ? [
20+
'dropdown-menu dropdown-menu-end w-100' => ($attributes['default-styling'] ?? true),
21+
]: [])
1522
->except(['default','default-styling','default-colors'])
1623
}}
1724
>

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
@aware(['isTailwind','isTailwind4','isBootstrap','bulkActionsRowButtonAttributes'])
1+
@aware(['isTailwind','isTailwind4','isBootstrap','isBootstrap4','isBootstrap5','bulkActionsRowButtonAttributes'])
22
@props(['bulkActionsRowButtonAttributes'])
33
<button {{
44
$attributes->merge([
55
'wire:loading.attr' => 'disabled',
66
'type' => 'button',
77
])
88
->merge($bulkActionsRowButtonAttributes)
9-
->class(
10-
[
11-
'ml-1 underline text-sm leading-5 font-medium focus:outline-none focus:underline transition duration-150 ease-in-out' => $isTailwind && ($bulkActionsRowButtonAttributes['default-styling'] ?? true),
12-
'text-blue-600 text-gray-700 focus:text-gray-800 dark:text-white dark:hover:text-gray-400' => $isTailwind && ($bulkActionsRowButtonAttributes['default-colors'] ?? true),
13-
'tw4ph ml-1 underline text-sm leading-5 font-medium focus:outline-none focus:underline transition duration-150 ease-in-out' => $isTailwind4 && ($bulkActionsRowButtonAttributes['default-styling'] ?? true),
14-
'tw4ph text-blue-600 text-gray-700 focus:text-gray-800 dark:text-white dark:hover:text-gray-400' => $isTailwind4 && ($bulkActionsRowButtonAttributes['default-colors'] ?? true),
15-
'btn btn-primary btn-sm' => $isBootstrap && ($bulkActionsRowButtonAttributes['default-styling'] ?? true)
16-
]
17-
)
9+
->class($isTailwind ? [
10+
'ml-1 underline text-sm leading-5 font-medium focus:outline-none focus:underline transition duration-150 ease-in-out' => ($bulkActionsRowButtonAttributes['default-styling'] ?? true),
11+
'text-blue-600 text-gray-700 focus:text-gray-800 dark:text-white dark:hover:text-gray-400' => ($bulkActionsRowButtonAttributes['default-colors'] ?? true),
12+
]: [])
13+
->class($isTailwind4 ? [
14+
'ml-1 underline text-sm leading-5 font-medium focus:outline-none focus:underline transition duration-150 ease-in-out' => ($bulkActionsRowButtonAttributes['default-styling'] ?? true),
15+
'text-blue-600 text-gray-700 focus:text-gray-800 dark:text-white dark:hover:text-gray-400' => ($bulkActionsRowButtonAttributes['default-colors'] ?? true),
16+
]: [])
17+
->class($isBootstrap4 ? [
18+
'btn btn-primary btn-sm' => ($bulkActionsRowButtonAttributes['default-styling'] ?? true),
19+
]: [])
20+
->class($isBootstrap5 ? [
21+
'btn btn-primary btn-sm' => ($bulkActionsRowButtonAttributes['default-styling'] ?? true),
22+
]: [])
1823
->except(['default','default-colors','default-styling'])
24+
1925
}}
2026
>
2127
{{ $slot }}
22-
</button>
28+
</button>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
'min-w-full divide-y' => ($attributes['default-styling'] ?? ($attributes['default'] ?? true)),
99
] : [])
1010
->class($isTailwind4 ? [
11-
'tw4ph rappasoft-livewire-table-new',
12-
'tw4ph divide-gray-200 dark:divide-none' => ($attributes['default-colors'] ?? ($attributes['default'] ?? true)),
13-
'tw4ph min-w-full divide-y' => ($attributes['default-styling'] ?? ($attributes['default'] ?? true)),
11+
'rappasoft-livewire-table-new',
12+
'divide-gray-200 dark:divide-none' => ($attributes['default-colors'] ?? ($attributes['default'] ?? true)),
13+
'min-w-full divide-y' => ($attributes['default-styling'] ?? ($attributes['default'] ?? true)),
1414
] : [])
1515
->class($isBootstrap ? [
1616
'' => ($attributes['default-colors'] ?? ($attributes['default'] ?? true)),

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
'cursor-pointer' => ($isClickable && ($tableRowDetails['url'] !== null && ($tableRowDetails['attributes']['default'] ?? true))),
1818
] : [])
1919
->class($isTailwind4 ? [
20-
'tw4ph whitespace-wrap' => (!$wrapText && $isHtml) && ($customAttributes['default-styling'] ?? true),
21-
'tw4ph whitespace-nowrap' => (!$wrapText && !$isHtml) && ($customAttributes['default-styling'] ?? true),
22-
'tw4ph px-6 py-4 text-sm font-medium' => ($customAttributes['default-styling'] ?? true),
23-
'tw4ph dark:text-white' => ($customAttributes['default-colors'] ?? true),
24-
'tw4ph cursor-pointer' => ($isClickable && ($tableRowDetails['url'] !== null && ($tableRowDetails['attributes']['default'] ?? true))),
20+
'whitespace-wrap' => (!$wrapText && $isHtml) && ($customAttributes['default-styling'] ?? true),
21+
'whitespace-nowrap' => (!$wrapText && !$isHtml) && ($customAttributes['default-styling'] ?? true),
22+
'px-6 py-4 text-sm font-medium' => ($customAttributes['default-styling'] ?? true),
23+
'dark:text-white' => ($customAttributes['default-colors'] ?? true),
24+
'cursor-pointer' => ($isClickable && ($tableRowDetails['url'] !== null && ($tableRowDetails['attributes']['default'] ?? true))),
2525
] : [])
2626
->class($isBootstrap ? [
2727
'' => ($customAttributes['default'] ?? true),

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
'cursor-pointer' => ($isClickable && ($tableRowDetails['url'] !== null && ($tableRowDetails['attributes']['default'] ?? true))),
1616
] : [])
1717
->class($isTailwind4 ? [
18-
'tw4ph whitespace-wrap' => (!$wrapText && $isHtml) && ($customAttributes['default-styling'] ?? true),
19-
'tw4ph whitespace-nowrap' => (!$wrapText && !$isHtml) && ($customAttributes['default-styling'] ?? true),
20-
'tw4ph text-left' => $textAlign == 'left',
21-
'tw4ph text-center' => $textAlign == 'center',
22-
'tw4ph text-right' => $textAlign == 'right',
23-
'tw4ph px-6 py-4 text-sm font-medium' => ($customAttributes['default-styling'] ?? true),
24-
'tw4ph dark:text-white' => ($customAttributes['default-colors'] ?? true),
25-
'tw4ph cursor-pointer' => ($isClickable && ($tableRowDetails['url'] !== null && ($tableRowDetails['attributes']['default'] ?? true))),
18+
'whitespace-wrap' => (!$wrapText && $isHtml) && ($customAttributes['default-styling'] ?? true),
19+
'whitespace-nowrap' => (!$wrapText && !$isHtml) && ($customAttributes['default-styling'] ?? true),
20+
'text-left' => $textAlign == 'left',
21+
'text-center' => $textAlign == 'center',
22+
'text-right' => $textAlign == 'right',
23+
'px-6 py-4 text-sm font-medium' => ($customAttributes['default-styling'] ?? true),
24+
'dark:text-white' => ($customAttributes['default-colors'] ?? true),
25+
'cursor-pointer' => ($isClickable && ($tableRowDetails['url'] !== null && ($tableRowDetails['attributes']['default'] ?? true))),
2626
] : [])
2727
->class($isBootstrap ? [
2828
'' => ($customAttributes['default'] ?? true),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
'shadow overflow-y-auto border-b sm:rounded-lg' => ($coreTableAttributes['wrapper']['default-styling'] ?? ($coreTableAttributes['wrapper']['default'] ?? false)),
77
] : [])
88
->class($isTailwind4 ? [
9-
'tw4ph border-gray-200 dark:border-gray-700' => ($coreTableAttributes['wrapper']['default-colors'] ?? ($coreTableAttributes['wrapper']['default'] ?? true)),
10-
'tw4ph shadow overflow-y-auto border-b sm:rounded-lg' => ($coreTableAttributes['wrapper']['default-styling'] ?? ($coreTableAttributes['wrapper']['default'] ?? false)),
9+
'border-gray-200 dark:border-gray-700' => ($coreTableAttributes['wrapper']['default-colors'] ?? ($coreTableAttributes['wrapper']['default'] ?? true)),
10+
'shadow overflow-y-auto border-b sm:rounded-lg' => ($coreTableAttributes['wrapper']['default-styling'] ?? ($coreTableAttributes['wrapper']['default'] ?? false)),
1111
] : [])
1212
->class($isBootstrap ? [
1313
'' => ($coreTableAttributes['wrapper']['default-colors'] ?? ($coreTableAttributes['wrapper']['default'] ?? true)),

‎resources/views/components/tools/filter-pills/buttons/reset-all.blade.php‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@
44
@if ($isTailwind || $isTailwind4)
55
<button
66
x-on:click.prevent="resetAllFilters"
7-
@class([
8-
'focus:outline-none active:outline-none' => $isTailwind,
9-
'tw4ph focus:outline-none active:outline-none' => $isTailwind4,
10-
])>
7+
@class($isTailwind ? [
8+
'focus:outline-none active:outline-none',
9+
] : [
10+
'focus:outline-none active:outline-none',
11+
]
12+
)>
1113
<span
1214
{{
1315
$attributes->merge($resetAllButtonAttributes)
14-
->class([
15-
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium' => $isTailwind && ($resetAllButtonAttributes['default-styling'] ?? true),
16-
'bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900' => $isTailwind && ($resetAllButtonAttributes['default-colors'] ?? true),
17-
'tw4ph inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium' => $isTailwind4 && ($resetAllButtonAttributes['default-styling'] ?? true),
18-
'tw4ph bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900' => $isTailwind4 && ($resetAllButtonAttributes['default-colors'] ?? true),
19-
])
16+
->class($isTailwind ? [
17+
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium' => ($resetAllButtonAttributes['default-styling'] ?? true),
18+
'bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900' => ($resetAllButtonAttributes['default-colors'] ?? true),
19+
] : [])
20+
->class($isTailwind4 ? [ [
21+
'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium' => ($resetAllButtonAttributes['default-styling'] ?? true),
22+
'bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900' => ($resetAllButtonAttributes['default-colors'] ?? true),
23+
] : [])
2024
->except(['default-styling', 'default-colors'])
2125
}}
2226
>

‎resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
<button
1010
{{
1111
$attributes->merge($filterButtonAttributes)
12-
->class([
13-
'flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none' => $isTailwind && $filterButtonAttributes['default-styling'],
14-
'text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white' => $isTailwind && $filterButtonAttributes['default-colors'],
15-
16-
'tw4ph flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none' => $isTailwind4 && $filterButtonAttributes['default-styling'],
17-
'tw4ph text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white' => $isTailwind4 && $filterButtonAttributes['default-colors'],
18-
19-
])
12+
->class($isTailwind ? [
13+
'flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none' => $filterButtonAttributes['default-styling'],
14+
'text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white' => $filterButtonAttributes['default-colors'],
15+
]: [])
16+
->class($isTailwind4 ? [
17+
'flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none' => $filterButtonAttributes['default-styling'],
18+
'text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white' => $filterButtonAttributes['default-colors'],
19+
]: [])
2020
->except(['default', 'default-colors', 'default-styling', 'default-text'])
2121
}}
2222
>

‎resources/views/components/tools/filter-pills/pills-item.blade.php‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,22 @@
99
<div x-data="filterPillsHandler(@js($filterPillData->getPillSetupData($filterKey,$shouldWatch)))" x-bind="trigger"
1010
wire:key="{{ $dataTableFingerprint }}-filter-pill-{{ $filterKey }}" {{
1111
$attributes->merge($filterPillsItemAttributes)
12-
->class([
13-
'inline-flex items-center px-2.5 py-0.5 rounded-full leading-4' => $isTailwind && ($filterPillsItemAttributes['default-styling'] ?? true),
12+
->class($isTailwind ? [
13+
'inline-flex items-center px-2.5 py-0.5 rounded-full leading-4' => ($filterPillsItemAttributes['default-styling'] ?? true),
1414
'text-xs font-medium' => $isTailwind && ($filterPillsItemAttributes['default-text'] ?? ($filterPillsItemAttributes['default-styling'] ?? true)),
15-
'bg-indigo-100 text-indigo-800 dark:bg-indigo-200 dark:text-indigo-900' => $isTailwind && ($filterPillsItemAttributes['default-colors'] ?? true),
16-
17-
'tw4ph inline-flex items-center px-2.5 py-0.5 rounded-full leading-4' => $isTailwind4 && ($filterPillsItemAttributes['default-styling'] ?? true),
18-
'tw4ph text-xs font-medium' => $isTailwind4 && ($filterPillsItemAttributes['default-text'] ?? ($filterPillsItemAttributes['default-styling'] ?? true)),
19-
'tw4ph bg-indigo-100 text-indigo-800 dark:bg-indigo-200 dark:text-indigo-900' => $isTailwind4 && ($filterPillsItemAttributes['default-colors'] ?? true),
20-
21-
'badge badge-pill badge-info d-inline-flex align-items-center' => $isBootstrap4 && ($filterPillsItemAttributes['default-styling'] ?? true),
22-
'badge rounded-pill bg-info d-inline-flex align-items-center' => $isBootstrap5 && ($filterPillsItemAttributes['default-styling'] ?? true),
23-
])
15+
'bg-indigo-100 text-indigo-800 dark:bg-indigo-200 dark:text-indigo-900' => ($filterPillsItemAttributes['default-colors'] ?? true),
16+
]: [])
17+
->class($isTailwind4 ? [
18+
'inline-flex items-center px-2.5 py-0.5 rounded-full leading-4' => ($filterPillsItemAttributes['default-styling'] ?? true),
19+
'text-xs font-medium' => $isTailwind4 && ($filterPillsItemAttributes['default-text'] ?? ($filterPillsItemAttributes['default-styling'] ?? true)),
20+
'bg-indigo-100 text-indigo-800 dark:bg-indigo-200 dark:text-indigo-900' => ($filterPillsItemAttributes['default-colors'] ?? true),
21+
]: [])
22+
->class($isBootstrap4 ? [
23+
'badge badge-pill badge-info d-inline-flex align-items-center' => ($filterPillsItemAttributes['default-styling'] ?? true),
24+
]: [])
25+
->class($isBootstrap5 ? [
26+
'badge rounded-pill bg-info d-inline-flex align-items-center' => ($filterPillsItemAttributes['default-styling'] ?? true),
27+
]: [])
2428
->except(['default', 'default-styling', 'default-colors'])
2529
}}
2630
>

0 commit comments

Comments
 (0)