Skip to content

Commit b2c1b1c

Browse files
lrljoelrljoe
committed
Tweaks To Collapse Behaviours
1 parent 95a3c54 commit b2c1b1c

File tree

7 files changed

+63
-66
lines changed

7 files changed

+63
-66
lines changed

‎resources/views/components/table/td/bulk-actions.blade.php‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
@aware([ 'tableName','primaryKey', 'isTailwind', 'isBootstrap', 'isBootstrap4', 'isBootstrap5'])
2-
@props(['row', 'rowIndex'])
3-
4-
@php
5-
$tdAttributes = $this->getBulkActionsTdAttributes();
6-
$tdCheckboxAttributes = $this->getBulkActionsTdCheckboxAttributes();
7-
@endphp
1+
@aware([ 'tableName', 'isTailwind', 'rowPk', 'tdAttributes', 'tdCheckboxAttributes'])
82

93
@if ($this->showBulkActionsSections())
10-
<x-livewire-tables::table.td.plain wire:key="{{ $tableName }}-tbody-td-bulk-actions-td-{{ $row->{$primaryKey} }}" :displayMinimisedOnReorder="true" :customAttributes=$tdAttributes>
11-
<div @class([
12-
'inline-flex rounded-md shadow-sm' => $isTailwind,
13-
'form-check' => $isBootstrap5,
4+
<x-livewire-tables::table.td.plain wire:key="{{ $tableName }}-tbody-td-bulk-actions-td-{{ $rowPk }}" :displayMinimisedOnReorder="true" :customAttributes=$tdAttributes>
5+
<div @class($isTailwind ? [
6+
'inline-flex rounded-md shadow-sm',
7+
] : [
8+
'form-check',
149
])>
1510
<x-livewire-tables::forms.checkbox
16-
wire:key="{{ $tableName . 'selectedItems-'.$row->{$primaryKey} }}"
17-
value="{{ $row->{$primaryKey} }}"
11+
wire:key="{{ $tableName . 'selectedItems-'.$rowPk }}"
12+
value="{{ $rowPk }}"
1813
:checkboxAttributes=$tdCheckboxAttributes
1914
/>
2015
</div>

‎resources/views/components/table/td/collapsed-columns.blade.php‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
1-
@aware([ 'tableName','isTailwind','isBootstrap','rowIndex'])
1+
@aware([ 'tableName','isTailwind','isBootstrap','rowIndex', 'collapsingColumnButtonExpandAttributes','collapsingColumnButtonCollapseAttributes','hasCollapsingColumns', 'shouldCollapseAlways','shouldCollapseOnTablet','shouldCollapseOnMobile'])
22
@props(['hidden' => false])
3-
@if ($this->collapsingColumnsAreEnabled() && $this->hasCollapsedColumns())
4-
@php($collapsingColumnButtonExpandAttributes= $this->getCollapsingColumnButtonExpandAttributes())
5-
@php($collapsingColumnButtonCollapseAttributes= $this->getCollapsingColumnButtonCollapseAttributes())
3+
@if ($hasCollapsingColumns)
64

75
<td x-data="{open:false}" wire:key="{{ $tableName }}-collapsingIcon-{{ $rowIndex }}-{{ md5(now()) }}"
86
{{
97
$attributes
108
->merge()
119
->class($isTailwind ? [
1210
'p-3 table-cell text-center',
13-
'sm:hidden' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet(),
14-
'md:hidden' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile(),
15-
'lg:hidden' => !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile()),
11+
'sm:hidden' => !$shouldCollapseAlways && !$shouldCollapseOnTablet,
12+
'md:hidden' => !$shouldCollapseAlways && !$shouldCollapseOnTablet && $shouldCollapseOnMobile,
13+
'lg:hidden' => !$shouldCollapseAlways && ($shouldCollapseOnTablet || $shouldCollapseOnMobile),
1614
] :
1715
[
18-
'd-sm-none' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet(),
19-
'd-md-none' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile(),
20-
'd-lg-none' => !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile()),
16+
'd-sm-none' => !$shouldCollapseAlways && !$shouldCollapseOnTablet,
17+
'd-md-none' => !$shouldCollapseAlways && !$shouldCollapseOnTablet && $shouldCollapseOnMobile,
18+
'd-lg-none' => !$shouldCollapseAlways && ($shouldCollapseOnTablet || $shouldCollapseOnMobile),
2119
2220
])
2321
}}

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,18 @@
1212

