From da3beabbb35514c3ade94e6f65ce2149c61462e4 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:47:01 +0100
Subject: [PATCH] Beta 6 - Dev to Master (#1444)

* Collapsing Header Fix (#1441)

* V3 - Additional Fixes for Collapsing header (#1443)

* Collapsing Header Fix

* Collapsing Fixes

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
Co-authored-by: Anthony Rappa <rappa819@gmail.com>
---
 CHANGELOG.md                                           |  2 +-
 resources/views/components/table/th.blade.php          |  8 ++++----
 .../views/components/table/th/row-contents.blade.php   | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bee30e88b..9b7138e54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
   - setBulkActionConfirmMessages 
   - setBulkActionDefaultConfirmationMessage
   - Localisation for confirmation message
-  - 
+
 ## [3.0.0-beta.4] - 2023-10-17
 - Introduction of Loading Placeholder
 - Docs livewire namespace fix [Here](https://github.com/rappasoft/laravel-livewire-tables/pull/1420)
diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php
index 1bdeb45cd..a7ebcd836 100644
--- a/resources/views/components/table/th.blade.php
+++ b/resources/views/components/table/th.blade.php
@@ -13,8 +13,8 @@
         $attributes->merge($customAttributes)
             ->class(['px-6 py-3 text-left text-xs font-medium whitespace-nowrap text-gray-500 uppercase tracking-wider dark:bg-gray-800 dark:text-gray-400' => $customAttributes['default'] ?? true])
             ->class(['hidden' => $column->shouldCollapseAlways()])
-            ->class(['hidden sm:table-cell' => $column->shouldCollapseOnMobile()])
-            ->class(['hidden md:table-cell' => $column->shouldCollapseOnTablet()])
+            ->class(['hidden md:table-cell' => $column->shouldCollapseOnMobile()])
+            ->class(['hidden lg:table-cell' => $column->shouldCollapseOnTablet()])
             ->except('default')
         }}
     >
@@ -50,8 +50,8 @@
         $attributes->merge($customAttributes)
             ->class(['' => $customAttributes['default'] ?? true])
             ->class(['d-none' => $column->shouldCollapseAlways()])
-            ->class(['d-none d-sm-table-cell' => $column->shouldCollapseOnMobile()])
-            ->class(['d-none d-md-table-cell' => $column->shouldCollapseOnTablet()])
+            ->class(['d-none d-md-table-cell' => $column->shouldCollapseOnMobile()])
+            ->class(['d-none d-lg-table-cell' => $column->shouldCollapseOnTablet()])
             ->except('default')
         }}
     >
diff --git a/resources/views/components/table/th/row-contents.blade.php b/resources/views/components/table/th/row-contents.blade.php
index 2e4ace3b4..2faf3e91e 100644
--- a/resources/views/components/table/th/row-contents.blade.php
+++ b/resources/views/components/table/th/row-contents.blade.php
@@ -7,8 +7,8 @@
             {{
                 $attributes
                     ->merge(['class' => 'table-cell dark:bg-gray-800 laravel-livewire-tables-reorderingMinimised'])
-                    ->class(['sm:hidden' => !$component->shouldCollapseOnMobile() && !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()])
-                    ->class(['md:hidden' => !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()])
+                    ->class(['sm:hidden' => !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()])
+                    ->class(['md:hidden' => !$component->shouldCollapseOnMobile() && !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()])
                     ->class(['lg:hidden' => !$component->shouldCollapseAlways()])
             }}
             :class="{ 'laravel-livewire-tables-reorderingMinimised': ! currentlyReorderingStatus }"
@@ -19,10 +19,10 @@
             {{
                 $attributes
                     ->merge(['class' => 'd-table-cell laravel-livewire-tables-reorderingMinimised'])
-                    ->class(['d-sm-none' => !$component->shouldCollapseOnMobile() && !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()])
-                    ->class(['d-md-none' => !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()])
+                    ->class(['d-sm-none' => !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()])
+                    ->class(['d-md-none' => !$component->shouldCollapseOnMobile() && !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()])
                     ->class(['d-lg-none' => !$component->shouldCollapseAlways()])
-            }}
+            }}                    
             :class="{ 'laravel-livewire-tables-reorderingMinimised': ! currentlyReorderingStatus }"
         ></th>
     @endif