diff --git a/CHANGELOG.md b/CHANGELOG.md index abfd018ba..9b7138e54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ All notable changes to `laravel-livewire-tables` will be documented in this file -## [3.0.0-beta.4] - 2023-10-25 +## [3.0.0-beta.6] - 2023-10-25 +- Fix for collapsing column header shift + +## [3.0.0-beta.5] - 2023-10-25 - Fix Return Type hinting for Column Rendering to allow Enum columns - Add Bulk Action Confirmations, using wire:confirm - setBulkActionConfirms @@ -10,6 +13,8 @@ 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) - Add CollapseAlways capability for Columns diff --git a/resources/views/components/table/th/row-contents.blade.php b/resources/views/components/table/th/row-contents.blade.php index 39aefdcf5..2e4ace3b4 100644 --- a/resources/views/components/table/th/row-contents.blade.php +++ b/resources/views/components/table/th/row-contents.blade.php @@ -7,13 +7,9 @@ {{ $attributes ->merge(['class' => 'table-cell dark:bg-gray-800 laravel-livewire-tables-reorderingMinimised']) - ->class([ - 'md:hidden' => !$component->shouldCollapseAlways() && ( - ($component->shouldCollapseOnMobile() && $component->shouldCollapseOnTablet()) || - ($component->shouldCollapseOnTablet() && ! $component->shouldCollapseOnMobile()) - ) - ]) - ->class(['sm:hidden' => !$component->shouldCollapseAlways() && $component->shouldCollapseOnMobile() && ! $component->shouldCollapseOnTablet()]) + ->class(['sm:hidden' => !$component->shouldCollapseOnMobile() && !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()]) + ->class(['md:hidden' => !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()]) + ->class(['lg:hidden' => !$component->shouldCollapseAlways()]) }} :class="{ 'laravel-livewire-tables-reorderingMinimised': ! currentlyReorderingStatus }" > @@ -23,12 +19,9 @@ {{ $attributes ->merge(['class' => 'd-table-cell laravel-livewire-tables-reorderingMinimised']) - ->class([ - 'd-md-none' => !$component->shouldCollapseAlways() && - ( ($component->shouldCollapseOnMobile() && $component->shouldCollapseOnTablet()) || - ($component->shouldCollapseOnTablet() && ! $component->shouldCollapseOnMobile())) - ]) - ->class(['d-sm-none' => !$component->shouldCollapseAlways() && $component->shouldCollapseOnMobile() && ! $component->shouldCollapseOnTablet()]) + ->class(['d-sm-none' => !$component->shouldCollapseOnMobile() && !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()]) + ->class(['d-md-none' => !$component->shouldCollapseOnTablet() && !$component->shouldCollapseAlways()]) + ->class(['d-lg-none' => !$component->shouldCollapseAlways()]) }} :class="{ 'laravel-livewire-tables-reorderingMinimised': ! currentlyReorderingStatus }" >