From 292ac8b544acf41159bf4372b4dd688fc97eecd7 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 25 Sep 2024 06:22:31 +0100
Subject: [PATCH 1/2] FixLoadingPlaceholderBug

---
 resources/views/components/includes/loading.blade.php | 8 ++++----
 resources/views/components/table/tr.blade.php         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/components/includes/loading.blade.php b/resources/views/components/includes/loading.blade.php
index c07d9cb19..99875b741 100644
--- a/resources/views/components/includes/loading.blade.php
+++ b/resources/views/components/includes/loading.blade.php
@@ -9,15 +9,15 @@
     @include($this->getLoadingPlaceHolderBlade(), ['colCount' => $colCount])
 @else
 
-    <tr wire:key="{{ $tableName }}-loader" class="hidden d-none"
+    <tr wire:key="{{ $tableName }}-loader"
     {{
         $attributes->merge($customAttributes['loader-wrapper'])
-            ->class(['w-full text-center h-screen place-items-center align-middle' => $isTailwind && ($customAttributes['loader-wrapper']['default'] ?? true)])
-            ->class(['w-100 text-center h-100 align-items-center' => $isBootstrap && ($customAttributes['loader-wrapper']['default'] ?? true)]);
+            ->class(['hidden w-full text-center h-screen place-items-center align-middle' => $isTailwind && ($customAttributes['loader-wrapper']['default'] ?? true)])
+            ->class(['d-none w-100 text-center h-100 align-items-center' => $isBootstrap && ($customAttributes['loader-wrapper']['default'] ?? true)]);
     }}
     wire:loading.class.remove="hidden d-none"
     >
-        <td colspan="{{ $colCount }}">
+        <td wire:key="{{ $tableName }}-loader-column" colspan="{{ $colCount }}">
             <div class="h-min self-center align-middle text-center">
                 <div class="lds-hourglass"
                 {{
diff --git a/resources/views/components/table/tr.blade.php b/resources/views/components/table/tr.blade.php
index 4a3f84ece..40ccde560 100644
--- a/resources/views/components/table/tr.blade.php
+++ b/resources/views/components/table/tr.blade.php
@@ -12,9 +12,9 @@
     x-on:dragover.prevent.throttle.500ms="currentlyReorderingStatus && dragOverEvent(event)"
     x-on:dragleave.prevent.throttle.500ms="currentlyReorderingStatus && dragLeaveEvent(event)"
     @if($this->hasDisplayLoadingPlaceholder()) 
-    wire:loading.remove
+        wire:loading.class.add="hidden d-none"
     @else
-    wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
+        wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
     @endif
     id="{{ $tableName }}-row-{{ $row->{$primaryKey} }}"
     :draggable="currentlyReorderingStatus"

From 79227b0fc1f986fc8a48f6c31a6f7ac83c8430cf Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Wed, 25 Sep 2024 06:30:59 +0100
Subject: [PATCH 2/2] Adjust tests for new Loading blade

---
 resources/views/components/includes/loading.blade.php  | 2 +-
 tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/components/includes/loading.blade.php b/resources/views/components/includes/loading.blade.php
index 99875b741..f22096321 100644
--- a/resources/views/components/includes/loading.blade.php
+++ b/resources/views/components/includes/loading.blade.php
@@ -17,7 +17,7 @@
     }}
     wire:loading.class.remove="hidden d-none"
     >
-        <td wire:key="{{ $tableName }}-loader-column" colspan="{{ $colCount }}">
+        <td colspan="{{ $colCount }}" wire:key="{{ $tableName }}-loader-column" >
             <div class="h-min self-center align-middle text-center">
                 <div class="lds-hourglass"
                 {{
diff --git a/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php b/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php
index 0f64aa5bf..5d93e3432 100644
--- a/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php
+++ b/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php
@@ -12,7 +12,7 @@ public function test_can_see_placeholder_section(): void
     {
         Livewire::test(PetsTableLoadingPlaceholder::class)
             ->call('setPerPageAccepted', [1, 5, 10])
-            ->assertSeeHtml('tr wire:key="table-loader" class="hidden d-none"')
+            ->assertSeeHtml('tr wire:key="table-loader')
             ->call('setPerPage', 5);
     }
 
@@ -21,7 +21,7 @@ public function test_can_see_placeholder_custom_text(): void
         Livewire::test(PetsTableLoadingPlaceholder::class)
             ->call('setPerPageAccepted', [1, 5, 10])
             ->assertSeeHtmlInOrder([
-                '<tr wire:key="table-loader" class="hidden d-none"',
+                '<tr wire:key="table-loader"',
                 '<td colspan="',
                 '<div class="h-min self-center align-middle text-center"',
                 '<div class="lds-hourglass"',