Skip to content

Commit 2d7f705

Browse files
authored
Fix Loading Placeholder Bug - Breaking Table (rappasoft#1969)
* FixLoadingPlaceholderBug * Adjust tests for new Loading blade
1 parent 2f4224b commit 2d7f705

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

resources/views/components/includes/loading.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
@include($this->getLoadingPlaceHolderBlade(), ['colCount' => $colCount])
1010
@else
1111

12-
<tr wire:key="{{ $tableName }}-loader" class="hidden d-none"
12+
<tr wire:key="{{ $tableName }}-loader"
1313
{{
1414
$attributes->merge($customAttributes['loader-wrapper'])
15-
->class(['w-full text-center h-screen place-items-center align-middle' => $isTailwind && ($customAttributes['loader-wrapper']['default'] ?? true)])
16-
->class(['w-100 text-center h-100 align-items-center' => $isBootstrap && ($customAttributes['loader-wrapper']['default'] ?? true)]);
15+
->class(['hidden w-full text-center h-screen place-items-center align-middle' => $isTailwind && ($customAttributes['loader-wrapper']['default'] ?? true)])
16+
->class(['d-none w-100 text-center h-100 align-items-center' => $isBootstrap && ($customAttributes['loader-wrapper']['default'] ?? true)]);
1717
}}
1818
wire:loading.class.remove="hidden d-none"
1919
>
20-
<td colspan="{{ $colCount }}">
20+
<td colspan="{{ $colCount }}" wire:key="{{ $tableName }}-loader-column" >
2121
<div class="h-min self-center align-middle text-center">
2222
<div class="lds-hourglass"
2323
{{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
x-on:dragover.prevent.throttle.500ms="currentlyReorderingStatus && dragOverEvent(event)"
1313
x-on:dragleave.prevent.throttle.500ms="currentlyReorderingStatus && dragLeaveEvent(event)"
1414
@if($this->hasDisplayLoadingPlaceholder())
15-
wire:loading.remove
15+
wire:loading.class.add="hidden d-none"
1616
@else
17-
wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
17+
wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
1818
@endif
1919
id="{{ $tableName }}-row-{{ $row->{$primaryKey} }}"
2020
:draggable="currentlyReorderingStatus"

tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public function test_can_see_placeholder_section(): void
1212
{
1313
Livewire::test(PetsTableLoadingPlaceholder::class)
1414
->call('setPerPageAccepted', [1, 5, 10])
15-
->assertSeeHtml('tr wire:key="table-loader" class="hidden d-none"')
15+
->assertSeeHtml('tr wire:key="table-loader')
1616
->call('setPerPage', 5);
1717
}
1818

@@ -21,7 +21,7 @@ public function test_can_see_placeholder_custom_text(): void
2121
Livewire::test(PetsTableLoadingPlaceholder::class)
2222
->call('setPerPageAccepted', [1, 5, 10])
2323
->assertSeeHtmlInOrder([
24-
'<tr wire:key="table-loader" class="hidden d-none"',
24+
'<tr wire:key="table-loader"',
2525
'<td colspan="',
2626
'<div class="h-min self-center align-middle text-center"',
2727
'<div class="lds-hourglass"',

0 commit comments

Comments
 (0)