Fix Collapsing Columns - View Point Break Incorrect (#1665)

* Collapsing Fix 1.0 * Fix styling * Hide Reorder When Not Reordering * Update Changelog & Version * Update Changelog --------- Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
rappasoft · Feb 24, 2024 · 52dac06 · 52dac06
1 parent f20721a
commit 52dac06
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/resources/views/components/table/td.blade.php b/resources/views/components/table/td.blade.php
@@ -15,12 +15,12 @@
             $attributes->merge($customAttributes)
                 ->class(['px-6 py-4 whitespace-nowrap text-sm font-medium dark:text-white' => $component->isTailwind() && ($customAttributes['default'] ?? true)])
                 ->class(['hidden' =>  $component->isTailwind() && $column && $column->shouldCollapseAlways()])
-                ->class(['hidden sm:table-cell' => $component->isTailwind() && $column && $column->shouldCollapseOnMobile()])
-                ->class(['hidden md:table-cell' => $component->isTailwind() && $column && $column->shouldCollapseOnTablet()])
+                ->class(['hidden md:table-cell' => $component->isTailwind() && $column && $column->shouldCollapseOnMobile()])
+                ->class(['hidden lg:table-cell' => $component->isTailwind() && $column && $column->shouldCollapseOnTablet()])
                 ->class(['' => $component->isBootstrap() && ($customAttributes['default'] ?? true)])
                 ->class(['d-none' => $component->isBootstrap() && $column && $column->shouldCollapseAlways()])
-                ->class(['d-none d-sm-table-cell' => $component->isBootstrap() && $column && $column->shouldCollapseOnMobile()])
-                ->class(['d-none d-md-table-cell' => $component->isBootstrap() && $column && $column->shouldCollapseOnTablet()])
+                ->class(['d-none d-md-table-cell' => $component->isBootstrap() && $column && $column->shouldCollapseOnMobile()])
+                ->class(['d-none d-lg-table-cell' => $component->isBootstrap() && $column && $column->shouldCollapseOnTablet()])
                 ->style(['cursor:pointer' => $component->isBootstrap()])
                 ->except('default')
         }}

diff --git a/resources/views/components/table/td/plain.blade.php b/resources/views/components/table/td/plain.blade.php
@@ -6,8 +6,8 @@
         ->merge($customAttributes)
         ->class(['px-6 py-4 whitespace-nowrap text-sm font-medium dark:text-white' => $customAttributes['default'] ?? true])
         ->class(['hidden' => $column && $column->shouldCollapseAlways()])
-        ->class(['hidden sm:table-cell' => $column && $column->shouldCollapseOnMobile()])
-        ->class(['hidden md:table-cell' => $column && $column->shouldCollapseOnTablet()])
+        ->class(['hidden md:table-cell' => $column && $column->shouldCollapseOnMobile()])
+        ->class(['hidden lg:table-cell' => $column && $column->shouldCollapseOnTablet()])
         ->except('default')
     }} @if($hideUntilReorder) x-show="reorderDisplayColumn" @endif >
         {{ $slot }}
@@ -17,8 +17,8 @@
         ->merge($customAttributes)
         ->class(['' => $customAttributes['default'] ?? true])
         ->class(['d-none' => $column && $column->shouldCollapseAlways()])
-        ->class(['d-none d-sm-table-cell' => $column && $column->shouldCollapseOnMobile()])
-        ->class(['d-none d-md-table-cell' => $column && $column->shouldCollapseOnTablet()])
+        ->class(['d-none d-md-table-cell' => $column && $column->shouldCollapseOnMobile()])
+        ->class(['d-none d-lg-table-cell' => $column && $column->shouldCollapseOnTablet()])
         ->except('default')
     }}>
         {{ $slot }}

diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
@@ -14,8 +14,12 @@
 
         <x-livewire-tables::table>
             <x-slot name="thead">
-                <x-livewire-tables::table.th.reorder x-cloak x-show="currentlyReorderingStatus" />
-                <x-livewire-tables::table.th.bulk-actions :displayMinimisedOnReorder="true" />
+                @if($this->getCurrentlyReorderingStatus())
+                    <x-livewire-tables::table.th.reorder x-cloak x-show="currentlyReorderingStatus" />
+                @endif
+                @if($this->bulkActionsAreEnabled() && $this->hasBulkActions())
+                    <x-livewire-tables::table.th.bulk-actions :displayMinimisedOnReorder="true" />
+                @endif
                 <x-livewire-tables::table.th.collapsed-columns />
 
                 @foreach($columns as $index => $column)

diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
@@ -14,7 +14,7 @@ class LaravelLivewireTablesServiceProvider extends ServiceProvider
     public function boot(): void
     {
 
-        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.0.0']);
+        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.1']);
 
         $this->mergeConfigFrom(
             __DIR__.'/../config/livewire-tables.php', 'livewire-tables'