1313
<th {{
1414
$attributes->merge($customThAttributes)
15-
->class([
16-
'text-gray-500 dark:bg-gray-800 dark:text-gray-400' => $isTailwind && (($customThAttributes['default-colors'] ?? true) || ($customThAttributes['default'] ?? true)),
17-
'px-6 py-3 text-left text-xs font-medium whitespace-nowrap uppercase tracking-wider' => $isTailwind && (($customThAttributes['default-styling'] ?? true) || ($customThAttributes['default'] ?? true)),
18-
'hidden' => $isTailwind && $column->shouldCollapseAlways(),
19-
'hidden md:table-cell' => $isTailwind && $column->shouldCollapseOnMobile(),
20-
'hidden lg:table-cell' => $isTailwind && $column->shouldCollapseOnTablet(),
21-
'' => $isBootstrap && ($customThAttributes['default'] ?? true),
22-
'd-none' => $isBootstrap && $column->shouldCollapseAlways(),
23-
'd-none d-md-table-cell' => $isBootstrap && $column->shouldCollapseOnMobile(),
24-
'd-none d-lg-table-cell' => $isBootstrap && $column->shouldCollapseOnTablet(),
15+
->class($isTailwind ?
16+
[
17+
'text-gray-500 dark:bg-gray-800 dark:text-gray-400' => (($customThAttributes['default-colors'] ?? true) || ($customThAttributes['default'] ?? true)),
18+
'px-6 py-3 text-left text-xs font-medium whitespace-nowrap uppercase tracking-wider' => (($customThAttributes['default-styling'] ?? true) || ($customThAttributes['default'] ?? true)),
19+
'hidden' => $column->shouldCollapseAlways(),
20+
'hidden md:table-cell' => $column->shouldCollapseOnMobile(),
21+
'hidden lg:table-cell' => $column->shouldCollapseOnTablet(),
22+
] : [
23+
'' => ($customThAttributes['default'] ?? true),
24+
'd-none' => $column->shouldCollapseAlways(),
25+
'd-none d-md-table-cell' => $column->shouldCollapseOnMobile(),
26+
'd-none d-lg-table-cell' => $column->shouldCollapseOnTablet(),
2527
])
2628
->except(['default', 'default-colors', 'default-styling'])
2729
}}>

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@
2222
loopType="{{ ($rowIndex % 2 === 0) ? 'even' : 'odd' }}"
2323
{{
2424
$attributes->merge($customAttributes)
25-
->class([
26-
'bg-white dark:bg-gray-700 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 === 0),
27-
'bg-gray-50 dark:bg-gray-800 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 !== 0),
28-
'cursor-pointer' => ($isTailwind && $this->hasTableRowUrl() && ($customAttributes['default'] ?? true)),
29-
'bg-light rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 === 0 && ($customAttributes['default'] ?? true)),
30-
'bg-white rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true)),
25+
->class($isTailwind ? [
26+
'bg-white dark:bg-gray-700 dark:text-white rappasoft-striped-row' => (($customAttributes['default'] ?? true) && $rowIndex % 2 === 0),
27+
'bg-gray-50 dark:bg-gray-800 dark:text-white rappasoft-striped-row' => (($customAttributes['default'] ?? true) && $rowIndex % 2 !== 0),
28+
'cursor-pointer' => ($this->hasTableRowUrl() && ($customAttributes['default'] ?? true)),
29+
] :
30+
[
31+
'bg-light rappasoft-striped-row' => ($rowIndex % 2 === 0 && ($customAttributes['default'] ?? true)),
32+
'bg-white rappasoft-striped-row' => ($rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true)),
33+
3134
])
3235
->except(['default','default-styling','default-colors'])
3336
}}

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

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,18 @@
11
@aware(['isTailwind','isBootstrap'])
22
@props(['customAttributes' => [], 'displayMinimisedOnReorder' => true, 'rowIndex' => "-1" ])
33

4-
@if ($isTailwind)
5-
<tr {{ $attributes
6-
->merge($customAttributes)
7-
->class([
8-
'laravel-livewire-tables-reorderingMinimised',
9-
'bg-white dark:bg-gray-700 dark:text-white' => ($customAttributes['default'] ?? true),
10-
])
11-
->except(['default','default-styling','default-colors'])
12-
}}
13-
>
14-
{{ $slot }}
15-
</tr>
16-
@elseif ($isBootstrap)
17-
<tr {{ $attributes
18-
->merge($customAttributes)
19-
->class([
20-
'laravel-livewire-tables-reorderingMinimised',
21-
'' => $customAttributes['default'] ?? true,
22-
])
23-
->except(['default','default-styling','default-colors'])
24-
}}
25-
>
26-
{{ $slot }}
27-
</tr>
28-
@endif
4+
<tr {{ $attributes
5+
->merge($customAttributes)
6+
->class($isTailwind ? [
7+
'laravel-livewire-tables-reorderingMinimised',
8+
'bg-white dark:bg-gray-700 dark:text-white' => ($customAttributes['default'] ?? true),
9+
] :
10+
[
11+
'laravel-livewire-tables-reorderingMinimised',
12+
'' => $customAttributes['default'] ?? true,
13+
])
14+
->except(['default','default-styling','default-colors'])
15+
}}
16+
>
17+
{{ $slot }}
18+
</tr>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@props(['component', 'tableName', 'primaryKey', 'isTailwind', 'isBootstrap','isBootstrap4', 'isBootstrap5', 'collapsingColumnDetails'])
1+
@props(['component', 'tableName', 'primaryKey', 'isTailwind', 'isBootstrap','isBootstrap4', 'isBootstrap5', 'collapsingColumnDetails', 'tdAttributes', 'tdCheckboxAttributes', 'collapsingColumnButtonExpandAttributes', 'collapsingColumnButtonCollapseAttributes', 'hasCollapsingColumns', 'shouldCollapseAlways', 'shouldCollapseOnTablet', 'shouldCollapseOnMobile'])
22
<div wire:key="{{ $tableName }}-wrapper" >
33
<div {{ $attributes->merge($this->getComponentWrapperAttributes()) }}
44
@if ($this->hasRefresh()) wire:poll{{ $this->getRefreshOptions() }} @endif

‎resources/views/datatable.blade.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@
1212
@php($showCollapsingColumnSections = $this->showCollapsingColumnSections)
1313
@php($selectedVisibleColumns = $this->selectedVisibleColumns)
1414
@php($collapsingColumnDetails = $this->getCollapsedColumnsForContentNew())
15+
@php($tdAttributes = $this->getBulkActionsTdAttributes())
16+
@php($tdCheckboxAttributes = $this->getBulkActionsTdCheckboxAttributes())
17+
@php($collapsingColumnButtonExpandAttributes = $this->getCollapsingColumnButtonExpandAttributes())
18+
@php($collapsingColumnButtonCollapseAttributes = $this->getCollapsingColumnButtonCollapseAttributes())
19+
@php($hasCollapsingColumns = ($this->collapsingColumnsAreEnabled() && $this->hasCollapsedColumns()))
20+
@php($shouldCollapseAlways = $this->shouldCollapseAlways())
21+
@php($shouldCollapseOnTablet = $this->shouldCollapseOnTablet())
22+
@php($shouldCollapseOnMobile = $this->shouldCollapseOnMobile())
23+
1524

1625
<div>
1726
<div x-data="{ currentlyReorderingStatus: false }">
@@ -23,7 +32,7 @@
2332
$this->getParametersForConfigurableArea('before-wrapper')
2433
)
2534

26-
<x-livewire-tables::wrapper :$tableName :$primaryKey :$isTailwind :$isBootstrap :$isBootstrap4 :$isBootstrap5 :$localisationPath :$collapsingColumnDetails>
35+
<x-livewire-tables::wrapper :$tableName :$primaryKey :$isTailwind :$isBootstrap :$isBootstrap4 :$isBootstrap5 :$localisationPath :$collapsingColumnDetails :$tdAttributes :$tdCheckboxAttributes :$collapsingColumnButtonExpandAttributes :$collapsingColumnButtonCollapseAttributes :$hasCollapsingColumns :$shouldCollapseAlways :$shouldCollapseOnTablet :$shouldCollapseOnMobile>
2736
@if($this->hasActions() && !$this->showActionsInToolbar())
2837
<x-livewire-tables::includes.actions/>
2938
@endif

0 commit comments

Comments
 (0)