Merge pull request #63 from Lakshan-Madushanka/fix

Fix loading state indicator styles overriding issue
Lakshan-Madushanka · Dec 1, 2024 · ac1221b · ac1221b
2 parents 25b7756 + 7a51161
commit ac1221b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/resources/views/components/button.blade.php b/resources/views/components/button.blade.php
@@ -31,7 +31,7 @@
         @endif
         type="button"
         disabled
-        {{ $attributes->merge(["class" => $class . $severity . "inline-flex justify-center items-center gap-x-2 font-semibold rounded border border-transparent text-white disabled:opacity-50 dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-gray-600"]) }}
+        {{ $attributes->merge(["class" => $class . $severity . "justify-center items-center gap-x-2 font-semibold rounded border border-transparent text-white disabled:opacity-50 dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-gray-600"]) }}
     >
         <span>{{ $slot }}</span>
         <x-comments::spin />
@@ -63,7 +63,7 @@
             @endif
             disabled
             type="button"
-            {{ $attributes->merge(["class" => $class . $severity . "inline-flex justify-center items-center gap-x-2 font-semibold rounded border border-transparent text-white disabled:opacity-50 dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-gray-600 cursor-not-allowed"]) }}
+            {{ $attributes->merge(["class" => $class . $severity . "justify-center items-center gap-x-2 font-semibold rounded border border-transparent text-white disabled:opacity-50 dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-gray-600 cursor-not-allowed"]) }}
         >
             <span>{{ $slot }}</span>
             <x-comments::spin />

diff --git a/resources/views/livewire/comment-item.blade.php b/resources/views/livewire/comment-item.blade.php
@@ -64,7 +64,7 @@ class="text-xs"
                             <x-comments::user-check height="14" width="14" />
                         </div>
 
-                        <x-comments::spin wire:loading wire:target="delete({{$comment}})" class="!text-blue-500" />
+                        <span wire:loading wire:target="delete({{$comment}})"><x-comments::spin class="!text-blue-500" /></span>
 
                         <div
                             x-data="{ showEditMenu: false }"

diff --git a/resources/views/livewire/comment-list.blade.php b/resources/views/livewire/comment-list.blade.php
@@ -67,7 +67,7 @@ class="lakm_commenter space-y-6"
         </div>
     </div>
 
-    <div wire:loading.flex class="flex items-center gap-x-2 sm:gap-x-4">
+    <div wire:loading.flex class="items-center gap-x-2 sm:gap-x-4">
         <div class="basis-14"></div>
         <x-comments::spin class="!size-5 !text-blue-500" />
     </div>

diff --git a/resources/views/livewire/comment-reply-item.blade.php b/resources/views/livewire/comment-reply-item.blade.php
@@ -62,7 +62,7 @@ class="text-xs"
                             <x-comments::user-check height="14" width="14" />
                         </div>
 
-                        <x-comments::spin wire:loading wire:target="delete({{$reply}})" class="!text-blue-500" />
+                        <span wire:loading wire:target="delete({{$reply}})"><x-comments::spin class="!text-blue-500" /></span>
 
                         <div
                             x-data="{ showEditMenu: false }"

diff --git a/resources/views/livewire/comment-reply-list.blade.php b/resources/views/livewire/comment-reply-list.blade.php
@@ -28,7 +28,7 @@
         </div>
     @endif
 
-    <div wire:loading.flex wire.target="setSortBy" class="flex items-center gap-x-2 sm:gap-x-4">
+    <div wire:loading.flex wire.target="setSortBy" class="items-center gap-x-2 sm:gap-x-4">
         <x-comments::spin class="!size-5 !text-blue-500" />
     </div>
 

diff --git a/tests/Livewire/CommentReplyItemTest.php b/tests/Livewire/CommentReplyItemTest.php
@@ -48,7 +48,7 @@
             'guestMode' => false
         ]
     )
-        ->assertSeeText($reply->ownerName(true))
+        ->assertSeeText(Str::limit($reply->ownerName(true), 25))
         ->assertOk();
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ @@
             </div>
         @endif
-        <div wire:loading.flex wire.target="setSortBy" class="flex items-center gap-x-2 sm:gap-x-4">
+        <div wire:loading.flex wire.target="setSortBy" class="items-center gap-x-2 sm:gap-x-4">
             <x-comments::spin class="!size-5 !text-blue-500" />
         </div>
@@ Expand Down @@