From 01b6824d43140ca1e5f889871ea6ae8497d55714 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 16 Dec 2024 03:03:36 +0000
Subject: [PATCH 01/36] Add Tests

---
 tests/Unit/Views/ColumnTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/Unit/Views/ColumnTest.php b/tests/Unit/Views/ColumnTest.php
index c15b58374..ac723f5af 100644
--- a/tests/Unit/Views/ColumnTest.php
+++ b/tests/Unit/Views/ColumnTest.php
@@ -114,4 +114,10 @@ public function test_cannot_collapse_on_tablet_and_mobile(): void
 
         $contents = $column->renderContents($rows->first());
     }
+
+    public function test_custom_sorting_pills_label_defaults_correctly(): void
+    {
+        $column = Column::make('Name', 'name');
+        $this->assertSame('Name', $column->getTitle());
+    }
 }

From d235860d59593ed8fb1c1b6d90f5e020451e06e6 Mon Sep 17 00:00:00 2001
From: LRLJoe <joe@lowerrocklabs.com>
Date: Mon, 16 Dec 2024 03:09:45 +0000
Subject: [PATCH 02/36] Add Missing Test

---
 tests/Unit/Views/ColumnTest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/Unit/Views/ColumnTest.php b/tests/Unit/Views/ColumnTest.php
index ac723f5af..544a3b273 100644
--- a/tests/Unit/Views/ColumnTest.php
+++ b/tests/Unit/Views/ColumnTest.php
@@ -118,6 +118,11 @@ public function test_cannot_collapse_on_tablet_and_mobile(): void
     public function test_custom_sorting_pills_label_defaults_correctly(): void
     {
         $column = Column::make('Name', 'name');
-        $this->assertSame('Name', $column->getTitle());
+        $defaultString = __($this->basicTable->getLocalisationPath().'not_applicable');
+
+        $this->assertSame('A-Z', $column->getCustomSortingPillDirectionsLabel('asc'));
+        $this->assertSame('Z-A', $column->getCustomSortingPillDirectionsLabel('desc'));
+        $this->assertSame($defaultString, $column->getCustomSortingPillDirectionsLabel('faulty_string'));
+
     }
 }

From 1e5d809f7dfed3cd0b062a648907c52d0462efea Mon Sep 17 00:00:00 2001
From: LRLJoe <joe@lowerrocklabs.com>
Date: Mon, 16 Dec 2024 03:15:02 +0000
Subject: [PATCH 03/36] Add label fixes

---
 tests/Unit/Views/ColumnTest.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/Unit/Views/ColumnTest.php b/tests/Unit/Views/ColumnTest.php
index 544a3b273..875b0f5c9 100644
--- a/tests/Unit/Views/ColumnTest.php
+++ b/tests/Unit/Views/ColumnTest.php
@@ -115,6 +115,18 @@ public function test_cannot_collapse_on_tablet_and_mobile(): void
         $contents = $column->renderContents($rows->first());
     }
 
+    public function test_custom_sorting_pills_defaults_correctly(): void
+    {
+        $column = Column::make('Name', 'name');
+        $defaultString = __($this->basicTable->getLocalisationPath().'not_applicable');
+
+        $this->assertSame('A-Z', $column->getCustomSortingPillDirections('asc'));
+        $this->assertSame('Z-A', $column->getCustomSortingPillDirections('desc'));
+        $this->assertSame($defaultString, $column->getCustomSortingPillDirections('faulty_string'));
+
+    }
+
+    
     public function test_custom_sorting_pills_label_defaults_correctly(): void
     {
         $column = Column::make('Name', 'name');

From 1f889cbba2720ba99fd5691806080bf0bbfb89e9 Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Mon, 16 Dec 2024 03:15:27 +0000
Subject: [PATCH 04/36] Fix styling

---
 tests/Unit/Views/ColumnTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Unit/Views/ColumnTest.php b/tests/Unit/Views/ColumnTest.php
index 875b0f5c9..3c9ff0d71 100644
--- a/tests/Unit/Views/ColumnTest.php
+++ b/tests/Unit/Views/ColumnTest.php
@@ -126,7 +126,6 @@ public function test_custom_sorting_pills_defaults_correctly(): void
 
     }
 
-    
     public function test_custom_sorting_pills_label_defaults_correctly(): void
     {
         $column = Column::make('Name', 'name');

From 4bb6b3d0e957c51c5c7a19708ec1e48f33dfb681 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 24 Dec 2024 03:09:16 +0000
Subject: [PATCH 05/36] Add Custom FIlter Input Attributes, Cleanup Filter
 Tests (#2131)

* Add Custom FIlter Input Attributes, Cleanup Filter Tests

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/filter-types/filters-number.md           |  46 +++
 docs/filters/available-filter-methods.md      |  52 ++++
 .../tools/filters/boolean.blade.php           |  17 +-
 .../components/tools/filters/date.blade.php   |  21 +-
 .../tools/filters/datetime.blade.php          |  21 +-
 .../filters/multi-select-dropdown.blade.php   |  47 ++-
 .../tools/filters/multi-select.blade.php      |  88 +++---
 .../components/tools/filters/number.blade.php |  21 +-
 .../components/tools/filters/select.blade.php |   2 +-
 .../tools/filters/text-field.blade.php        |  20 +-
 src/Views/Filters/BooleanFilter.php           |  16 +
 src/Views/Filters/DateFilter.php              |  15 +
 src/Views/Filters/DateTimeFilter.php          |  15 +
 src/Views/Filters/NumberFilter.php            |  16 +
 src/Views/Filters/TextFilter.php              |  15 +
 .../Configuration/FilterConfiguration.php     |   7 -
 src/Views/Traits/Core/HasWireables.php        |   4 +-
 src/Views/Traits/Helpers/FilterHelpers.php    |  14 +-
 src/Views/Traits/IsFilter.php                 |   7 +-
 .../Styling/HandlesFilterInputAttributes.php  |  42 +++
 .../Styling/HandlesFilterLabelAttributes.php  |  27 ++
 .../Configuration/FilterConfigurationTest.php |   2 +
 .../QueryStringForFiltersTest.php             |   2 +
 .../Unit/Traits/Helpers/FilterHelpersTest.php |   2 +
 .../Styling/FilterPopoverStylingTest.php      |   2 +
 .../Styling/FilterSlidedownStylingTest.php    |   2 +
 .../Unit/Views/Filters/BooleanFilterTest.php  | 110 +++++--
 tests/Unit/Views/Filters/DateFilterTest.php   |  22 +-
 .../Views/Filters/DateRangeFilterTest.php     |   2 +
 .../Unit/Views/Filters/DateTimeFilterTest.php |  22 +-
 tests/Unit/Views/Filters/FilterTestCase.php   |  63 ++++
 .../Filters/LivewireComponentFilterTest.php   |  28 +-
 .../Filters/MultiSelectDropdownFilterTest.php | 212 +++++++-------
 .../Views/Filters/MultiSelectFilterTest.php   | 185 ++++++------
 tests/Unit/Views/Filters/NumberFilterTest.php | 155 +++++-----
 .../Views/Filters/NumberRangeFilterTest.php   | 273 ++++++++----------
 tests/Unit/Views/Filters/SelectFilterTest.php |  14 +-
 tests/Unit/Views/Filters/TextFilterTest.php   |  20 +-
 .../Configuration/FilterConfigurationTest.php |   2 +
 .../Traits/Helpers/FilterHelpersTest.php      |   2 +
 .../Visuals/ActionsVisualsTest.php            |   4 +-
 .../Visuals/BulkActionsVisualsTest.php        |   4 +-
 .../Visuals/Columns/IconColumnVisualsTest.php |   4 +-
 .../Visuals/ComponentVisualsTest.php          |   4 +-
 .../Visuals/FilterVisualsTest.php             |   4 +-
 .../Filters/BooleanFilterVisualsTest.php      |  45 +++
 .../Visuals/Filters/DateFilterVisualsTest.php |  65 +++++
 .../Filters/DateTimeFilterVisualsTest.php     |  64 ++++
 .../Visuals/Filters/FilterVisualsTestCase.php |  15 +
 .../Filters/NumberFilterVisualsTest.php       |  46 +++
 .../Visuals/Filters/TextFilterVisualsTest.php |  30 +-
 .../Visuals/HideableTableTest.php             |   4 +-
 .../Visuals/LoadingPlaceholderVisualsTest.php |   4 +-
 .../Visuals/PaginationVisualsTest.php         |   4 +-
 .../Visuals/RefreshVisualsTest.php            |   4 +-
 .../Visuals/ReorderingVisualsTest.php         |   4 +-
 .../Visuals/SearchVisualsTest.php             |   4 +-
 .../Visuals/SortingVisualsTest.php            |   4 +-
 58 files changed, 1272 insertions(+), 674 deletions(-)
 create mode 100644 src/Views/Traits/Styling/HandlesFilterInputAttributes.php
 create mode 100644 src/Views/Traits/Styling/HandlesFilterLabelAttributes.php
 rename tests/Unit/{Traits => }/Visuals/ActionsVisualsTest.php (96%)
 rename tests/Unit/{Traits => }/Visuals/BulkActionsVisualsTest.php (98%)
 rename tests/Unit/{Traits => }/Visuals/Columns/IconColumnVisualsTest.php (95%)
 rename tests/Unit/{Traits => }/Visuals/ComponentVisualsTest.php (98%)
 rename tests/Unit/{Traits => }/Visuals/FilterVisualsTest.php (98%)
 create mode 100644 tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php
 create mode 100644 tests/Unit/Visuals/Filters/DateFilterVisualsTest.php
 create mode 100644 tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php
 create mode 100644 tests/Unit/Visuals/Filters/FilterVisualsTestCase.php
 create mode 100644 tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php
 rename tests/Unit/{Traits => }/Visuals/Filters/TextFilterVisualsTest.php (88%)
 rename tests/Unit/{Traits => }/Visuals/HideableTableTest.php (93%)
 rename tests/Unit/{Traits => }/Visuals/LoadingPlaceholderVisualsTest.php (93%)
 rename tests/Unit/{Traits => }/Visuals/PaginationVisualsTest.php (99%)
 rename tests/Unit/{Traits => }/Visuals/RefreshVisualsTest.php (90%)
 rename tests/Unit/{Traits => }/Visuals/ReorderingVisualsTest.php (99%)
 rename tests/Unit/{Traits => }/Visuals/SearchVisualsTest.php (97%)
 rename tests/Unit/{Traits => }/Visuals/SortingVisualsTest.php (98%)

diff --git a/docs/filter-types/filters-number.md b/docs/filter-types/filters-number.md
index 2bfba4404..78dd191a3 100644
--- a/docs/filter-types/filters-number.md
+++ b/docs/filter-types/filters-number.md
@@ -5,6 +5,27 @@ weight: 9
 
 Number filters are just HTML number inputs.
 
+```php
+public function filters(): array
+{
+    return [
+        NumberFilter::make('Amount')
+            ->filter(function(Builder $builder, string $value) {
+                $builder->where('amount', '<', $value);
+            }),
+    ];
+}
+```
+
+Historically, min/max/placeholders were set using the "config" option, which is still available.  However, it is strongly recommended to use the new setInputAttributes for enhanced customisation.
+
+## Old Behaviour
+The following would:
+- Set a min of 0
+- Set a max of 100
+- Add a placeholder
+- Keep the default colors & styling
+
 ```php
 public function filters(): array
 {
@@ -21,3 +42,28 @@ public function filters(): array
     ];
 }
 ```
+
+## New Behaviour
+The following would:
+- Set a min of 5
+- Set a max of 20
+- Set steps to be 0.5
+- Add a placeholder
+- Keep the default colors & styling
+
+```php
+public function filters(): array
+{
+    return [
+        NumberFilter::make('Age')
+        ->setInputAttributes([
+            'min' => '5', // Minimum Value Accepted
+            'max' => '20', // Maximum Value Accepted
+            'step' => '0.5', // Set step
+            'placeholder' => 'Enter Number 0 - 100', // A placeholder value
+            'default-colors' => true,
+            'default-styling' => true,
+        ]),
+    ];
+}
+```
\ No newline at end of file
diff --git a/docs/filters/available-filter-methods.md b/docs/filters/available-filter-methods.md
index 6e17a63b4..9597372d4 100644
--- a/docs/filters/available-filter-methods.md
+++ b/docs/filters/available-filter-methods.md
@@ -208,6 +208,58 @@ TextFilter::make('Name')
     ),
 ```
 
+## setInputAttributes
+Allows for customising the attributes that will apply to the input field for the filter.
+
+By default, this replaces the default classes on the Filter Input, if you would like to keep them, set the default-styling and/or default-colors flags to true.
+
+### TextFilter Example
+The following would:
+- Set a maxlength of 75
+- Set a placeholder of "Enter a Name"
+- Replace the default colors
+- Retain the default styling (e.g. rounding/shadow)
+
+```php
+public function filters(): array
+{
+    return [
+        TextFilter::make('Name')
+        ->setInputAttributes([
+            'maxlength' => '75',
+            'placeholder' => 'Enter a Name',
+            'class' => 'text-white bg-red-500 dark:bg-red-500',
+            'default-colors' => false,
+            'default-styling' => true,
+        ]),
+    ];
+}
+```
+
+### NumberFilter Example
+The following would:
+- Set a min of 5
+- Set a max of 20
+- Set steps to be 0.5
+- Keep the default colors & styling
+
+```php
+public function filters(): array
+{
+    return [
+        NumberFilter::make('Age')
+        ->setInputAttributes([
+            'min' => '5',
+            'max' => '20',
+            'step' => '0.5',
+            'default-colors' => true,
+            'default-styling' => true,
+        ]),
+    ];
+}
+```
+
+
 ## setCustomView
 Use a fully custom view for a filter.  This will utilise solely your view when rendering this filter.  Note that the following methods will no longer apply to a filter using this:
 - setCustomFilterLabel
diff --git a/resources/views/components/tools/filters/boolean.blade.php b/resources/views/components/tools/filters/boolean.blade.php
index abc983581..759400e13 100644
--- a/resources/views/components/tools/filters/boolean.blade.php
+++ b/resources/views/components/tools/filters/boolean.blade.php
@@ -7,14 +7,15 @@
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
     <input id="thisId" type="checkbox" name="switch" class="hidden" :checked="value" />
 
-    <button id="{{ $tableName }}-filter-{{ $filter->getKey() }}"
-        x-ref="switchButton"
-        type="button"
-        @click="toggleStatusWithUpdate"
-        :class="(value == 1 || value == true)  ? 'bg-blue-600' : 'bg-neutral-200'"
-        class="relative inline-flex h-6 py-0.5 ml-4 focus:outline-none rounded-full w-10"
-        x-cloak>
-        <span :class="(value == 1 || value == true) ? 'translate-x-[18px]' : 'translate-x-0.5'" class="w-5 h-5 duration-200 ease-in-out bg-white rounded-full shadow-md"></span>
+    <button x-cloak {{ $filterInputAttributes->merge([
+                ":class" => "(value == 1 || value == true) ? '".$filterInputAttributes['activeColor']."' : '".$filterInputAttributes['inactiveColor']."'",
+            ])
+            ->class([
+                'relative inline-flex h-6 py-0.5 ml-4 focus:outline-none rounded-full w-10' => ($filterInputAttributes['default-styling'] ?? true)
+            ])
+            ->except(['default-styling','default-colors','activeColor','inactiveColor','blobColor'])
+        }}>
+        <span :class="(value == 1 || value == true) ? 'translate-x-[18px]' : 'translate-x-0.5'" class="w-5 h-5 duration-200 ease-in-out rounded-full shadow-md {{ $filterInputAttributes['blobColor'] }}"></span>
     </button>
     <template x-if="(value == 1 || value == true)">
         <button @click="toggleStatusWithReset" type="button"
diff --git a/resources/views/components/tools/filters/date.blade.php b/resources/views/components/tools/filters/date.blade.php
index e3c75f0b0..b32b38bbb 100644
--- a/resources/views/components/tools/filters/date.blade.php
+++ b/resources/views/components/tools/filters/date.blade.php
@@ -4,17 +4,14 @@
         'rounded-md shadow-sm' => $isTailwind,
         'mb-3 mb-md-0 input-group' => $isBootstrap,
     ])>
-        <input {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'date') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            type="date"
-            @if($filter->hasConfig('min')) min="{{ $filter->getConfig('min') }}" @endif
-            @if($filter->hasConfig('max')) max="{{ $filter->getConfig('max') }}" @endif
-            @if($filter->hasConfig('placeholder')) placeholder="{{ $filter->getConfig('placeholder') }}" @endif
-            @class([
-                'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind,
-                'form-control' => $isBootstrap,
-            ])
-        />
+        <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge()
+                ->class([
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300  focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap,
+                ])
+                ->except(['default-styling','default-colors']) 
+            }} />
     </div>
 </div>
diff --git a/resources/views/components/tools/filters/datetime.blade.php b/resources/views/components/tools/filters/datetime.blade.php
index 1ca67a233..74d80455a 100644
--- a/resources/views/components/tools/filters/datetime.blade.php
+++ b/resources/views/components/tools/filters/datetime.blade.php
@@ -5,17 +5,14 @@
         'rounded-md shadow-sm' => $isTailwind,
         'mb-3 mb-md-0 input-group' => $isBootstrap,
     ])>
-        <input {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'datetime') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            type="datetime-local"
-            @if($filter->hasConfig('min')) min="{{ $filter->getConfig('min') }}" @endif
-            @if($filter->hasConfig('max')) max="{{ $filter->getConfig('max') }}" @endif
-            @if($filter->hasConfig('placeholder')) placeholder="{{ $filter->getConfig('placeholder') }}" @endif
-            @class([
-                'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind,
-                'form-control' => $isBootstrap,
-            ])
-        />
+        <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge()
+                ->class([
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap,
+                ])
+                ->except(['default-styling','default-colors']) 
+            }} />
     </div>
 </div>
diff --git a/resources/views/components/tools/filters/multi-select-dropdown.blade.php b/resources/views/components/tools/filters/multi-select-dropdown.blade.php
index a9c86ff68..a0f1a580b 100644
--- a/resources/views/components/tools/filters/multi-select-dropdown.blade.php
+++ b/resources/views/components/tools/filters/multi-select-dropdown.blade.php
@@ -2,37 +2,22 @@
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
     @if ($isTailwind)
-        <div class="rounded-md shadow-sm">
-            <select multiple
-                {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-                wire:key="{{ $filter->generateWireKey($tableName, 'multiselectdropdown') }}"
-                id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-                class="block w-full transition duration-150 ease-in-out border-gray-300 rounded-md shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600"
-            >
-            @if ($filter->getFirstOption() !== '')
-                <option @if($filter->isEmpty($this)) selected @endif value="all">{{ $filter->getFirstOption()}}</option>
-            @endif
-                @foreach($filter->getOptions() as $key => $value)
-                    @if (is_iterable($value))
-                        <optgroup label="{{ $key }}">
-                            @foreach ($value as $optionKey => $optionValue)
-                                <option value="{{ $optionKey }}">{{ $optionValue }}</option>
-                            @endforeach
-                        </optgroup>
-                    @else
-                        <option value="{{ $key }}">{{ $value }}</option>
-                    @endif
-                @endforeach
-            </select>
-        </div>
-    @elseif ($isBootstrap)
+    <div class="rounded-md shadow-sm">
+    @endif
         <select multiple
-            {{ $filter->getWireMethod("filterComponents.".$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'multiselectdropdown') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            class="{{ $isBootstrap4 ? 'form-control' : 'form-select' }}"
-        >
-        @if ($filter->getFirstOption() != "")
+            {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge([
+                    'wire:key' => $filter->generateWireKey($tableName, 'multiselectdropdown'),
+                ])
+                ->class([
+                    'block w-full transition duration-150 ease-in-out rounded-md shadow-sm focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap4 && ($filterInputAttributes['default-styling'] ?? true),
+                    'form-select' => $isBootstrap5 && ($filterInputAttributes['default-styling'] ?? true),
+                ])
+                ->except(['default-styling','default-colors']) 
+            }}>
+        @if ($filter->getFirstOption() !== '')
             <option @if($filter->isEmpty($this)) selected @endif value="all">{{ $filter->getFirstOption()}}</option>
         @endif
             @foreach($filter->getOptions() as $key => $value)
@@ -47,5 +32,7 @@ class="{{ $isBootstrap4 ? 'form-control' : 'form-select' }}"
                 @endif
             @endforeach
         </select>
+    @if ($isTailwind)
+    </div>
     @endif
 </div>
diff --git a/resources/views/components/tools/filters/multi-select.blade.php b/resources/views/components/tools/filters/multi-select.blade.php
index 582848bd3..6ee391a71 100644
--- a/resources/views/components/tools/filters/multi-select.blade.php
+++ b/resources/views/components/tools/filters/multi-select.blade.php
@@ -2,61 +2,57 @@
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
     @if ($isTailwind)
-        <div class="rounded-md shadow-sm">
-            <div>
-                <input
-                    type="checkbox"
-                    id="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                    wire:input="selectAllFilterOptions('{{ $filter->getKey() }}')"
-                    class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 disabled:opacity-50 disabled:cursor-wait"
-                >
-                <label for="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif" class="dark:text-white">
+    <div class="rounded-md shadow-sm">
+    @endif
+        <div @class(['form-check' => $isBootstrap])>
+            <input id="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" wire:input="selectAllFilterOptions('{{ $filter->getKey() }}')" {{ 
+                    $filterInputAttributes->merge([
+                        'type' => 'checkbox'
+                    ])
+                    ->class([
+                        'rounded shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 disabled:opacity-50 disabled:cursor-wait' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                        'text-indigo-600 border-gray-300 focus:border-indigo-300  focus:ring-indigo-200  dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 ' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                        'form-check-input' => $isBootstrap && ($filterInputAttributes['default-styling'] ?? true),
+                    ])
+                    ->except(['id','wire:key','value','default-styling','default-colors']) 
+                }}>
+            <label for="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" @class([
+                'dark:text-white' => $isTailwind,
+                'form-check-label' => $isBootstrap,
+                ])>
                 @if ($filter->getFirstOption() !== '')
                     {{ $filter->getFirstOption() }}
                 @else
                     {{ __($localisationPath.'All') }}
                 @endif
-                </label>
-            </div>
-
-            @foreach($filter->getOptions() as $key => $value)
-                <div wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-multiselect-{{ $key }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif">
-                    <input
-                        type="checkbox"
-                        id="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                        value="{{ $key }}"
-                        wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                        {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-                        class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 disabled:opacity-50 disabled:cursor-wait"
-                    >
-                    <label for="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif" class="dark:text-white">{{ $value }}</label>
-                </div>
-            @endforeach
-        </div>
-    @elseif ($isBootstrap)
-        <div class="form-check">
-            <input
-                type="checkbox"
-                id="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                wire:input="selectAllFilterOptions('{{ $filter->getKey() }}')"
-                class="form-check-input"
-            >
-            <label class="form-check-label" for="{{ $tableName }}-filter-{{ $filter->getKey() }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif-select-all">{{ __($localisationPath.'All') }}</label>
+            </label>
         </div>
 
         @foreach($filter->getOptions() as $key => $value)
-            <div class="form-check" wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-multiselect-{{ $key }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif">
-                <input
-                    class="form-check-input"
-                    type="checkbox"
-                    id="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                    value="{{ $key }}"
-                    wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                    {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-
-                >
-                <label class="form-check-label" for="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif">{{ $value }}</label>
+            <div @class([
+                'form-check' => $isBootstrap,
+                ]) wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-multiselect-{{ $key }}{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}">
+                <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} 
+                id="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" 
+                
+                wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" value="{{ $key }}" {{ 
+                    $filterInputAttributes->merge([
+                        'type' => 'checkbox'
+                    ])
+                    ->class([
+                        'rounded shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 disabled:opacity-50 disabled:cursor-wait' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                        'text-indigo-600 border-gray-300 focus:border-indigo-300  focus:ring-indigo-200  dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 ' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                        'form-check-input' => $isBootstrap && ($filterInputAttributes['default-styling'] ?? true),
+                    ])
+                    ->except(['id','wire:key','value','default-styling','default-colors']) 
+                }}>
+                <label for="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" @class([
+                    'dark:text-white' => $isTailwind,
+                    'form-check-label' => $isBootstrap,
+                ])>{{ $value }}</label>
             </div>
         @endforeach
+    @if ($isTailwind)
+    </div>
     @endif
 </div>
diff --git a/resources/views/components/tools/filters/number.blade.php b/resources/views/components/tools/filters/number.blade.php
index bca4f1956..0c8e766cb 100644
--- a/resources/views/components/tools/filters/number.blade.php
+++ b/resources/views/components/tools/filters/number.blade.php
@@ -5,17 +5,14 @@
         'rounded-md shadow-sm' => $isTailwind,
         'mb-3 mb-md-0 input-group' => $isBootstrap,
     ])>
-        <input {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'number') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            type="number"
-            @if($filter->hasConfig('min')) min="{{ $filter->getConfig('min') }}" @endif
-            @if($filter->hasConfig('max')) max="{{ $filter->getConfig('max') }}" @endif
-            @if($filter->hasConfig('placeholder')) placeholder="{{ $filter->getConfig('placeholder') }}" @endif
-            @class([
-                'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind,
-                'form-control' => $isBootstrap,
-            ])
-        />
+        <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge() 
+                ->class([
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap,
+                ])
+                ->except(['default-styling','default-colors']) 
+            }} />
     </div>
 </div>
diff --git a/resources/views/components/tools/filters/select.blade.php b/resources/views/components/tools/filters/select.blade.php
index 7ff281a76..d3f5dfe1a 100644
--- a/resources/views/components/tools/filters/select.blade.php
+++ b/resources/views/components/tools/filters/select.blade.php
@@ -5,7 +5,7 @@
         'rounded-md shadow-sm' => $isTailwind,
         'inline' => $isBootstrap,
     ])>
-        <select {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
+        <select {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} 
             wire:key="{{ $filter->generateWireKey($tableName, 'select') }}"
             id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
             @class([
diff --git a/resources/views/components/tools/filters/text-field.blade.php b/resources/views/components/tools/filters/text-field.blade.php
index edf6898bc..74d80455a 100644
--- a/resources/views/components/tools/filters/text-field.blade.php
+++ b/resources/views/components/tools/filters/text-field.blade.php
@@ -5,16 +5,14 @@
         'rounded-md shadow-sm' => $isTailwind,
         'mb-3 mb-md-0 input-group' => $isBootstrap,
     ])>
-        <input {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'text') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            type="text"
-            @if($filter->hasConfig('placeholder')) placeholder="{{ $filter->getConfig('placeholder') }}" @endif
-            @if($filter->hasConfig('maxlength')) maxlength="{{ $filter->getConfig('maxlength') }}" @endif
-            @class([
-                'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind,
-                'form-control' => $isBootstrap,
-            ])
-        />
+        <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge()
+                ->class([
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap,
+                ])
+                ->except(['default-styling','default-colors']) 
+            }} />
     </div>
 </div>
diff --git a/src/Views/Filters/BooleanFilter.php b/src/Views/Filters/BooleanFilter.php
index c43b517fb..f629a2c48 100644
--- a/src/Views/Filters/BooleanFilter.php
+++ b/src/Views/Filters/BooleanFilter.php
@@ -55,6 +55,22 @@ public function isEmpty(bool|int|string|null $value): bool
         return true;
     }
 
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                '@click' => 'toggleStatusWithUpdate',
+                'activeColor' => 'bg-blue-600',
+                'blobColor' => 'bg-white',
+                'inactiveColor' => 'bg-neutral-200',
+                'type' => 'button',
+                'x-ref' => 'switchButton',
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
+
     /**
      * Gets the Default Value for this Filter via the Component
      */
diff --git a/src/Views/Filters/DateFilter.php b/src/Views/Filters/DateFilter.php
index 66965547a..44e2aed51 100644
--- a/src/Views/Filters/DateFilter.php
+++ b/src/Views/Filters/DateFilter.php
@@ -41,4 +41,19 @@ public function getFilterPillValue($value): ?string
 
         return null;
     }
+
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                'min' => $this->hasConfig('min') ? $this->getConfig('min') : null,
+                'max' => $this->hasConfig('max') ? $this->getConfig('max') : null,
+                'placeholder' => $this->hasConfig('placeholder') ? $this->getConfig('placeholder') : null,
+                'type' => 'date',
+                'wire:key' => $this->generateWireKey($this->getGenericDisplayData()['tableName'], 'date'),
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
 }
diff --git a/src/Views/Filters/DateTimeFilter.php b/src/Views/Filters/DateTimeFilter.php
index 3df56e7be..8bb2f05d0 100644
--- a/src/Views/Filters/DateTimeFilter.php
+++ b/src/Views/Filters/DateTimeFilter.php
@@ -42,4 +42,19 @@ public function getFilterPillValue($value): ?string
 
         return null;
     }
+
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                'min' => $this->hasConfig('min') ? $this->getConfig('min') : null,
+                'max' => $this->hasConfig('max') ? $this->getConfig('max') : null,
+                'placeholder' => $this->hasConfig('placeholder') ? $this->getConfig('placeholder') : null,
+                'type' => 'datetime-local',
+                'wire:key' => $this->generateWireKey($this->getGenericDisplayData()['tableName'], 'datetime'),
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
 }
diff --git a/src/Views/Filters/NumberFilter.php b/src/Views/Filters/NumberFilter.php
index 259c99b95..9aa8249ce 100644
--- a/src/Views/Filters/NumberFilter.php
+++ b/src/Views/Filters/NumberFilter.php
@@ -34,4 +34,20 @@ public function validate(float|int|string|array $value): float|int|string|false
 
         return false;
     }
+
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                'min' => $this->hasConfig('min') ? $this->getConfig('min') : null,
+                'max' => $this->hasConfig('max') ? $this->getConfig('max') : null,
+                'placeholder' => $this->hasConfig('placeholder') ? $this->getConfig('placeholder') : null,
+                'type' => 'number',
+                'wire:key' => $this->generateWireKey($this->getGenericDisplayData()['tableName'], 'number'),
+
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
 }
diff --git a/src/Views/Filters/TextFilter.php b/src/Views/Filters/TextFilter.php
index c44cca906..173c5c95c 100644
--- a/src/Views/Filters/TextFilter.php
+++ b/src/Views/Filters/TextFilter.php
@@ -24,4 +24,19 @@ public function validate(string $value): string|bool
 
         return strlen($value) ? $value : false;
     }
+
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                'type' => 'text',
+                'placeholder' => $this->hasConfig('placeholder') ? $this->getConfig('placeholder') : null,
+                'maxlength' => $this->hasConfig('maxlength') ? $this->getConfig('maxlength') : null,
+                'wire:key' => $this->generateWireKey($this->getGenericDisplayData()['tableName'], 'text'),
+
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
 }
diff --git a/src/Views/Traits/Configuration/FilterConfiguration.php b/src/Views/Traits/Configuration/FilterConfiguration.php
index 123dda5f0..2bc40c32a 100644
--- a/src/Views/Traits/Configuration/FilterConfiguration.php
+++ b/src/Views/Traits/Configuration/FilterConfiguration.php
@@ -54,13 +54,6 @@ public function setFilterDefaultValue($value): self
         return $this;
     }
 
-    public function setFilterLabelAttributes(array $filterLabelAttributes): self
-    {
-        $this->filterLabelAttributes = [...['default' => false], ...$filterLabelAttributes];
-
-        return $this;
-    }
-
     public function setGenericDisplayData(array $genericDisplayData = []): self
     {
         $this->genericDisplayData = [
diff --git a/src/Views/Traits/Core/HasWireables.php b/src/Views/Traits/Core/HasWireables.php
index c0a7e34af..938d8baf1 100644
--- a/src/Views/Traits/Core/HasWireables.php
+++ b/src/Views/Traits/Core/HasWireables.php
@@ -76,10 +76,10 @@ public function getWireMethodString(string $wireMethod, string $wireableElement)
     {
 
         if ($wireMethod != 'defer') {
-            return 'wire:model.'.$wireMethod.'='.$wireableElement;
+            return 'wire:model.'.$wireMethod.'="'.$wireableElement.'"';
         }
 
-        return 'wire:model='.$wireableElement;
+        return 'wire:model="'.$wireableElement.'"';
 
     }
 }
diff --git a/src/Views/Traits/Helpers/FilterHelpers.php b/src/Views/Traits/Helpers/FilterHelpers.php
index 3af1ce088..5ec88943c 100644
--- a/src/Views/Traits/Helpers/FilterHelpers.php
+++ b/src/Views/Traits/Helpers/FilterHelpers.php
@@ -133,16 +133,6 @@ public function hasFilterDefaultValue(): bool
         return ! is_null($this->filterDefaultValue);
     }
 
-    public function getFilterLabelAttributes(): array
-    {
-        return [...['default' => true], ...$this->filterLabelAttributes];
-    }
-
-    public function hasFilterLabelAttributes(): bool
-    {
-        return $this->getFilterLabelAttributes() != ['default' => true] && $this->getFilterLabelAttributes() != ['default' => false];
-    }
-
     public function generateWireKey(string $tableName, string $filterType, string $extraData = ''): string
     {
         return $tableName.'-filter-'.$filterType.'-'.$this->getKey().($extraData != '' ? '-'.$extraData : '').($this->hasCustomPosition() ? '-'.$this->getCustomPosition() : '');
@@ -160,6 +150,8 @@ public function getFilterDisplayData(): array
 
     public function render(): string|\Illuminate\Contracts\Foundation\Application|\Illuminate\View\View|\Illuminate\View\Factory
     {
-        return view($this->getViewPath(), $this->getFilterDisplayData());
+        return view($this->getViewPath())
+            ->with($this->getFilterDisplayData())
+            ->with(['filterInputAttributes' => $this->getInputAttributesBag()]);
     }
 }
diff --git a/src/Views/Traits/IsFilter.php b/src/Views/Traits/IsFilter.php
index 9e5a7b47b..ed1db9067 100644
--- a/src/Views/Traits/IsFilter.php
+++ b/src/Views/Traits/IsFilter.php
@@ -7,6 +7,7 @@
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig, HasLabelAttributes, HasView};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasCustomPosition, HasVisibility};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\FilterHelpers;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Styling\{HandlesFilterInputAttributes, HandlesFilterLabelAttributes};
 
 trait IsFilter
 {
@@ -17,7 +18,9 @@ trait IsFilter
         HasCustomPosition,
         HasLabelAttributes,
         HasVisibility,
-        HasView;
+        HasView,
+        HandlesFilterInputAttributes,
+        HandlesFilterLabelAttributes;
 
     protected string $name;
 
@@ -33,8 +36,6 @@ trait IsFilter
 
     protected ?string $filterCustomLabel = null;
 
-    protected array $filterLabelAttributes = [];
-
     protected ?string $filterCustomPillBlade = null;
 
     protected mixed $filterDefaultValue = null;
diff --git a/src/Views/Traits/Styling/HandlesFilterInputAttributes.php b/src/Views/Traits/Styling/HandlesFilterInputAttributes.php
new file mode 100644
index 000000000..a921c7808
--- /dev/null
+++ b/src/Views/Traits/Styling/HandlesFilterInputAttributes.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
+
+use Illuminate\View\ComponentAttributeBag;
+
+trait HandlesFilterInputAttributes
+{
+    protected array $filterInputAttributes = [];
+
+    public function getInputAttributesBag(): ComponentAttributeBag
+    {
+        $attributes = array_merge($this->getCoreInputAttributes(), $this->getInputAttributes());
+        ksort($attributes);
+
+        return new ComponentAttributeBag($attributes);
+    }
+
+    protected function getInputAttributes(): array
+    {
+        return $this->filterInputAttributes;
+    }
+
+    protected function getCoreInputAttributes(): array
+    {
+        return [
+            'id' => $this->getGenericDisplayData()['tableName'].'-filter-'.$this->getKey().($this->hasCustomPosition() ? '-'.$this->getCustomPosition() : ''),
+            'default-styling' => true,
+            'default-colors' => true,
+        ];
+    }
+
+    public function setInputAttributes(array $filterInputAttributes): self
+    {
+        $this->filterInputAttributes = array_merge([
+            'default-styling' => false,
+            'default-colors' => false,
+        ], $filterInputAttributes);
+
+        return $this;
+    }
+}
diff --git a/src/Views/Traits/Styling/HandlesFilterLabelAttributes.php b/src/Views/Traits/Styling/HandlesFilterLabelAttributes.php
new file mode 100644
index 000000000..b175478a9
--- /dev/null
+++ b/src/Views/Traits/Styling/HandlesFilterLabelAttributes.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
+
+use Illuminate\View\ComponentAttributeBag;
+
+trait HandlesFilterLabelAttributes
+{
+    protected array $filterLabelAttributes = [];
+
+    public function getFilterLabelAttributes(): array
+    {
+        return [...['default' => true], ...$this->filterLabelAttributes];
+    }
+
+    public function hasFilterLabelAttributes(): bool
+    {
+        return $this->getFilterLabelAttributes() != ['default' => true] && $this->getFilterLabelAttributes() != ['default' => false];
+    }
+
+    public function setFilterLabelAttributes(array $filterLabelAttributes): self
+    {
+        $this->filterLabelAttributes = [...['default' => false], ...$filterLabelAttributes];
+
+        return $this;
+    }
+}
diff --git a/tests/Unit/Traits/Configuration/FilterConfigurationTest.php b/tests/Unit/Traits/Configuration/FilterConfigurationTest.php
index 0f5e85b35..d9756b5e6 100644
--- a/tests/Unit/Traits/Configuration/FilterConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/FilterConfigurationTest.php
@@ -2,9 +2,11 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 final class FilterConfigurationTest extends TestCase
 {
     public function test_filters_status_can_be_set(): void
diff --git a/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
index a9a40033c..849da880f 100644
--- a/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
@@ -4,9 +4,11 @@
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 final class QueryStringForFiltersTest extends TestCase
 {
     public function test_can_get_default_filter_query_string_status(): void
diff --git a/tests/Unit/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
index 367dd1d1a..80995c042 100644
--- a/tests/Unit/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Illuminate\Support\Facades\Event;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Events\FilterApplied;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
@@ -13,6 +14,7 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
+#[Group('Filters')]
 final class FilterHelpersTest extends TestCase
 {
     public function test_can_get_filters_status(): void
diff --git a/tests/Unit/Traits/Styling/FilterPopoverStylingTest.php b/tests/Unit/Traits/Styling/FilterPopoverStylingTest.php
index 886ae1956..48980ee48 100644
--- a/tests/Unit/Traits/Styling/FilterPopoverStylingTest.php
+++ b/tests/Unit/Traits/Styling/FilterPopoverStylingTest.php
@@ -2,8 +2,10 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Styling;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 final class FilterPopoverStylingTest extends TestCase
 {
     public function test_filter_popover_attributes_returns_default_if_not_set(): void
diff --git a/tests/Unit/Traits/Styling/FilterSlidedownStylingTest.php b/tests/Unit/Traits/Styling/FilterSlidedownStylingTest.php
index 5ba1ac182..baddf7316 100644
--- a/tests/Unit/Traits/Styling/FilterSlidedownStylingTest.php
+++ b/tests/Unit/Traits/Styling/FilterSlidedownStylingTest.php
@@ -2,8 +2,10 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Styling;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 final class FilterSlidedownStylingTest extends TestCase
 {
     public function test_filter_slidedown_wrapper_attributes_returns_default_if_not_set(): void
diff --git a/tests/Unit/Views/Filters/BooleanFilterTest.php b/tests/Unit/Views/Filters/BooleanFilterTest.php
index 5fb5203e4..63f7edcf5 100644
--- a/tests/Unit/Views/Filters/BooleanFilterTest.php
+++ b/tests/Unit/Views/Filters/BooleanFilterTest.php
@@ -2,14 +2,26 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\BooleanFilter;
 
+#[Group('Filters')]
 final class BooleanFilterTest extends FilterTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
         self::$filterInstance = BooleanFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            '@click' => 'toggleStatusWithUpdate',
+            'activeColor' => 'bg-blue-600',
+            'blobColor' => 'bg-white',
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'inactiveColor' => 'bg-neutral-200',
+            'type' => 'button',
+            'x-ref' => 'switchButton',
+        ];
+
     }
 
     public function test_can_not_set_boolean_filter_to_non_number(): void
@@ -41,28 +53,26 @@ public function test_cannot_set_boolean_filter_to_valid_string(): void
 
     public function test_can_get_custom_filter_pills(): void
     {
-        $filter = self::$filterInstance;
-        $filter->setFilterPillValues([
+        self::$filterInstance->setFilterPillValues([
             true => 'Active',
             false => 'Inactive',
         ]);
-        $this->assertSame('Active', $filter->getFilterPillValue(1));
-        $this->assertSame('Inactive', $filter->getFilterPillValue(0));
+        $this->assertSame('Active', self::$filterInstance->getFilterPillValue(1));
+        $this->assertSame('Inactive', self::$filterInstance->getFilterPillValue(0));
     }
 
     public function test_can_set_default_values(): void
     {
-        $filter = self::$filterInstance;
-        $this->assertFalse($filter->hasFilterDefaultValue());
-        $this->assertNull($filter->getFilterDefaultValue());
+        $this->assertFalse(self::$filterInstance->hasFilterDefaultValue());
+        $this->assertNull(self::$filterInstance->getFilterDefaultValue());
 
-        $filter->setFilterDefaultValue(true);
-        $this->assertTrue($filter->hasFilterDefaultValue());
-        $this->assertSame(true, $filter->getFilterDefaultValue());
+        self::$filterInstance->setFilterDefaultValue(true);
+        $this->assertTrue(self::$filterInstance->hasFilterDefaultValue());
+        $this->assertSame(true, self::$filterInstance->getFilterDefaultValue());
 
-        $filter->setFilterDefaultValue(false);
-        $this->assertTrue($filter->hasFilterDefaultValue());
-        $this->assertSame(false, $filter->getFilterDefaultValue());
+        self::$filterInstance->setFilterDefaultValue(false);
+        $this->assertTrue(self::$filterInstance->hasFilterDefaultValue());
+        $this->assertSame(false, self::$filterInstance->getFilterDefaultValue());
 
     }
 
@@ -93,23 +103,85 @@ public function test_can_get_if_boolean_filter_not_empty_invalid_string(): void
 
     public function test_can_validate_null_boolean_filter_value(): void
     {
-        $filter = self::$filterInstance;
-        $filter->setFilterPillValues([
+        self::$filterInstance->setFilterPillValues([
             true => 'Active',
             false => 'Inactive',
         ]);
 
-        $this->assertFalse($filter->validate(null));
+        $this->assertFalse(self::$filterInstance->validate(null));
     }
 
     public function test_is_empty_null_boolean_filter_value(): void
     {
-        $filter = self::$filterInstance;
-        $filter->setFilterPillValues([
+        self::$filterInstance->setFilterPillValues([
             true => 'Active',
             false => 'Inactive',
         ]);
 
-        $this->assertTrue($filter->isEmpty(null));
+        $this->assertTrue(self::$filterInstance->isEmpty(null));
+    }
+
+    public function test_can_set_custom_input_attributes_boolean(): void
+    {
+
+        self::$filterInstance->setGenericDisplayData(self::$testGenericData);
+        $baseAttributes = self::$filterInstance->getInputAttributesBag();
+
+        $this->assertTrue($baseAttributes['default-styling']);
+        $this->assertTrue($baseAttributes['default-colors']);
+
+        self::$filterInstance->setInputAttributes([
+            'class' => 'bg-red-500',
+        ]);
+
+        $this->assertFalse(self::$filterInstance->getInputAttributesBag()['default-styling']);
+        $this->assertFalse(self::$filterInstance->getInputAttributesBag()['default-colors']);
+        $this->assertSame('bg-red-500', self::$filterInstance->getInputAttributesBag()['class']);
+        self::$filterInstance->setInputAttributes([
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'default-styling' => true,
+        ]);
+        $currentAttributeBag = self::$filterInstance->getInputAttributesBag()->getAttributes();
+        ksort($currentAttributeBag);
+
+        $this->assertTrue($currentAttributeBag['default-styling']);
+        $this->assertFalse($currentAttributeBag['default-colors']);
+        $this->assertSame('bg-red-500 dark:bg-red-500', $currentAttributeBag['class']);
+
+        $this->assertSame([
+            '@click' => 'toggleStatusWithUpdate',
+            'activeColor' => 'bg-blue-600',
+            'blobColor' => 'bg-white',
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'default-colors' => false,
+            'default-styling' => true,
+            'id' => $baseAttributes['id'],
+            'inactiveColor' => 'bg-neutral-200',
+            'type' => 'button',
+            'x-ref' => 'switchButton',
+        ], $currentAttributeBag);
+
+        self::$filterInstance->setInputAttributes([
+            'activeColor' => 'bg-red-600',
+            'blobColor' => 'bg-green-500',
+            'default-colors' => false,
+            'default-styling' => true,
+            'inactiveColor' => 'bg-blue-200',
+        ]);
+        $currentAttributeBag = self::$filterInstance->getInputAttributesBag()->getAttributes();
+        ksort($currentAttributeBag);
+
+        $this->assertSame([
+            '@click' => 'toggleStatusWithUpdate',
+            'activeColor' => 'bg-red-600',
+            'blobColor' => 'bg-green-500',
+            'default-colors' => false,
+            'default-styling' => true,
+            'id' => $baseAttributes['id'],
+            'inactiveColor' => 'bg-blue-200',
+            'type' => 'button',
+            'x-ref' => 'switchButton',
+        ], $currentAttributeBag);
+
     }
 }
diff --git a/tests/Unit/Views/Filters/DateFilterTest.php b/tests/Unit/Views/Filters/DateFilterTest.php
index 5305408ae..ebf89d03e 100644
--- a/tests/Unit/Views/Filters/DateFilterTest.php
+++ b/tests/Unit/Views/Filters/DateFilterTest.php
@@ -3,14 +3,24 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use DateTime;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\DateFilter;
 
+#[Group('Filters')]
 final class DateFilterTest extends FilterTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
         self::$filterInstance = DateFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            'max' => null,
+            'min' => null,
+            'placeholder' => null,
+            'type' => 'date',
+            'wire:key' => 'test123-filter-date-active',
+        ];
+
     }
 
     public function test_can_not_set_date_filter_to_non_number(): void
@@ -146,33 +156,33 @@ public function test_can_set_text_filter_wireable_live(): void
     {
 
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireBlur();
 
         $this->assertSame('blur', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.blur=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireLive();
 
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDefer();
 
         $this->assertSame('defer', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(250);
 
         $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(500);
 
         $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
     }
 
diff --git a/tests/Unit/Views/Filters/DateRangeFilterTest.php b/tests/Unit/Views/Filters/DateRangeFilterTest.php
index aa73aac9b..a6dccecac 100644
--- a/tests/Unit/Views/Filters/DateRangeFilterTest.php
+++ b/tests/Unit/Views/Filters/DateRangeFilterTest.php
@@ -3,8 +3,10 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\DateRangeFilter;
 
+#[Group('Filters')]
 final class DateRangeFilterTest extends FilterTestCase
 {
     protected function setUp(): void
diff --git a/tests/Unit/Views/Filters/DateTimeFilterTest.php b/tests/Unit/Views/Filters/DateTimeFilterTest.php
index 341d2e847..7c3674b25 100644
--- a/tests/Unit/Views/Filters/DateTimeFilterTest.php
+++ b/tests/Unit/Views/Filters/DateTimeFilterTest.php
@@ -4,14 +4,24 @@
 
 use DateTime;
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\DateTimeFilter;
 
+#[Group('Filters')]
 final class DateTimeFilterTest extends FilterTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
         self::$filterInstance = DateTimeFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            'max' => null,
+            'min' => null,
+            'placeholder' => null,
+            'type' => 'datetime-local',
+            'wire:key' => 'test123-filter-datetime-active',
+        ];
+
     }
 
     public function test_can_get_filter_callback(): void
@@ -137,33 +147,33 @@ public function test_can_set_text_filter_wireable_live(): void
     {
 
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireBlur();
 
         $this->assertSame('blur', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.blur=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireLive();
 
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDefer();
 
         $this->assertSame('defer', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(250);
 
         $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(500);
 
         $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
     }
 }
diff --git a/tests/Unit/Views/Filters/FilterTestCase.php b/tests/Unit/Views/Filters/FilterTestCase.php
index 917bf9a21..244557393 100644
--- a/tests/Unit/Views/Filters/FilterTestCase.php
+++ b/tests/Unit/Views/Filters/FilterTestCase.php
@@ -2,15 +2,35 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 abstract class FilterTestCase extends TestCase
 {
     protected static $filterInstance;
 
+    protected static $testGenericData;
+
+    protected static $extraFilterInputAttributes;
+
     protected function setUp(): void
     {
         parent::setUp();
+        self::$testGenericData = [
+            'filterLayout' => 'tailwind',
+            'tableName' => 'test123',
+            'isTailwind' => true,
+            'isBootstrap' => false,
+            'isBootstrap4' => false,
+            'isBootstrap5' => false,
+            'localisationPath' => 'livewire-tables::core.',
+        ];
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$extraFilterInputAttributes = null;
     }
 
     public function test_can_get_filter_name(): void
@@ -93,4 +113,47 @@ public function test_can_check_if_filter_is_reset_by_clear_button(): void
 
         $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
+
+    public function test_can_set_custom_input_attributes(): void
+    {
+        $filter = self::$filterInstance;
+
+        $filter->setGenericDisplayData(self::$testGenericData);
+        $baseAttributes = $filter->getInputAttributesBag();
+
+        $this->assertTrue($baseAttributes['default-styling']);
+        $this->assertTrue($baseAttributes['default-colors']);
+
+        $filter->setInputAttributes([
+            'class' => 'bg-red-500',
+        ]);
+
+        $this->assertFalse($filter->getInputAttributesBag()['default-styling']);
+        $this->assertFalse($filter->getInputAttributesBag()['default-colors']);
+        $this->assertSame('bg-red-500', $filter->getInputAttributesBag()['class']);
+        $filter->setInputAttributes([
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'default-styling' => true,
+        ]);
+        $currentAttributeBag = $filter->getInputAttributesBag()->getAttributes();
+        ksort($currentAttributeBag);
+
+        $this->assertTrue($currentAttributeBag['default-styling']);
+        $this->assertFalse($currentAttributeBag['default-colors']);
+        $this->assertSame('bg-red-500 dark:bg-red-500', $currentAttributeBag['class']);
+
+        $standardAttributes = [
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'default-colors' => false,
+            'default-styling' => true,
+            'id' => $baseAttributes['id'],
+        ];
+        if (isset(self::$extraFilterInputAttributes)) {
+            $standardAttributes = array_merge($standardAttributes, self::$extraFilterInputAttributes);
+            ksort($standardAttributes);
+        }
+
+        $this->assertSame($standardAttributes, $currentAttributeBag);
+
+    }
 }
diff --git a/tests/Unit/Views/Filters/LivewireComponentFilterTest.php b/tests/Unit/Views/Filters/LivewireComponentFilterTest.php
index 447e229b6..4fb58ce75 100644
--- a/tests/Unit/Views/Filters/LivewireComponentFilterTest.php
+++ b/tests/Unit/Views/Filters/LivewireComponentFilterTest.php
@@ -3,8 +3,10 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\LivewireComponentFilter;
 
+#[Group('Filters')]
 final class LivewireComponentFilterTest extends FilterTestCase
 {
     protected function setUp(): void
@@ -15,35 +17,31 @@ protected function setUp(): void
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = LivewireComponentFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $this->assertFalse($filter->hasFilterCallback());
-
-        $filter = LivewireComponentFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, int $value) {
                 return $builder->where('name', '=', $value);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_set_livewire_component_filter_to_text(): void
     {
-        $filter = LivewireComponentFilter::make('BreedID');
-        $this->assertSame('test', $filter->validate('test'));
-        $this->assertSame('123', $filter->validate(123));
+        $this->assertSame('test', self::$filterInstance->validate('test'));
+        $this->assertSame('123', self::$filterInstance->validate(123));
 
     }
 
     public function test_can_get_if_livewire_component_filter_empty(): void
     {
-        $filter = LivewireComponentFilter::make('Active');
-        $this->assertTrue($filter->isEmpty(null));
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertFalse($filter->isEmpty('123'));
-        $this->assertFalse($filter->isEmpty('test'));
-        $this->assertFalse($filter->isEmpty(1234));
+        $this->assertTrue(self::$filterInstance->isEmpty(null));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertFalse(self::$filterInstance->isEmpty('123'));
+        $this->assertFalse(self::$filterInstance->isEmpty('test'));
+        $this->assertFalse(self::$filterInstance->isEmpty(1234));
 
     }
 }
diff --git a/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php b/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php
index dc5b55880..864909b53 100644
--- a/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php
+++ b/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php
@@ -4,13 +4,21 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter;
 
-final class MultiSelectDropdownFilterTest extends TestCase
+#[Group('Filters')]
+final class MultiSelectDropdownFilterTest extends FilterTestCase
 {
     public array $optionsArray = [];
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::$filterInstance = MultiSelectDropdownFilter::make('Active');
+    }
+
     public function test_array_setup(): array
     {
         $this->optionsArray = $optionsArray = array_values(['Cartman', 'Tux', 'May', 'Ben', 'Chico']);
@@ -21,251 +29,225 @@ public function test_array_setup(): array
 
     public function test_can_get_filter_name(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertSame('Active', $filter->getName());
+        $this->assertSame('Active', self::$filterInstance->getName());
     }
 
     public function test_can_get_filter_key(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertSame('active', $filter->getKey());
+        $this->assertSame('active', self::$filterInstance->getKey());
     }
 
     public function test_can_get_filter_configs(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertSame([], $filter->getConfigs());
+        $this->assertSame([], self::$filterInstance->getConfigs());
 
-        $filter->config(['foo' => 'bar']);
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $this->assertSame(['foo' => 'bar'], $filter->getConfigs());
+        $this->assertSame(['foo' => 'bar'], self::$filterInstance->getConfigs());
     }
 
     public function test_get_a_single_filter_config(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getConfig('foo'));
+        $this->assertSame('bar', self::$filterInstance->getConfig('foo'));
     }
 
     public function test_can_get_filter_default_value(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertSame([], $filter->getDefaultValue());
+        $this->assertSame([], self::$filterInstance->getDefaultValue());
     }
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertFalse($filter->hasFilterCallback());
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $filter = MultiSelectDropdownFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, int $value) {
                 return $builder->where('name', '=', $value);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_get_filter_pill_title(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
+        $this->assertSame('Active', self::$filterInstance->getFilterPillTitle());
 
-        $this->assertSame('Active', $filter->getFilterPillTitle());
+        self::$filterInstance->setFilterPillTitle('User Status');
 
-        $filter = MultiSelectDropdownFilter::make('Active')
-            ->setFilterPillTitle('User Status');
-
-        $this->assertSame('User Status', $filter->getFilterPillTitle());
+        $this->assertSame('User Status', self::$filterInstance->getFilterPillTitle());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_get_filter_pill_value(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active')->options($optionsArray);
-        $this->assertSame($optionsArray[1], $filter->getFilterPillValue(['1'])[0]);
-        $this->assertSame([$optionsArray[1], $optionsArray[2]], $filter->getFilterPillValue(['1', '2']));
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame($optionsArray[1], self::$filterInstance->getFilterPillValue(['1'])[0]);
+        $this->assertSame([$optionsArray[1], $optionsArray[2]], self::$filterInstance->getFilterPillValue(['1', '2']));
     }
 
     public function test_can_check_if_filter_has_configs(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertFalse($filter->hasConfigs());
+        $this->assertFalse(self::$filterInstance->hasConfigs());
 
-        $filter = MultiSelectDropdownFilter::make('Active')
-            ->config(['foo' => 'bar']);
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfigs());
+        $this->assertTrue(self::$filterInstance->hasConfigs());
     }
 
     public function test_can_check_filter_config_by_name(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfig('foo'));
-        $this->assertFalse($filter->hasConfig('bar'));
+        $this->assertTrue(self::$filterInstance->hasConfig('foo'));
+        $this->assertFalse(self::$filterInstance->hasConfig('bar'));
     }
 
     public function test_can_check_if_filter_is_hidden_from_menus(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromMenus());
-        $this->assertTrue($filter->isVisibleInMenus());
+        $this->assertFalse(self::$filterInstance->isHiddenFromMenus());
+        $this->assertTrue(self::$filterInstance->isVisibleInMenus());
 
-        $filter->hiddenFromMenus();
+        self::$filterInstance->hiddenFromMenus();
 
-        $this->assertTrue($filter->isHiddenFromMenus());
-        $this->assertFalse($filter->isVisibleInMenus());
+        $this->assertTrue(self::$filterInstance->isHiddenFromMenus());
+        $this->assertFalse(self::$filterInstance->isVisibleInMenus());
     }
 
     public function test_can_check_if_filter_is_hidden_from_pills(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromPills());
+        $this->assertTrue(self::$filterInstance->isVisibleInPills());
 
-        $this->assertFalse($filter->isHiddenFromPills());
-        $this->assertTrue($filter->isVisibleInPills());
+        self::$filterInstance->hiddenFromPills();
 
-        $filter->hiddenFromPills();
-
-        $this->assertTrue($filter->isHiddenFromPills());
-        $this->assertFalse($filter->isVisibleInPills());
+        $this->assertTrue(self::$filterInstance->isHiddenFromPills());
+        $this->assertFalse(self::$filterInstance->isVisibleInPills());
     }
 
     public function test_can_check_if_filter_is_hidden_from_count(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromFilterCount());
-        $this->assertTrue($filter->isVisibleInFilterCount());
+        $this->assertFalse(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertTrue(self::$filterInstance->isVisibleInFilterCount());
 
-        $filter->hiddenFromFilterCount();
+        self::$filterInstance->hiddenFromFilterCount();
 
-        $this->assertTrue($filter->isHiddenFromFilterCount());
-        $this->assertFalse($filter->isVisibleInFilterCount());
+        $this->assertTrue(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertFalse(self::$filterInstance->isVisibleInFilterCount());
     }
 
     public function test_can_check_if_filter_is_reset_by_clear_button(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertTrue($filter->isResetByClearButton());
+        $this->assertTrue(self::$filterInstance->isResetByClearButton());
 
-        $filter->notResetByClearButton();
+        self::$filterInstance->notResetByClearButton();
 
-        $this->assertFalse($filter->isResetByClearButton());
+        $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_to_number(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame(123, $filter->validate(123));
-        $this->assertSame('123', $filter->validate('123'));
+        $this->assertSame(123, self::$filterInstance->validate(123));
+        $this->assertSame('123', self::$filterInstance->validate('123'));
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_to_valid_value(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame($optionsArray, $filter->getOptions());
-        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3']));
-        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3', 2 => '99']));
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame($optionsArray, self::$filterInstance->getOptions());
+        $this->assertSame(['1', '3'], self::$filterInstance->validate([0 => '1', 1 => '3']));
+        $this->assertSame(['1', '3'], self::$filterInstance->validate([0 => '1', 1 => '3', 2 => '99']));
     }
 
     public function test_can_get_if_filter_empty(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-        $this->assertTrue($filter->isEmpty(['all']));
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertFalse($filter->isEmpty([]));
-        $this->assertTrue($filter->isEmpty('123'));
-        $this->assertTrue($filter->isEmpty('test'));
-        $this->assertFalse($filter->isEmpty([1]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['all']));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertFalse(self::$filterInstance->isEmpty([]));
+        $this->assertTrue(self::$filterInstance->isEmpty('123'));
+        $this->assertTrue(self::$filterInstance->isEmpty('test'));
+        $this->assertFalse(self::$filterInstance->isEmpty([1]));
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_first_option(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame('', $filter->getFirstOption());
-        $filter->setFirstOption('all');
-        $this->assertSame('all', $filter->getFirstOption());
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame('', self::$filterInstance->getFirstOption());
+        self::$filterInstance->setFirstOption('all');
+        $this->assertSame('all', self::$filterInstance->getFirstOption());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_check_if_can_set_default_value(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
+        self::$filterInstance->options($optionsArray);
 
-        $this->assertSame([], $filter->getFilterDefaultValue());
+        $this->assertSame([], self::$filterInstance->getFilterDefaultValue());
 
-        $filter->setFilterDefaultValue(['1', '3']);
+        self::$filterInstance->setFilterDefaultValue(['1', '3']);
 
-        $this->assertSame(['1', '3'], $filter->getFilterDefaultValue());
+        $this->assertSame(['1', '3'], self::$filterInstance->getFilterDefaultValue());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_custom_filter_view(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame('livewire-tables::components.tools.filters.multi-select-dropdown', $filter->getViewPath());
-        $filter->setCustomView('test-custom-filter-view');
-        $this->assertSame('test-custom-filter-view', $filter->getViewPath());
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame('livewire-tables::components.tools.filters.multi-select-dropdown', self::$filterInstance->getViewPath());
+        self::$filterInstance->setCustomView('test-custom-filter-view');
+        $this->assertSame('test-custom-filter-view', self::$filterInstance->getViewPath());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_select_filter_wireable_live(array $optionsArray): void
     {
 
-        $filter = MultiSelectDropdownFilter::make('Active')->options($optionsArray);
+        self::$filterInstance->options($optionsArray);
 
-        $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
+        $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireBlur();
+        self::$filterInstance->setWireBlur();
 
-        $this->assertSame('blur', $filter->getWireableMethod());
-        $this->assertSame('wire:model.blur=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('blur', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireLive();
+        self::$filterInstance->setWireLive();
 
-        $this->assertSame('live', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDefer();
+        self::$filterInstance->setWireDefer();
 
-        $this->assertSame('defer', $filter->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('defer', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDebounce(250);
+        self::$filterInstance->setWireDebounce(250);
 
-        $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDebounce(500);
+        self::$filterInstance->setWireDebounce(500);
 
-        $this->assertSame('live.debounce.500ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_separator(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active')->options($optionsArray);
-        $this->assertSame(', ', $filter->getPillsSeparator());
-        $filter->setPillsSeparator('<br />');
-        $this->assertSame('<br />', $filter->getPillsSeparator());
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame(', ', self::$filterInstance->getPillsSeparator());
+        self::$filterInstance->setPillsSeparator('<br />');
+        $this->assertSame('<br />', self::$filterInstance->getPillsSeparator());
     }
 }
diff --git a/tests/Unit/Views/Filters/MultiSelectFilterTest.php b/tests/Unit/Views/Filters/MultiSelectFilterTest.php
index 3f1937947..022005621 100644
--- a/tests/Unit/Views/Filters/MultiSelectFilterTest.php
+++ b/tests/Unit/Views/Filters/MultiSelectFilterTest.php
@@ -4,13 +4,21 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter;
 
-final class MultiSelectFilterTest extends TestCase
+#[Group('Filters')]
+final class MultiSelectFilterTest extends FilterTestCase
 {
     public array $optionsArray = [];
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::$filterInstance = MultiSelectFilter::make('Active');
+    }
+
     public function test_array_setup(): array
     {
         $this->optionsArray = $optionsArray = array_values(['Cartman', 'Tux', 'May', 'Ben', 'Chico']);
@@ -21,216 +29,191 @@ public function test_array_setup(): array
 
     public function test_can_get_filter_name(): void
     {
-        $filter = MultiSelectFilter::make('Active');
 
-        $this->assertSame('Active', $filter->getName());
+        $this->assertSame('Active', self::$filterInstance->getName());
     }
 
     public function test_can_get_filter_key(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertSame('active', $filter->getKey());
+        $this->assertSame('active', self::$filterInstance->getKey());
     }
 
     public function test_can_get_filter_configs(): void
     {
-        $filter = MultiSelectFilter::make('Active');
+        $this->assertSame([], self::$filterInstance->getConfigs());
 
-        $this->assertSame([], $filter->getConfigs());
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $filter->config(['foo' => 'bar']);
+        $this->assertSame(['foo' => 'bar'], self::$filterInstance->getConfigs());
 
-        $this->assertSame(['foo' => 'bar'], $filter->getConfigs());
+        self::$filterInstance->config([]);
     }
 
     public function test_get_a_single_filter_config(): void
     {
-        $filter = MultiSelectFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getConfig('foo'));
+        $this->assertSame('bar', self::$filterInstance->getConfig('foo'));
     }
 
     public function test_can_get_filter_default_value(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertSame([], $filter->getDefaultValue());
+        $this->assertSame([], self::$filterInstance->getDefaultValue());
     }
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertFalse($filter->hasFilterCallback());
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $filter = MultiSelectFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, int $value) {
                 return $builder->where('name', '=', $value);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_get_filter_pill_title(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertSame('Active', $filter->getFilterPillTitle());
+        $this->assertSame('Active', self::$filterInstance->getFilterPillTitle());
 
-        $filter = MultiSelectFilter::make('Active')
+        self::$filterInstance
             ->setFilterPillTitle('User Status');
 
-        $this->assertSame('User Status', $filter->getFilterPillTitle());
+        $this->assertSame('User Status', self::$filterInstance->getFilterPillTitle());
     }
 
     public function test_can_check_if_filter_has_configs(): void
     {
-        $filter = MultiSelectFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->hasConfigs());
 
-        $this->assertFalse($filter->hasConfigs());
-
-        $filter = MultiSelectFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfigs());
+        $this->assertTrue(self::$filterInstance->hasConfigs());
     }
 
     public function test_can_check_filter_config_by_name(): void
     {
-        $filter = MultiSelectFilter::make('Active')
-            ->config(['foo' => 'bar']);
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfig('foo'));
-        $this->assertFalse($filter->hasConfig('bar'));
+        $this->assertTrue(self::$filterInstance->hasConfig('foo'));
+        $this->assertFalse(self::$filterInstance->hasConfig('bar'));
     }
 
     public function test_can_check_if_filter_is_hidden_from_menus(): void
     {
-        $filter = MultiSelectFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromMenus());
+        $this->assertTrue(self::$filterInstance->isVisibleInMenus());
 
-        $this->assertFalse($filter->isHiddenFromMenus());
-        $this->assertTrue($filter->isVisibleInMenus());
+        self::$filterInstance->hiddenFromMenus();
 
-        $filter->hiddenFromMenus();
-
-        $this->assertTrue($filter->isHiddenFromMenus());
-        $this->assertFalse($filter->isVisibleInMenus());
+        $this->assertTrue(self::$filterInstance->isHiddenFromMenus());
+        $this->assertFalse(self::$filterInstance->isVisibleInMenus());
     }
 
     public function test_can_check_if_filter_is_hidden_from_pills(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromPills());
-        $this->assertTrue($filter->isVisibleInPills());
+        $this->assertFalse(self::$filterInstance->isHiddenFromPills());
+        $this->assertTrue(self::$filterInstance->isVisibleInPills());
 
-        $filter->hiddenFromPills();
+        self::$filterInstance->hiddenFromPills();
 
-        $this->assertTrue($filter->isHiddenFromPills());
-        $this->assertFalse($filter->isVisibleInPills());
+        $this->assertTrue(self::$filterInstance->isHiddenFromPills());
+        $this->assertFalse(self::$filterInstance->isVisibleInPills());
     }
 
     public function test_can_check_if_filter_is_hidden_from_count(): void
     {
-        $filter = MultiSelectFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertTrue(self::$filterInstance->isVisibleInFilterCount());
 
-        $this->assertFalse($filter->isHiddenFromFilterCount());
-        $this->assertTrue($filter->isVisibleInFilterCount());
+        self::$filterInstance->hiddenFromFilterCount();
 
-        $filter->hiddenFromFilterCount();
-
-        $this->assertTrue($filter->isHiddenFromFilterCount());
-        $this->assertFalse($filter->isVisibleInFilterCount());
+        $this->assertTrue(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertFalse(self::$filterInstance->isVisibleInFilterCount());
     }
 
     public function test_can_check_if_filter_is_reset_by_clear_button(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertTrue($filter->isResetByClearButton());
+        $this->assertTrue(self::$filterInstance->isResetByClearButton());
 
-        $filter->notResetByClearButton();
+        self::$filterInstance->notResetByClearButton();
 
-        $this->assertFalse($filter->isResetByClearButton());
+        $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_to_number(array $optionsArray): void
     {
-        $filter = MultiSelectFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame(123, $filter->validate(123));
-        $this->assertSame('123', $filter->validate('123'));
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame(123, self::$filterInstance->validate(123));
+        $this->assertSame('123', self::$filterInstance->validate('123'));
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_to_valid_value(array $optionsArray): void
     {
-        $filter = MultiSelectFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame($optionsArray, $filter->getOptions());
-        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3']));
-        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3', 2 => '99']));
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame($optionsArray, self::$filterInstance->getOptions());
+        $this->assertSame(['1', '3'], self::$filterInstance->validate([0 => '1', 1 => '3']));
+        $this->assertSame(['1', '3'], self::$filterInstance->validate([0 => '1', 1 => '3', 2 => '99']));
     }
 
     public function test_can_get_if_filter_empty(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertTrue($filter->isEmpty([]));
-        $this->assertTrue($filter->isEmpty('123'));
-        $this->assertTrue($filter->isEmpty('test'));
-        $this->assertFalse($filter->isEmpty([1]));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertTrue(self::$filterInstance->isEmpty([]));
+        $this->assertTrue(self::$filterInstance->isEmpty('123'));
+        $this->assertTrue(self::$filterInstance->isEmpty('test'));
+        $this->assertFalse(self::$filterInstance->isEmpty([1]));
     }
 
     public function test_can_set_custom_filter_view(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-        $this->assertSame('livewire-tables::components.tools.filters.multi-select', $filter->getViewPath());
-        $filter->setCustomView('test-custom-filter-view');
-        $this->assertSame('test-custom-filter-view', $filter->getViewPath());
+        $this->assertSame('livewire-tables::components.tools.filters.multi-select', self::$filterInstance->getViewPath());
+        self::$filterInstance->setCustomView('test-custom-filter-view');
+        $this->assertSame('test-custom-filter-view', self::$filterInstance->getViewPath());
     }
 
     public function test_can_set_select_filter_wireable_live(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
+        $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireBlur();
+        self::$filterInstance->setWireBlur();
 
-        $this->assertSame('blur', $filter->getWireableMethod());
-        $this->assertSame('wire:model.blur=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('blur', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireLive();
+        self::$filterInstance->setWireLive();
 
-        $this->assertSame('live', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDefer();
+        self::$filterInstance->setWireDefer();
 
-        $this->assertSame('defer', $filter->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('defer', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDebounce(250);
+        self::$filterInstance->setWireDebounce(250);
 
-        $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDebounce(500);
+        self::$filterInstance->setWireDebounce(500);
 
-        $this->assertSame('live.debounce.500ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
     }
 
     public function test_can_set_separator(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-        $this->assertSame(', ', $filter->getPillsSeparator());
-        $filter->setPillsSeparator('<br />');
-        $this->assertSame('<br />', $filter->getPillsSeparator());
+        $this->assertSame(', ', self::$filterInstance->getPillsSeparator());
+        self::$filterInstance->setPillsSeparator('<br />');
+        $this->assertSame('<br />', self::$filterInstance->getPillsSeparator());
     }
 }
diff --git a/tests/Unit/Views/Filters/NumberFilterTest.php b/tests/Unit/Views/Filters/NumberFilterTest.php
index a97a93e35..141734038 100644
--- a/tests/Unit/Views/Filters/NumberFilterTest.php
+++ b/tests/Unit/Views/Filters/NumberFilterTest.php
@@ -3,190 +3,177 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\NumberFilter;
 
-final class NumberFilterTest extends TestCase
+#[Group('Filters')]
+final class NumberFilterTest extends FilterTestCase
 {
-    public function test_can_get_filter_name(): void
+    protected function setUp(): void
     {
-        $filter = NumberFilter::make('Active');
+        parent::setUp();
+        self::$filterInstance = NumberFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            'max' => null,
+            'min' => null,
+            'placeholder' => null,
+            'type' => 'number',
+            'wire:key' => 'test123-filter-number-active',
+        ];
 
-        $this->assertSame('Active', $filter->getName());
     }
 
-    public function test_can_get_filter_key(): void
+    public function test_can_get_filter_name(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertSame('Active', self::$filterInstance->getName());
+    }
 
-        $this->assertSame('active', $filter->getKey());
+    public function test_can_get_filter_key(): void
+    {
+        $this->assertSame('active', self::$filterInstance->getKey());
     }
 
     public function test_can_get_filter_configs(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertSame([], self::$filterInstance->getConfigs());
 
-        $this->assertSame([], $filter->getConfigs());
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $filter->config(['foo' => 'bar']);
-
-        $this->assertSame(['foo' => 'bar'], $filter->getConfigs());
+        $this->assertSame(['foo' => 'bar'], self::$filterInstance->getConfigs());
     }
 
     public function test_get_a_single_filter_config(): void
     {
-        $filter = NumberFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getConfig('foo'));
+        $this->assertSame('bar', self::$filterInstance->getConfig('foo'));
     }
 
     public function test_can_get_filter_default_value(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertNull($filter->getDefaultValue());
+        $this->assertNull(self::$filterInstance->getDefaultValue());
     }
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $this->assertFalse($filter->hasFilterCallback());
-
-        $filter = NumberFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, int $value) {
                 return $builder->where('breed_id', '>', $value);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_get_filter_pill_title(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertSame('Active', $filter->getFilterPillTitle());
+        $this->assertSame('Active', self::$filterInstance->getFilterPillTitle());
 
-        $filter = NumberFilter::make('Active')
-            ->setFilterPillTitle('User Status');
+        self::$filterInstance->setFilterPillTitle('User Status');
 
-        $this->assertSame('User Status', $filter->getFilterPillTitle());
+        $this->assertSame('User Status', self::$filterInstance->getFilterPillTitle());
     }
 
     public function test_can_check_if_filter_has_configs(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->hasConfigs());
 
-        $this->assertFalse($filter->hasConfigs());
-
-        $filter = NumberFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfigs());
+        $this->assertTrue(self::$filterInstance->hasConfigs());
     }
 
     public function test_can_check_filter_config_by_name(): void
     {
-        $filter = NumberFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfig('foo'));
-        $this->assertFalse($filter->hasConfig('bar'));
+        $this->assertTrue(self::$filterInstance->hasConfig('foo'));
+        $this->assertFalse(self::$filterInstance->hasConfig('bar'));
     }
 
     public function test_can_check_if_filter_is_hidden_from_menus(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromMenus());
-        $this->assertTrue($filter->isVisibleInMenus());
+        $this->assertFalse(self::$filterInstance->isHiddenFromMenus());
+        $this->assertTrue(self::$filterInstance->isVisibleInMenus());
 
-        $filter->hiddenFromMenus();
+        self::$filterInstance->hiddenFromMenus();
 
-        $this->assertTrue($filter->isHiddenFromMenus());
-        $this->assertFalse($filter->isVisibleInMenus());
+        $this->assertTrue(self::$filterInstance->isHiddenFromMenus());
+        $this->assertFalse(self::$filterInstance->isVisibleInMenus());
     }
 
     public function test_can_check_if_filter_is_hidden_from_pills(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromPills());
+        $this->assertTrue(self::$filterInstance->isVisibleInPills());
 
-        $this->assertFalse($filter->isHiddenFromPills());
-        $this->assertTrue($filter->isVisibleInPills());
+        self::$filterInstance->hiddenFromPills();
 
-        $filter->hiddenFromPills();
-
-        $this->assertTrue($filter->isHiddenFromPills());
-        $this->assertFalse($filter->isVisibleInPills());
+        $this->assertTrue(self::$filterInstance->isHiddenFromPills());
+        $this->assertFalse(self::$filterInstance->isVisibleInPills());
     }
 
     public function test_can_check_if_filter_is_hidden_from_count(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromFilterCount());
-        $this->assertTrue($filter->isVisibleInFilterCount());
+        $this->assertFalse(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertTrue(self::$filterInstance->isVisibleInFilterCount());
 
-        $filter->hiddenFromFilterCount();
+        self::$filterInstance->hiddenFromFilterCount();
 
-        $this->assertTrue($filter->isHiddenFromFilterCount());
-        $this->assertFalse($filter->isVisibleInFilterCount());
+        $this->assertTrue(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertFalse(self::$filterInstance->isVisibleInFilterCount());
     }
 
     public function test_can_check_if_filter_is_reset_by_clear_button(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertTrue(self::$filterInstance->isResetByClearButton());
 
-        $this->assertTrue($filter->isResetByClearButton());
+        self::$filterInstance->notResetByClearButton();
 
-        $filter->notResetByClearButton();
-
-        $this->assertFalse($filter->isResetByClearButton());
+        $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
 
     public function test_can_not_set_number_filter_to_non_number(): void
     {
-        $filter = NumberFilter::make('BreedID');
-        $this->assertFalse($filter->validate('test'));
-        $this->assertFalse($filter->validate(['test']));
+        $this->assertFalse(self::$filterInstance->validate('test'));
+        $this->assertFalse(self::$filterInstance->validate(['test']));
     }
 
     public function test_can_set_number_filter_to_number(): void
     {
-        $filter = NumberFilter::make('BreedID');
-        $this->assertSame(123, $filter->validate(123));
-        $this->assertSame(123.51, $filter->validate(123.51));
-        $this->assertSame(123, $filter->validate('123'));
-        $this->assertSame(123.51, $filter->validate('123.51'));
+        $this->assertSame(123, self::$filterInstance->validate(123));
+        $this->assertSame(123.51, self::$filterInstance->validate(123.51));
+        $this->assertSame(123, self::$filterInstance->validate('123'));
+        $this->assertSame(123.51, self::$filterInstance->validate('123.51'));
 
     }
 
     public function test_can_get_if_number_filter_empty(): void
     {
-        $filter = NumberFilter::make('Active');
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertTrue($filter->isEmpty('q'));
-        $this->assertFalse($filter->isEmpty('123'));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertTrue(self::$filterInstance->isEmpty('q'));
+        $this->assertFalse(self::$filterInstance->isEmpty('123'));
     }
 
     public function test_can_check_if_can_set_default_value(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertNull($filter->getFilterDefaultValue());
+        $this->assertNull(self::$filterInstance->getFilterDefaultValue());
 
-        $filter->setFilterDefaultValue(123);
+        self::$filterInstance->setFilterDefaultValue(123);
 
-        $this->assertSame('123', $filter->getFilterDefaultValue());
+        $this->assertSame('123', self::$filterInstance->getFilterDefaultValue());
     }
 
     public function test_can_set_custom_filter_view(): void
     {
-        $filter = NumberFilter::make('Active');
-        $this->assertSame('livewire-tables::components.tools.filters.number', $filter->getViewPath());
-        $filter->setCustomView('test-custom-filter-view');
-        $this->assertSame('test-custom-filter-view', $filter->getViewPath());
+        $this->assertSame('livewire-tables::components.tools.filters.number', self::$filterInstance->getViewPath());
+        self::$filterInstance->setCustomView('test-custom-filter-view');
+        $this->assertSame('test-custom-filter-view', self::$filterInstance->getViewPath());
     }
 }
diff --git a/tests/Unit/Views/Filters/NumberRangeFilterTest.php b/tests/Unit/Views/Filters/NumberRangeFilterTest.php
index b0790a1d0..b6e665032 100644
--- a/tests/Unit/Views/Filters/NumberRangeFilterTest.php
+++ b/tests/Unit/Views/Filters/NumberRangeFilterTest.php
@@ -3,223 +3,215 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\NumberRangeFilter;
 
-final class NumberRangeFilterTest extends TestCase
+#[Group('Filters')]
+final class NumberRangeFilterTest extends FilterTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::$filterInstance = NumberRangeFilter::make('Active');
+
+    }
+
     public function test_can_get_filter_name(): void
     {
-        $filter = NumberRangeFilter::make('Active');
         // Should Match
-        $this->assertSame('Active', $filter->getName());
+        $this->assertSame('Active', self::$filterInstance->getName());
     }
 
     public function test_can_get_filter_key(): void
     {
-        $filter = NumberRangeFilter::make('Active');
 
-        $this->assertSame('active', $filter->getKey());
+        $this->assertSame('active', self::$filterInstance->getKey());
     }
 
     public function test_can_get_filter_configs(): void
     {
-        $filter = NumberRangeFilter::make('Active');
 
         $defaultConfig = config('livewire-tables.numberRange.defaultConfig');
 
-        $this->assertSame($defaultConfig, $filter->getConfigs());
+        $this->assertSame($defaultConfig, self::$filterInstance->getConfigs());
 
-        $filter->config(['foo' => 'bar']);
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $this->assertSame(array_merge($defaultConfig, ['foo' => 'bar']), $filter->getConfigs());
+        $this->assertSame(array_merge($defaultConfig, ['foo' => 'bar']), self::$filterInstance->getConfigs());
     }
 
     public function test_get_a_single_filter_config(): void
     {
-        $filter = NumberRangeFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getConfig('foo'));
+        $this->assertSame('bar', self::$filterInstance->getConfig('foo'));
     }
 
     public function test_can_get_if_empty(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertTrue($filter->isEmpty([]));
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertTrue($filter->isEmpty(['max' => 100]));
-        $this->assertTrue($filter->isEmpty(['min' => 0]));
-        $this->assertTrue($filter->isEmpty(['min' => '0']));
-        $this->assertTrue($filter->isEmpty(['min' => '0', 'max' => '']));
-        $this->assertTrue($filter->isEmpty(['min' => '0', 'max' => null]));
-        $this->assertTrue($filter->isEmpty(['min' => null, 'max' => null]));
-        $this->assertTrue($filter->isEmpty(['max' => null, 'min' => null]));
-        $this->assertTrue($filter->isEmpty(['max' => null, 'min' => '4']));
-        $this->assertTrue($filter->isEmpty(['min' => '62', 'max' => '']));
-        $this->assertTrue($filter->isEmpty(['min' => '', 'max' => '3']));
-        $this->assertTrue($filter->isEmpty(['min' => '', 'max' => '']));
-        $this->assertTrue($filter->isEmpty(['min' => 0, 'max' => 100]));
-        $this->assertFalse($filter->isEmpty(['min' => 0, 'max' => 50]));
-        $this->assertFalse($filter->isEmpty(['min' => '0', 'max' => 50]));
-        $this->assertFalse($filter->isEmpty(['min' => '0', 'max' => '50']));
-        $this->assertFalse($filter->isEmpty(['min' => '10', 'max' => '100']));
-        $this->assertFalse($filter->isEmpty(['min' => 10, 'max' => '100']));
+        $this->assertTrue(self::$filterInstance->isEmpty([]));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertTrue(self::$filterInstance->isEmpty(['max' => 100]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => 0]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '0']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '0', 'max' => '']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '0', 'max' => null]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => null, 'max' => null]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['max' => null, 'min' => null]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['max' => null, 'min' => '4']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '62', 'max' => '']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '', 'max' => '3']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '', 'max' => '']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => 0, 'max' => 100]));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => 0, 'max' => 50]));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => '0', 'max' => 50]));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => '0', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => '10', 'max' => '100']));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => 10, 'max' => '100']));
     }
 
     public function test_can_check_validation_accepts_valid_values(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertSame(['min' => 5, 'max' => 100], $filter->validate(['min' => '5', 'max' => '100']));
+        $this->assertSame(['min' => 5, 'max' => 100], self::$filterInstance->validate(['min' => '5', 'max' => '100']));
     }
 
     public function test_can_check_validation_rejects_invalid_values(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertFalse($filter->validate(['min' => '0', 'max' => 'set']));
-        $this->assertFalse($filter->validate(['min' => 'test', 'max' => '0']));
-        $this->assertFalse($filter->validate(['min' => 'test', 'max' => 'test']));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => '15', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '0', 'max' => 'set']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => 'test', 'max' => '0']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => 'test', 'max' => 'test']));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => '15', 'max' => '50']));
     }
 
     public function test_can_check_validation_rejects_missing_values(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertFalse($filter->validate(['min' => 10]));
-        $this->assertFalse($filter->validate(['min' => 10]));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => 15, 'max' => 50]));
+        $this->assertFalse(self::$filterInstance->validate(['min' => 10]));
+        $this->assertFalse(self::$filterInstance->validate(['min' => 10]));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => 15, 'max' => 50]));
     }
 
     public function test_can_check_validation_rejects_values_over_configmax(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['min' => '15', 'max' => '5000']));
-        $this->assertFalse($filter->validate(['min' => '6', 'max' => '5000']));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => '15', 'max' => '50']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['min' => '15', 'max' => '5000']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '6', 'max' => '5000']));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => '15', 'max' => '50']));
     }
 
     public function test_can_check_validation_rejects_values_below_configmax(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['min' => '-46', 'max' => '50']));
-        $this->assertFalse($filter->validate(['min' => '-6', 'max' => '22']));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => '15', 'max' => '50']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-46', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-6', 'max' => '22']));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => '15', 'max' => '50']));
     }
 
     public function test_can_check_validation_flips_values_min_larger_than_max(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['min' => '-46', 'max' => '50']));
-        $this->assertFalse($filter->validate(['min' => '-6', 'max' => '22']));
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['min' => '80', 'max' => '50']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-46', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-6', 'max' => '22']));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['min' => '80', 'max' => '50']));
     }
 
     public function test_can_check_validation_flips_values_max_smaller_than_min_orderflipped(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['min' => '146', 'max' => '50']));
-        $this->assertFalse($filter->validate(['min' => '-6', 'max' => '22']));
-        $this->assertFalse($filter->validate(['min' => '30', 'max' => '-5']));
-        $this->assertFalse($filter->validate(['min' => '30', 'max' => '125']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['min' => '146', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-6', 'max' => '22']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '30', 'max' => '-5']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '30', 'max' => '125']));
 
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['max' => '50', 'min' => '80']));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['max' => '50', 'min' => '80']));
     }
 
     public function test_can_check_validation_fails_values_empty_string(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['']));
-        $this->assertFalse($filter->validate(['min' => '-6', 'max' => '22']));
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['min' => '80', 'max' => '50']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-6', 'max' => '22']));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['min' => '80', 'max' => '50']));
     }
 
     public function test_can_check_validation_fails_values_null_values(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => 0, 'maxRange' => 100]);
-        $this->assertFalse($filter->validate(['min' => 22, 'max' => null]));
-        $this->assertFalse($filter->validate(['min' => null, 'max' => 22]));
-        $this->assertSame(['min' => 0, 'max' => 22], $filter->validate(['min' => '', 'max' => 22]));
-        $this->assertSame(['min' => 0, 'max' => 22], $filter->validate(['min' => '22', 'max' => '']));
+        self::$filterInstance->config(['minRange' => 0, 'maxRange' => 100]);
+        $this->assertFalse(self::$filterInstance->validate(['min' => 22, 'max' => null]));
+        $this->assertFalse(self::$filterInstance->validate(['min' => null, 'max' => 22]));
+        $this->assertSame(['min' => 0, 'max' => 22], self::$filterInstance->validate(['min' => '', 'max' => 22]));
+        $this->assertSame(['min' => 0, 'max' => 22], self::$filterInstance->validate(['min' => '22', 'max' => '']));
 
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['min' => '80', 'max' => '50']));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['min' => '80', 'max' => '50']));
     }
 
     public function test_filter_pill_values_can_be_set_for_numberrange(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '10', 'maxRange' => '100']);
+        self::$filterInstance->config(['minRange' => '10', 'maxRange' => '100']);
 
-        $this->assertEquals('Min:25, Max:50', $filter->getFilterPillValue(['min' => '25', 'max' => '50']));
-        $this->assertEquals('', $filter->getFilterPillValue(['min' => '30', 'max' => '166']));
-        $this->assertEquals('', $filter->getFilterPillValue(['min' => '5', 'max' => '53']));
-        $this->assertEquals('', $filter->getFilterPillValue(['min' => 'd0', 'max' => '76']));
+        $this->assertEquals('Min:25, Max:50', self::$filterInstance->getFilterPillValue(['min' => '25', 'max' => '50']));
+        $this->assertEquals('', self::$filterInstance->getFilterPillValue(['min' => '30', 'max' => '166']));
+        $this->assertEquals('', self::$filterInstance->getFilterPillValue(['min' => '5', 'max' => '53']));
+        $this->assertEquals('', self::$filterInstance->getFilterPillValue(['min' => 'd0', 'max' => '76']));
     }
 
     public function test_can_check_validation_fails_non_numeric_values(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertSame(['min' => 0, 'max' => 48], $filter->validate(['min' => 0, 'max' => 48]));
-        $this->assertSame(['min' => 0, 'max' => 38], $filter->validate(['min' => 38, 'max' => 'test']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertSame(['min' => 0, 'max' => 48], self::$filterInstance->validate(['min' => 0, 'max' => 48]));
+        $this->assertSame(['min' => 0, 'max' => 38], self::$filterInstance->validate(['min' => 38, 'max' => 'test']));
 
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['min' => 50, 'max' => 80]));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['min' => 50, 'max' => 80]));
     }
 
     public function test_can_check_validation_rejects_values_fault_configs(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => 0, 'maxRange' => 100]);
-        $this->assertFalse($filter->validate(['min' => -6, 'max' => 2200]));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => 15, 'max' => 50]));
+        self::$filterInstance->config(['minRange' => 0, 'maxRange' => 100]);
+        $this->assertFalse(self::$filterInstance->validate(['min' => -6, 'max' => 2200]));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => 15, 'max' => 50]));
     }
 
     public function test_can_get_filter_options(): void
     {
-        $filter = NumberRangeFilter::make('Active');
+        $this->assertSame(config('livewire-tables.numberRange.defaultOptions'), self::$filterInstance->getOptions());
 
-        $this->assertSame(config('livewire-tables.numberRange.defaultOptions'), $filter->getOptions());
-
-        $filter->options(['foo' => 'bar']);
-        $this->assertSame(['min' => 0, 'max' => 100, 'foo' => 'bar'], $filter->getOptions());
+        self::$filterInstance->options(['foo' => 'bar']);
+        $this->assertSame(['min' => 0, 'max' => 100, 'foo' => 'bar'], self::$filterInstance->getOptions());
     }
 
     public function test_can_get_filter_keys(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertSame(['min', 'max'], $filter->getKeys());
+        $this->assertSame(['min', 'max'], self::$filterInstance->getKeys());
     }
 
     public function test_can_get_filter_default_value(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertSame([], $filter->getDefaultValue());
+        $this->assertSame([], self::$filterInstance->getDefaultValue());
     }
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertFalse($filter->hasFilterCallback());
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $filter = NumberRangeFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, array $values) {
                 return $builder->where('breed_id', '>', $values['min'])
                     ->where('breed_id', '<', $values['max']);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_get_filter_pill_title(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertSame('Active', $filter->getFilterPillTitle());
+        $this->assertSame('Active', self::$filterInstance->getFilterPillTitle());
 
-        $filter = NumberRangeFilter::make('Active')
+        self::$filterInstance
             ->setFilterPillTitle('User Status');
 
-        $this->assertSame('User Status', $filter->getFilterPillTitle());
+        $this->assertSame('User Status', self::$filterInstance->getFilterPillTitle());
     }
 
     /*
@@ -228,13 +220,13 @@ public function test_can_get_filter_pill_value(): void
         $filter = NumberRangeFilter::make('Active')
             ->options(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getFilterPillValue('foo'));
+        $this->assertSame('bar', self::$filterInstance->getFilterPillValue('foo'));
 
         $filter = NumberRangeFilter::make('Active')
             ->options(['foo' => 'bar'])
             ->setFilterPillValues(['foo' => 'baz']);
 
-        $this->assertSame('baz', $filter->getFilterPillValue('foo'));
+        $this->assertSame('baz', self::$filterInstance->getFilterPillValue('foo'));
     }*/
 
     /*
@@ -243,91 +235,80 @@ public function test_can_get_nested_filter_pill_value(): void
         $filter = NumberRangeFilter::make('Active')
             ->options(['foo' => ['bar' => 'baz']]);
 
-        $this->assertSame('baz', $filter->getFilterPillValue('bar'));
+        $this->assertSame('baz', self::$filterInstance->getFilterPillValue('bar'));
 
         $filter = NumberRangeFilter::make('Active')
             ->options(['foo' => ['bar' => 'baz']])
             ->setFilterPillValues(['bar' => 'etc']);
 
-        $this->assertSame('etc', $filter->getFilterPillValue('bar'));
+        $this->assertSame('etc', self::$filterInstance->getFilterPillValue('bar'));
     }*/
 
     public function test_can_check_if_filter_has_configs(): void
     {
-        $filter = NumberRangeFilter::make('Active');
+        $this->assertTrue(self::$filterInstance->hasConfigs());
 
-        $this->assertTrue($filter->hasConfigs());
+        self::$filterInstance->config();
 
-        $filter->config();
-
-        $this->assertTrue($filter->hasConfigs());
+        $this->assertTrue(self::$filterInstance->hasConfigs());
 
     }
 
     public function test_can_check_filter_config_by_name(): void
     {
-        $filter = NumberRangeFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfig('foo'));
-        $this->assertFalse($filter->hasConfig('bar'));
+        $this->assertTrue(self::$filterInstance->hasConfig('foo'));
+        $this->assertFalse(self::$filterInstance->hasConfig('bar'));
     }
 
     public function test_can_check_if_filter_is_hidden_from_menus(): void
     {
-        $filter = NumberRangeFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromMenus());
+        $this->assertTrue(self::$filterInstance->isVisibleInMenus());
 
-        $this->assertFalse($filter->isHiddenFromMenus());
-        $this->assertTrue($filter->isVisibleInMenus());
+        self::$filterInstance->hiddenFromMenus();
 
-        $filter->hiddenFromMenus();
-
-        $this->assertTrue($filter->isHiddenFromMenus());
-        $this->assertFalse($filter->isVisibleInMenus());
+        $this->assertTrue(self::$filterInstance->isHiddenFromMenus());
+        $this->assertFalse(self::$filterInstance->isVisibleInMenus());
     }
 
     public function test_can_check_if_filter_is_hidden_from_pills(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromPills());
-        $this->assertTrue($filter->isVisibleInPills());
+        $this->assertFalse(self::$filterInstance->isHiddenFromPills());
+        $this->assertTrue(self::$filterInstance->isVisibleInPills());
 
-        $filter->hiddenFromPills();
+        self::$filterInstance->hiddenFromPills();
 
-        $this->assertTrue($filter->isHiddenFromPills());
-        $this->assertFalse($filter->isVisibleInPills());
+        $this->assertTrue(self::$filterInstance->isHiddenFromPills());
+        $this->assertFalse(self::$filterInstance->isVisibleInPills());
     }
 
     public function test_can_check_if_filter_is_hidden_from_count(): void
     {
-        $filter = NumberRangeFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertTrue(self::$filterInstance->isVisibleInFilterCount());
 
-        $this->assertFalse($filter->isHiddenFromFilterCount());
-        $this->assertTrue($filter->isVisibleInFilterCount());
+        self::$filterInstance->hiddenFromFilterCount();
 
-        $filter->hiddenFromFilterCount();
-
-        $this->assertTrue($filter->isHiddenFromFilterCount());
-        $this->assertFalse($filter->isVisibleInFilterCount());
+        $this->assertTrue(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertFalse(self::$filterInstance->isVisibleInFilterCount());
     }
 
     public function test_can_check_if_filter_is_reset_by_clear_button(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertTrue($filter->isResetByClearButton());
+        $this->assertTrue(self::$filterInstance->isResetByClearButton());
 
-        $filter->notResetByClearButton();
+        self::$filterInstance->notResetByClearButton();
 
-        $this->assertFalse($filter->isResetByClearButton());
+        $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
 
     public function test_can_set_custom_filter_view(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertSame('livewire-tables::components.tools.filters.number-range', $filter->getViewPath());
-        $filter->setCustomView('test-custom-filter-view');
-        $this->assertSame('test-custom-filter-view', $filter->getViewPath());
+        $this->assertSame('livewire-tables::components.tools.filters.number-range', self::$filterInstance->getViewPath());
+        self::$filterInstance->setCustomView('test-custom-filter-view');
+        $this->assertSame('test-custom-filter-view', self::$filterInstance->getViewPath());
     }
 }
diff --git a/tests/Unit/Views/Filters/SelectFilterTest.php b/tests/Unit/Views/Filters/SelectFilterTest.php
index 9484c85b0..c95653019 100644
--- a/tests/Unit/Views/Filters/SelectFilterTest.php
+++ b/tests/Unit/Views/Filters/SelectFilterTest.php
@@ -3,8 +3,10 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 
+#[Group('Filters')]
 final class SelectFilterTest extends FilterTestCase
 {
     protected function setUp(): void
@@ -77,32 +79,32 @@ public function test_can_set_select_filter_wireable_live(): void
     {
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireBlur();
 
         $this->assertSame('blur', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.blur=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDefer();
 
         $this->assertSame('defer', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireLive();
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(250);
 
         $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(500);
 
         $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
     }
 }
diff --git a/tests/Unit/Views/Filters/TextFilterTest.php b/tests/Unit/Views/Filters/TextFilterTest.php
index 72bfd4d3e..28f2d49e1 100644
--- a/tests/Unit/Views/Filters/TextFilterTest.php
+++ b/tests/Unit/Views/Filters/TextFilterTest.php
@@ -3,14 +3,22 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
+#[Group('Filters')]
 final class TextFilterTest extends FilterTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
         self::$filterInstance = TextFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            'maxlength' => null,
+            'placeholder' => null,
+            'type' => 'text',
+            'wire:key' => 'test123-filter-text-active',
+        ];
     }
 
     public function test_can_get_filter_callback(): void
@@ -70,33 +78,33 @@ public function test_can_set_text_filter_wireable_live(): void
 
         $this->assertSame('blur', $filter->getWireableMethod());
 
-        $this->assertSame('wire:model.blur=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireLive();
 
         $this->assertSame('live', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireDefer();
 
         $this->assertSame('defer', $filter->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireBlur();
 
         $this->assertSame('blur', $filter->getWireableMethod());
 
-        $this->assertSame('wire:model.blur=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireDebounce(250);
 
         $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireDebounce(500);
 
         $this->assertSame('live.debounce.500ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
     }
 
diff --git a/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php b/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php
index 2293446a7..6c3c590f2 100644
--- a/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php
+++ b/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php
@@ -2,9 +2,11 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Configuration;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 
+#[Group('Filters')]
 final class FilterConfigurationTest extends TestCase
 {
     public function test_filter_config_can_be_set(): void
diff --git a/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php
index afe5deb3c..fb77abcac 100644
--- a/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php
@@ -3,12 +3,14 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Helpers;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
+#[Group('Filters')]
 final class FilterHelpersTest extends TestCase
 {
     public function test_can_get_filter_name(): void
diff --git a/tests/Unit/Traits/Visuals/ActionsVisualsTest.php b/tests/Unit/Visuals/ActionsVisualsTest.php
similarity index 96%
rename from tests/Unit/Traits/Visuals/ActionsVisualsTest.php
rename to tests/Unit/Visuals/ActionsVisualsTest.php
index a0da08004..a0150f0f2 100644
--- a/tests/Unit/Traits/Visuals/ActionsVisualsTest.php
+++ b/tests/Unit/Visuals/ActionsVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class ActionsVisualsTest extends TestCase
 {
     public function test_can_align_actions_left(): void
diff --git a/tests/Unit/Traits/Visuals/BulkActionsVisualsTest.php b/tests/Unit/Visuals/BulkActionsVisualsTest.php
similarity index 98%
rename from tests/Unit/Traits/Visuals/BulkActionsVisualsTest.php
rename to tests/Unit/Visuals/BulkActionsVisualsTest.php
index 8c2ebd6c3..32f0a57cc 100644
--- a/tests/Unit/Traits/Visuals/BulkActionsVisualsTest.php
+++ b/tests/Unit/Visuals/BulkActionsVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class BulkActionsVisualsTest extends TestCase
 {
     public function test_bulk_dropdown_shows_when_necessary(): void
diff --git a/tests/Unit/Traits/Visuals/Columns/IconColumnVisualsTest.php b/tests/Unit/Visuals/Columns/IconColumnVisualsTest.php
similarity index 95%
rename from tests/Unit/Traits/Visuals/Columns/IconColumnVisualsTest.php
rename to tests/Unit/Visuals/Columns/IconColumnVisualsTest.php
index 746f8e039..21d1572a1 100644
--- a/tests/Unit/Traits/Visuals/Columns/IconColumnVisualsTest.php
+++ b/tests/Unit/Visuals/Columns/IconColumnVisualsTest.php
@@ -1,15 +1,17 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Columns;
 
 use Exception;
 use Illuminate\View\ViewException;
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\{BrokenSecondaryHeaderTable, NoBuildMethodTable, NoPrimaryKeyTable};
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{PetsTable,PetsTableAttributes};
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class IconColumnVisualsTest extends TestCase
 {
     private $testErrors;
diff --git a/tests/Unit/Traits/Visuals/ComponentVisualsTest.php b/tests/Unit/Visuals/ComponentVisualsTest.php
similarity index 98%
rename from tests/Unit/Traits/Visuals/ComponentVisualsTest.php
rename to tests/Unit/Visuals/ComponentVisualsTest.php
index d2eda3b8d..7b9ed0282 100644
--- a/tests/Unit/Traits/Visuals/ComponentVisualsTest.php
+++ b/tests/Unit/Visuals/ComponentVisualsTest.php
@@ -1,15 +1,17 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Exception;
 use Illuminate\View\ViewException;
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\{BrokenSecondaryHeaderTable, NoBuildMethodTable, NoPrimaryKeyTable};
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{PetsTable,PetsTableAttributes};
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class ComponentVisualsTest extends TestCase
 {
     private $testErrors;
diff --git a/tests/Unit/Traits/Visuals/FilterVisualsTest.php b/tests/Unit/Visuals/FilterVisualsTest.php
similarity index 98%
rename from tests/Unit/Traits/Visuals/FilterVisualsTest.php
rename to tests/Unit/Visuals/FilterVisualsTest.php
index d55a00cb0..19b979437 100644
--- a/tests/Unit/Traits/Visuals/FilterVisualsTest.php
+++ b/tests/Unit/Visuals/FilterVisualsTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTableNoFilters;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class FilterVisualsTest extends TestCase
 {
     public function test_filters_button_shows_when_enabled(): void
diff --git a/tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php b/tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php
new file mode 100644
index 000000000..644dfc33c
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Views\Filters\BooleanFilter;
+
+#[Group('Visuals')]
+#[Group('Filters')]
+final class BooleanFilterVisualsTest extends FilterVisualsTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function test_can_set_custom_attributes_on_boolean_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    BooleanFilter::make('Boolfilter')
+                        ->setInputAttributes([
+                            'blobColor' => 'bg-green-500',
+                            'activeColor' => 'bg-red-500',
+                            'inactiveColor' => 'bg-blue-500',
+                            'default-styling' => true,
+                        ]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<span :class="(value == 1 || value == true) ? \'translate-x-[18px]\' : \'translate-x-0.5\'" class="w-5 h-5 duration-200 ease-in-out rounded-full shadow-md bg-green-500"></span>')
+            ->assertSeeHtml('<button x-cloak class="relative inline-flex h-6 py-0.5 ml-4 focus:outline-none rounded-full w-10" :class="(value == 1 || value == true) ? &#039;bg-red-500&#039; : &#039;bg-blue-500&#039;" @click="toggleStatusWithUpdate" id="table-filter-boolfilter" type="button" x-ref="switchButton">');
+    }
+}
diff --git a/tests/Unit/Visuals/Filters/DateFilterVisualsTest.php b/tests/Unit/Visuals/Filters/DateFilterVisualsTest.php
new file mode 100644
index 000000000..85c7ac153
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/DateFilterVisualsTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Views\Filters\DateFilter;
+
+#[Group('Visuals')]
+#[Group('Filters')]
+final class DateFilterVisualsTest extends FilterVisualsTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function test_can_use_default_attributes_on_date_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    DateFilter::make('Datefilter'),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.live="filterComponents.datefilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300  focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-datefilter" type="date" wire:key="table-filter-date-datefilter" />');
+    }
+
+    public function test_can_set_custom_attributes_on_date_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    DateFilter::make('Datefilter')
+                        ->setInputAttributes([
+                            'min' => '01/01/2024',
+                            'max' => '12/12/2024',
+                            'default-colors' => true,
+                            'default-styling' => true,
+                        ]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.live="filterComponents.datefilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300  focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-datefilter" max="12/12/2024" min="01/01/2024" type="date" wire:key="table-filter-date-datefilter" />');
+
+    }
+}
diff --git a/tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php b/tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php
new file mode 100644
index 000000000..3172f8b60
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Views\Filters\DateTimeFilter;
+
+#[Group('Visuals')]
+#[Group('Filters')]
+final class DateTimeFilterVisualsTest extends FilterVisualsTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function test_can_use_default_attributes_on_datetime_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    DateTimeFilter::make('Datetimefilter'),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.live="filterComponents.datetimefilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-datetimefilter" type="datetime-local" wire:key="table-filter-datetime-datetimefilter" />');
+    }
+
+    public function test_can_set_custom_attributes_on_datetime_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    DateTimeFilter::make('Datetimefilter')
+                        ->setInputAttributes([
+                            'min' => '01/01/2024',
+                            'max' => '12/12/2024',
+                            'default-colors' => true,
+                            'default-styling' => true,
+                        ]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.live="filterComponents.datetimefilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-datetimefilter" max="12/12/2024" min="01/01/2024" type="datetime-local" wire:key="table-filter-datetime-datetimefilter" />');
+    }
+}
diff --git a/tests/Unit/Visuals/Filters/FilterVisualsTestCase.php b/tests/Unit/Visuals/Filters/FilterVisualsTestCase.php
new file mode 100644
index 000000000..78a65b93c
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/FilterVisualsTestCase.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+abstract class FilterVisualsTestCase extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        parent::setupBreedsTable();
+    }
+}
diff --git a/tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php b/tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php
new file mode 100644
index 000000000..ac8df3b50
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Views\Filters\NumberFilter;
+
+#[Group('Visuals')]
+#[Group('Filters')]
+final class NumberFilterVisualsTest extends FilterVisualsTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function test_can_set_custom_attributes_on_number_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    NumberFilter::make('Numberfilter')
+                        ->setInputAttributes([
+                            'min' => '20',
+                            'max' => '100',
+                            'steps' => '0.5',
+                            'default-colors' => true,
+                            'default-styling' => true,
+                        ]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.blur="filterComponents.numberfilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-numberfilter" max="100" min="20" steps="0.5" type="number" wire:key="table-filter-number-numberfilter" />');
+
+    }
+}
diff --git a/tests/Unit/Traits/Visuals/Filters/TextFilterVisualsTest.php b/tests/Unit/Visuals/Filters/TextFilterVisualsTest.php
similarity index 88%
rename from tests/Unit/Traits/Visuals/Filters/TextFilterVisualsTest.php
rename to tests/Unit/Visuals/Filters/TextFilterVisualsTest.php
index 6a89e48ef..7b12c22d3 100644
--- a/tests/Unit/Traits/Visuals/Filters/TextFilterVisualsTest.php
+++ b/tests/Unit/Visuals/Filters/TextFilterVisualsTest.php
@@ -1,18 +1,20 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-final class TextFilterVisualsTest extends TestCase
+#[Group('Visuals')]
+#[Group('Filters')]
+final class TextFilterVisualsTest extends FilterVisualsTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setupBreedsTable();
     }
 
     public function test_can_use_endswith_method(): void
@@ -308,4 +310,26 @@ public function filters(): array
             ->assertDontSee('Maine Coon')
             ->assertSee('Persian');
     }
+
+    public function test_can_set_custom_attributes_on_text_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    TextFilter::make('name')
+                        ->setInputAttributes(['maxlength' => 75, 'class' => 'bg-red-500', 'default-styling' => true]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.blur="filterComponents.name" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 bg-red-500" id="table-filter-name" maxlength="75" type="text" wire:key="table-filter-text-name" />');
+
+    }
 }
diff --git a/tests/Unit/Traits/Visuals/HideableTableTest.php b/tests/Unit/Visuals/HideableTableTest.php
similarity index 93%
rename from tests/Unit/Traits/Visuals/HideableTableTest.php
rename to tests/Unit/Visuals/HideableTableTest.php
index 06cf02db7..b5793dd8d 100644
--- a/tests/Unit/Traits/Visuals/HideableTableTest.php
+++ b/tests/Unit/Visuals/HideableTableTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class HideableTableTest extends TestCase
 {
     public function test_can_see_table_by_default(): void
diff --git a/tests/Unit/Traits/Visuals/LoadingPlaceholderVisualsTest.php b/tests/Unit/Visuals/LoadingPlaceholderVisualsTest.php
similarity index 93%
rename from tests/Unit/Traits/Visuals/LoadingPlaceholderVisualsTest.php
rename to tests/Unit/Visuals/LoadingPlaceholderVisualsTest.php
index ad8923dad..34a1c36de 100644
--- a/tests/Unit/Traits/Visuals/LoadingPlaceholderVisualsTest.php
+++ b/tests/Unit/Visuals/LoadingPlaceholderVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTableLoadingPlaceholder;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class LoadingPlaceholderVisualsTest extends TestCase
 {
     public function test_can_see_placeholder_section(): void
diff --git a/tests/Unit/Traits/Visuals/PaginationVisualsTest.php b/tests/Unit/Visuals/PaginationVisualsTest.php
similarity index 99%
rename from tests/Unit/Traits/Visuals/PaginationVisualsTest.php
rename to tests/Unit/Visuals/PaginationVisualsTest.php
index 1d4226e78..668259f88 100644
--- a/tests/Unit/Traits/Visuals/PaginationVisualsTest.php
+++ b/tests/Unit/Visuals/PaginationVisualsTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{PetsTable};
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class PaginationVisualsTest extends TestCase
 {
     public function test_pagination_shows_by_default(): void
diff --git a/tests/Unit/Traits/Visuals/RefreshVisualsTest.php b/tests/Unit/Visuals/RefreshVisualsTest.php
similarity index 90%
rename from tests/Unit/Traits/Visuals/RefreshVisualsTest.php
rename to tests/Unit/Visuals/RefreshVisualsTest.php
index ee0f7944a..9ed0890a8 100644
--- a/tests/Unit/Traits/Visuals/RefreshVisualsTest.php
+++ b/tests/Unit/Visuals/RefreshVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class RefreshVisualsTest extends TestCase
 {
     public function test_refresh_shows_no_poll_by_default(): void
diff --git a/tests/Unit/Traits/Visuals/ReorderingVisualsTest.php b/tests/Unit/Visuals/ReorderingVisualsTest.php
similarity index 99%
rename from tests/Unit/Traits/Visuals/ReorderingVisualsTest.php
rename to tests/Unit/Visuals/ReorderingVisualsTest.php
index 5ee1071aa..20e5b08af 100644
--- a/tests/Unit/Traits/Visuals/ReorderingVisualsTest.php
+++ b/tests/Unit/Visuals/ReorderingVisualsTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class ReorderingVisualsTest extends TestCase
 {
     public function test_filter_array_setup(): array
diff --git a/tests/Unit/Traits/Visuals/SearchVisualsTest.php b/tests/Unit/Visuals/SearchVisualsTest.php
similarity index 97%
rename from tests/Unit/Traits/Visuals/SearchVisualsTest.php
rename to tests/Unit/Visuals/SearchVisualsTest.php
index c64876e32..4d56ee213 100644
--- a/tests/Unit/Traits/Visuals/SearchVisualsTest.php
+++ b/tests/Unit/Visuals/SearchVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class SearchVisualsTest extends TestCase
 {
     public function test_search_shows_be_default(): void
diff --git a/tests/Unit/Traits/Visuals/SortingVisualsTest.php b/tests/Unit/Visuals/SortingVisualsTest.php
similarity index 98%
rename from tests/Unit/Traits/Visuals/SortingVisualsTest.php
rename to tests/Unit/Visuals/SortingVisualsTest.php
index 6e0bb79f4..6a6333445 100644
--- a/tests/Unit/Traits/Visuals/SortingVisualsTest.php
+++ b/tests/Unit/Visuals/SortingVisualsTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class SortingVisualsTest extends TestCase
 {
     public array $default10 = [];

From ab35e6cf26b9d1467e7b2e9a0e16dcc422126fe5 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 24 Dec 2024 06:35:19 +0000
Subject: [PATCH 06/36] Enable InputAttributes for SelectFilter (#2133)

* Enable InputAttributes for SelectFilter

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../components/tools/filters/select.blade.php   | 17 +++++++++--------
 src/Views/Filters/SelectFilter.php              | 11 +++++++++++
 tests/Unit/Views/Filters/SelectFilterTest.php   |  4 ++++
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/resources/views/components/tools/filters/select.blade.php b/resources/views/components/tools/filters/select.blade.php
index d3f5dfe1a..9a0ca9683 100644
--- a/resources/views/components/tools/filters/select.blade.php
+++ b/resources/views/components/tools/filters/select.blade.php
@@ -5,15 +5,16 @@
         'rounded-md shadow-sm' => $isTailwind,
         'inline' => $isBootstrap,
     ])>
-        <select {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} 
-            wire:key="{{ $filter->generateWireKey($tableName, 'select') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            @class([
-                    'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind,
-                    'form-control' => $isBootstrap4,
-                    'form-select' => $isBootstrap5,
+        <select {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge()
+                ->class([
+                    'block w-full transition duration-150 ease-in-out rounded-md shadow-sm focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap4 && ($filterInputAttributes['default-styling'] ?? true),
+                    'form-select' => $isBootstrap5 && ($filterInputAttributes['default-styling'] ?? true),
                 ])
-        >
+                ->except(['default-styling','default-colors']) 
+            }}>
             @foreach($filter->getOptions() as $key => $value)
                 @if (is_iterable($value))
                     <optgroup label="{{ $key }}">
diff --git a/src/Views/Filters/SelectFilter.php b/src/Views/Filters/SelectFilter.php
index dc564fd22..4066f91cb 100644
--- a/src/Views/Filters/SelectFilter.php
+++ b/src/Views/Filters/SelectFilter.php
@@ -49,4 +49,15 @@ public function getFilterPillValue($value): array|string|bool|null
                 ->mapWithKeys(fn ($options, $optgroupLabel) => is_iterable($options) ? $options : [$optgroupLabel => $options])[$value]
             ?? null;
     }
+
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                'wire:key' => $this->generateWireKey($this->getGenericDisplayData()['tableName'], 'select'),
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
 }
diff --git a/tests/Unit/Views/Filters/SelectFilterTest.php b/tests/Unit/Views/Filters/SelectFilterTest.php
index c95653019..43fb49561 100644
--- a/tests/Unit/Views/Filters/SelectFilterTest.php
+++ b/tests/Unit/Views/Filters/SelectFilterTest.php
@@ -13,6 +13,10 @@ protected function setUp(): void
     {
         parent::setUp();
         self::$filterInstance = SelectFilter::make('Active')->options(['Cartman', 'Tux', 'May', 'Ben', 'Chico']);
+        self::$extraFilterInputAttributes = [
+            'wire:key' => 'test123-filter-select-active',
+        ];
+
     }
 
     public function test_array_setup(): array

From eda4c5ec3ce3661d994e2b01f6a1396e8bac52dc Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Thu, 26 Dec 2024 21:19:29 +0000
Subject: [PATCH 07/36] Tidy ComponentUtilities, Migrate
 ColumnSelectQueryString (#2135)

* Tidy ComponentUtilities, Migrate ColumnSelectQueryString

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/ComponentUtilities.php             |  18 ---
 .../Configuration/ComponentConfiguration.php  | 111 ----------------
 .../Configuration/QueryConfiguration.php      | 124 ++++++++++++++++++
 .../QueryStringConfiguration.php              |  32 ++++-
 .../Core/QueryStrings/HasQueryString.php      |  59 ---------
 .../HasQueryStringForColumnSelect.php         |  66 ++++++++++
 src/Traits/HasAllTraits.php                   |   3 +-
 src/Traits/Helpers/ComponentHelpers.php       |  95 --------------
 src/Traits/Helpers/QueryHelpers.php           |  99 ++++++++++++++
 src/Traits/Helpers/QueryStringHelpers.php     |  25 ++++
 src/Traits/WithColumnSelect.php               |   8 +-
 src/Traits/WithQuery.php                      |  31 +++++
 src/Traits/WithQueryString.php                |  10 +-
 .../QueryStringForColumnSelectTest.php        |  67 ++++++++++
 .../QueryStringForFiltersTest.php             | 106 +++++----------
 .../QueryStrings/QueryStringForSearchTest.php | 109 +++++----------
 .../QueryStrings/QueryStringForSortTest.php   | 108 +++++----------
 .../Core/QueryStrings/QueryStringTestBase.php |  28 ++++
 18 files changed, 576 insertions(+), 523 deletions(-)
 create mode 100644 src/Traits/Configuration/QueryConfiguration.php
 delete mode 100644 src/Traits/Core/QueryStrings/HasQueryString.php
 create mode 100644 src/Traits/Core/QueryStrings/HasQueryStringForColumnSelect.php
 create mode 100644 src/Traits/Helpers/QueryHelpers.php
 create mode 100644 src/Traits/WithQuery.php
 create mode 100644 tests/Unit/Traits/Core/QueryStrings/QueryStringForColumnSelectTest.php
 create mode 100644 tests/Unit/Traits/Core/QueryStrings/QueryStringTestBase.php

diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index 89607fe66..d2121205f 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -15,14 +15,8 @@ trait ComponentUtilities
 
     public array $table = [];
 
-    protected Builder $builder;
-
     protected $model;
 
-    protected ?string $primaryKey;
-
-    protected array $relationships = [];
-
     #[Locked]
     public string $tableName = 'table';
 
@@ -31,20 +25,8 @@ trait ComponentUtilities
 
     protected bool $offlineIndicatorStatus = true;
 
-    protected bool $eagerLoadAllRelationsStatus = false;
-
     protected string $emptyMessage = 'No items found, try to broaden your search';
 
-    protected array $additionalSelects = [];
-
-    protected array $extraWiths = [];
-
-    protected array $extraWithCounts = [];
-
-    protected array $extraWithSums = [];
-
-    protected array $extraWithAvgs = [];
-
     protected bool $useComputedProperties = true;
 
     protected bool $hasRunConfigure = false;
diff --git a/src/Traits/Configuration/ComponentConfiguration.php b/src/Traits/Configuration/ComponentConfiguration.php
index f233718c8..fee44c87d 100644
--- a/src/Traits/Configuration/ComponentConfiguration.php
+++ b/src/Traits/Configuration/ComponentConfiguration.php
@@ -4,13 +4,6 @@
 
 trait ComponentConfiguration
 {
-    public function setPrimaryKey(?string $key): self
-    {
-        $this->primaryKey = $key;
-
-        return $this;
-    }
-
     /**
      * Set the empty message
      */
@@ -42,54 +35,6 @@ public function setOfflineIndicatorDisabled(): self
         return $this;
     }
 
-    public function setEagerLoadAllRelationsStatus(bool $status): self
-    {
-        $this->eagerLoadAllRelationsStatus = $status;
-
-        return $this;
-    }
-
-    public function setEagerLoadAllRelationsEnabled(): self
-    {
-        $this->setEagerLoadAllRelationsStatus(true);
-
-        return $this;
-    }
-
-    public function setEagerLoadAllRelationsDisabled(): self
-    {
-        $this->setEagerLoadAllRelationsStatus(false);
-
-        return $this;
-    }
-
-    /**
-     * Allows adding a single set of additional selects to the query
-     */
-    public function setAdditionalSelects(string|array $selects): self
-    {
-        if (! is_array($selects)) {
-            $selects = [$selects];
-        }
-
-        $this->additionalSelects = $selects;
-
-        return $this;
-    }
-
-    /**
-     * Allows appending more additional selects
-     */
-    public function addAdditionalSelects(string|array $selects): self
-    {
-        if (! is_array($selects)) {
-            $selects = [$selects];
-        }
-        $this->additionalSelects = [...$this->additionalSelects, ...$selects];
-
-        return $this;
-    }
-
     public function setDataTableFingerprint(string $dataTableFingerprint): self
     {
         $this->dataTableFingerprint = $dataTableFingerprint;
@@ -97,62 +42,6 @@ public function setDataTableFingerprint(string $dataTableFingerprint): self
         return $this;
     }
 
-    public function setExtraWiths(array $extraWiths): self
-    {
-        $this->extraWiths = $extraWiths;
-
-        return $this;
-    }
-
-    public function addExtraWith(string $extraWith): self
-    {
-        $this->extraWiths[] = $extraWith;
-
-        return $this;
-    }
-
-    public function addExtraWiths(array $extraWiths): self
-    {
-        $this->extraWiths = [...$this->extraWiths, ...$extraWiths];
-
-        return $this;
-    }
-
-    public function setExtraWithCounts(array $extraWithCounts): self
-    {
-        $this->extraWithCounts = $extraWithCounts;
-
-        return $this;
-    }
-
-    public function addExtraWithCount(string $extraWithCount): self
-    {
-        $this->extraWithCounts[] = $extraWithCount;
-
-        return $this;
-    }
-
-    public function addExtraWithCounts(array $extraWithCounts): self
-    {
-        $this->extraWithCounts = [...$this->extraWithCounts, ...$extraWithCounts];
-
-        return $this;
-    }
-
-    public function addExtraWithSum(string $relationship, string $column): self
-    {
-        $this->extraWithSums[] = ['table' => $relationship, 'field' => $column];
-
-        return $this;
-    }
-
-    public function addExtraWithAvg(string $relationship, string $column): self
-    {
-        $this->extraWithAvgs[] = ['table' => $relationship, 'field' => $column];
-
-        return $this;
-    }
-
     public function useComputedPropertiesEnabled(): self
     {
         $this->useComputedProperties = true;
diff --git a/src/Traits/Configuration/QueryConfiguration.php b/src/Traits/Configuration/QueryConfiguration.php
new file mode 100644
index 000000000..8c2d5f3e6
--- /dev/null
+++ b/src/Traits/Configuration/QueryConfiguration.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
+
+use Illuminate\Database\Eloquent\Builder;
+
+trait QueryConfiguration
+{
+    public function setBuilder(Builder $builder): void
+    {
+        $this->builder = $builder;
+    }
+
+    public function setPrimaryKey(?string $key): self
+    {
+        $this->primaryKey = $key;
+
+        return $this;
+    }
+
+    /**
+     * Allows adding a single set of additional selects to the query
+     */
+    public function setAdditionalSelects(string|array $selects): self
+    {
+        if (! is_array($selects)) {
+            $selects = [$selects];
+        }
+
+        $this->additionalSelects = $selects;
+
+        return $this;
+    }
+
+    /**
+     * Allows appending more additional selects
+     */
+    public function addAdditionalSelects(string|array $selects): self
+    {
+        if (! is_array($selects)) {
+            $selects = [$selects];
+        }
+        $this->additionalSelects = [...$this->additionalSelects, ...$selects];
+
+        return $this;
+    }
+
+    public function setExtraWiths(array $extraWiths): self
+    {
+        $this->extraWiths = $extraWiths;
+
+        return $this;
+    }
+
+    public function addExtraWith(string $extraWith): self
+    {
+        $this->extraWiths[] = $extraWith;
+
+        return $this;
+    }
+
+    public function addExtraWiths(array $extraWiths): self
+    {
+        $this->extraWiths = [...$this->extraWiths, ...$extraWiths];
+
+        return $this;
+    }
+
+    public function setExtraWithCounts(array $extraWithCounts): self
+    {
+        $this->extraWithCounts = $extraWithCounts;
+
+        return $this;
+    }
+
+    public function addExtraWithCount(string $extraWithCount): self
+    {
+        $this->extraWithCounts[] = $extraWithCount;
+
+        return $this;
+    }
+
+    public function addExtraWithCounts(array $extraWithCounts): self
+    {
+        $this->extraWithCounts = [...$this->extraWithCounts, ...$extraWithCounts];
+
+        return $this;
+    }
+
+    public function addExtraWithSum(string $relationship, string $column): self
+    {
+        $this->extraWithSums[] = ['table' => $relationship, 'field' => $column];
+
+        return $this;
+    }
+
+    public function addExtraWithAvg(string $relationship, string $column): self
+    {
+        $this->extraWithAvgs[] = ['table' => $relationship, 'field' => $column];
+
+        return $this;
+    }
+
+    public function setEagerLoadAllRelationsStatus(bool $status): self
+    {
+        $this->eagerLoadAllRelationsStatus = $status;
+
+        return $this;
+    }
+
+    public function setEagerLoadAllRelationsEnabled(): self
+    {
+        $this->setEagerLoadAllRelationsStatus(true);
+
+        return $this;
+    }
+
+    public function setEagerLoadAllRelationsDisabled(): self
+    {
+        $this->setEagerLoadAllRelationsStatus(false);
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Configuration/QueryStringConfiguration.php b/src/Traits/Configuration/QueryStringConfiguration.php
index fb0dedfad..e62997bc5 100644
--- a/src/Traits/Configuration/QueryStringConfiguration.php
+++ b/src/Traits/Configuration/QueryStringConfiguration.php
@@ -4,13 +4,6 @@
 
 trait QueryStringConfiguration
 {
-    public function setQueryStringAlias(string $queryStringAlias): self
-    {
-        $this->queryStringAlias = $queryStringAlias;
-
-        return $this;
-    }
-
     public function setupQueryStringStatus(): void
     {
         if (! $this->hasQueryStringStatus()) {
@@ -41,4 +34,29 @@ public function setQueryStringDisabled(): self
 
         return $this;
     }
+
+    public function setQueryStringAlias(string $queryStringAlias): self
+    {
+        $this->queryStringAlias = $queryStringAlias;
+
+        return $this;
+    }
+
+    protected function setQueryStringConfig(string $type, array $config): self
+    {
+        $this->queryStringConfig[$type] = array_merge($this->getQueryStringConfig($type), $config);
+
+        return $this;
+    }
+
+    protected function setQueryStringConfigStatus(string $type, bool $status): self
+    {
+        return $this->setQueryStringConfig($type, ['status' => $status]);
+
+    }
+
+    protected function setQueryStringConfigAlias(string $type, string $alias): self
+    {
+        return $this->setQueryStringConfig($type, ['alias' => $alias]);
+    }
 }
diff --git a/src/Traits/Core/QueryStrings/HasQueryString.php b/src/Traits/Core/QueryStrings/HasQueryString.php
deleted file mode 100644
index 7c1f567b6..000000000
--- a/src/Traits/Core/QueryStrings/HasQueryString.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings;
-
-use Livewire\Attributes\Locked;
-
-trait HasQueryString
-{
-    #[Locked]
-    public array $queryStringConfig = [
-        'columns' => [],
-        'filter' => [],
-        'search' => [],
-        'sorts' => [],
-    ];
-
-    protected function getQueryStringConfig(string $type): array
-    {
-        return array_merge(['status' => null, 'alias' => null], ($this->queryStringConfig[$type] ?? []));
-    }
-
-    protected function hasQueryStringConfigStatus(string $type): bool
-    {
-        return isset($this->getQueryStringConfig($type)['status']);
-    }
-
-    protected function getQueryStringConfigStatus(string $type): bool
-    {
-        return $this->getQueryStringConfig($type)['status'] ?? $this->getQueryStringStatus();
-    }
-
-    protected function hasQueryStringConfigAlias(string $type): bool
-    {
-        return isset($this->getQueryStringConfig($type)['alias']);
-    }
-
-    protected function getQueryStringConfigAlias(string $type): string
-    {
-        return $this->getQueryStringConfig($type)['alias'] ?? $this->getQueryStringAlias().'-'.$type;
-    }
-
-    protected function setQueryStringConfig(string $type, array $config): self
-    {
-        $this->queryStringConfig[$type] = array_merge($this->getQueryStringConfig($type), $config);
-
-        return $this;
-    }
-
-    protected function setQueryStringConfigStatus(string $type, bool $status): self
-    {
-        return $this->setQueryStringConfig($type, ['status' => $status]);
-
-    }
-
-    protected function setQueryStringConfigAlias(string $type, string $alias): self
-    {
-        return $this->setQueryStringConfig($type, ['alias' => $alias]);
-    }
-}
diff --git a/src/Traits/Core/QueryStrings/HasQueryStringForColumnSelect.php b/src/Traits/Core/QueryStrings/HasQueryStringForColumnSelect.php
new file mode 100644
index 000000000..51e9140a2
--- /dev/null
+++ b/src/Traits/Core/QueryStrings/HasQueryStringForColumnSelect.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings;
+
+trait HasQueryStringForColumnSelect
+{
+    protected function queryStringHasQueryStringForColumnSelect(): array
+    {
+        return (($this->queryStringIsEnabled() || $this->queryStringForColumnSelectEnabled()) && $this->columnSelectIsEnabled()) ? ['selectedColumns' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForColumnSelect()]] : [];
+
+    }
+
+    protected function setupQueryStringStatusForColumnSelect(): void
+    {
+        if (! $this->hasQueryStringStatusForColumnSelect()) {
+            $this->setQueryStringForColumnSelectEnabled();
+        }
+    }
+
+    public function hasQueryStringStatusForColumnSelect(): bool
+    {
+        return $this->hasQueryStringConfigStatus('columns');
+    }
+
+    public function getQueryStringStatusForColumnSelect(): bool
+    {
+        return $this->getQueryStringConfigStatus('columns');
+    }
+
+    public function queryStringForColumnSelectEnabled(): bool
+    {
+        $this->setupQueryStringStatusForColumnSelect();
+
+        return $this->getQueryStringStatusForColumnSelect() && $this->columnSelectIsEnabled();
+    }
+
+    public function setQueryStringStatusForColumnSelect(bool $status): self
+    {
+        return $this->setQueryStringConfigStatus('columns', $status);
+    }
+
+    public function setQueryStringForColumnSelectEnabled(): self
+    {
+        return $this->setQueryStringStatusForColumnSelect(true);
+    }
+
+    public function setQueryStringForColumnSelectDisabled(): self
+    {
+        return $this->setQueryStringStatusForColumnSelect(false);
+    }
+
+    public function hasQueryStringAliasForColumnSelect(): bool
+    {
+        return $this->hasQueryStringConfigAlias('columns');
+    }
+
+    public function getQueryStringAliasForColumnSelect(): string
+    {
+        return $this->getQueryStringConfigAlias('columns');
+    }
+
+    public function setQueryStringAliasForColumnSelect(string $alias): self
+    {
+        return $this->setQueryStringConfigAlias('columns', $alias);
+    }
+}
diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index ebbe7a815..e2e675588 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -12,7 +12,8 @@ trait HasAllTraits
     use HasLocalisations;
     use WithLoadingPlaceholder;
     use HasTheme;
-    use ComponentUtilities,
+    use WithQuery,
+        ComponentUtilities,
         WithActions,
         WithData,
         WithQueryString,
diff --git a/src/Traits/Helpers/ComponentHelpers.php b/src/Traits/Helpers/ComponentHelpers.php
index ff4c5c212..06cf2ee16 100644
--- a/src/Traits/Helpers/ComponentHelpers.php
+++ b/src/Traits/Helpers/ComponentHelpers.php
@@ -12,38 +12,6 @@ public function getDataTableFingerprint(): string
         return $this->dataTableFingerprint ?? ($this->dataTableFingerprint = $this->generateDataTableFingerprint());
     }
 
-    public function setBuilder(Builder $builder): void
-    {
-        $this->builder = $builder;
-    }
-
-    public function getBuilder(): Builder
-    {
-        return $this->builder;
-    }
-
-    public function hasPrimaryKey(): bool
-    {
-        return isset($this->primaryKey) && $this->primaryKey !== null;
-    }
-
-    /**
-     * @return mixed
-     */
-    #[Computed]
-    public function getPrimaryKey()
-    {
-        return $this->primaryKey;
-    }
-
-    /**
-     * @return array<mixed>
-     */
-    public function getRelationships(): array
-    {
-        return $this->relationships;
-    }
-
     public function hasModel(): bool
     {
         return $this->model !== null;
@@ -106,69 +74,6 @@ public function isTableNamed(string $name): bool
         return $this->tableName === $name;
     }
 
-    public function getEagerLoadAllRelationsStatus(): bool
-    {
-        return $this->eagerLoadAllRelationsStatus;
-    }
-
-    public function eagerLoadAllRelationsIsEnabled(): bool
-    {
-        return $this->getEagerLoadAllRelationsStatus() === true;
-    }
-
-    public function eagerLoadAllRelationsIsDisabled(): bool
-    {
-        return $this->getEagerLoadAllRelationsStatus() === false;
-    }
-
-    /**
-     * @return array<mixed>
-     */
-    public function getAdditionalSelects(): array
-    {
-        return $this->additionalSelects;
-    }
-
-    public function hasExtraWiths(): bool
-    {
-        return ! empty($this->extraWiths);
-    }
-
-    public function getExtraWiths(): array
-    {
-        return $this->extraWiths;
-    }
-
-    public function hasExtraWithCounts(): bool
-    {
-        return ! empty($this->extraWithCounts);
-    }
-
-    public function getExtraWithCounts(): array
-    {
-        return $this->extraWithCounts;
-    }
-
-    public function hasExtraWithSums(): bool
-    {
-        return ! empty($this->extraWithSums);
-    }
-
-    public function getExtraWithSums(): array
-    {
-        return $this->extraWithSums;
-    }
-
-    public function hasExtraWithAvgs(): bool
-    {
-        return ! empty($this->extraWithAvgs);
-    }
-
-    public function getExtraWithAvgs(): array
-    {
-        return $this->extraWithAvgs;
-    }
-
     public function getComputedPropertiesStatus(): bool
     {
         return $this->useComputedProperties ?? false;
diff --git a/src/Traits/Helpers/QueryHelpers.php b/src/Traits/Helpers/QueryHelpers.php
new file mode 100644
index 000000000..1a7b2d46c
--- /dev/null
+++ b/src/Traits/Helpers/QueryHelpers.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
+
+use Illuminate\Database\Eloquent\Builder;
+use Livewire\Attributes\Computed;
+
+trait QueryHelpers
+{
+    public function getBuilder(): Builder
+    {
+        return $this->builder;
+    }
+
+    public function hasPrimaryKey(): bool
+    {
+        return isset($this->primaryKey) && $this->primaryKey !== null;
+    }
+
+    /**
+     * @return mixed
+     */
+    #[Computed]
+    public function getPrimaryKey()
+    {
+        return $this->primaryKey;
+    }
+
+    /**
+     * @return array<mixed>
+     */
+    public function getRelationships(): array
+    {
+        return $this->relationships;
+    }
+
+    /**
+     * @return array<mixed>
+     */
+    public function getAdditionalSelects(): array
+    {
+        return $this->additionalSelects;
+    }
+
+    public function hasExtraWiths(): bool
+    {
+        return ! empty($this->extraWiths);
+    }
+
+    public function getExtraWiths(): array
+    {
+        return $this->extraWiths;
+    }
+
+    public function hasExtraWithCounts(): bool
+    {
+        return ! empty($this->extraWithCounts);
+    }
+
+    public function getExtraWithCounts(): array
+    {
+        return $this->extraWithCounts;
+    }
+
+    public function hasExtraWithSums(): bool
+    {
+        return ! empty($this->extraWithSums);
+    }
+
+    public function getExtraWithSums(): array
+    {
+        return $this->extraWithSums;
+    }
+
+    public function hasExtraWithAvgs(): bool
+    {
+        return ! empty($this->extraWithAvgs);
+    }
+
+    public function getExtraWithAvgs(): array
+    {
+        return $this->extraWithAvgs;
+    }
+
+    public function getEagerLoadAllRelationsStatus(): bool
+    {
+        return $this->eagerLoadAllRelationsStatus;
+    }
+
+    public function eagerLoadAllRelationsIsEnabled(): bool
+    {
+        return $this->getEagerLoadAllRelationsStatus() === true;
+    }
+
+    public function eagerLoadAllRelationsIsDisabled(): bool
+    {
+        return $this->getEagerLoadAllRelationsStatus() === false;
+    }
+}
diff --git a/src/Traits/Helpers/QueryStringHelpers.php b/src/Traits/Helpers/QueryStringHelpers.php
index e1acd73a9..cb1940e2a 100644
--- a/src/Traits/Helpers/QueryStringHelpers.php
+++ b/src/Traits/Helpers/QueryStringHelpers.php
@@ -35,4 +35,29 @@ public function getQueryStringAlias(): string
     {
         return $this->queryStringAlias ?? $this->getTableName();
     }
+
+    protected function getQueryStringConfig(string $type): array
+    {
+        return array_merge(['status' => null, 'alias' => null], ($this->queryStringConfig[$type] ?? []));
+    }
+
+    protected function hasQueryStringConfigStatus(string $type): bool
+    {
+        return isset($this->getQueryStringConfig($type)['status']);
+    }
+
+    protected function getQueryStringConfigStatus(string $type): bool
+    {
+        return $this->getQueryStringConfig($type)['status'] ?? $this->getQueryStringStatus();
+    }
+
+    protected function hasQueryStringConfigAlias(string $type): bool
+    {
+        return isset($this->getQueryStringConfig($type)['alias']);
+    }
+
+    protected function getQueryStringConfigAlias(string $type): string
+    {
+        return $this->getQueryStringConfig($type)['alias'] ?? $this->getQueryStringAlias().'-'.$type;
+    }
 }
diff --git a/src/Traits/WithColumnSelect.php b/src/Traits/WithColumnSelect.php
index d398967cc..e992c72a8 100644
--- a/src/Traits/WithColumnSelect.php
+++ b/src/Traits/WithColumnSelect.php
@@ -5,12 +5,14 @@
 use Livewire\Attributes\Locked;
 use Rappasoft\LaravelLivewireTables\Events\ColumnsSelected;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\ColumnSelectConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings\HasQueryStringForColumnSelect;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\ColumnSelectHelpers;
 
 trait WithColumnSelect
 {
     use ColumnSelectConfiguration,
-        ColumnSelectHelpers;
+        ColumnSelectHelpers,
+        HasQueryStringForColumnSelect;
 
     #[Locked]
     public array $columnSelectColumns = ['setupRun' => false, 'selected' => [], 'deselected' => [], 'defaultdeselected' => []];
@@ -35,7 +37,7 @@ trait WithColumnSelect
 
     protected bool $columnSelectHiddenOnTablet = false;
 
-    protected function queryStringWithColumnSelect(): array
+    /*protected function queryStringWithColumnSelect(): array
     {
         if ($this->queryStringIsEnabled() && $this->columnSelectIsEnabled()) {
             return [
@@ -44,7 +46,7 @@ protected function queryStringWithColumnSelect(): array
         }
 
         return [];
-    }
+    }*/
 
     public function bootedWithColumnSelect(): void
     {
diff --git a/src/Traits/WithQuery.php b/src/Traits/WithQuery.php
new file mode 100644
index 000000000..836006ae2
--- /dev/null
+++ b/src/Traits/WithQuery.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits;
+
+use Illuminate\Database\Eloquent\Builder;
+use Rappasoft\LaravelLivewireTables\Traits\Configuration\QueryConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Helpers\QueryHelpers;
+
+trait WithQuery
+{
+    use QueryConfiguration,
+        QueryHelpers;
+
+    protected Builder $builder;
+
+    protected ?string $primaryKey;
+
+    protected array $relationships = [];
+
+    protected array $additionalSelects = [];
+
+    protected array $extraWiths = [];
+
+    protected array $extraWithCounts = [];
+
+    protected array $extraWithSums = [];
+
+    protected array $extraWithAvgs = [];
+
+    protected bool $eagerLoadAllRelationsStatus = false;
+}
diff --git a/src/Traits/WithQueryString.php b/src/Traits/WithQueryString.php
index 56dee3699..52b2b37f8 100644
--- a/src/Traits/WithQueryString.php
+++ b/src/Traits/WithQueryString.php
@@ -4,14 +4,20 @@
 
 use Livewire\Attributes\Locked;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\QueryStringConfiguration;
-use Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings\HasQueryString;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\QueryStringHelpers;
 
 trait WithQueryString
 {
     use QueryStringConfiguration,
         QueryStringHelpers;
-    use HasQueryString;
+
+    #[Locked]
+    public array $queryStringConfig = [
+        'columns' => ['status' => false, 'alias' => null],
+        'filter' => ['status' => false, 'alias' => null],
+        'search' => ['status' => true, 'alias' => null],
+        'sorts' => ['status' => true, 'alias' => null],
+    ];
 
     #[Locked]
     public ?bool $queryStringStatus;
diff --git a/tests/Unit/Traits/Core/QueryStrings/QueryStringForColumnSelectTest.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringForColumnSelectTest.php
new file mode 100644
index 000000000..1ab117386
--- /dev/null
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringForColumnSelectTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Core\QueryStrings;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+
+#[Group('QueryString')]
+final class QueryStringForColumnSelectTest extends QueryStringTestBase
+{
+    public function test_can_get_default_column_select_query_string_status(): void
+    {
+        parent::$mock->configure();
+        parent::$mock->boot();
+
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForColumnSelect());
+
+        parent::$mock->setQueryStringForColumnSelectEnabled();
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForColumnSelect());
+
+    }
+
+    public function test_can_disable_column_select_query_string_status(): void
+    {
+        parent::$mock->configure();
+        parent::$mock->boot();
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForColumnSelect());
+        parent::$mock->setQueryStringForColumnSelectDisabled();
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForColumnSelect());
+    }
+
+    public function test_can_enable_column_select_query_string_status(): void
+    {
+        parent::$mock->configure();
+        parent::$mock->boot();
+
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForColumnSelect());
+        parent::$mock->setQueryStringForColumnSelectEnabled();
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForColumnSelect());
+        parent::$mock->setQueryStringForColumnSelectDisabled();
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForColumnSelect());
+
+    }
+
+    public function test_can_get_default_column_select_query_string_alias(): void
+    {
+        parent::$mock->configure();
+        parent::$mock->boot();
+
+        $this->assertSame('table-columns', parent::$mock->getQueryStringAliasForColumnSelect());
+
+    }
+
+    public function test_can_change_default_column_select_query_string_alias(): void
+    {
+        parent::$mock->configure();
+        parent::$mock->boot();
+
+        $this->assertSame('table-columns', parent::$mock->getQueryStringAliasForColumnSelect());
+        $this->assertFalse(parent::$mock->hasQueryStringAliasForColumnSelect());
+        parent::$mock->setQueryStringAliasForColumnSelect('selected-columns');
+        $this->assertSame('selected-columns', parent::$mock->getQueryStringAliasForColumnSelect());
+        $this->assertTrue(parent::$mock->hasQueryStringAliasForColumnSelect());
+    }
+}
diff --git a/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
index 849da880f..63ae05085 100644
--- a/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
@@ -6,107 +6,63 @@
 use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
-use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
 #[Group('Filters')]
-final class QueryStringForFiltersTest extends TestCase
+#[Group('QueryString')]
+final class QueryStringForFiltersTest extends QueryStringTestBase
 {
-    public function test_can_get_default_filter_query_string_status(): void
+    protected function setUp(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-        };
+        parent::setUp();
+    }
 
-        $mock->configure();
-        $mock->boot();
+    public function test_can_get_default_filter_query_string_status(): void
+    {
+        parent::$mock->configure();
+        parent::$mock->boot();
 
-        $this->assertSame(true, $mock->getQueryStringStatusForFilter());
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForFilter());
     }
 
     public function test_can_disable_filter_query_string_status(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-                $this->setQueryStringForFilterDisabled();
-            }
-        };
-
-        $mock->configure();
-        $mock->boot();
-
-        $this->assertSame(false, $mock->getQueryStringStatusForFilter());
+        parent::$mock->configure();
+        parent::$mock->boot();
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForFilter());
+        parent::$mock->setQueryStringForFilterDisabled();
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForFilter());
     }
 
     public function test_can_enable_filter_query_string_status(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-                $this->setQueryStringForFilterDisabled();
-            }
-        };
+        parent::$mock->configure();
+        parent::$mock->boot();
 
-        $mock->configure();
-        $mock->boot();
-
-        $this->assertSame(false, $mock->getQueryStringStatusForFilter());
-        $mock->setQueryStringForFilterEnabled();
-        $this->assertSame(true, $mock->getQueryStringStatusForFilter());
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForFilter());
+        parent::$mock->setQueryStringForFilterDisabled();
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForFilter());
+        parent::$mock->setQueryStringForFilterEnabled();
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForFilter());
 
     }
 
     public function test_can_get_default_filter_query_string_alias(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-        };
+        parent::$mock->configure();
+        parent::$mock->boot();
 
-        $mock->configure();
-        $mock->boot();
-
-        $this->assertSame('table-filters', $mock->getQueryStringAliasForFilter());
+        $this->assertSame('table-filters', parent::$mock->getQueryStringAliasForFilter());
 
     }
 
     public function test_can_change_default_filter_query_string_alias(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-        };
-
-        $mock->configure();
-        $mock->boot();
+        parent::$mock->configure();
+        parent::$mock->boot();
 
-        $this->assertSame('table-filters', $mock->getQueryStringAliasForFilter());
-        $mock->setQueryStringAliasForFilter('pet-filters');
-        $this->assertSame('pet-filters', $mock->getQueryStringAliasForFilter());
-        $this->assertTrue($mock->hasQueryStringAliasForFilter());
+        $this->assertSame('table-filters', parent::$mock->getQueryStringAliasForFilter());
+        parent::$mock->setQueryStringAliasForFilter('pet-filters');
+        $this->assertSame('pet-filters', parent::$mock->getQueryStringAliasForFilter());
+        $this->assertTrue(parent::$mock->hasQueryStringAliasForFilter());
     }
 }
diff --git a/tests/Unit/Traits/Core/QueryStrings/QueryStringForSearchTest.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringForSearchTest.php
index c972feb96..f85deaf97 100644
--- a/tests/Unit/Traits/Core/QueryStrings/QueryStringForSearchTest.php
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringForSearchTest.php
@@ -4,107 +4,62 @@
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
-use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
-final class QueryStringForSearchTest extends TestCase
+#[Group('QueryString')]
+final class QueryStringForSearchTest extends QueryStringTestBase
 {
-    public function test_can_get_default_search_query_string_status(): void
+    protected function setUp(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-        };
+        parent::setUp();
+    }
 
-        $mock->configure();
-        $mock->boot();
+    public function test_can_get_default_search_query_string_status(): void
+    {
+        parent::$mock->configure();
+        parent::$mock->boot();
 
-        $this->assertSame(true, $mock->getQueryStringStatusForSearch());
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForSearch());
     }
 
     public function test_can_disable_search_query_string_status(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-                $this->setQueryStringForSearchDisabled();
-            }
-        };
+        parent::$mock->configure();
+        parent::$mock->boot();
+        parent::$mock->setQueryStringForSearchDisabled();
 
-        $mock->configure();
-        $mock->boot();
-
-        $this->assertSame(false, $mock->getQueryStringStatusForSearch());
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForSearch());
     }
 
     public function test_can_enable_search_query_string_status(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-                $this->setQueryStringForSearchDisabled();
-            }
-        };
-
-        $mock->configure();
-        $mock->boot();
-
-        $this->assertSame(false, $mock->getQueryStringStatusForSearch());
-        $mock->setQueryStringForSearchEnabled();
-        $this->assertSame(true, $mock->getQueryStringStatusForSearch());
+        parent::$mock->configure();
+        parent::$mock->boot();
+        parent::$mock->setQueryStringForSearchDisabled();
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForSearch());
+        parent::$mock->setQueryStringForSearchEnabled();
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForSearch());
 
     }
 
     public function test_can_get_default_search_query_string_alias(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-        };
-
-        $mock->configure();
-        $mock->boot();
+        parent::$mock->configure();
+        parent::$mock->boot();
 
-        $this->assertSame('table-search', $mock->getQueryStringAliasForSearch());
+        $this->assertSame('table-search', parent::$mock->getQueryStringAliasForSearch());
     }
 
     public function test_can_change_default_search_query_string_alias(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-        };
-
-        $mock->configure();
-        $mock->boot();
-
-        $this->assertFalse($mock->hasQueryStringAliasForSearch());
-        $this->assertSame('table-search', $mock->getQueryStringAliasForSearch());
-        $mock->setQueryStringAliasForSearch('pet-search');
-        $this->assertSame('pet-search', $mock->getQueryStringAliasForSearch());
-        $this->assertTrue($mock->hasQueryStringAliasForSearch());
+        parent::$mock->configure();
+        parent::$mock->boot();
+
+        $this->assertFalse(parent::$mock->hasQueryStringAliasForSearch());
+        $this->assertSame('table-search', parent::$mock->getQueryStringAliasForSearch());
+        parent::$mock->setQueryStringAliasForSearch('pet-search');
+        $this->assertSame('pet-search', parent::$mock->getQueryStringAliasForSearch());
+        $this->assertTrue(parent::$mock->hasQueryStringAliasForSearch());
     }
 }
diff --git a/tests/Unit/Traits/Core/QueryStrings/QueryStringForSortTest.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringForSortTest.php
index 10215a710..4f71eb5ee 100644
--- a/tests/Unit/Traits/Core/QueryStrings/QueryStringForSortTest.php
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringForSortTest.php
@@ -4,107 +4,65 @@
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
-use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
-final class QueryStringForSortTest extends TestCase
+#[Group('QueryString')]
+final class QueryStringForSortTest extends QueryStringTestBase
 {
-    public function test_can_get_default_sort_query_string_status(): void
+    protected function setUp(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-        };
+        parent::setUp();
+    }
 
-        $mock->configure();
-        $mock->boot();
+    public function test_can_get_default_sort_query_string_status(): void
+    {
+        parent::$mock->configure();
+        parent::$mock->boot();
 
-        $this->assertSame(true, $mock->getQueryStringStatusForSort());
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForSort());
     }
 
     public function test_can_disable_sort_query_string_status(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-                $this->setQueryStringForSortDisabled();
-            }
-        };
-
-        $mock->configure();
-        $mock->boot();
+        parent::$mock->configure();
+        parent::$mock->boot();
+        parent::$mock->setQueryStringForSortDisabled();
 
-        $this->assertSame(false, $mock->getQueryStringStatusForSort());
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForSort());
     }
 
     public function test_can_enable_sort_query_string_status(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
+        parent::$mock->configure();
+        parent::$mock->boot();
+        parent::$mock->setQueryStringForSortDisabled();
 
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-                $this->setQueryStringForSortDisabled();
-            }
-        };
-
-        $mock->configure();
-        $mock->boot();
-
-        $this->assertSame(false, $mock->getQueryStringStatusForSort());
-        $mock->setQueryStringForSortEnabled();
-        $this->assertSame(true, $mock->getQueryStringStatusForSort());
+        $this->assertSame(false, parent::$mock->getQueryStringStatusForSort());
+        parent::$mock->setQueryStringForSortEnabled();
+        $this->assertSame(true, parent::$mock->getQueryStringStatusForSort());
 
     }
 
     public function test_can_get_default_sort_query_string_alias(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-        };
-
-        $mock->configure();
-        $mock->boot();
+        parent::$mock->configure();
+        parent::$mock->boot();
+        parent::$mock->setQueryStringForSortDisabled();
 
-        $this->assertSame('table-sorts', $mock->getQueryStringAliasForSort());
+        $this->assertSame('table-sorts', parent::$mock->getQueryStringAliasForSort());
 
     }
 
     public function test_can_change_default_sort_query_string_alias(): void
     {
-        $mock = new class extends PetsTable
-        {
-            public ?array $testAttributesArray;
-
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-        };
-
-        $mock->configure();
-        $mock->boot();
-
-        $this->assertSame('table-sorts', $mock->getQueryStringAliasForSort());
-        $mock->setQueryStringAliasForSort('pet-sorts');
-        $this->assertSame('pet-sorts', $mock->getQueryStringAliasForSort());
-        $this->assertTrue($mock->hasQueryStringAliasForSort());
+        parent::$mock->configure();
+        parent::$mock->boot();
+        parent::$mock->setQueryStringForSortDisabled();
+
+        $this->assertSame('table-sorts', parent::$mock->getQueryStringAliasForSort());
+        parent::$mock->setQueryStringAliasForSort('pet-sorts');
+        $this->assertSame('pet-sorts', parent::$mock->getQueryStringAliasForSort());
+        $this->assertTrue(parent::$mock->hasQueryStringAliasForSort());
     }
 }
diff --git a/tests/Unit/Traits/Core/QueryStrings/QueryStringTestBase.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringTestBase.php
new file mode 100644
index 000000000..769ae168f
--- /dev/null
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringTestBase.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Core\QueryStrings;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+#[Group('QueryString')]
+class QueryStringTestBase extends TestCase
+{
+    protected static $mock;
+
+    protected function setUp(): void
+    {
+        self::$mock = new class extends PetsTable
+        {
+            public ?array $testAttributesArray;
+
+            public function configure(): void
+            {
+                $this->setDataTableFingerprint('test');
+            }
+        };
+    }
+}

From c67247bc27ac878351521bc406a801fb3de8c5c1 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 31 Dec 2024 22:06:41 +0000
Subject: [PATCH 08/36] TH Fixes - Clean-up, efficiency, and Sort Icons fixes
 (#2140)

* Tweaks for Sort Icon Styling

* Move customIconAttributes into th

* Further tweaks & tidying

* Fixes for other TH Elements

* Move Visuals tests to Visuals section, clean up tests


---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 resources/views/components/table/th.blade.php | 116 +++++++-----------
 .../table/th/bulk-actions.blade.php           |  14 +--
 .../table/th/collapsed-columns.blade.php      |  42 +++----
 .../views/components/table/th/label.blade.php |   4 +
 .../views/components/table/th/plain.blade.php |  15 +--
 .../components/table/th/reorder.blade.php     |  12 +-
 .../components/table/th/sort-icons.blade.php  |  75 ++++++++---
 resources/views/datatable.blade.php           |  14 +--
 src/Commands/MakeCommand.php                  |   2 +-
 .../Helpers/CollapsingColumnHelpers.php       |   2 +
 src/Traits/Helpers/ColumnHelpers.php          |   4 +
 src/Traits/Helpers/TableAttributeHelpers.php  |   2 +-
 src/Traits/WithData.php                       |   2 +-
 src/Traits/WithReordering.php                 |   3 -
 .../Traits/Filters/HasCustomPosition.php      |   2 -
 tests/DataTableComponentTest.php              |   8 --
 tests/Localisations/BaseLocalisationCase.php  |   4 +-
 .../ComponentConfigurationTest.php            |   4 +-
 .../Unit/Traits/Helpers/ColumnHelpersTest.php |   4 +-
 .../Traits/Helpers/ComponentHelpersTest.php   |   2 +-
 tests/Unit/Traits/WithCustomisationsTest.php  |  31 -----
 tests/Unit/Views/Columns/DateColumnTest.php   |   2 +-
 tests/Unit/Views/Columns/IconColumnTest.php   |   2 +-
 tests/Unit/Visuals/BulkActionsVisualsTest.php | 103 +++++++++++++++-
 .../Visuals/CustomisationsVisualsTest.php     |  46 +++++++
 .../Visuals/DataTableComponentVisualsTest.php |  24 ++++
 tests/Unit/Visuals/SortingVisualsTest.php     |   6 +-
 27 files changed, 339 insertions(+), 206 deletions(-)
 create mode 100644 resources/views/components/table/th/label.blade.php
 create mode 100644 tests/Unit/Visuals/CustomisationsVisualsTest.php
 create mode 100644 tests/Unit/Visuals/DataTableComponentVisualsTest.php

diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php
index 525833fe7..f587600eb 100644
--- a/resources/views/components/table/th.blade.php
+++ b/resources/views/components/table/th.blade.php
@@ -1,90 +1,58 @@
-@aware([ 'tableName','isTailwind','isBootstrap'])
 @props(['column', 'index'])
 
 @php
-    $attributes = $attributes->merge(['wire:key' => $tableName . '-header-col-'.$column->getSlug()]);
     $allThAttributes = $this->getAllThAttributes($column);
-
     $customThAttributes = $allThAttributes['customAttributes'];
     $customSortButtonAttributes = $allThAttributes['sortButtonAttributes'];
-    $customSortIconAttributes = $allThAttributes['sortIconAttributes'];
     $customLabelAttributes = $allThAttributes['labelAttributes'];
-
-    //$customThAttributes = $this->getThAttributes($column);
-    //$customSortButtonAttributes = $this->getThSortButtonAttributes($column);
-    //$customSortIconAttributes = $this->getThSortIconAttributes($column);
-
-    $direction = $column->hasField() ? $this->getSort($column->getColumnSelectName()) : $this->getSort($column->getSlug()) ?? null ;
+    $customIconAttributes = $this->getThSortIconAttributes($column);
+    $direction = $column->hasField() ? $this->getSort($column->getColumnSelectName()) : $this->getSort($column->getSlug()) ?? null;
 @endphp
 
-@if ($isTailwind)
-    <th scope="col" {{
-        $attributes->merge($customThAttributes)
-            ->class(['text-gray-500 dark:bg-gray-800 dark:text-gray-400' => (($customThAttributes['default-colors'] ?? true) || ($customThAttributes['default'] ?? true))])
-            ->class(['px-6 py-3 text-left text-xs font-medium whitespace-nowrap uppercase tracking-wider' => (($customThAttributes['default-styling'] ?? true) || ($customThAttributes['default'] ?? true))])
-            ->class(['hidden' => $column->shouldCollapseAlways()])
-            ->class(['hidden md:table-cell' => $column->shouldCollapseOnMobile()])
-            ->class(['hidden lg:table-cell' => $column->shouldCollapseOnTablet()])
-            ->except(['default', 'default-colors', 'default-styling'])
-        }}
-    >
-        @if($column->getColumnLabelStatus())
-            @unless ($this->sortingIsEnabled() && ($column->isSortable() || $column->getSortCallback()))
-                <span {{ $customLabelAttributes->except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }}</span>
-            @else
-                <button wire:click="sortBy('{{ $column->getColumnSortKey() }}')"
-                    {{
+<th {{
+    $attributes->merge($customThAttributes)
+        ->class([
+            'text-gray-500 dark:bg-gray-800 dark:text-gray-400' => $this->isTailwind && (($customThAttributes['default-colors'] ?? true) || ($customThAttributes['default'] ?? true)),
+            'px-6 py-3 text-left text-xs font-medium whitespace-nowrap uppercase tracking-wider' => $this->isTailwind && (($customThAttributes['default-styling'] ?? true) || ($customThAttributes['default'] ?? true)),
+            'hidden' => $this->isTailwind && $column->shouldCollapseAlways(),
+            'hidden md:table-cell' => $this->isTailwind && $column->shouldCollapseOnMobile(),
+            'hidden lg:table-cell' => $this->isTailwind && $column->shouldCollapseOnTablet(),
+            '' => $this->isBootstrap && ($customThAttributes['default'] ?? true),
+            'd-none' => $this->isBootstrap && $column->shouldCollapseAlways(),
+            'd-none d-md-table-cell' => $this->isBootstrap && $column->shouldCollapseOnMobile(),
+            'd-none d-lg-table-cell' => $this->isBootstrap && $column->shouldCollapseOnTablet(),
+        ])
+        ->except(['default', 'default-colors', 'default-styling'])
+}}>
+    @if($column->getColumnLabelStatus())
+        @unless ($this->sortingIsEnabled() && ($column->isSortable() || $column->getSortCallback()))
+            <x-livewire-tables::table.th.label :$customLabelAttributes :columnTitle="$column->getTitle()" />
+        @else
+            @if ($this->isTailwind)
+
+                <button wire:click="sortBy('{{ $column->getColumnSortKey() }}')" {{
                         $attributes->merge($customSortButtonAttributes)
-                            ->class(['text-gray-500 dark:text-gray-400' => (($customSortButtonAttributes['default-colors'] ?? true) || ($customSortButtonAttributes['default'] ?? true))])
-                            ->class(['flex items-center space-x-1 text-left text-xs leading-4 font-medium uppercase tracking-wider group focus:outline-none' => (($customSortButtonAttributes['default-styling'] ?? true) || ($customSortButtonAttributes['default'] ?? true))])
-                            ->except(['default', 'default-colors', 'default-styling', 'wire:key'])
-                    }}
-                >
-                    <span {{ $customLabelAttributes->except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }}</span>
-                    <x-livewire-tables::table.th.sort-icons :$direction
-                    {{
-                        $attributes->merge($customSortIconAttributes)
+                            ->class([
+                                'text-gray-500 dark:text-gray-400' => (($customSortButtonAttributes['default-colors'] ?? true) || ($customSortButtonAttributes['default'] ?? true)),
+                                'flex items-center space-x-1 text-left text-xs leading-4 font-medium uppercase tracking-wider group focus:outline-none' => (($customSortButtonAttributes['default-styling'] ?? true) || ($customSortButtonAttributes['default'] ?? true)),
+                            ])
                             ->except(['default', 'default-colors', 'default-styling', 'wire:key'])
-                    }}
-                    />
-
+                }}>
+                    <x-livewire-tables::table.th.label :$customLabelAttributes :columnTitle="$column->getTitle()" />
+                    <x-livewire-tables::table.th.sort-icons :$direction :$customIconAttributes />
                 </button>
-            @endunless
-        @endif
-    </th>
-@elseif ($isBootstrap)
-    <th scope="col" {{
-        $attributes->merge($customThAttributes)
-            ->class(['' => $customThAttributes['default'] ?? true])
-            ->class(['d-none' => $column->shouldCollapseAlways()])
-            ->class(['d-none d-md-table-cell' => $column->shouldCollapseOnMobile()])
-            ->class(['d-none d-lg-table-cell' => $column->shouldCollapseOnTablet()])
-            ->except(['default','default-styling','default-colors'])
-        }}
-    >
-        @if($column->getColumnLabelStatus())
-            @unless ($this->sortingIsEnabled() && ($column->isSortable() || $column->getSortCallback()))
-                <span {{ $customLabelAttributes->except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }}</span>
-            @else
-                <div
-                    class="d-flex align-items-center laravel-livewire-tables-cursor"
-                    wire:click="sortBy('{{ $column->getColumnSortKey() }}')"
-                    {{
+            @elseif ($this->isBootstrap)
+                <div wire:click="sortBy('{{ $column->getColumnSortKey() }}')" {{
                         $attributes->merge($customSortButtonAttributes)
-                            ->class(['' => (($customSortButtonAttributes['default-styling'] ?? true) || ($customSortButtonAttributes['default'] ?? true))])
+                            ->class(['d-flex align-items-center laravel-livewire-tables-cursor' => (($customSortButtonAttributes['default-styling'] ?? true) || ($customSortButtonAttributes['default'] ?? true))])
                             ->except(['default', 'default-colors', 'default-styling', 'wire:key'])
-                    }}
-                >
-                    <span {{ $customLabelAttributes->except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }}</span>
+                }}>
+                    <x-livewire-tables::table.th.label :$customLabelAttributes :columnTitle="$column->getTitle()" />
+                    <x-livewire-tables::table.th.sort-icons :$direction :$customIconAttributes />
 
-                    <x-livewire-tables::table.th.sort-icons :$direction                     {{
-                        $attributes->merge($customSortButtonAttributes)
-                            ->class(['' => (($customSortButtonAttributes['default-colors'] ?? true) || ($customSortButtonAttributes['default'] ?? true))])
-                            ->except(['default', 'default-colors', 'default-styling', 'wire:key'])
-                    }}
-                />
                 </div>
-            @endunless
-        @endif
-    </th>
-@endif
+            @endif
+
+        @endunless
+    @endif
+</th>
diff --git a/resources/views/components/table/th/bulk-actions.blade.php b/resources/views/components/table/th/bulk-actions.blade.php
index d15f5a728..e99199e2f 100644
--- a/resources/views/components/table/th/bulk-actions.blade.php
+++ b/resources/views/components/table/th/bulk-actions.blade.php
@@ -1,20 +1,17 @@
-@aware([ 'tableName'])
 @php
     $customAttributes = $this->hasBulkActionsThAttributes ? $this->getBulkActionsThAttributes : $this->getAllThAttributes($this->getBulkActionsColumn())['customAttributes'];
-
     $bulkActionsThCheckboxAttributes = $this->getBulkActionsThCheckboxAttributes();
-    $theme = $this->getTheme();
 @endphp
 
 @if ($this->bulkActionsAreEnabled() && $this->hasBulkActions())
-    <x-livewire-tables::table.th.plain wire:key="{{ $tableName }}-thead-bulk-actions" :displayMinimisedOnReorder="true" :$customAttributes>
+    <x-livewire-tables::table.th.plain  :displayMinimisedOnReorder="true" wire:key="{{ $this->getTableName }}-thead-bulk-actions" :$customAttributes>
         <div
             x-data="{newSelectCount: 0, indeterminateCheckbox: false, bulkActionHeaderChecked: false}"
             x-init="$watch('selectedItems', value => indeterminateCheckbox = (value.length > 0 && value.length < paginationTotalItemCount))"
             x-cloak x-show="currentlyReorderingStatus !== true"
             @class([
-                'inline-flex rounded-md shadow-sm' => $theme === 'tailwind',
-                'form-check' => $theme === 'bootstrap-5',
+                'inline-flex rounded-md shadow-sm' => $this->isTailwind,
+                'form-check' => $this->isBootstrap,
             ])
         >
             <input
@@ -24,8 +21,9 @@
                 :checked="selectedItems.length == paginationTotalItemCount"
                 {{
                     $attributes->merge($bulkActionsThCheckboxAttributes)->class([
-                        'rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => ($theme === 'tailwind') && ($bulkActionsThCheckboxAttributes['default'] ?? true),
-                        'form-check-input' => ($theme === 'bootstrap-5') && ($bulkActionsThCheckboxAttributes['default'] ?? true),
+                        'border-gray-300 text-indigo-600 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => $this->isTailwind && (($bulkActionsThCheckboxAttributes['default'] ?? true) || ($bulkActionsThCheckboxAttributes['default-colors'] ?? true)),
+                        'rounded shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 ' => $this->isTailwind && (($bulkActionsThCheckboxAttributes['default'] ?? true) || ($bulkActionsThCheckboxAttributes['default-styling'] ?? true)),
+                        'form-check-input' => $this->isBootstrap && ($bulkActionsThCheckboxAttributes['default'] ?? true),
                     ])->except(['default','default-styling','default-colors'])
                 }}
             />
diff --git a/resources/views/components/table/th/collapsed-columns.blade.php b/resources/views/components/table/th/collapsed-columns.blade.php
index eebc53e70..ad8a1860d 100644
--- a/resources/views/components/table/th/collapsed-columns.blade.php
+++ b/resources/views/components/table/th/collapsed-columns.blade.php
@@ -1,29 +1,15 @@
-@aware([ 'tableName','isTailwind','isBootstrap'])
-
-@if ($this->collapsingColumnsAreEnabled() && $this->hasCollapsedColumns())
-    @if ($isTailwind)
-        <th
-            scope="col"
-            {{
-                $attributes
-                    ->merge(['class' => 'table-cell dark:bg-gray-800 laravel-livewire-tables-reorderingMinimised'])
-                    ->class(['sm:hidden' => !$this->shouldCollapseOnTablet() && !$this->shouldCollapseAlways()])
-                    ->class(['md:hidden' => !$this->shouldCollapseOnMobile() && !$this->shouldCollapseOnTablet() && !$this->shouldCollapseAlways()])
-                    ->class(['lg:hidden' => !$this->shouldCollapseAlways()])
-            }}
-            :class="{ 'laravel-livewire-tables-reorderingMinimised': ! currentlyReorderingStatus }"
-        ></th>
-    @elseif ($isBootstrap)
-        <th
-            scope="col"
-            {{
-                $attributes
-                    ->merge(['class' => 'd-table-cell laravel-livewire-tables-reorderingMinimised'])
-                    ->class(['d-sm-none' => !$this->shouldCollapseOnTablet() && !$this->shouldCollapseAlways()])
-                    ->class(['d-md-none' => !$this->shouldCollapseOnMobile() && !$this->shouldCollapseOnTablet() && !$this->shouldCollapseAlways()])
-                    ->class(['d-lg-none' => !$this->shouldCollapseAlways()])
-            }}                    
-            :class="{ 'laravel-livewire-tables-reorderingMinimised': ! currentlyReorderingStatus }"
-        ></th>
-    @endif
+@if ($this->collapsingColumnsAreEnabled && $this->hasCollapsedColumns)
+    <th scope="col" :class="{ 'laravel-livewire-tables-reorderingMinimised': ! currentlyReorderingStatus }" {{
+        $attributes->merge()
+            ->class([
+                'table-cell dark:bg-gray-800 laravel-livewire-tables-reorderingMinimised' => $this->isTailwind,
+                'sm:hidden' => $this->isTailwind && !$this->shouldCollapseOnTablet && !$this->shouldCollapseAlways,
+                'md:hidden' => $this->isTailwind && !$this->shouldCollapseOnMobile && !$this->shouldCollapseOnTablet && !$this->shouldCollapseAlways,
+                'lg:hidden' => $this->isTailwind && !$this->shouldCollapseAlways,
+                'd-table-cell laravel-livewire-tables-reorderingMinimised' => $this->isBootstrap,
+                'd-sm-none' => $this->isBootstrap && !$this->shouldCollapseOnTablet && !$this->shouldCollapseAlways,
+                'd-md-none' => $this->isBootstrap && !$this->shouldCollapseOnMobile && !$this->shouldCollapseOnTablet && !$this->shouldCollapseAlways,
+                'd-lg-none' => $this->isBootstrap && !$this->shouldCollapseAlways,
+            ])
+        }}></th>
 @endif
diff --git a/resources/views/components/table/th/label.blade.php b/resources/views/components/table/th/label.blade.php
new file mode 100644
index 000000000..bafe25fdb
--- /dev/null
+++ b/resources/views/components/table/th/label.blade.php
@@ -0,0 +1,4 @@
+@props(['columnTitle' => '', 'customLabelAttributes' => ['default' => true]])
+<span {{ $customLabelAttributes->except(['default', 'default-colors', 'default-styling']) }}>
+    {{ $columnTitle }}
+</span>
diff --git a/resources/views/components/table/th/plain.blade.php b/resources/views/components/table/th/plain.blade.php
index 0b9c8326e..b15d56d0f 100644
--- a/resources/views/components/table/th/plain.blade.php
+++ b/resources/views/components/table/th/plain.blade.php
@@ -1,14 +1,11 @@
-@aware(['isTailwind','isBootstrap'])
 @props(['displayMinimisedOnReorder' => false, 'hideUntilReorder' => false, 'customAttributes' => ['default' => true]])
 
-<th x-cloak {{ $attributes }} scope="col"
-    {{ 
+<th x-cloak scope="col" @if($hideUntilReorder) :class="!reorderDisplayColumn && 'w-0 p-0 hidden'" @endif {{ 
         $attributes->merge($customAttributes)->class([
-            'table-cell px-3 py-2 md:px-6 md:py-3 text-center md:text-left bg-gray-50 dark:bg-gray-800 laravel-livewire-tables-reorderingMinimised' => ($isTailwind) && (($customAttributes['default-colors'] ?? true) || ($customAttributes['default'] ?? true)),
-            'laravel-livewire-tables-reorderingMinimised' => ($isBootstrap) && (($customAttributes['default-colors'] ?? true) || ($customAttributes['default'] ?? true)),
-        ])
-    }}
-    @if($hideUntilReorder) :class="!reorderDisplayColumn && 'w-0 p-0 hidden'" @endif
->
+            'table-cell px-3 py-2 md:px-6 md:py-3 text-center md:text-left laravel-livewire-tables-reorderingMinimised' => $this->isTailwind && (($customAttributes['default-styling'] ?? true) || ($customAttributes['default'] ?? true)),
+            'bg-gray-50 dark:bg-gray-800' => $this->isTailwind && (($customAttributes['default-colors'] ?? true) || ($customAttributes['default'] ?? true)),
+            'laravel-livewire-tables-reorderingMinimised' => $this->isBootstrap && (($customAttributes['default-colors'] ?? true) || ($customAttributes['default'] ?? true)),
+        ])->except(['default','default-styling','default-colors'])
+}}>
     {{ $slot }}
 </th>
diff --git a/resources/views/components/table/th/reorder.blade.php b/resources/views/components/table/th/reorder.blade.php
index e4fe7cecb..a3b1f7e86 100644
--- a/resources/views/components/table/th/reorder.blade.php
+++ b/resources/views/components/table/th/reorder.blade.php
@@ -1,14 +1,16 @@
-@aware(['tableName','isTailwind','isBootstrap'])
 @php
     $customThAttributes = $this->hasReorderThAttributes() ? $this->getReorderThAttributes() : $this->getAllThAttributes($this->getReorderColumn())['customAttributes'];
 @endphp
 
-<x-livewire-tables::table.th.plain x-cloak x-show="currentlyReorderingStatus" wire:key="{{ $tableName }}-thead-reorder" :displayMinimisedOnReorder="false" 
+<x-livewire-tables::table.th.plain x-cloak x-show="currentlyReorderingStatus" wire:key="{{ $this->getTableName }}-thead-reorder" :displayMinimisedOnReorder="false" 
     {{ 
         $attributes->merge($customThAttributes)
-            ->class(['text-gray-500 dark:bg-gray-800 dark:text-gray-400' => (($customThAttributes['default-colors'] ?? true) || ($customThAttributes['default'] ?? true))])
-            ->class(['table-cell px-6 py-3 text-left text-xs font-medium whitespace-nowrap uppercase tracking-wider' => (($customThAttributes['default-styling'] ?? true) || ($customThAttributes['default'] ?? true))])
-            ->class(['laravel-livewire-tables-reorderingMinimised' => ($isBootstrap) && ($customThAttributes['default'] ?? true)])
+            ->class([
+                'table-cell px-6 py-3 text-left text-xs font-medium whitespace-nowrap uppercase tracking-wider' => $this->isTailwind && (($customThAttributes['default-styling'] ?? true) || ($customThAttributes['default'] ?? true)),
+                'text-gray-500 dark:bg-gray-800 dark:text-gray-400' => $this->isTailwind && (($customThAttributes['default-colors'] ?? true) || ($customThAttributes['default'] ?? true)),
+                'laravel-livewire-tables-reorderingMinimised' => $this->isBootstrap && ($customThAttributes['default'] ?? true),
+            ])
+            ->except(['default','default-styling','default-colors'])
     }}
 >
     <div x-cloak x-show="currentlyReorderingStatus"></div>
diff --git a/resources/views/components/table/th/sort-icons.blade.php b/resources/views/components/table/th/sort-icons.blade.php
index b26b7d964..f08cd3473 100644
--- a/resources/views/components/table/th/sort-icons.blade.php
+++ b/resources/views/components/table/th/sort-icons.blade.php
@@ -1,32 +1,79 @@
-@props(['direction'])
-<span {{ $attributes->class([
+@props(['direction' => 'none', 'customIconAttributes'])
+<span @class([
         'relative flex items-center' => $this->isTailwind,
         'relative d-flex align-items-center' => $this->isBootstrap
-    ]) }}
+    ])
 >
+
     @if($this->isTailwind)
         @switch($direction)
             @case('asc')
-                <x-heroicon-o-chevron-up class="w-3 h-3 group-hover:opacity-0" />
-                <x-heroicon-o-chevron-down class="w-3 h-3 opacity-0 group-hover:opacity-100 absolute"/>
-                @break
+                <x-heroicon-o-chevron-up {{ $attributes->merge($customIconAttributes)
+                    ->class([
+                        'w-3 h-3' => $customIconAttributes['default-styling'] ?? ($customIconAttributes['default'] ?? true),
+                        'absolute opacity-100 group-hover:opacity-0',
+                    ])
+                    ->except(['default', 'default-colors', 'default-styling', 'wire:key']) }} />
+                <x-heroicon-o-chevron-down {{ $attributes->merge($customIconAttributes)
+                    ->class([
+                        'w-3 h-3' => $customIconAttributes['default-styling'] ?? ($customIconAttributes['default'] ?? true),
+                        'absolute opacity-0 group-hover:opacity-100',
+                    ])
+                    ->except(['default', 'default-colors', 'default-styling', 'wire:key']) }}  />
+            @break
             @case('desc')
-                <x-heroicon-o-chevron-down class="w-3 h-3 group-hover:opacity-0" />
-                <x-heroicon-o-x-circle class="w-3 h-3 opacity-0 group-hover:opacity-100 absolute"/>
-                @break
+                <x-heroicon-o-chevron-down {{ $attributes->merge($customIconAttributes)
+                    ->class([
+                        'w-3 h-3' => $customIconAttributes['default-styling'] ?? ($customIconAttributes['default'] ?? true),
+                        'absolute opacity-100 group-hover:opacity-0',
+                    ])
+                    ->except(['default', 'default-colors', 'default-styling', 'wire:key']) }}   />
+                <x-heroicon-o-x-circle  {{ $attributes->merge($customIconAttributes)
+                    ->class([
+                        'w-3 h-3' => $customIconAttributes['default-styling'] ?? ($customIconAttributes['default'] ?? true),
+                        'absolute opacity-0 group-hover:opacity-100',
+                    ])
+                    ->except(['default', 'default-colors', 'default-styling', 'wire:key']) }}  />
+
+            @break
             @default
-                <x-heroicon-o-chevron-up class="w-3 h-3 opacity-0 group-hover:opacity-100 transition-opacity duration-300" />
-        @endswitch
+                <x-heroicon-o-chevron-up-down {{ $attributes->merge($customIconAttributes)
+                    ->class([
+                        'w-3 h-3' => $customIconAttributes['default-styling'] ?? ($customIconAttributes['default'] ?? true),
+                        'absolute opacity-100 group-hover:opacity-0',
+                    ])
+                    ->except(['default', 'default-colors', 'default-styling', 'wire:key'])  }}  />
+                <x-heroicon-o-chevron-up {{ $attributes->merge($customIconAttributes)
+                    ->class([
+                        'w-3 h-3' => $customIconAttributes['default-styling'] ?? ($customIconAttributes['default'] ?? true),
+                        'absolute opacity-0 group-hover:opacity-100',
+                    ])
+                    ->except(['default', 'default-colors', 'default-styling', 'wire:key']) }} />
+            @endswitch
+
+
     @else
         @switch($direction)
             @case('asc')
-                <x-heroicon-o-chevron-up class="laravel-livewire-tables-btn-smaller ms-1 "  />
+                <x-heroicon-o-chevron-up {{ $attributes->merge($customIconAttributes)
+                    ->class([
+                        'laravel-livewire-tables-btn-smaller ms-1' => $customIconAttributes['default-styling'] ?? ($customIconAttributes['default'] ?? true),
+                    ])
+                    ->except(['default', 'default-colors', 'default-styling', 'wire:key']) }} />
                 @break
             @case('desc')
-                <x-heroicon-o-chevron-down class="laravel-livewire-tables-btn-smaller ms-1"  />
+                <x-heroicon-o-chevron-down {{ $attributes->merge($customIconAttributes)
+                    ->class([
+                        'laravel-livewire-tables-btn-smaller ms-1' => $customIconAttributes['default-styling'] ?? ($customIconAttributes['default'] ?? true),
+                    ])
+                    ->except(['default', 'default-colors', 'default-styling', 'wire:key']) }}  />
             @break
             @default
-                <x-heroicon-o-chevron-up-down class="laravel-livewire-tables-btn-smaller ms-1" />
+                <x-heroicon-o-chevron-up-down {{ $attributes->merge($customIconAttributes)
+                    ->class([
+                        'laravel-livewire-tables-btn-smaller ms-1' => $customIconAttributes['default-styling'] ?? ($customIconAttributes['default'] ?? true),
+                    ])
+                    ->except(['default', 'default-colors', 'default-styling', 'wire:key']) }}  />
         @endswitch
     @endif
 </span>
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index 7b90b7734..4b4feab5a 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -68,7 +68,7 @@
                     @endif
 
                     @foreach($this->selectedVisibleColumns as $index => $column)
-                        <x-livewire-tables::table.th wire:key="{{ $tableName.'-table-head-'.$index }}" :column="$column" :index="$index" />
+                        <x-livewire-tables::table.th wire:key="{{ $tableName.'-table-head-'.$index }}" :$column :$index />
                     @endforeach
                 </x-slot>
 
@@ -84,19 +84,19 @@
                 @endif
 
                 @forelse ($this->getRows as $rowIndex => $row)
-                    <x-livewire-tables::table.tr wire:key="{{ $tableName }}-row-wrap-{{ $row->{$primaryKey} }}" :row="$row" :rowIndex="$rowIndex">
+                    <x-livewire-tables::table.tr wire:key="{{ $tableName }}-row-wrap-{{ $row->{$primaryKey} }}" :$row :$rowIndex>
                         @if($this->getCurrentlyReorderingStatus)
-                            <x-livewire-tables::table.td.reorder x-cloak x-show="currentlyReorderingStatus" wire:key="{{ $tableName }}-row-reorder-{{ $row->{$primaryKey} }}" :rowID="$tableName.'-'.$row->{$this->getPrimaryKey()}" :rowIndex="$rowIndex" />
+                            <x-livewire-tables::table.td.reorder x-cloak x-show="currentlyReorderingStatus" wire:key="{{ $tableName }}-row-reorder-{{ $row->{$primaryKey} }}" :rowID="$tableName.'-'.$row->{$this->getPrimaryKey()}" :$rowIndex />
                         @endif
                         @if($this->showBulkActionsSections)
-                            <x-livewire-tables::table.td.bulk-actions wire:key="{{ $tableName }}-row-bulk-act-{{ $row->{$primaryKey} }}" :row="$row" :rowIndex="$rowIndex"/>
+                            <x-livewire-tables::table.td.bulk-actions wire:key="{{ $tableName }}-row-bulk-act-{{ $row->{$primaryKey} }}" :$row :$rowIndex />
                         @endif
                         @if ($this->showCollapsingColumnSections)
-                            <x-livewire-tables::table.td.collapsed-columns wire:key="{{ $tableName }}-row-collapsed-{{ $row->{$primaryKey} }}" :rowIndex="$rowIndex" />
+                            <x-livewire-tables::table.td.collapsed-columns wire:key="{{ $tableName }}-row-collapsed-{{ $row->{$primaryKey} }}" :$rowIndex />
                         @endif
 
                         @foreach($this->selectedVisibleColumns as $colIndex => $column)
-                            <x-livewire-tables::table.td wire:key="{{ $tableName . '-' . $row->{$primaryKey} . '-datatable-td-' . $column->getSlug() }}"  :column="$column" :colIndex="$colIndex">
+                            <x-livewire-tables::table.td wire:key="{{ $tableName . '-' . $row->{$primaryKey} . '-datatable-td-' . $column->getSlug() }}"  :$column :$colIndex>
                                 @if($column->isHtml())
                                     {!! $column->setIndexes($rowIndex, $colIndex)->renderContents($row) !!}
                                 @else
@@ -107,7 +107,7 @@
                     </x-livewire-tables::table.tr>
 
                     @if ($this->showCollapsingColumnSections)
-                        <x-livewire-tables::table.collapsed-columns :row="$row" :rowIndex="$rowIndex" />
+                        <x-livewire-tables::table.collapsed-columns :$row :$rowIndex />
                     @endif
                 @empty
                     <x-livewire-tables::table.empty />
diff --git a/src/Commands/MakeCommand.php b/src/Commands/MakeCommand.php
index bf06570ae..cc974885f 100644
--- a/src/Commands/MakeCommand.php
+++ b/src/Commands/MakeCommand.php
@@ -126,7 +126,7 @@ public function getModelImport(): string
         if (isset($this->modelPath)) {
             $filename = rtrim($this->modelPath, '/').'/'.$this->model.'.php';
             if (File::exists($filename)) {
-                //In case the file has more than one class which is highly unlikely but still possible
+                // In case the file has more than one class which is highly unlikely but still possible
                 $classes = array_filter($this->getClassesList($filename), function ($class) {
                     return substr($class, strrpos($class, '\\') + 1) == $this->model;
                 });
diff --git a/src/Traits/Helpers/CollapsingColumnHelpers.php b/src/Traits/Helpers/CollapsingColumnHelpers.php
index 131e43b65..e80e9da64 100644
--- a/src/Traits/Helpers/CollapsingColumnHelpers.php
+++ b/src/Traits/Helpers/CollapsingColumnHelpers.php
@@ -11,11 +11,13 @@ public function getCollapsingColumnsStatus(): bool
         return $this->collapsingColumnsStatus;
     }
 
+    #[Computed]
     public function hasCollapsingColumns(): bool
     {
         return $this->getCollapsingColumnsStatus() === true;
     }
 
+    #[Computed]
     public function collapsingColumnsAreEnabled(): bool
     {
         return $this->getCollapsingColumnsStatus() === true;
diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 487bcb879..830756a0c 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
 
 use Illuminate\Support\Collection;
+use Livewire\Attributes\Computed;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 use Rappasoft\LaravelLivewireTables\Views\Columns\AggregateColumn;
 
@@ -133,6 +134,7 @@ public function hasCollapsedColumns(): bool
         return false;
     }
 
+    #[Computed]
     public function shouldCollapseOnMobile(): bool
     {
 
@@ -170,6 +172,7 @@ public function getVisibleMobileColumnsCount(): int
         return $this->getVisibleMobileColumns()->count();
     }
 
+    #[Computed]
     public function shouldCollapseOnTablet(): bool
     {
         if (! isset($this->shouldTabletCollapse)) {
@@ -235,6 +238,7 @@ public function getCollapsedAlwaysColumnsCount(): int
         return $this->getCollapsedAlwaysColumns()->count();
     }
 
+    #[Computed]
     public function shouldCollapseAlways(): bool
     {
         if (! isset($this->shouldAlwaysCollapse)) {
diff --git a/src/Traits/Helpers/TableAttributeHelpers.php b/src/Traits/Helpers/TableAttributeHelpers.php
index 5c8125fa9..36971ab3e 100644
--- a/src/Traits/Helpers/TableAttributeHelpers.php
+++ b/src/Traits/Helpers/TableAttributeHelpers.php
@@ -47,7 +47,7 @@ public function getThAttributes(Column $column): array
     {
 
         if (isset($this->thAttributesCallback)) {
-            return array_merge(['default' => false, 'default-colors' => false, 'default-styling' => false], call_user_func($this->thAttributesCallback, $column));
+            return array_merge(['scope' => 'col', 'default' => false, 'default-colors' => false, 'default-styling' => false], call_user_func($this->thAttributesCallback, $column));
         }
 
         return ['default' => true, 'default-colors' => true, 'default-styling' => true];
diff --git a/src/Traits/WithData.php b/src/Traits/WithData.php
index b2d191031..e7b52518a 100644
--- a/src/Traits/WithData.php
+++ b/src/Traits/WithData.php
@@ -21,7 +21,7 @@ trait WithData
      */
     public function bootedWithData(): void
     {
-        //Sets up the Builder Instance
+        // Sets up the Builder Instance
         $this->setBuilder($this->builder());
     }
 
diff --git a/src/Traits/WithReordering.php b/src/Traits/WithReordering.php
index 49d36f78f..ae5be34cb 100644
--- a/src/Traits/WithReordering.php
+++ b/src/Traits/WithReordering.php
@@ -51,13 +51,10 @@ public function enablePaginatedReordering(): void {}
 
     public function enableReordering(): void
     {
-        //$this->enablePaginatedReordering();
-
         $this->setReorderingSession();
         $this->setReorderingBackup();
         $this->resetReorderFields();
         $this->reorderStatus = $this->currentlyReorderingStatus = $this->reorderDisplayColumn = true;
-
     }
 
     public function disableReordering(): void
diff --git a/src/Views/Traits/Filters/HasCustomPosition.php b/src/Views/Traits/Filters/HasCustomPosition.php
index 443baf749..4bdb670ee 100644
--- a/src/Views/Traits/Filters/HasCustomPosition.php
+++ b/src/Views/Traits/Filters/HasCustomPosition.php
@@ -67,7 +67,6 @@ public function hasFilterSlidedownColspan(): bool
 
     public function setFilterSlidedownRow(string $filterSlidedownRow): self
     {
-        //$this->filterSlidedownRow = (is_int($filterSlidedownRow) ? $filterSlidedownRow : intval($filterSlidedownRow));
         $this->filterSlidedownRow = intval($filterSlidedownRow);
 
         return $this;
@@ -75,7 +74,6 @@ public function setFilterSlidedownRow(string $filterSlidedownRow): self
 
     public function setFilterSlidedownColspan(string $filterSlidedownColspan): self
     {
-        //$this->filterSlidedownColspan = (is_int($filterSlidedownColspan) ? $filterSlidedownColspan : intval($filterSlidedownColspan));
         $this->filterSlidedownColspan = intval($filterSlidedownColspan);
 
         return $this;
diff --git a/tests/DataTableComponentTest.php b/tests/DataTableComponentTest.php
index 8237e8411..e0849463c 100644
--- a/tests/DataTableComponentTest.php
+++ b/tests/DataTableComponentTest.php
@@ -2,7 +2,6 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests;
 
-use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\NoColumnsTable;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\NoPrimaryKeyTable;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
@@ -27,13 +26,6 @@ public function test_primary_key_can_be_checked_for_existence(): void
         $this->assertFalse($this->basicTable->hasPrimaryKey());
     }
 
-    public function test_primary_key_has_to_be_set(): void
-    {
-        $this->expectException(\Illuminate\View\ViewException::class);
-        Livewire::test(NoPrimaryKeyTable::class)
-            ->call('setSearch', 'abcd');
-    }
-
     public function test_default_fingerprint_will_always_be_the_same_for_same_datatable(): void
     {
         $this->assertSame(
diff --git a/tests/Localisations/BaseLocalisationCase.php b/tests/Localisations/BaseLocalisationCase.php
index 595c019e7..e3ae15093 100644
--- a/tests/Localisations/BaseLocalisationCase.php
+++ b/tests/Localisations/BaseLocalisationCase.php
@@ -57,10 +57,10 @@ public static function localisationProvider(): array
             'tw',
             'uk',
         ];
-        //return $availableLocales;
+        // return $availableLocales;
 
         foreach ($availableLocales as $availableLocale) {
-            //$array = require($baseDir.$availableLocale.'/core.php');
+            // $array = require($baseDir.$availableLocale.'/core.php');
             $localisations[] = [
                 'locale' => $availableLocale,
                 //      'localisationStrings' => $array,
diff --git a/tests/Unit/Traits/Configuration/ComponentConfigurationTest.php b/tests/Unit/Traits/Configuration/ComponentConfigurationTest.php
index a477cf06c..bd593eeab 100644
--- a/tests/Unit/Traits/Configuration/ComponentConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/ComponentConfigurationTest.php
@@ -73,8 +73,8 @@ public function test_can_set_th_attributes(): void
             return ['default' => true, 'here' => 'there'];
         });
 
-        $this->assertSame($this->basicTable->getThAttributes($this->basicTable->columns()[0]), ['default' => false, 'default-colors' => false, 'default-styling' => false, 'this' => 'that']);
-        $this->assertSame($this->basicTable->getThAttributes($this->basicTable->columns()[1]), ['default' => true, 'default-colors' => false, 'default-styling' => false, 'here' => 'there']);
+        $this->assertSame($this->basicTable->getThAttributes($this->basicTable->columns()[0]), ['scope' => 'col', 'default' => false, 'default-colors' => false, 'default-styling' => false, 'this' => 'that']);
+        $this->assertSame($this->basicTable->getThAttributes($this->basicTable->columns()[1]), ['scope' => 'col', 'default' => true, 'default-colors' => false, 'default-styling' => false, 'here' => 'there']);
     }
 
     public function test_can_set_th_sort_button_attributes(): void
diff --git a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
index cfebce832..ec4f3814b 100644
--- a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
@@ -205,7 +205,7 @@ public function test_can_get_visible_tablet_columns_count(): void
         $this->assertSame(7, $this->basicTable->getVisibleTabletColumnsCount());
     }
 
-    /// *** ** //
+    // / *** ** //
 
     public function test_can_tell_if_columns_should_collapse_always(): void
     {
@@ -299,7 +299,7 @@ public function test_can_check_if_column_has_secondary_header_filter(): void
         $this->assertTrue($column->hasSecondaryHeaderCallback());
 
         $contents = $column->getSecondaryHeaderFilter($this->basicTable->getFilterByKey($column->getSecondaryHeaderCallback()), $this->basicTable->getFilterGenericData());
-        //$contents = $column->getSecondaryHeaderFilter($this->basicTable->getFilterByKey('breed'));
+        // $contents = $column->getSecondaryHeaderFilter($this->basicTable->getFilterByKey('breed'));
         $this->assertStringContainsString('id="table-filter-breed-8-header"', $contents);
     }
 
diff --git a/tests/Unit/Traits/Helpers/ComponentHelpersTest.php b/tests/Unit/Traits/Helpers/ComponentHelpersTest.php
index 6fbbf6364..d9deb58f4 100644
--- a/tests/Unit/Traits/Helpers/ComponentHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ComponentHelpersTest.php
@@ -244,7 +244,7 @@ public function test_can_get_hide_configurable_areas_when_reordering_status(): v
 
     // Exists in DataTableComponentTest
     // public function test_can_get_dataTable_fingerprint(): void
-    //{
+    // {
     //     $this->assertSame($this->defaultFingerPrintingAlgo($this->basicTable::class), $this->basicTable->getDataTableFingerprint());
     // }
 
diff --git a/tests/Unit/Traits/WithCustomisationsTest.php b/tests/Unit/Traits/WithCustomisationsTest.php
index 64ccf4d36..e5101454f 100644
--- a/tests/Unit/Traits/WithCustomisationsTest.php
+++ b/tests/Unit/Traits/WithCustomisationsTest.php
@@ -2,43 +2,12 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits;
 
-use Livewire\Component;
 use Livewire\Features\SupportPageComponents\PageComponentConfig;
-use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
 final class WithCustomisationsTest extends TestCase
 {
-    public function test_can_use_as_nested(): void
-    {
-        $test = Livewire::test([new class extends Component
-        {
-            public function render()
-            {
-                return <<<'HTML'
-                <div>
-                    <div>ParentComponentTest</div>
-                    <div> <livewire:child /></div>
-                </div>
-                HTML;
-            }
-        },
-            'child' => new class extends PetsTable
-            {
-                public function configure(): void
-                {
-                    parent::configure();
-                    $this->setLayout('livewire-tables::tests.layout1');
-
-                }
-            },
-        ])
-            ->assertSee('ParentComponentTest')
-            ->assertSee('Cartman');
-
-    }
-
     public function test_can_use_as_full_page(): void
     {
         $temp = new class extends PetsTable
diff --git a/tests/Unit/Views/Columns/DateColumnTest.php b/tests/Unit/Views/Columns/DateColumnTest.php
index 1b3e96a94..876bb9bda 100644
--- a/tests/Unit/Views/Columns/DateColumnTest.php
+++ b/tests/Unit/Views/Columns/DateColumnTest.php
@@ -2,7 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
-//use Illuminate\Support\Facades\Exceptions;
+// use Illuminate\Support\Facades\Exceptions;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Columns\DateColumn;
diff --git a/tests/Unit/Views/Columns/IconColumnTest.php b/tests/Unit/Views/Columns/IconColumnTest.php
index 3696bbc67..a6a609939 100644
--- a/tests/Unit/Views/Columns/IconColumnTest.php
+++ b/tests/Unit/Views/Columns/IconColumnTest.php
@@ -2,7 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
-//use Illuminate\Support\Facades\Exceptions;
+// use Illuminate\Support\Facades\Exceptions;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Columns\IconColumn;
diff --git a/tests/Unit/Visuals/BulkActionsVisualsTest.php b/tests/Unit/Visuals/BulkActionsVisualsTest.php
index 32f0a57cc..59570f3cd 100644
--- a/tests/Unit/Visuals/BulkActionsVisualsTest.php
+++ b/tests/Unit/Visuals/BulkActionsVisualsTest.php
@@ -192,7 +192,7 @@ public function exportBulk($items)
         })->assertDontSee('Bulk Actions');
     }
 
-    public function test_bulk_dropdown_can_have_customised_classes(): void
+    public function test_bulk_dropdown_can_have_customised_classes_with_no_defaults(): void
     {
         Livewire::test(new class extends PetsTable
         {
@@ -202,7 +202,7 @@ public function configure(): void
                 $this->setBulkActionsThAttributes([
                     'class' => 'bg-yellow-500 dark:bg-yellow-800',
                     'default' => false,
-                    'default-styling' => true,
+                    'default-styling' => false,
                     'default-colors' => false,
                 ]);
 
@@ -224,4 +224,103 @@ public function exportBulk($items)
                 'wire:key="table-thead-bulk-actions"',
             ]);
     }
+
+    public function test_bulk_dropdown_can_have_customised_classes_with_default_styling(): void
+    {
+        Livewire::test(new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+                $this->setBulkActionsThAttributes([
+                    'class' => 'bg-yellow-500 dark:bg-yellow-800',
+                    'default' => false,
+                    'default-styling' => true,
+                    'default-colors' => false,
+                ]);
+
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        })->assertSee('Bulk Actions')
+            ->assertSeeHtmlInOrder([
+                'scope="col"',
+                'class="table-cell px-3 py-2 md:px-6 md:py-3 text-center md:text-left laravel-livewire-tables-reorderingMinimised bg-yellow-500 dark:bg-yellow-800"',
+                'wire:key="table-thead-bulk-actions"',
+            ]);
+    }
+
+    public function test_bulk_dropdown_can_have_customised_classes_with_default_colors(): void
+    {
+        Livewire::test(new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+                $this->setBulkActionsThAttributes([
+                    'class' => 'text-lg',
+                    'default' => false,
+                    'default-styling' => false,
+                    'default-colors' => true,
+                ]);
+
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        })->assertSee('Bulk Actions')
+            ->assertSeeHtmlInOrder([
+                'scope="col"',
+                'class="bg-gray-50 dark:bg-gray-800 text-lg"',
+                'wire:key="table-thead-bulk-actions"',
+            ]);
+    }
+
+    public function test_bulk_dropdown_can_have_customised_classes_with_defaults(): void
+    {
+        Livewire::test(new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+                $this->setBulkActionsThAttributes([
+                    'class' => 'text-lg',
+                    'default' => true,
+                    'default-styling' => true,
+                    'default-colors' => true,
+                ]);
+
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        })->assertSee('Bulk Actions')
+            ->assertSeeHtmlInOrder([
+                'scope="col"',
+                'class="table-cell px-3 py-2 md:px-6 md:py-3 text-center md:text-left laravel-livewire-tables-reorderingMinimised bg-gray-50 dark:bg-gray-800 text-lg"',
+                'wire:key="table-thead-bulk-actions"',
+            ]);
+    }
 }
diff --git a/tests/Unit/Visuals/CustomisationsVisualsTest.php b/tests/Unit/Visuals/CustomisationsVisualsTest.php
new file mode 100644
index 000000000..55a6da4e1
--- /dev/null
+++ b/tests/Unit/Visuals/CustomisationsVisualsTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+
+use Exception;
+use Illuminate\View\ViewException;
+use Livewire\Component;
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\{BrokenSecondaryHeaderTable, NoBuildMethodTable, NoPrimaryKeyTable};
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{PetsTable,PetsTableAttributes};
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+#[Group('Visuals')]
+final class CustomisationsVisualsTest extends TestCase
+{
+    public function test_can_use_as_nested(): void
+    {
+        $test = Livewire::test([new class extends Component
+        {
+            public function render()
+            {
+                return <<<'HTML'
+                <div>
+                    <div>ParentComponentTest</div>
+                    <div> <livewire:child /></div>
+                </div>
+                HTML;
+            }
+        },
+            'child' => new class extends PetsTable
+            {
+                public function configure(): void
+                {
+                    parent::configure();
+                    $this->setLayout('livewire-tables::tests.layout1');
+
+                }
+            },
+        ])
+            ->assertSee('ParentComponentTest')
+            ->assertSee('Cartman');
+
+    }
+}
diff --git a/tests/Unit/Visuals/DataTableComponentVisualsTest.php b/tests/Unit/Visuals/DataTableComponentVisualsTest.php
new file mode 100644
index 000000000..29fd9f01e
--- /dev/null
+++ b/tests/Unit/Visuals/DataTableComponentVisualsTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+
+use Exception;
+use Illuminate\View\ViewException;
+use Livewire\Component;
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\{BrokenSecondaryHeaderTable, NoBuildMethodTable, NoPrimaryKeyTable};
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{PetsTable,PetsTableAttributes};
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+#[Group('Visuals')]
+final class DataTableComponentVisualsTest extends TestCase
+{
+    public function test_primary_key_has_to_be_set(): void
+    {
+        $this->expectException(\Illuminate\View\ViewException::class);
+        Livewire::test(NoPrimaryKeyTable::class)
+            ->call('setSearch', 'abcd');
+    }
+}
diff --git a/tests/Unit/Visuals/SortingVisualsTest.php b/tests/Unit/Visuals/SortingVisualsTest.php
index 6a6333445..6a9df4714 100644
--- a/tests/Unit/Visuals/SortingVisualsTest.php
+++ b/tests/Unit/Visuals/SortingVisualsTest.php
@@ -37,7 +37,7 @@ public function test_th_headers_are_buttons_with_sorting_enabled(): void
         Livewire::test(PetsTable::class)
             ->assertSeeHtmlInOrder([
                 'wire:click="sortBy(\'id\')"',
-                'class="flex items-center space-x-1 text-left text-xs leading-4 font-medium uppercase tracking-wider group focus:outline-none text-gray-500 dark:text-gray-400"',
+                'class="text-gray-500 dark:text-gray-400 flex items-center space-x-1 text-left text-xs leading-4 font-medium uppercase tracking-wider group focus:outline-none"',
             ]);
     }
 
@@ -58,12 +58,12 @@ public function test_th_headers_are_not_buttons_until_sorting_enabled(): void
             ->call('setSortingDisabled')
             ->assertDontSeeHtml('<button
                 wire:click="sortBy(\'id\')"
-                class="flex items-center space-x-1 text-left text-xs leading-4 font-medium uppercase tracking-wider group focus:outline-none text-gray-500 dark:text-gray-400"
+                class="text-gray-500 dark:text-gray-400 flex items-center space-x-1 text-left text-xs leading-4 font-medium uppercase tracking-wider group focus:outline-none"
             >')
             ->call('setSortingEnabled')
             ->assertSeeHtmlInOrder([
                 'wire:click="sortBy(\'id\')"',
-                'class="flex items-center space-x-1 text-left text-xs leading-4 font-medium uppercase tracking-wider group focus:outline-none text-gray-500 dark:text-gray-400"',
+                'class="text-gray-500 dark:text-gray-400 flex items-center space-x-1 text-left text-xs leading-4 font-medium uppercase tracking-wider group focus:outline-none"',
             ]);
 
     }

From 1d991b2ae25f3b449b92a65543ab6737835f8c3f Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 31 Dec 2024 22:13:28 +0000
Subject: [PATCH 09/36] Ensure Default Sorting Is Shown in Pills (#2138)

* Ensure Default Sorting Is Shown in Pills

* Fix styling

* Fix return type

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/Configuration/SortingConfiguration.php | 7 +++++++
 src/Traits/WithSorting.php                        | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Traits/Configuration/SortingConfiguration.php b/src/Traits/Configuration/SortingConfiguration.php
index 2c0c86ab7..71eb4979d 100644
--- a/src/Traits/Configuration/SortingConfiguration.php
+++ b/src/Traits/Configuration/SortingConfiguration.php
@@ -4,6 +4,13 @@
 
 trait SortingConfiguration
 {
+    protected function setupDefaultSorting(): void
+    {
+        if ($this->sortingIsEnabled() && $this->hasDefaultSort() && ! $this->hasSorts()) {
+            $this->setSort($this->getDefaultSortColumn(), $this->getDefaultSortDirection());
+        }
+    }
+
     public function setSortingStatus(bool $status): self
     {
         $this->sortingStatus = $status;
diff --git a/src/Traits/WithSorting.php b/src/Traits/WithSorting.php
index 67054e8a8..a4c093d7f 100644
--- a/src/Traits/WithSorting.php
+++ b/src/Traits/WithSorting.php
@@ -32,6 +32,11 @@ trait WithSorting
 
     public string $defaultSortingLabelDesc = 'Z-A';
 
+    public function mountWithSorting(): void
+    {
+        $this->setupDefaultSorting();
+    }
+
     public function sortBy(string $columnSelectName): ?string
     {
 
@@ -66,11 +71,7 @@ public function sortBy(string $columnSelectName): ?string
 
     public function applySorting(): Builder
     {
-        if ($this->hasDefaultSort() && ! $this->hasSorts()) {
-            $this->setBuilder($this->getBuilder()->orderBy($this->getDefaultSortColumn(), $this->getDefaultSortDirection()));
 
-            return $this->getBuilder();
-        }
         $allCols = $this->getColumns();
 
         foreach ($this->getSorts() as $column => $direction) {

From 660c061d48852145a9170b4d847f3799e3071204 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 31 Dec 2024 22:21:18 +0000
Subject: [PATCH 10/36] Add hasCollapsedColumns as Computed (#2141)

* Add hasCollapsedColumns as Computed

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/Helpers/ColumnHelpers.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 830756a0c..61f011a7e 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -125,6 +125,7 @@ public function getColumnCount(): int
         return $this->getColumns()->count();
     }
 
+    #[Computed]
     public function hasCollapsedColumns(): bool
     {
         if ($this->shouldCollapseOnMobile() || $this->shouldCollapseOnTablet() || $this->shouldCollapseAlways()) {

From fe3abd6ee4847a7251918ffd0f3b81acae1e6e9b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 4 Jan 2025 07:39:13 +0000
Subject: [PATCH 11/36] Separate the Unit and Visuals Test Suites (#2144)

* Separate Test Suites

* Remove PHP8.1 From Test Suite

* Adjust PHPUnit XML

* Workflow Test Suite Fixes
---
 .github/workflows/run-tests-pcov-pull.yml           |  2 +-
 .github/workflows/run-tests-pull.yml                | 13 +++++++++----
 .github/workflows/run-tests.yml                     | 13 +++++++++----
 phpunit.xml.dist                                    |  7 +++++++
 tests/{Unit => }/Visuals/ActionsVisualsTest.php     |  2 +-
 tests/{Unit => }/Visuals/BulkActionsVisualsTest.php |  2 +-
 .../Visuals/Columns/IconColumnVisualsTest.php       |  2 +-
 tests/{Unit => }/Visuals/ComponentVisualsTest.php   |  2 +-
 .../Visuals/CustomisationsVisualsTest.php           |  2 +-
 .../Visuals/DataTableComponentVisualsTest.php       |  2 +-
 tests/{Unit => }/Visuals/FilterVisualsTest.php      |  2 +-
 .../Visuals/Filters/BooleanFilterVisualsTest.php    |  2 +-
 .../Visuals/Filters/DateFilterVisualsTest.php       |  2 +-
 .../Visuals/Filters/DateTimeFilterVisualsTest.php   |  2 +-
 .../Visuals/Filters/FilterVisualsTestCase.php       |  2 +-
 .../Visuals/Filters/NumberFilterVisualsTest.php     |  2 +-
 .../Visuals/Filters/TextFilterVisualsTest.php       |  2 +-
 tests/{Unit => }/Visuals/HideableTableTest.php      |  2 +-
 .../Visuals/LoadingPlaceholderVisualsTest.php       |  2 +-
 tests/{Unit => }/Visuals/PaginationVisualsTest.php  |  2 +-
 tests/{Unit => }/Visuals/RefreshVisualsTest.php     |  2 +-
 tests/{Unit => }/Visuals/ReorderingVisualsTest.php  |  2 +-
 tests/{Unit => }/Visuals/SearchVisualsTest.php      |  2 +-
 tests/{Unit => }/Visuals/SortingVisualsTest.php     |  2 +-
 24 files changed, 46 insertions(+), 29 deletions(-)
 rename tests/{Unit => }/Visuals/ActionsVisualsTest.php (98%)
 rename tests/{Unit => }/Visuals/BulkActionsVisualsTest.php (99%)
 rename tests/{Unit => }/Visuals/Columns/IconColumnVisualsTest.php (97%)
 rename tests/{Unit => }/Visuals/ComponentVisualsTest.php (99%)
 rename tests/{Unit => }/Visuals/CustomisationsVisualsTest.php (95%)
 rename tests/{Unit => }/Visuals/DataTableComponentVisualsTest.php (92%)
 rename tests/{Unit => }/Visuals/FilterVisualsTest.php (99%)
 rename tests/{Unit => }/Visuals/Filters/BooleanFilterVisualsTest.php (96%)
 rename tests/{Unit => }/Visuals/Filters/DateFilterVisualsTest.php (97%)
 rename tests/{Unit => }/Visuals/Filters/DateTimeFilterVisualsTest.php (97%)
 rename tests/{Unit => }/Visuals/Filters/FilterVisualsTestCase.php (80%)
 rename tests/{Unit => }/Visuals/Filters/NumberFilterVisualsTest.php (95%)
 rename tests/{Unit => }/Visuals/Filters/TextFilterVisualsTest.php (99%)
 rename tests/{Unit => }/Visuals/HideableTableTest.php (96%)
 rename tests/{Unit => }/Visuals/LoadingPlaceholderVisualsTest.php (96%)
 rename tests/{Unit => }/Visuals/PaginationVisualsTest.php (99%)
 rename tests/{Unit => }/Visuals/RefreshVisualsTest.php (95%)
 rename tests/{Unit => }/Visuals/ReorderingVisualsTest.php (99%)
 rename tests/{Unit => }/Visuals/SearchVisualsTest.php (98%)
 rename tests/{Unit => }/Visuals/SortingVisualsTest.php (99%)

diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
index 0fa82ceb9..b22ea41a9 100644
--- a/.github/workflows/run-tests-pcov-pull.yml
+++ b/.github/workflows/run-tests-pcov-pull.yml
@@ -88,7 +88,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit and Visuals Test Suite" --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v5
diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
index 3d81e3b8c..1ea6334be 100644
--- a/.github/workflows/run-tests-pull.yml
+++ b/.github/workflows/run-tests-pull.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
-      max-parallel: 3
+      max-parallel: 2
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.2, 8.3, 8.4]
+        php: [8.2, 8.3, 8.4]
         laravel: [10.*]
         stability: [prefer-dist]
 
@@ -85,8 +85,10 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
+        run: php ./vendor/bin/paratest --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
 
+      - name: Run Visuals Tests
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Visuals Test Suite" --no-coverage
 
   test-laravel11:
     runs-on: ${{ matrix.os }}
@@ -166,4 +168,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
+        run: php ./vendor/bin/paratest --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
+
+      - name: Run Visuals Tests
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Visuals Test Suite" --no-coverage
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 05ff871b9..21161009c 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
-      max-parallel: 3
+      max-parallel: 2
       matrix:
         os: [ubuntu-24.04]
-        php: [8.1, 8.2, 8.3, 8.4]
+        php: [8.2, 8.3, 8.4]
         laravel: [10.*]
         stability: [prefer-dist]
 
@@ -87,8 +87,10 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
+        run: php ./vendor/bin/paratest --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
 
+      - name: Run Visuals Tests
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Visuals Test Suite" --no-coverage
 
   test-laravel11:
     runs-on: ${{ matrix.os }}
@@ -168,4 +170,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
+        run: php ./vendor/bin/paratest --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
+
+      - name: Run Visuals Tests
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Visuals Test Suite" --no-coverage
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1d717c349..2156f09a7 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,9 +9,16 @@
          failOnEmptyTestSuite="false" 
          beStrictAboutOutputDuringTests="true" >
     <testsuites>
+        <testsuite name="Laravel Livewire Tables Unit and Visuals Test Suite">
+            <directory>tests/Unit</directory>
+            <directory>tests/Visuals</directory>
+        </testsuite>
         <testsuite name="Laravel Livewire Tables Unit Test Suite">
             <directory>tests/Unit</directory>
         </testsuite>
+        <testsuite name="Laravel Livewire Tables Visuals Test Suite">
+            <directory>tests/Visuals</directory>
+        </testsuite>
         <testsuite name="Laravel Livewire Tables Localisations Unit">
             <directory>tests/Localisations/Unit</directory>
         </testsuite>
diff --git a/tests/Unit/Visuals/ActionsVisualsTest.php b/tests/Visuals/ActionsVisualsTest.php
similarity index 98%
rename from tests/Unit/Visuals/ActionsVisualsTest.php
rename to tests/Visuals/ActionsVisualsTest.php
index a0150f0f2..2a0d80bf2 100644
--- a/tests/Unit/Visuals/ActionsVisualsTest.php
+++ b/tests/Visuals/ActionsVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/BulkActionsVisualsTest.php b/tests/Visuals/BulkActionsVisualsTest.php
similarity index 99%
rename from tests/Unit/Visuals/BulkActionsVisualsTest.php
rename to tests/Visuals/BulkActionsVisualsTest.php
index 59570f3cd..8469eb907 100644
--- a/tests/Unit/Visuals/BulkActionsVisualsTest.php
+++ b/tests/Visuals/BulkActionsVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/Columns/IconColumnVisualsTest.php b/tests/Visuals/Columns/IconColumnVisualsTest.php
similarity index 97%
rename from tests/Unit/Visuals/Columns/IconColumnVisualsTest.php
rename to tests/Visuals/Columns/IconColumnVisualsTest.php
index 21d1572a1..86beb4c46 100644
--- a/tests/Unit/Visuals/Columns/IconColumnVisualsTest.php
+++ b/tests/Visuals/Columns/IconColumnVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals\Columns;
 
 use Exception;
 use Illuminate\View\ViewException;
diff --git a/tests/Unit/Visuals/ComponentVisualsTest.php b/tests/Visuals/ComponentVisualsTest.php
similarity index 99%
rename from tests/Unit/Visuals/ComponentVisualsTest.php
rename to tests/Visuals/ComponentVisualsTest.php
index 7b9ed0282..2819195a5 100644
--- a/tests/Unit/Visuals/ComponentVisualsTest.php
+++ b/tests/Visuals/ComponentVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Exception;
 use Illuminate\View\ViewException;
diff --git a/tests/Unit/Visuals/CustomisationsVisualsTest.php b/tests/Visuals/CustomisationsVisualsTest.php
similarity index 95%
rename from tests/Unit/Visuals/CustomisationsVisualsTest.php
rename to tests/Visuals/CustomisationsVisualsTest.php
index 55a6da4e1..87e3cf929 100644
--- a/tests/Unit/Visuals/CustomisationsVisualsTest.php
+++ b/tests/Visuals/CustomisationsVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Exception;
 use Illuminate\View\ViewException;
diff --git a/tests/Unit/Visuals/DataTableComponentVisualsTest.php b/tests/Visuals/DataTableComponentVisualsTest.php
similarity index 92%
rename from tests/Unit/Visuals/DataTableComponentVisualsTest.php
rename to tests/Visuals/DataTableComponentVisualsTest.php
index 29fd9f01e..855d1cfbd 100644
--- a/tests/Unit/Visuals/DataTableComponentVisualsTest.php
+++ b/tests/Visuals/DataTableComponentVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Exception;
 use Illuminate\View\ViewException;
diff --git a/tests/Unit/Visuals/FilterVisualsTest.php b/tests/Visuals/FilterVisualsTest.php
similarity index 99%
rename from tests/Unit/Visuals/FilterVisualsTest.php
rename to tests/Visuals/FilterVisualsTest.php
index 19b979437..2580896de 100644
--- a/tests/Unit/Visuals/FilterVisualsTest.php
+++ b/tests/Visuals/FilterVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php b/tests/Visuals/Filters/BooleanFilterVisualsTest.php
similarity index 96%
rename from tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php
rename to tests/Visuals/Filters/BooleanFilterVisualsTest.php
index 644dfc33c..738080e96 100644
--- a/tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php
+++ b/tests/Visuals/Filters/BooleanFilterVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals\Filters;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/Filters/DateFilterVisualsTest.php b/tests/Visuals/Filters/DateFilterVisualsTest.php
similarity index 97%
rename from tests/Unit/Visuals/Filters/DateFilterVisualsTest.php
rename to tests/Visuals/Filters/DateFilterVisualsTest.php
index 85c7ac153..8207d07d4 100644
--- a/tests/Unit/Visuals/Filters/DateFilterVisualsTest.php
+++ b/tests/Visuals/Filters/DateFilterVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals\Filters;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php b/tests/Visuals/Filters/DateTimeFilterVisualsTest.php
similarity index 97%
rename from tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php
rename to tests/Visuals/Filters/DateTimeFilterVisualsTest.php
index 3172f8b60..334d1c41a 100644
--- a/tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php
+++ b/tests/Visuals/Filters/DateTimeFilterVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals\Filters;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/Filters/FilterVisualsTestCase.php b/tests/Visuals/Filters/FilterVisualsTestCase.php
similarity index 80%
rename from tests/Unit/Visuals/Filters/FilterVisualsTestCase.php
rename to tests/Visuals/Filters/FilterVisualsTestCase.php
index 78a65b93c..7dea230cd 100644
--- a/tests/Unit/Visuals/Filters/FilterVisualsTestCase.php
+++ b/tests/Visuals/Filters/FilterVisualsTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals\Filters;
 
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php b/tests/Visuals/Filters/NumberFilterVisualsTest.php
similarity index 95%
rename from tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php
rename to tests/Visuals/Filters/NumberFilterVisualsTest.php
index ac8df3b50..aae34b252 100644
--- a/tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php
+++ b/tests/Visuals/Filters/NumberFilterVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals\Filters;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/Filters/TextFilterVisualsTest.php b/tests/Visuals/Filters/TextFilterVisualsTest.php
similarity index 99%
rename from tests/Unit/Visuals/Filters/TextFilterVisualsTest.php
rename to tests/Visuals/Filters/TextFilterVisualsTest.php
index 7b12c22d3..95b8366f1 100644
--- a/tests/Unit/Visuals/Filters/TextFilterVisualsTest.php
+++ b/tests/Visuals/Filters/TextFilterVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals\Filters;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/HideableTableTest.php b/tests/Visuals/HideableTableTest.php
similarity index 96%
rename from tests/Unit/Visuals/HideableTableTest.php
rename to tests/Visuals/HideableTableTest.php
index b5793dd8d..c0fa9b8b5 100644
--- a/tests/Unit/Visuals/HideableTableTest.php
+++ b/tests/Visuals/HideableTableTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/LoadingPlaceholderVisualsTest.php b/tests/Visuals/LoadingPlaceholderVisualsTest.php
similarity index 96%
rename from tests/Unit/Visuals/LoadingPlaceholderVisualsTest.php
rename to tests/Visuals/LoadingPlaceholderVisualsTest.php
index 34a1c36de..612a24be2 100644
--- a/tests/Unit/Visuals/LoadingPlaceholderVisualsTest.php
+++ b/tests/Visuals/LoadingPlaceholderVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/PaginationVisualsTest.php b/tests/Visuals/PaginationVisualsTest.php
similarity index 99%
rename from tests/Unit/Visuals/PaginationVisualsTest.php
rename to tests/Visuals/PaginationVisualsTest.php
index 668259f88..ebe053741 100644
--- a/tests/Unit/Visuals/PaginationVisualsTest.php
+++ b/tests/Visuals/PaginationVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/RefreshVisualsTest.php b/tests/Visuals/RefreshVisualsTest.php
similarity index 95%
rename from tests/Unit/Visuals/RefreshVisualsTest.php
rename to tests/Visuals/RefreshVisualsTest.php
index 9ed0890a8..cb5e0542a 100644
--- a/tests/Unit/Visuals/RefreshVisualsTest.php
+++ b/tests/Visuals/RefreshVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/ReorderingVisualsTest.php b/tests/Visuals/ReorderingVisualsTest.php
similarity index 99%
rename from tests/Unit/Visuals/ReorderingVisualsTest.php
rename to tests/Visuals/ReorderingVisualsTest.php
index 20e5b08af..7c3505d25 100644
--- a/tests/Unit/Visuals/ReorderingVisualsTest.php
+++ b/tests/Visuals/ReorderingVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Depends;
diff --git a/tests/Unit/Visuals/SearchVisualsTest.php b/tests/Visuals/SearchVisualsTest.php
similarity index 98%
rename from tests/Unit/Visuals/SearchVisualsTest.php
rename to tests/Visuals/SearchVisualsTest.php
index 4d56ee213..6b11d38cf 100644
--- a/tests/Unit/Visuals/SearchVisualsTest.php
+++ b/tests/Visuals/SearchVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Group;
diff --git a/tests/Unit/Visuals/SortingVisualsTest.php b/tests/Visuals/SortingVisualsTest.php
similarity index 99%
rename from tests/Unit/Visuals/SortingVisualsTest.php
rename to tests/Visuals/SortingVisualsTest.php
index 6a9df4714..e1dcf21b3 100644
--- a/tests/Unit/Visuals/SortingVisualsTest.php
+++ b/tests/Visuals/SortingVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Depends;

From b819109cf19feb3462fce4b0a395d740e19a9b85 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 4 Jan 2025 08:06:50 +0000
Subject: [PATCH 12/36] Tidy up Blade Class Definitions (#2145)

* Tidy up Blade Class Definitions

* Fix test class ordering
---
 .../components/includes/actions.blade.php     | 20 +++++++++--------
 .../components/includes/loading.blade.php     | 18 ++++++++++-----
 resources/views/components/table.blade.php    | 12 +++++++---
 .../table/collapsed-columns.blade.php         | 10 +++++----
 resources/views/components/table/td.blade.php | 20 +++++++++--------
 .../table/td/collapsed-columns.blade.php      | 19 ++++++++++------
 .../views/components/table/td/plain.blade.php | 20 ++++++++++-------
 resources/views/components/table/th.blade.php |  4 +++-
 resources/views/components/table/tr.blade.php | 12 +++++-----
 .../views/components/table/tr/plain.blade.php | 12 ++++++----
 resources/views/components/tools.blade.php    |  6 +++--
 .../components/tools/filter-label.blade.php   |  8 ++++---
 .../views/components/tools/toolbar.blade.php  |  6 +++--
 .../toolbar/items/bulk-actions.blade.php      | 20 ++++++++---------
 .../views/includes/actions/button.blade.php   | 22 ++++++++++++-------
 tests/Unit/Views/Actions/ActionTest.php       |  2 +-
 16 files changed, 129 insertions(+), 82 deletions(-)

diff --git a/resources/views/components/includes/actions.blade.php b/resources/views/components/includes/actions.blade.php
index 035c8397a..f10f44af7 100644
--- a/resources/views/components/includes/actions.blade.php
+++ b/resources/views/components/includes/actions.blade.php
@@ -1,14 +1,16 @@
 <div {{ $attributes
             ->merge($this->getActionWrapperAttributes)
-            ->class(['flex flex-cols py-2 space-x-2' => $this->isTailwind && $this->getActionWrapperAttributes['default-styling'] ?? true])
-            ->class(['' => $this->isTailwind && $this->getActionWrapperAttributes['default-colors'] ?? true])
-            ->class(['d-flex flex-cols py-2 space-x-2' => $this->isBootstrap && $this->getActionWrapperAttributes['default-styling'] ?? true])
-            ->class(['' => $this->isBootstrap && $this->getActionWrapperAttributes['default-colors'] ?? true])
-            ->class(['justify-start' => $this->getActionsPosition === 'left'])
-            ->class(['justify-center' => $this->getActionsPosition === 'center'])
-            ->class(['justify-end' => $this->getActionsPosition === 'right'])
-            ->class(['pl-2' => $this->showActionsInToolbar && $this->getActionsPosition === 'left'])
-            ->class(['pr-2' => $this->showActionsInToolbar && $this->getActionsPosition === 'right'])
+            ->class([
+                'flex flex-cols py-2 space-x-2' => $this->isTailwind && ($this->getActionWrapperAttributes['default-styling'] ?? true),
+                '' => $this->isTailwind && ($this->getActionWrapperAttributes['default-colors'] ?? true),
+                'd-flex flex-cols py-2 space-x-2' => $this->isBootstrap && ($this->getActionWrapperAttributes['default-styling'] ?? true),
+                '' => $this->isBootstrap && ($this->getActionWrapperAttributes['default-colors'] ?? true),
+                'justify-start' => $this->getActionsPosition === 'left',
+                'justify-center' => $this->getActionsPosition === 'center',
+                'justify-end' => $this->getActionsPosition === 'right',
+                'pl-2' => $this->showActionsInToolbar && $this->getActionsPosition === 'left',
+                'pr-2' => $this->showActionsInToolbar && $this->getActionsPosition === 'right',
+            ])
             ->except(['default','default-styling','default-colors'])
         }} >
     @foreach($this->getActions as $action)
diff --git a/resources/views/components/includes/loading.blade.php b/resources/views/components/includes/loading.blade.php
index ef88b43e8..c4c5c31e9 100644
--- a/resources/views/components/includes/loading.blade.php
+++ b/resources/views/components/includes/loading.blade.php
@@ -9,14 +9,18 @@
 
 <tr wire:key="{{ $tableName }}-loader" wire:loading.class.remove="hidden d-none" {{
     $attributes->merge($loaderRow)
-        ->class(['hidden w-full text-center place-items-center align-middle' => $this->isTailwind && ($loaderRow['default'] ?? true)])
-        ->class(['d-none w-100 text-center align-items-center' => $this->isBootstrap && ($loaderRow['default'] ?? true)])
+        ->class([
+            'hidden w-full text-center place-items-center align-middle' => $this->isTailwind && ($loaderRow['default'] ?? true),
+            'd-none w-100 text-center align-items-center' => $this->isBootstrap && ($loaderRow['default'] ?? true),
+        ])
         ->except(['default','default-styling','default-colors'])
 }}>
     <td colspan="{{ $colCount }}" wire:key="{{ $tableName }}-loader-column" {{
         $attributes->merge($loaderCell)
-            ->class(['py-4' => $this->isTailwind && ($loaderCell['default'] ?? true)])
-            ->class(['py-4' => $this->isBootstrap && ($loaderCell['default'] ?? true)])
+            ->class([
+                'py-4' => $this->isTailwind && ($loaderCell['default'] ?? true),
+                'py-4' => $this->isBootstrap && ($loaderCell['default'] ?? true),
+            ])
             ->except(['default','default-styling','default-colors', 'colspan','wire:key'])
     }}>
         @if($this->hasLoadingPlaceholderBlade())
@@ -25,8 +29,10 @@
             <div class="h-min self-center align-middle text-center">
                 <div class="lds-hourglass"{{
                         $attributes->merge($loaderIcon)
-                            ->class(['lds-hourglass' => $this->isTailwind && ($loaderIcon['default'] ?? true)])
-                            ->class(['lds-hourglass' => $this->isBootstrap && ($loaderIcon['default'] ?? true)])
+                            ->class([
+                                'lds-hourglass' => $this->isTailwind && ($loaderIcon['default'] ?? true),
+                                'lds-hourglass' => $this->isBootstrap && ($loaderIcon['default'] ?? true),
+                            ])
                             ->except(['default','default-styling','default-colors'])
                 }}></div>
                 <div>{!! $this->getLoadingPlaceholderContent() !!}</div>
diff --git a/resources/views/components/table.blade.php b/resources/views/components/table.blade.php
index 87d0c3c05..a972275b0 100644
--- a/resources/views/components/table.blade.php
+++ b/resources/views/components/table.blade.php
@@ -13,7 +13,9 @@
     <div
         wire:key="{{ $tableName }}-twrap"
         {{ $attributes->merge($customAttributes['wrapper'])
-            ->class(['shadow overflow-y-auto border-b border-gray-200 dark:border-gray-700 sm:rounded-lg' => $customAttributes['wrapper']['default'] ?? true])
+            ->class([
+                'shadow overflow-y-auto border-b border-gray-200 dark:border-gray-700 sm:rounded-lg' => $customAttributes['wrapper']['default'] ?? true
+            ])
             ->except(['default','default-styling','default-colors']) }}
     >
         <table
@@ -25,7 +27,9 @@
         >
             <thead wire:key="{{ $tableName }}-thead"
                 {{ $attributes->merge($customAttributes['thead'])
-                    ->class(['bg-gray-50 dark:bg-gray-800' => $customAttributes['thead']['default'] ?? true])
+                    ->class([
+                        'bg-gray-50 dark:bg-gray-800' => $customAttributes['thead']['default'] ?? true
+                    ])
                     ->except(['default','default-styling','default-colors']) }}
             >
                 <tr>
@@ -37,7 +41,9 @@
                 wire:key="{{ $tableName }}-tbody"
                 id="{{ $tableName }}-tbody"
                 {{ $attributes->merge($customAttributes['tbody'])
-                        ->class(['bg-white divide-y divide-gray-200 dark:bg-gray-800 dark:divide-none' => $customAttributes['tbody']['default'] ?? true])
+                        ->class([
+                            'bg-white divide-y divide-gray-200 dark:bg-gray-800 dark:divide-none' => $customAttributes['tbody']['default'] ?? true
+                        ])
                         ->except(['default','default-styling','default-colors']) }}
             >
                 {{ $slot }}
diff --git a/resources/views/components/table/collapsed-columns.blade.php b/resources/views/components/table/collapsed-columns.blade.php
index f773bd8ae..1db467ce1 100644
--- a/resources/views/components/table/collapsed-columns.blade.php
+++ b/resources/views/components/table/collapsed-columns.blade.php
@@ -34,10 +34,12 @@
         wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
         {{
         $attributes->merge($customAttributes)
-                ->class(['hidden bg-white dark:bg-gray-700 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 === 0)])
-                ->class(['hidden bg-gray-50 dark:bg-gray-800 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 !== 0)])
-                ->class(['d-none bg-light rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 === 0 && ($customAttributes['default'] ?? true))])
-                ->class(['d-none bg-white rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true))])
+                ->class([
+                    'hidden bg-white dark:bg-gray-700 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 === 0),
+                    'hidden bg-gray-50 dark:bg-gray-800 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 !== 0),
+                    'd-none bg-light rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 === 0 && ($customAttributes['default'] ?? true)),
+                    'd-none bg-white rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true)),
+                ])
                 ->except(['default','default-styling','default-colors'])
         }}
 
diff --git a/resources/views/components/table/td.blade.php b/resources/views/components/table/td.blade.php
index 546bf33fe..9fae459d3 100644
--- a/resources/views/components/table/td.blade.php
+++ b/resources/views/components/table/td.blade.php
@@ -13,15 +13,17 @@
     @endif
         {{
             $attributes->merge($customAttributes)
-                ->class(['px-6 py-4 whitespace-nowrap text-sm font-medium dark:text-white' => $isTailwind && ($customAttributes['default'] ?? true)])
-                ->class(['hidden' =>  $isTailwind && $column && $column->shouldCollapseAlways()])
-                ->class(['hidden md:table-cell' => $isTailwind && $column && $column->shouldCollapseOnMobile()])
-                ->class(['hidden lg:table-cell' => $isTailwind && $column && $column->shouldCollapseOnTablet()])
-                ->class(['' => $isBootstrap && ($customAttributes['default'] ?? true)])
-                ->class(['d-none' => $isBootstrap && $column && $column->shouldCollapseAlways()])
-                ->class(['d-none d-md-table-cell' => $isBootstrap && $column && $column->shouldCollapseOnMobile()])
-                ->class(['d-none d-lg-table-cell' => $isBootstrap && $column && $column->shouldCollapseOnTablet()])
-                ->class(['laravel-livewire-tables-cursor' => $isBootstrap && $column && $column->isClickable()])
+                ->class([
+                    'px-6 py-4 whitespace-nowrap text-sm font-medium dark:text-white' => $isTailwind && ($customAttributes['default'] ?? true),
+                    'hidden' =>  $isTailwind && $column && $column->shouldCollapseAlways(),
+                    'hidden md:table-cell' => $isTailwind && $column && $column->shouldCollapseOnMobile(),
+                    'hidden lg:table-cell' => $isTailwind && $column && $column->shouldCollapseOnTablet(),
+                    '' => $isBootstrap && ($customAttributes['default'] ?? true),
+                    'd-none' => $isBootstrap && $column && $column->shouldCollapseAlways(),
+                    'd-none d-md-table-cell' => $isBootstrap && $column && $column->shouldCollapseOnMobile(),
+                    'd-none d-lg-table-cell' => $isBootstrap && $column && $column->shouldCollapseOnTablet(),
+                    'laravel-livewire-tables-cursor' => $isBootstrap && $column && $column->isClickable(),
+                ])
                 ->except(['default','default-styling','default-colors'])
         }}
     >
diff --git a/resources/views/components/table/td/collapsed-columns.blade.php b/resources/views/components/table/td/collapsed-columns.blade.php
index 3bf65e170..63294f432 100644
--- a/resources/views/components/table/td/collapsed-columns.blade.php
+++ b/resources/views/components/table/td/collapsed-columns.blade.php
@@ -6,10 +6,13 @@
         <td x-data="{open:false}" wire:key="{{ $tableName }}-collapsingIcon-{{ $rowIndex }}-{{ md5(now()) }}"
             {{
                 $attributes
-                    ->merge(['class' => 'p-3 table-cell text-center '])
-                    ->class(['sm:hidden' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet()])
-                    ->class(['md:hidden' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile()])
-                    ->class(['lg:hidden' => !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile())])
+                    ->merge()
+                    ->class([
+                        'p-3 table-cell text-center',
+                        'sm:hidden' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet(),
+                        'md:hidden' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile(),
+                        'lg:hidden' => !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile()),
+                    ])
             }}
             :class="currentlyReorderingStatus ? 'laravel-livewire-tables-reorderingMinimised' : ''"
         >
@@ -45,9 +48,11 @@
         <td x-data="{open:false}" wire:key="{{ $tableName }}-collapsingIcon-{{ $rowIndex }}-{{ md5(now()) }}" 
             {{
                 $attributes
-                    ->class(['d-sm-none' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet()])
-                    ->class(['d-md-none' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile()])
-                    ->class(['d-lg-none' => !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile())])
+                    ->class([
+                        'd-sm-none' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet(),
+                        'd-md-none' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile(),
+                        'd-lg-none' => !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile()),
+                    ])
             }}
             :class="currentlyReorderingStatus ? 'laravel-livewire-tables-reorderingMinimised' : ''"
         >
diff --git a/resources/views/components/table/td/plain.blade.php b/resources/views/components/table/td/plain.blade.php
index 417f6c6b6..d47872a03 100644
--- a/resources/views/components/table/td/plain.blade.php
+++ b/resources/views/components/table/td/plain.blade.php
@@ -5,10 +5,12 @@
 @if ($isTailwind)
     <td x-cloak {{ $attributes
         ->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 md:table-cell' => $column && $column->shouldCollapseOnMobile()])
-        ->class(['hidden lg:table-cell' => $column && $column->shouldCollapseOnTablet()])
+        ->class([
+            'px-6 py-4 whitespace-nowrap text-sm font-medium dark:text-white' => $customAttributes['default'] ?? true,
+            'hidden' => $column && $column->shouldCollapseAlways(),
+            'hidden md:table-cell' => $column && $column->shouldCollapseOnMobile(),
+            'hidden lg:table-cell' => $column && $column->shouldCollapseOnTablet(),
+        ])
         ->except(['default','default-styling','default-colors'])
     }} @if($hideUntilReorder) x-show="reorderDisplayColumn" @endif >
         {{ $slot }}
@@ -16,10 +18,12 @@
 @elseif ($isBootstrap)
     <td {{ $attributes
         ->merge($customAttributes)
-        ->class(['' => $customAttributes['default'] ?? true])
-        ->class(['d-none' => $column && $column->shouldCollapseAlways()])
-        ->class(['d-none d-md-table-cell' => $column && $column->shouldCollapseOnMobile()])
-        ->class(['d-none d-lg-table-cell' => $column && $column->shouldCollapseOnTablet()])
+        ->class([
+            '' => $customAttributes['default'] ?? true,
+            'd-none' => $column && $column->shouldCollapseAlways(),
+            'd-none d-md-table-cell' => $column && $column->shouldCollapseOnMobile(),
+            'd-none d-lg-table-cell' => $column && $column->shouldCollapseOnTablet(),
+        ])
         ->except(['default','default-styling','default-colors'])
     }}>
         {{ $slot }}
diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php
index f587600eb..db8c0da4d 100644
--- a/resources/views/components/table/th.blade.php
+++ b/resources/views/components/table/th.blade.php
@@ -44,7 +44,9 @@
             @elseif ($this->isBootstrap)
                 <div wire:click="sortBy('{{ $column->getColumnSortKey() }}')" {{
                         $attributes->merge($customSortButtonAttributes)
-                            ->class(['d-flex align-items-center laravel-livewire-tables-cursor' => (($customSortButtonAttributes['default-styling'] ?? true) || ($customSortButtonAttributes['default'] ?? true))])
+                            ->class([
+                                'd-flex align-items-center laravel-livewire-tables-cursor' => (($customSortButtonAttributes['default-styling'] ?? true) || ($customSortButtonAttributes['default'] ?? true))
+                            ])
                             ->except(['default', 'default-colors', 'default-styling', 'wire:key'])
                 }}>
                     <x-livewire-tables::table.th.label :$customLabelAttributes :columnTitle="$column->getTitle()" />
diff --git a/resources/views/components/table/tr.blade.php b/resources/views/components/table/tr.blade.php
index 9f5f84b20..92ef2955e 100644
--- a/resources/views/components/table/tr.blade.php
+++ b/resources/views/components/table/tr.blade.php
@@ -22,11 +22,13 @@
     loopType="{{ ($rowIndex % 2 === 0) ? 'even' : 'odd' }}"
     {{
         $attributes->merge($customAttributes)
-                ->class(['bg-white dark:bg-gray-700 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 === 0)])
-                ->class(['bg-gray-50 dark:bg-gray-800 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 !== 0)])
-                ->class(['cursor-pointer' => ($isTailwind && $this->hasTableRowUrl() && ($customAttributes['default'] ?? true))])
-                ->class(['bg-light rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 === 0 && ($customAttributes['default'] ?? true))])
-                ->class(['bg-white rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true))])
+                ->class([
+                    'bg-white dark:bg-gray-700 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 === 0),
+                    'bg-gray-50 dark:bg-gray-800 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 !== 0),
+                    'cursor-pointer' => ($isTailwind && $this->hasTableRowUrl() && ($customAttributes['default'] ?? true)),
+                    'bg-light rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 === 0 && ($customAttributes['default'] ?? true)),
+                    'bg-white rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true)),
+                ])
                 ->except(['default','default-styling','default-colors'])
     }}
 
diff --git a/resources/views/components/table/tr/plain.blade.php b/resources/views/components/table/tr/plain.blade.php
index f299b3c0a..ba7c3d695 100644
--- a/resources/views/components/table/tr/plain.blade.php
+++ b/resources/views/components/table/tr/plain.blade.php
@@ -4,8 +4,10 @@
 @if ($isTailwind)
     <tr {{ $attributes
             ->merge($customAttributes)
-            ->class(['bg-white dark:bg-gray-700 dark:text-white' => $customAttributes['default'] ?? true])
-            ->class(['laravel-livewire-tables-reorderingMinimised'])
+            ->class([
+                'laravel-livewire-tables-reorderingMinimised',
+                'bg-white dark:bg-gray-700 dark:text-white' => ($customAttributes['default'] ?? true),
+            ])
             ->except(['default','default-styling','default-colors'])
         }}
     >
@@ -14,8 +16,10 @@
 @elseif ($isBootstrap)
     <tr {{ $attributes
             ->merge($customAttributes)
-            ->class(['' => $customAttributes['default'] ?? true])
-            ->class(['laravel-livewire-tables-reorderingMinimised'])
+            ->class([
+                'laravel-livewire-tables-reorderingMinimised',
+                '' => $customAttributes['default'] ?? true,
+            ])
             ->except(['default','default-styling','default-colors'])
         }}
     >
diff --git a/resources/views/components/tools.blade.php b/resources/views/components/tools.blade.php
index 38b80037c..ae652df20 100644
--- a/resources/views/components/tools.blade.php
+++ b/resources/views/components/tools.blade.php
@@ -3,8 +3,10 @@
 
 <div {{
     $toolsAttributes->merge()
-        ->class(['flex-col' => $isTailwind && ($toolsAttributes['default-styling'] ?? true)])
-        ->class(['d-flex flex-column' => $isBootstrap && ($toolsAttributes['default-styling'] ?? true)])
+        ->class([
+            'flex-col' => $isTailwind && ($toolsAttributes['default-styling'] ?? true),
+            'd-flex flex-column' => $isBootstrap && ($toolsAttributes['default-styling'] ?? true)
+        ])
         ->except(['default','default-styling','default-colors'])
     }}
 >
diff --git a/resources/views/components/tools/filter-label.blade.php b/resources/views/components/tools/filter-label.blade.php
index f6993c8f9..c7c69fb75 100644
--- a/resources/views/components/tools/filter-label.blade.php
+++ b/resources/views/components/tools/filter-label.blade.php
@@ -13,9 +13,11 @@
 
         {{
             $attributes->merge($customLabelAttributes)->merge($filterLabelAttributes)
-                ->class(['block text-sm font-medium leading-5 text-gray-700 dark:text-white' => $isTailwind && ($filterLabelAttributes['default'] ?? true)])
-                ->class(['d-block' => $isBootstrap && $filterLayout === 'slide-down' && ($filterLabelAttributes['default'] ?? true)])
-                ->class(['mb-2' => $isBootstrap && $filterLayout === 'popover' && ($filterLabelAttributes['default'] ?? true)])
+                ->class([
+                    'block text-sm font-medium leading-5 text-gray-700 dark:text-white' => $isTailwind && ($filterLabelAttributes['default'] ?? true),
+                    'd-block' => $isBootstrap && $filterLayout === 'slide-down' && ($filterLabelAttributes['default'] ?? true),
+                    'mb-2' => $isBootstrap && $filterLayout === 'popover' && ($filterLabelAttributes['default'] ?? true),
+                ])
                 ->except(['default', 'default-colors', 'default-styling'])
         }}
 
diff --git a/resources/views/components/tools/toolbar.blade.php b/resources/views/components/tools/toolbar.blade.php
index 36a78e787..75814c1f7 100644
--- a/resources/views/components/tools/toolbar.blade.php
+++ b/resources/views/components/tools/toolbar.blade.php
@@ -5,8 +5,10 @@
 <div
     {{
         $toolBarAttributes->merge()
-        ->class(['md:flex md:justify-between mb-4 px-4 md:p-0' => $isTailwind && ($toolBarAttributes['default-styling'] ?? true)])
-        ->class(['d-md-flex justify-content-between mb-3' => $isBootstrap && ($toolBarAttributes['default-styling'] ?? true)])
+        ->class([
+            'md:flex md:justify-between mb-4 px-4 md:p-0' => $isTailwind && ($toolBarAttributes['default-styling'] ?? true),
+            'd-md-flex justify-content-between mb-3' => $isBootstrap && ($toolBarAttributes['default-styling'] ?? true),
+        ])
         ->except(['default','default-styling','default-colors'])
     }}
 >
diff --git a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
index 92180299c..344ea0309 100644
--- a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
+++ b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
@@ -16,9 +16,9 @@
             {{ 
                 $attributes->merge($this->getBulkActionsButtonAttributes)
                 ->class([
-                    'btn dropdown-toggle d-block d-md-inline' => $this->isBootstrap && $this->getBulkActionsButtonAttributes['default-styling'] ?? true,
-                    'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600' => $this->isTailwind  && $this->getBulkActionsButtonAttributes['default-colors'] ?? true,
-                    'inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $this->isTailwind  && $this->getBulkActionsButtonAttributes['default-styling'] ?? true,
+                    'btn dropdown-toggle d-block d-md-inline' => $this->isBootstrap && ($this->getBulkActionsButtonAttributes['default-styling'] ?? true),
+                    'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600' => $this->isTailwind && ($this->getBulkActionsButtonAttributes['default-colors'] ?? true),
+                    'inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $this->isTailwind && ($this->getBulkActionsButtonAttributes['default-styling'] ?? true),
 
                 ])
                 ->except(['default','default-styling','default-colors']) 
@@ -58,8 +58,8 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
                     {{ 
                         $attributes->merge($this->getBulkActionsMenuAttributes)
                         ->class([
-                            'bg-white dark:bg-gray-700 dark:text-white' => $this->isTailwind && $this->getBulkActionsMenuAttributes['default-colors'] ?? true,
-                            'rounded-md shadow-xs' => $this->isTailwind && $this->getBulkActionsMenuAttributes['default-styling'] ?? true,
+                            'bg-white dark:bg-gray-700 dark:text-white' => $this->isTailwind && ($this->getBulkActionsMenuAttributes['default-colors'] ?? true),
+                            'rounded-md shadow-xs' => $this->isTailwind && ($this->getBulkActionsMenuAttributes['default-styling'] ?? true),
                         ])
                         ->except(['default','default-styling','default-colors']) 
                     }}
@@ -77,8 +77,8 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
                                 {{ 
                                     $attributes->merge($this->getBulkActionsMenuItemAttributes)
                                     ->class([
-                                        'text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:hover:bg-gray-600' => $this->isTailwind && $this->getBulkActionsMenuItemAttributes['default-colors'] ?? true,
-                                        'block w-full px-4 py-2 text-sm leading-5 focus:outline-none flex items-center space-x-2' => $this->isTailwind && $this->getBulkActionsMenuItemAttributes['default-styling'] ?? true,
+                                        'text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:hover:bg-gray-600' => $this->isTailwind && ($this->getBulkActionsMenuItemAttributes['default-colors'] ?? true),
+                                        'block w-full px-4 py-2 text-sm leading-5 focus:outline-none flex items-center space-x-2' => $this->isTailwind && ($this->getBulkActionsMenuItemAttributes['default-styling'] ?? true),
                                     ])
                                     ->except(['default','default-styling','default-colors']) 
                                 }}
@@ -94,8 +94,8 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
                 {{ 
                     $attributes->merge($this->getBulkActionsMenuAttributes)
                     ->class([
-                        'dropdown-menu dropdown-menu-right w-100' => $this->isBootstrap4 && $this->getBulkActionsMenuAttributes['default-styling'] ?? true,
-                        'dropdown-menu dropdown-menu-end w-100' => $this->isBootstrap5 && $this->getBulkActionsMenuAttributes['default-styling'] ?? true,
+                        'dropdown-menu dropdown-menu-right w-100' => $this->isBootstrap4 && ($this->getBulkActionsMenuAttributes['default-styling'] ?? true),
+                        'dropdown-menu dropdown-menu-end w-100' => $this->isBootstrap5 && ($this->getBulkActionsMenuAttributes['default-styling'] ?? true),
                     ])
                     ->except(['default','default-styling','default-colors']) 
                 }}
@@ -112,7 +112,7 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
                         {{ 
                             $attributes->merge($this->getBulkActionsMenuItemAttributes)
                                 ->class([
-                                    'dropdown-item' => $this->isBootstrap && $this->getBulkActionsMenuItemAttributes['default-styling'] ?? true,
+                                    'dropdown-item' => $this->isBootstrap && ($this->getBulkActionsMenuItemAttributes['default-styling'] ?? true),
                                 ])
                                 ->except(['default','default-styling','default-colors']) 
                         }}
diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php
index 074a36de2..b73acd3bd 100644
--- a/resources/views/includes/actions/button.blade.php
+++ b/resources/views/includes/actions/button.blade.php
@@ -1,8 +1,10 @@
 <a {{ $attributes->merge()
-            ->class(['justify-center text-center items-center inline-flex space-x-2 rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && $attributes['default-styling'] ?? true])
-            ->class(['focus:border-indigo-300 focus:ring-indigo-200' => $isTailwind && $attributes['default-colors'] ?? true])
-            ->class(['btn btn-sm btn-success' => $isBootstrap && $attributes['default-styling'] ?? true])
-            ->class(['' => $isBootstrap && $attributes['default-colors'] ?? true])
+            ->class([
+                'justify-center text-center items-center inline-flex space-x-2 rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && ($attributes['default-styling'] ?? true),
+                'focus:border-indigo-300 focus:ring-indigo-200' => $isTailwind && ($attributes['default-colors'] ?? true),
+                'btn btn-sm btn-success' => $isBootstrap && ($attributes['default-styling'] ?? true),
+                '' => $isBootstrap && ($attributes['default-colors'] ?? true),
+            ])
             ->except(['default','default-styling','default-colors'])
         }}
            @if($action->hasWireAction())
@@ -16,15 +18,19 @@
         @if($action->hasIcon() && $action->getIconRight())
             <span {{ $action->getLabelAttributesBag() }}>{{ $action->getLabel() }}</span>
             <i {{ $action->getIconAttributes()
-                    ->class(['ms-1 '. $action->getIcon() => $isBootstrap])
-                    ->class(['ml-1 '. $action->getIcon() => $isTailwind])
+                    ->class([
+                        'ms-1 '. $action->getIcon() => $isBootstrap,
+                        'ml-1 '. $action->getIcon() => $isTailwind,
+                    ])
                     ->except(['default','default-styling','default-colors'])
                 }}
             ></i>
         @elseif($action->hasIcon() && !$action->getIconRight())
             <i {{ $action->getIconAttributes()
-                    ->class(['ms-1 '. $action->getIcon() => $isBootstrap])
-                    ->class(['mr-1 '. $action->getIcon() => $isTailwind])
+                    ->class([
+                        'ms-1 '. $action->getIcon() => $isBootstrap,
+                        'mr-1 '. $action->getIcon() => $isTailwind,
+                    ])
                     ->except(['default','default-styling','default-colors'])
                 }}
             ></i>
diff --git a/tests/Unit/Views/Actions/ActionTest.php b/tests/Unit/Views/Actions/ActionTest.php
index 6d5b09660..0c16c2652 100644
--- a/tests/Unit/Views/Actions/ActionTest.php
+++ b/tests/Unit/Views/Actions/ActionTest.php
@@ -338,7 +338,7 @@ public function test_action_renders_correctly(): void
             )
             ->route('dashboard22');
 
-        $this->assertStringContainsString('<a class="focus:border-indigo-300 focus:ring-indigo-200 justify-center text-center items-center inline-flex space-x-2 rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50 dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800" href="dashboard22"', $action->render());
+        $this->assertStringContainsString('<a class="justify-center text-center items-center inline-flex space-x-2 rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800" href="dashboard22"', $action->render());
     }
 
     public function test_can_set_action_position(): void

From 4125285325b8d5364f656eec64a555b00733db9b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 4 Jan 2025 08:07:09 +0000
Subject: [PATCH 13/36] Move Filters Before Query (#2143)

---
 src/Traits/HasAllTraits.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index e2e675588..10eba62ab 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -9,10 +9,11 @@ trait HasAllTraits
 {
     // Note Specific Order Below!
     use WithTableHooks;
-    use HasLocalisations;
-    use WithLoadingPlaceholder;
-    use HasTheme;
-    use WithQuery,
+    use HasLocalisations,
+        WithLoadingPlaceholder,
+        HasTheme;
+    use WithFilters,
+        WithQuery,
         ComponentUtilities,
         WithActions,
         WithData,
@@ -29,7 +30,6 @@ trait HasAllTraits
         WithCustomisations,
         WithDebugging,
         WithEvents,
-        WithFilters,
         WithFooter,
         WithRefresh,
         WithReordering,

From d17464b947780fa7fb0dbcf7c4fcfaabd38d3608 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 4 Jan 2025 10:40:20 +0000
Subject: [PATCH 14/36] Migrate Filter Code Appropriately (#2146)

* Migrate Filter Code Appropriately

* Fix styling

* Test Fixes

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 phpunit.xml.dist                              |   4 -
 .../Configuration/FilterConfiguration.php     |  54 ---------
 .../Core/Filters/HandlesFilterTraits.php      |  13 +++
 .../Core/Filters/HasFilterGenericData.php     |  36 ++++++
 .../Filters/HasFilterMenuStyling.php}         |  96 +++++++++++++++-
 .../Core/Filters/HasFilterPillsStyling.php    |  62 +++++++++++
 .../HasFilterQueryString.php}                 |   4 +-
 .../Core/Filters/HasFiltersVisibility.php     |  64 +++++++++++
 src/Traits/Core/Filters/ManagesFilters.php    | 100 +++++++++++++++++
 src/Traits/HasAllTraits.php                   |   6 +-
 src/Traits/Helpers/FilterHelpers.php          | 103 +-----------------
 src/Traits/Helpers/QueryHelpers.php           |   4 +
 .../FilterMenuStylingConfiguration.php        |  85 ---------------
 src/Traits/Styling/HasFilterMenuStyling.php   |  26 -----
 src/Traits/WithData.php                       |  14 +--
 src/Traits/WithFilters.php                    |  78 +------------
 tests/DataTableComponentTest.php              |   3 +-
 tests/TestCase.php                            |  18 ++-
 .../DebuggableDataTest.php                    |  24 +++-
 .../Unit/Traits/Helpers/ColumnHelpersTest.php |   4 +-
 .../Helpers/ColumnSelectHelpersTest.php       |   9 +-
 .../Unit/Traits/Helpers/FilterHelpersTest.php |   4 +-
 .../Helpers/SessionStorageHelpersTest.php     |  29 ++++-
 tests/Unit/Traits/WithCustomisationsTest.php  |  10 +-
 tests/Unit/Traits/WithMountTest.php           |   8 +-
 tests/Unit/Traits/WithSearchTest.php          |   7 +-
 26 files changed, 474 insertions(+), 391 deletions(-)
 create mode 100644 src/Traits/Core/Filters/HandlesFilterTraits.php
 create mode 100644 src/Traits/Core/Filters/HasFilterGenericData.php
 rename src/Traits/{Styling/Helpers/FilterMenuStylingHelpers.php => Core/Filters/HasFilterMenuStyling.php} (55%)
 create mode 100644 src/Traits/Core/Filters/HasFilterPillsStyling.php
 rename src/Traits/Core/{QueryStrings/HasQueryStringForFilter.php => Filters/HasFilterQueryString.php} (95%)
 create mode 100644 src/Traits/Core/Filters/HasFiltersVisibility.php
 create mode 100644 src/Traits/Core/Filters/ManagesFilters.php
 delete mode 100644 src/Traits/Styling/Configuration/FilterMenuStylingConfiguration.php
 delete mode 100644 src/Traits/Styling/HasFilterMenuStyling.php

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2156f09a7..30d511e6d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,10 +9,6 @@
          failOnEmptyTestSuite="false" 
          beStrictAboutOutputDuringTests="true" >
     <testsuites>
-        <testsuite name="Laravel Livewire Tables Unit and Visuals Test Suite">
-            <directory>tests/Unit</directory>
-            <directory>tests/Visuals</directory>
-        </testsuite>
         <testsuite name="Laravel Livewire Tables Unit Test Suite">
             <directory>tests/Unit</directory>
         </testsuite>
diff --git a/src/Traits/Configuration/FilterConfiguration.php b/src/Traits/Configuration/FilterConfiguration.php
index d17e7bf16..7e8400b86 100644
--- a/src/Traits/Configuration/FilterConfiguration.php
+++ b/src/Traits/Configuration/FilterConfiguration.php
@@ -2,8 +2,6 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
 
-use Rappasoft\LaravelLivewireTables\DataTransferObjects\FilterGenericData;
-
 trait FilterConfiguration
 {
     public function setFiltersStatus(bool $status): self
@@ -26,56 +24,4 @@ public function setFiltersDisabled(): self
 
         return $this;
     }
-
-    public function setFiltersVisibilityStatus(bool $status): self
-    {
-        $this->filtersVisibilityStatus = $status;
-
-        return $this;
-    }
-
-    public function setFiltersVisibilityEnabled(): self
-    {
-        $this->setFiltersVisibilityStatus(true);
-
-        return $this;
-    }
-
-    public function setFiltersVisibilityDisabled(): self
-    {
-        $this->setFiltersVisibilityStatus(false);
-
-        return $this;
-    }
-
-    public function setFilterPillsStatus(bool $status): self
-    {
-        $this->filterPillsStatus = $status;
-
-        return $this;
-    }
-
-    public function setFilterPillsEnabled(): self
-    {
-        $this->setFilterPillsStatus(true);
-
-        return $this;
-    }
-
-    public function setFilterPillsDisabled(): self
-    {
-        $this->setFilterPillsStatus(false);
-
-        return $this;
-    }
-
-    public function generateFilterGenericData(): array
-    {
-        return (new FilterGenericData($this->getTableName(), $this->getFilterLayout(), $this->isTailwind(), $this->isBootstrap4(), $this->isBootstrap5()))->toArray();
-    }
-
-    public function setFilterGenericData(array $filterGenericData = []): void
-    {
-        $this->filterGenericData = $filterGenericData;
-    }
 }
diff --git a/src/Traits/Core/Filters/HandlesFilterTraits.php b/src/Traits/Core/Filters/HandlesFilterTraits.php
new file mode 100644
index 000000000..d4f3c114e
--- /dev/null
+++ b/src/Traits/Core/Filters/HandlesFilterTraits.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+trait HandlesFilterTraits
+{
+    use ManagesFilters,
+        HasFilterGenericData,
+        HasFilterMenuStyling,
+        HasFilterPillsStyling,
+        HasFilterQueryString,
+        HasFiltersVisibility;
+}
diff --git a/src/Traits/Core/Filters/HasFilterGenericData.php b/src/Traits/Core/Filters/HasFilterGenericData.php
new file mode 100644
index 000000000..2025ffeb5
--- /dev/null
+++ b/src/Traits/Core/Filters/HasFilterGenericData.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+use Livewire\Attributes\Computed;
+use Rappasoft\LaravelLivewireTables\DataTransferObjects\FilterGenericData;
+
+trait HasFilterGenericData
+{
+    public array $filterGenericData = [];
+
+    public function generateFilterGenericData(): array
+    {
+        return (new FilterGenericData($this->getTableName(), $this->getFilterLayout(), $this->isTailwind(), $this->isBootstrap4(), $this->isBootstrap5()))->toArray();
+    }
+
+    public function setFilterGenericData(array $filterGenericData = []): void
+    {
+        $this->filterGenericData = $filterGenericData;
+    }
+
+    public function hasFilterGenericData(): bool
+    {
+        return ! empty($this->filterGenericData);
+    }
+
+    #[Computed]
+    public function getFilterGenericData(): array
+    {
+        if (! $this->hasFilterGenericData()) {
+            $this->setFilterGenericData($this->generateFilterGenericData());
+        }
+
+        return $this->filterGenericData;
+    }
+}
diff --git a/src/Traits/Styling/Helpers/FilterMenuStylingHelpers.php b/src/Traits/Core/Filters/HasFilterMenuStyling.php
similarity index 55%
rename from src/Traits/Styling/Helpers/FilterMenuStylingHelpers.php
rename to src/Traits/Core/Filters/HasFilterMenuStyling.php
index 9833809d6..cf511e8cd 100644
--- a/src/Traits/Styling/Helpers/FilterMenuStylingHelpers.php
+++ b/src/Traits/Core/Filters/HasFilterMenuStyling.php
@@ -1,13 +1,103 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
 
+use Closure;
 use Illuminate\Support\Arr;
-use Livewire\Attributes\Computed;
+use Livewire\Attributes\{Computed, Locked};
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Views\Filter;
 
-trait FilterMenuStylingHelpers
+trait HasFilterMenuStyling
 {
+    #[Locked]
+    public string $filterLayout = 'popover';
+
+    // Entangled in JS
+    public bool $filterSlideDownDefaultVisible = false;
+
+    protected array $filterPopoverAttributes = ['class' => '', 'default-width' => true, 'default-colors' => true, 'default-styling' => true];
+
+    protected array $filterSlidedownWrapperAttributes = ['class' => '', 'default-colors' => true, 'default-styling' => true];
+
+    protected ?Closure $filterSlidedownRowCallback;
+
+    /**
+     * Used to set attributes for the Filter Popover
+     */
+    public function setFilterPopoverAttributes(array $filterPopoverAttributes): self
+    {
+        $this->filterPopoverAttributes = array_merge($this->filterPopoverAttributes, $filterPopoverAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the Filter Slidedown Wrapper
+     */
+    public function setFilterSlidedownWrapperAttributes(array $filterSlidedownWrapperAttributes): self
+    {
+        $this->filterSlidedownWrapperAttributes = array_merge($this->filterSlidedownWrapperAttributes, $filterSlidedownWrapperAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Set a list of attributes to override on the th sort button elements
+     */
+    public function setFilterSlidedownRowAttributes(Closure $callback): self
+    {
+        $this->filterSlidedownRowCallback = $callback;
+
+        return $this;
+    }
+
+    public function setFilterLayout(string $type): self
+    {
+        if (! in_array($type, ['popover', 'slide-down'], true)) {
+            throw new DataTableConfigurationException('Invalid filter layout type');
+        }
+
+        $this->filterLayout = $type;
+
+        return $this;
+    }
+
+    public function setFilterLayoutPopover(): self
+    {
+        $this->setFilterLayout('popover');
+
+        return $this;
+    }
+
+    public function setFilterLayoutSlideDown(): self
+    {
+        $this->setFilterLayout('slide-down');
+
+        return $this;
+    }
+
+    public function setFilterSlideDownDefaultStatus(bool $status): self
+    {
+        $this->filterSlideDownDefaultVisible = $status;
+
+        return $this;
+    }
+
+    public function setFilterSlideDownDefaultStatusDisabled(): self
+    {
+        $this->setFilterSlideDownDefaultStatus(false);
+
+        return $this;
+    }
+
+    public function setFilterSlideDownDefaultStatusEnabled(): self
+    {
+        $this->setFilterSlideDownDefaultStatus(true);
+
+        return $this;
+    }
+
     /**
      * Used to get attributes for the Filter Popover
      *
diff --git a/src/Traits/Core/Filters/HasFilterPillsStyling.php b/src/Traits/Core/Filters/HasFilterPillsStyling.php
new file mode 100644
index 000000000..667583ba5
--- /dev/null
+++ b/src/Traits/Core/Filters/HasFilterPillsStyling.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+use Livewire\Attributes\{Computed, Locked};
+use Rappasoft\LaravelLivewireTables\Views\Filter;
+
+trait HasFilterPillsStyling
+{
+    #[Locked]
+    public bool $filterPillsStatus = true;
+
+    public function setFilterPillsStatus(bool $status): self
+    {
+        $this->filterPillsStatus = $status;
+
+        return $this;
+    }
+
+    public function setFilterPillsEnabled(): self
+    {
+        $this->setFilterPillsStatus(true);
+
+        return $this;
+    }
+
+    public function setFilterPillsDisabled(): self
+    {
+        $this->setFilterPillsStatus(false);
+
+        return $this;
+    }
+
+    #[Computed]
+    public function showFilterPillsSection(): bool
+    {
+        return $this->filtersAreEnabled() && $this->filterPillsAreEnabled() && $this->hasAppliedVisibleFiltersForPills();
+    }
+
+    public function getFilterPillsStatus(): bool
+    {
+        return $this->filterPillsStatus;
+    }
+
+    public function filterPillsAreEnabled(): bool
+    {
+        return $this->getFilterPillsStatus() === true;
+    }
+
+    public function filterPillsAreDisabled(): bool
+    {
+        return $this->getFilterPillsStatus() === false;
+    }
+
+    public function hasAppliedVisibleFiltersForPills(): bool
+    {
+        return collect($this->getAppliedFiltersWithValues())
+            ->map(fn ($_item, $key) => $this->getFilterByKey($key))
+            ->reject(fn (Filter $filter) => $filter->isHiddenFromPills())
+            ->count() > 0;
+    }
+}
diff --git a/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php b/src/Traits/Core/Filters/HasFilterQueryString.php
similarity index 95%
rename from src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
rename to src/Traits/Core/Filters/HasFilterQueryString.php
index add0a331f..73bfb82b1 100644
--- a/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
+++ b/src/Traits/Core/Filters/HasFilterQueryString.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings;
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
 
 use Livewire\Attributes\Locked;
 
-trait HasQueryStringForFilter
+trait HasFilterQueryString
 {
     #[Locked]
     public ?bool $queryStringStatusForFilter;
diff --git a/src/Traits/Core/Filters/HasFiltersVisibility.php b/src/Traits/Core/Filters/HasFiltersVisibility.php
new file mode 100644
index 000000000..ddb80778b
--- /dev/null
+++ b/src/Traits/Core/Filters/HasFiltersVisibility.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+use Illuminate\Support\Collection;
+use Livewire\Attributes\Locked;
+use Rappasoft\LaravelLivewireTables\Views\Filter;
+
+trait HasFiltersVisibility
+{
+    public function getFiltersVisibilityStatus(): bool
+    {
+        return $this->filtersVisibilityStatus;
+    }
+
+    public function filtersVisibilityIsEnabled(): bool
+    {
+        return $this->getFiltersVisibilityStatus() === true;
+    }
+
+    public function filtersVisibilityIsDisabled(): bool
+    {
+        return $this->getFiltersVisibilityStatus() === false;
+    }
+
+    public function hasVisibleFilters(): bool
+    {
+        return $this->getFilters()
+            ->reject(fn (Filter $filter) => $filter->isHiddenFromMenus())
+            ->count() > 0;
+    }
+
+    /**
+     * Get whether filter has a configured slide down row.
+     */
+    public function getVisibleFilters(): Collection
+    {
+        return $this->getFilters()->reject(fn (Filter $filter) => $filter->isHiddenFromMenus());
+    }
+
+    #[Locked]
+    public bool $filtersVisibilityStatus = true;
+
+    public function setFiltersVisibilityStatus(bool $status): self
+    {
+        $this->filtersVisibilityStatus = $status;
+
+        return $this;
+    }
+
+    public function setFiltersVisibilityEnabled(): self
+    {
+        $this->setFiltersVisibilityStatus(true);
+
+        return $this;
+    }
+
+    public function setFiltersVisibilityDisabled(): self
+    {
+        $this->setFiltersVisibilityStatus(false);
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Core/Filters/ManagesFilters.php b/src/Traits/Core/Filters/ManagesFilters.php
new file mode 100644
index 000000000..72bf73ad2
--- /dev/null
+++ b/src/Traits/Core/Filters/ManagesFilters.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+use Rappasoft\LaravelLivewireTables\Events\FilterApplied;
+
+trait ManagesFilters
+{
+    // Set in JS
+    public array $filterComponents = [];
+
+    // Set in Frontend
+    public array $appliedFilters = [];
+
+    /**
+     * Sets Filter Default Values
+     */
+    public function mountManagesFilters(): void
+    {
+        $this->restoreFilterValues();
+
+        foreach ($this->getFilters() as $filter) {
+            if (! isset($this->appliedFilters[$filter->getKey()])) {
+                if ($filter->hasFilterDefaultValue()) {
+                    $this->setFilter($filter->getKey(), $filter->getFilterDefaultValue());
+                } else {
+                    $this->resetFilter($filter);
+                }
+            } else {
+                $this->setFilter($filter->getKey(), $this->appliedFilters[$filter->getKey()]);
+            }
+        }
+    }
+
+    public function bootedManagesFilters(): void
+    {
+        $this->setBuilder($this->builder());
+
+        foreach ($this->filterComponents as $filterKey => $value) {
+            $this->appliedFilters[$filterKey] = $value;
+        }
+    }
+
+    public function applyFilters(): Builder
+    {
+        if ($this->filtersAreEnabled() && $this->hasFilters() && $this->hasAppliedFiltersWithValues()) {
+            foreach ($this->getFilters() as $filter) {
+                foreach ($this->getAppliedFiltersWithValues() as $key => $value) {
+                    if ($filter->getKey() === $key && $filter->hasFilterCallback()) {
+                        // Let the filter class validate the value
+                        $value = $filter->validate($value);
+
+                        if ($value === false) {
+                            continue;
+                        }
+
+                        $this->callHook('filterApplying', ['filter' => $filter->getKey(), 'value' => $value]);
+                        $this->callTraitHook('filterApplying', ['filter' => $filter->getKey(), 'value' => $value]);
+
+                        ($filter->getFilterCallback())($this->getBuilder(), $value);
+                    }
+                }
+            }
+            $this->storeFilterValues();
+        }
+
+        return $this->getBuilder();
+    }
+
+    public function updatedFilterComponents(string|array|null $value, string $filterName): void
+    {
+        $this->resetComputedPage();
+
+        // Clear bulk actions on filter - if enabled
+        if ($this->getClearSelectedOnFilter()) {
+            $this->clearSelected();
+            $this->setSelectAllDisabled();
+        }
+
+        // Clear filters on empty value
+        $filter = $this->getFilterByKey($filterName);
+
+        if ($filter && $filter->isEmpty($value)) {
+            $this->callHook('filterRemoved', ['filter' => $filter->getKey()]);
+            $this->callTraitHook('filterRemoved', ['filter' => $filter->getKey()]);
+
+            $this->resetFilter($filterName);
+        } elseif ($filter) {
+            $this->callHook('filterUpdated', ['filter' => $filter->getKey(), 'value' => $value]);
+            $this->callTraitHook('filterUpdated', ['filter' => $filter->getKey(), 'value' => $value]);
+            if ($this->getEventStatusFilterApplied() && $filter->getKey() != null && $value != null) {
+                event(new FilterApplied($this->getTableName(), $filter->getKey(), $value));
+            }
+            $this->dispatch('filter-was-set', tableName: $this->getTableName(), filterKey: $filter->getKey(), value: $value);
+
+        }
+
+    }
+}
diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index 10eba62ab..a79ef0b03 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -11,9 +11,9 @@ trait HasAllTraits
     use WithTableHooks;
     use HasLocalisations,
         WithLoadingPlaceholder,
-        HasTheme;
-    use WithFilters,
-        WithQuery,
+        HasTheme,
+        WithFilters;
+    use WithQuery,
         ComponentUtilities,
         WithActions,
         WithData,
diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php
index a9265c6ec..714eebfd5 100644
--- a/src/Traits/Helpers/FilterHelpers.php
+++ b/src/Traits/Helpers/FilterHelpers.php
@@ -2,36 +2,15 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
-use Livewire\Attributes\Computed;
-use Livewire\Attributes\On;
+use Livewire\Attributes\{Computed,On};
 use Rappasoft\LaravelLivewireTables\Events\FilterApplied;
 use Rappasoft\LaravelLivewireTables\Views\Filter;
-use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter;
-use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter;
+use Rappasoft\LaravelLivewireTables\Views\Filters\{MultiSelectDropdownFilter, MultiSelectFilter};
 
 trait FilterHelpers
 {
-    /**
-     * Sets Filter Default Values
-     */
-    public function mountFilterHelpers(): void
-    {
-        $this->restoreFilterValues();
-
-        foreach ($this->getFilters() as $filter) {
-            if (! isset($this->appliedFilters[$filter->getKey()])) {
-                if ($filter->hasFilterDefaultValue()) {
-                    $this->setFilter($filter->getKey(), $filter->getFilterDefaultValue());
-                } else {
-                    $this->resetFilter($filter);
-                }
-            } else {
-                $this->setFilter($filter->getKey(), $this->appliedFilters[$filter->getKey()]);
-            }
-        }
-    }
-
     public function getFiltersStatus(): bool
     {
         return $this->filtersStatus;
@@ -47,48 +26,11 @@ public function filtersAreDisabled(): bool
         return $this->getFiltersStatus() === false;
     }
 
-    public function getFiltersVisibilityStatus(): bool
-    {
-        return $this->filtersVisibilityStatus;
-    }
-
-    public function filtersVisibilityIsEnabled(): bool
-    {
-        return $this->getFiltersVisibilityStatus() === true;
-    }
-
-    public function filtersVisibilityIsDisabled(): bool
-    {
-        return $this->getFiltersVisibilityStatus() === false;
-    }
-
-    public function getFilterPillsStatus(): bool
-    {
-        return $this->filterPillsStatus;
-    }
-
-    public function filterPillsAreEnabled(): bool
-    {
-        return $this->getFilterPillsStatus() === true;
-    }
-
-    public function filterPillsAreDisabled(): bool
-    {
-        return $this->getFilterPillsStatus() === false;
-    }
-
     public function hasFilters(): bool
     {
         return $this->getFiltersCount() > 0;
     }
 
-    public function hasVisibleFilters(): bool
-    {
-        return $this->getFilters()
-            ->reject(fn (Filter $filter) => $filter->isHiddenFromMenus())
-            ->count() > 0;
-    }
-
     public function getFilters(): Collection
     {
         if (! isset($this->filterCollection)) {
@@ -96,7 +38,6 @@ public function getFilters(): Collection
         }
 
         return $this->filterCollection;
-
     }
 
     public function getFiltersCount(): int
@@ -106,7 +47,6 @@ public function getFiltersCount(): int
         }
 
         return $this->filterCount;
-
     }
 
     /**
@@ -199,14 +139,6 @@ public function getFilterBadgeCount(): int
             ->count();
     }
 
-    public function hasAppliedVisibleFiltersForPills(): bool
-    {
-        return collect($this->getAppliedFiltersWithValues())
-            ->map(fn ($_item, $key) => $this->getFilterByKey($key))
-            ->reject(fn (Filter $filter) => $filter->isHiddenFromPills())
-            ->count() > 0;
-    }
-
     /**
      * @return array<mixed>
      */
@@ -257,35 +189,6 @@ public function resetFilter($filter): void
 
     }
 
-    /**
-     * Get whether filter has a configured slide down row.
-     */
-    public function getVisibleFilters(): Collection
-    {
-        return $this->getFilters()->reject(fn (Filter $filter) => $filter->isHiddenFromMenus());
-    }
-
-    public function hasFilterGenericData(): bool
-    {
-        return ! empty($this->filterGenericData);
-    }
-
-    #[Computed]
-    public function getFilterGenericData(): array
-    {
-        if (! $this->hasFilterGenericData()) {
-            $this->setFilterGenericData($this->generateFilterGenericData());
-        }
-
-        return $this->filterGenericData;
-    }
-
-    #[Computed]
-    public function showFilterPillsSection(): bool
-    {
-        return $this->filtersAreEnabled() && $this->filterPillsAreEnabled() && $this->hasAppliedVisibleFiltersForPills();
-    }
-
     #[On('livewireArrayFilterUpdateValues')]
     public function updateLivewireArrayFilterValues(string $filterKey, string $tableName, array $values): void
     {
diff --git a/src/Traits/Helpers/QueryHelpers.php b/src/Traits/Helpers/QueryHelpers.php
index 1a7b2d46c..3bb7150dd 100644
--- a/src/Traits/Helpers/QueryHelpers.php
+++ b/src/Traits/Helpers/QueryHelpers.php
@@ -9,6 +9,10 @@ trait QueryHelpers
 {
     public function getBuilder(): Builder
     {
+        if (! isset($this->builder)) {
+            $this->setBuilder($this->builder());
+        }
+
         return $this->builder;
     }
 
diff --git a/src/Traits/Styling/Configuration/FilterMenuStylingConfiguration.php b/src/Traits/Styling/Configuration/FilterMenuStylingConfiguration.php
deleted file mode 100644
index 9a7a140b5..000000000
--- a/src/Traits/Styling/Configuration/FilterMenuStylingConfiguration.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
-
-use Closure;
-use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
-
-trait FilterMenuStylingConfiguration
-{
-    /**
-     * Used to set attributes for the Filter Popover
-     */
-    public function setFilterPopoverAttributes(array $filterPopoverAttributes): self
-    {
-        $this->filterPopoverAttributes = array_merge($this->filterPopoverAttributes, $filterPopoverAttributes);
-
-        return $this;
-    }
-
-    /**
-     * Used to set attributes for the Filter Slidedown Wrapper
-     */
-    public function setFilterSlidedownWrapperAttributes(array $filterSlidedownWrapperAttributes): self
-    {
-        $this->filterSlidedownWrapperAttributes = array_merge($this->filterSlidedownWrapperAttributes, $filterSlidedownWrapperAttributes);
-
-        return $this;
-    }
-
-    /**
-     * Set a list of attributes to override on the th sort button elements
-     */
-    public function setFilterSlidedownRowAttributes(Closure $callback): self
-    {
-        $this->filterSlidedownRowCallback = $callback;
-
-        return $this;
-    }
-
-    public function setFilterLayout(string $type): self
-    {
-        if (! in_array($type, ['popover', 'slide-down'], true)) {
-            throw new DataTableConfigurationException('Invalid filter layout type');
-        }
-
-        $this->filterLayout = $type;
-
-        return $this;
-    }
-
-    public function setFilterLayoutPopover(): self
-    {
-        $this->setFilterLayout('popover');
-
-        return $this;
-    }
-
-    public function setFilterLayoutSlideDown(): self
-    {
-        $this->setFilterLayout('slide-down');
-
-        return $this;
-    }
-
-    public function setFilterSlideDownDefaultStatus(bool $status): self
-    {
-        $this->filterSlideDownDefaultVisible = $status;
-
-        return $this;
-    }
-
-    public function setFilterSlideDownDefaultStatusDisabled(): self
-    {
-        $this->setFilterSlideDownDefaultStatus(false);
-
-        return $this;
-    }
-
-    public function setFilterSlideDownDefaultStatusEnabled(): self
-    {
-        $this->setFilterSlideDownDefaultStatus(true);
-
-        return $this;
-    }
-}
diff --git a/src/Traits/Styling/HasFilterMenuStyling.php b/src/Traits/Styling/HasFilterMenuStyling.php
deleted file mode 100644
index 397409743..000000000
--- a/src/Traits/Styling/HasFilterMenuStyling.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling;
-
-use Closure;
-use Livewire\Attributes\Locked;
-use Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration\FilterMenuStylingConfiguration;
-use Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers\FilterMenuStylingHelpers;
-
-trait HasFilterMenuStyling
-{
-    use FilterMenuStylingConfiguration,
-        FilterMenuStylingHelpers;
-
-    #[Locked]
-    public string $filterLayout = 'popover';
-
-    // Entangled in JS
-    public bool $filterSlideDownDefaultVisible = false;
-
-    protected array $filterPopoverAttributes = ['class' => '', 'default-width' => true, 'default-colors' => true, 'default-styling' => true];
-
-    protected array $filterSlidedownWrapperAttributes = ['class' => '', 'default-colors' => true, 'default-styling' => true];
-
-    protected ?Closure $filterSlidedownRowCallback;
-}
diff --git a/src/Traits/WithData.php b/src/Traits/WithData.php
index e7b52518a..c8c4f4a75 100644
--- a/src/Traits/WithData.php
+++ b/src/Traits/WithData.php
@@ -16,21 +16,13 @@
 
 trait WithData
 {
-    /**
-     * Sets up the Builder instance
-     */
-    public function bootedWithData(): void
-    {
-        // Sets up the Builder Instance
-        $this->setBuilder($this->builder());
-    }
-
     /**
      * Retrieves the rows for the executed query
      */
     #[Computed]
     public function getRows(): Collection|CursorPaginator|Paginator|LengthAwarePaginator
     {
+
         // Setup the Base Query
         $this->baseQuery();
 
@@ -52,6 +44,10 @@ public function getRows(): Collection|CursorPaginator|Paginator|LengthAwarePagin
 
     protected function baseQuery(): Builder
     {
+        $this->setBuilder($this->builder());
+
+        $builder = $this->getBuilder();
+
         $this->setBuilder($this->joinRelations());
 
         $this->setBuilder($this->applySearch());
diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
index 140ae6d0b..9d099b3aa 100644
--- a/src/Traits/WithFilters.php
+++ b/src/Traits/WithFilters.php
@@ -2,102 +2,28 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Livewire\Attributes\Locked;
-use Rappasoft\LaravelLivewireTables\Events\FilterApplied;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\FilterConfiguration;
-use Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings\HasQueryStringForFilter;
+use Rappasoft\LaravelLivewireTables\Traits\Core\Filters\HandlesFilterTraits;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\FilterHelpers;
-use Rappasoft\LaravelLivewireTables\Traits\Styling\HasFilterMenuStyling;
 
 trait WithFilters
 {
     use FilterConfiguration,
         FilterHelpers;
-    use HasQueryStringForFilter;
-    use HasFilterMenuStyling;
+    use HandlesFilterTraits;
 
     #[Locked]
     public bool $filtersStatus = true;
 
-    #[Locked]
-    public bool $filtersVisibilityStatus = true;
-
-    #[Locked]
-    public bool $filterPillsStatus = true;
-
     #[Locked]
     public int $filterCount;
 
-    // Set in JS
-    public array $filterComponents = [];
-
-    // Set in Frontend
-    public array $appliedFilters = [];
-
-    public array $filterGenericData = [];
-
     protected ?Collection $filterCollection;
 
     public function filters(): array
     {
         return [];
     }
-
-    public function applyFilters(): Builder
-    {
-        if ($this->filtersAreEnabled() && $this->hasFilters() && $this->hasAppliedFiltersWithValues()) {
-            foreach ($this->getFilters() as $filter) {
-                foreach ($this->getAppliedFiltersWithValues() as $key => $value) {
-                    if ($filter->getKey() === $key && $filter->hasFilterCallback()) {
-                        // Let the filter class validate the value
-                        $value = $filter->validate($value);
-
-                        if ($value === false) {
-                            continue;
-                        }
-
-                        $this->callHook('filterApplying', ['filter' => $filter->getKey(), 'value' => $value]);
-                        $this->callTraitHook('filterApplying', ['filter' => $filter->getKey(), 'value' => $value]);
-
-                        ($filter->getFilterCallback())($this->getBuilder(), $value);
-                    }
-                }
-            }
-            $this->storeFilterValues();
-        }
-
-        return $this->getBuilder();
-    }
-
-    public function updatedFilterComponents(string|array|null $value, string $filterName): void
-    {
-        $this->resetComputedPage();
-
-        // Clear bulk actions on filter - if enabled
-        if ($this->getClearSelectedOnFilter()) {
-            $this->clearSelected();
-            $this->setSelectAllDisabled();
-        }
-
-        // Clear filters on empty value
-        $filter = $this->getFilterByKey($filterName);
-
-        if ($filter && $filter->isEmpty($value)) {
-            $this->callHook('filterRemoved', ['filter' => $filter->getKey()]);
-            $this->callTraitHook('filterRemoved', ['filter' => $filter->getKey()]);
-
-            $this->resetFilter($filterName);
-        } elseif ($filter) {
-            $this->callHook('filterUpdated', ['filter' => $filter->getKey(), 'value' => $value]);
-            $this->callTraitHook('filterUpdated', ['filter' => $filter->getKey(), 'value' => $value]);
-            if ($this->getEventStatusFilterApplied() && $filter->getKey() != null && $value != null) {
-                event(new FilterApplied($this->getTableName(), $filter->getKey(), $value));
-            }
-            $this->dispatch('filter-was-set', tableName: $this->getTableName(), filterKey: $filter->getKey(), value: $value);
-
-        }
-
-    }
 }
diff --git a/tests/DataTableComponentTest.php b/tests/DataTableComponentTest.php
index e0849463c..62a1e46ec 100644
--- a/tests/DataTableComponentTest.php
+++ b/tests/DataTableComponentTest.php
@@ -67,9 +67,10 @@ public function test_minimum_one_column_expected(): void
     {
         $this->expectException(\Rappasoft\LaravelLivewireTables\Exceptions\NoColumnsException::class);
         $table = new NoColumnsTable;
+        $table->mountManagesFilters();
         $table->boot();
+        $table->bootedManagesFilters();
         $table->bootedComponentUtilities();
-        $table->bootedWithData();
         $table->bootedWithColumns();
         $table->bootedWithColumnSelect();
         $table->bootedWithSecondaryHeader();
diff --git a/tests/TestCase.php b/tests/TestCase.php
index eb5f3b441..70cc035de 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -96,9 +96,10 @@ protected function setupBasicTable()
     {
         $view = view('livewire-tables::datatable');
         $this->basicTable = new PetsTable;
+        $this->basicTable->mountManagesFilters();
         $this->basicTable->boot();
+        $this->basicTable->bootedManagesFilters();
         $this->basicTable->bootedComponentUtilities();
-        $this->basicTable->bootedWithData();
         $this->basicTable->bootedWithColumns();
         $this->basicTable->bootedWithColumnSelect();
         $this->basicTable->bootedWithSecondaryHeader();
@@ -117,9 +118,10 @@ protected function setupEventsTable()
     {
         $view = view('livewire-tables::datatable');
         $this->eventsTable = new PetsTableEvents;
+        $this->eventsTable->mountManagesFilters();
         $this->eventsTable->boot();
         $this->eventsTable->bootedComponentUtilities();
-        $this->eventsTable->bootedWithData();
+        $this->eventsTable->bootedManagesFilters();
         $this->eventsTable->bootedWithColumns();
         $this->eventsTable->bootedWithColumnSelect();
         $this->eventsTable->bootedWithSecondaryHeader();
@@ -139,9 +141,10 @@ protected function setupBreedsTable()
     {
         $view = view('livewire-tables::datatable');
         $this->breedsTable = new BreedsTable;
+        $this->breedsTable->mountManagesFilters();
         $this->breedsTable->boot();
         $this->breedsTable->bootedComponentUtilities();
-        $this->breedsTable->bootedWithData();
+        $this->breedsTable->bootedManagesFilters();
         $this->breedsTable->bootedWithColumns();
         $this->breedsTable->bootedWithColumnSelect();
         $this->breedsTable->bootedWithSecondaryHeader();
@@ -160,9 +163,10 @@ protected function setupPetOwnerTable()
     {
         $view = view('livewire-tables::datatable');
         $this->petOwnerTable = new PetsTableWithOwner;
+        $this->petOwnerTable->mountManagesFilters();
         $this->petOwnerTable->boot();
         $this->petOwnerTable->bootedComponentUtilities();
-        $this->petOwnerTable->bootedWithData();
+        $this->petOwnerTable->bootedManagesFilters();
         $this->petOwnerTable->bootedWithColumns();
         $this->petOwnerTable->bootedWithColumnSelect();
         $this->petOwnerTable->bootedWithSecondaryHeader();
@@ -181,9 +185,10 @@ protected function setupSpeciesTable()
     {
         $view = view('livewire-tables::datatable');
         $this->speciesTable = new SpeciesTable;
+        $this->speciesTable->mountManagesFilters();
         $this->speciesTable->boot();
         $this->speciesTable->bootedComponentUtilities();
-        $this->speciesTable->bootedWithData();
+        $this->speciesTable->bootedManagesFilters();
         $this->speciesTable->bootedWithColumns();
         $this->speciesTable->bootedWithColumnSelect();
         $this->speciesTable->bootedWithSecondaryHeader();
@@ -203,9 +208,10 @@ protected function setupUnpaginatedTable()
 
         $view = view('livewire-tables::datatable');
         $this->unpaginatedTable = new PetsTableUnpaginated;
+        $this->unpaginatedTable->mountManagesFilters();
         $this->unpaginatedTable->boot();
         $this->unpaginatedTable->bootedComponentUtilities();
-        $this->unpaginatedTable->bootedWithData();
+        $this->unpaginatedTable->bootedManagesFilters();
         $this->unpaginatedTable->bootedWithColumns();
         $this->unpaginatedTable->bootedWithColumnSelect();
         $this->unpaginatedTable->bootedWithSecondaryHeader();
diff --git a/tests/Unit/DataTransferObjects/DebuggableDataTest.php b/tests/Unit/DataTransferObjects/DebuggableDataTest.php
index 34124e26d..d185383cf 100644
--- a/tests/Unit/DataTransferObjects/DebuggableDataTest.php
+++ b/tests/Unit/DataTransferObjects/DebuggableDataTest.php
@@ -25,7 +25,13 @@ public function test_check_all_default_dto_elements()
 
         $defaultQuery = 'select "pets"."id" as "id", "pets"."sort" as "sort", "pets"."name" as "name", "pets"."age" as "age", "breed"."name" as "breed.name", "pets"."last_visit" as "last_visit" from "pets" left join "breeds" as "breed" on "pets"."breed_id" = "breed"."id" limit 10 offset 0';
         $this->assertSame($debuggableArray['query'], $defaultQuery);
-        $this->assertSame($debuggableArray['filters'], []);
+        $this->assertSame($debuggableArray['filters'], ['breed' => [],
+            'species' => [],
+            'breed_id_filter' => null,
+            'pet_name_filter' => null,
+            'last_visit_date_filter' => null,
+            'last_visit_datetime_filter' => null,
+            'breed_select_filter' => null]);
         $this->assertSame($debuggableArray['sorts'], []);
         $this->assertSame($debuggableArray['search'], '');
         $this->assertFalse($debuggableArray['select-all']);
@@ -36,12 +42,24 @@ public function test_check_dto_returns_filters_correctly()
     {
         $debuggableDTO = new DebuggableData($this->basicTable);
         $debuggableArray = $debuggableDTO->toArray();
-        $this->assertSame($debuggableArray['filters'], []);
+        $this->assertSame($debuggableArray['filters'], ['breed' => [],
+            'species' => [],
+            'breed_id_filter' => null,
+            'pet_name_filter' => null,
+            'last_visit_date_filter' => null,
+            'last_visit_datetime_filter' => null,
+            'breed_select_filter' => null]);
 
         $this->basicTable->setFilter('breed', ['1']);
         $debuggableDTO = new DebuggableData($this->basicTable);
         $debuggableArray = $debuggableDTO->toArray();
-        $this->assertSame($debuggableArray['filters'], ['breed' => ['1']]);
+        $this->assertSame($debuggableArray['filters'], ['breed' => ['1'],
+            'species' => [],
+            'breed_id_filter' => null,
+            'pet_name_filter' => null,
+            'last_visit_date_filter' => null,
+            'last_visit_datetime_filter' => null,
+            'breed_select_filter' => null]);
 
     }
 }
diff --git a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
index ec4f3814b..0b786109f 100644
--- a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
@@ -374,11 +374,11 @@ public function columns(): array
                 return [];
             }
         };
-
+        $testTable->mountManagesFilters();
         $testTable->configure();
         $testTable->boot();
         $testTable->bootedComponentUtilities();
-        $testTable->bootedWithData();
+        $testTable->bootedManagesFilters();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
         $testTable->bootedWithSecondaryHeader();
diff --git a/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
index 4da1d5912..05ea4cdc9 100644
--- a/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
@@ -118,10 +118,11 @@ public function configure(): void
                 parent::configure();
             }
         };
+        $testTable->mountManagesFilters();
         $testTable->configure();
         $testTable->boot();
+        $testTable->bootedManagesFilters();
         $testTable->bootedComponentUtilities();
-        $testTable->bootedWithData();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
         $testTable->bootedWithSecondaryHeader();
@@ -156,10 +157,11 @@ public function configure(): void
                 $this->enableColumnSelectEvent();
             }
         };
+        $testTable->mountManagesFilters();
         $testTable->configure();
         $testTable->boot();
         $testTable->bootedComponentUtilities();
-        $testTable->bootedWithData();
+        $testTable->bootedManagesFilters();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
         $testTable->bootedWithSecondaryHeader();
@@ -186,10 +188,11 @@ public function configure(): void
                 $this->disableColumnSelectEvent();
             }
         };
+        $testTable->mountManagesFilters();
         $testTable->configure();
         $testTable->boot();
+        $testTable->bootedManagesFilters();
         $testTable->bootedComponentUtilities();
-        $testTable->bootedWithData();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
         $testTable->bootedWithSecondaryHeader();
diff --git a/tests/Unit/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
index 80995c042..85c07c072 100644
--- a/tests/Unit/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
@@ -224,10 +224,12 @@ public function configure(): void
                 parent::configure();
             }
         };
+        $testTable->mountManagesFilters();
+
         $testTable->configure();
         $testTable->boot();
+        $testTable->bootedManagesFilters();
         $testTable->bootedComponentUtilities();
-        $testTable->bootedWithData();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
         $testTable->bootedWithSecondaryHeader();
diff --git a/tests/Unit/Traits/Helpers/SessionStorageHelpersTest.php b/tests/Unit/Traits/Helpers/SessionStorageHelpersTest.php
index 08b252a3f..afc8455d2 100644
--- a/tests/Unit/Traits/Helpers/SessionStorageHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/SessionStorageHelpersTest.php
@@ -27,17 +27,40 @@ public function test_can_get_session_storage_status_filter_key(): void
 
     public function test_can_store_for_fikers(): void
     {
+        $this->basicTable->storeFiltersInSessionDisabled();
+        $this->assertFalse($this->basicTable->shouldStoreFiltersInSession());
+
         $this->basicTable->storeFiltersInSessionEnabled();
 
         $this->assertTrue($this->basicTable->shouldStoreFiltersInSession());
 
         $this->basicTable->setFilter('breed', ['1']);
         $this->assertSame(['1'], $this->basicTable->getAppliedFilterWithValue('breed'));
-        $this->assertSame(['breed' => ['1']], $this->basicTable->filterComponents);
-        $this->assertSame(['breed' => ['1']], $this->basicTable->getStoredFilterValues());
+        $this->assertSame([
+            'breed' => ['1'],
+            'species' => [],
+            'breed_id_filter' => null,
+            'pet_name_filter' => null,
+            'last_visit_date_filter' => null,
+            'last_visit_datetime_filter' => null,
+            'breed_select_filter' => null,
+        ], $this->basicTable->filterComponents);
+        $this->assertSame(['breed' => ['1'],
+            'species' => [],
+            'breed_id_filter' => null,
+            'pet_name_filter' => null,
+            'last_visit_date_filter' => null,
+            'last_visit_datetime_filter' => null,
+            'breed_select_filter' => null], $this->basicTable->getStoredFilterValues());
 
         $this->basicTable->setFilter('breed', ['2']);
-        $this->assertSame(['breed' => ['2']], $this->basicTable->filterComponents);
+        $this->assertSame(['breed' => ['2'],
+            'species' => [],
+            'breed_id_filter' => null,
+            'pet_name_filter' => null,
+            'last_visit_date_filter' => null,
+            'last_visit_datetime_filter' => null,
+            'breed_select_filter' => null], $this->basicTable->filterComponents);
         $this->assertSame(['2'], $this->basicTable->getAppliedFilterWithValue('breed'));
         $this->assertSame(['breed' => ['2']], $this->basicTable->getStoredFilterValues());
 
diff --git a/tests/Unit/Traits/WithCustomisationsTest.php b/tests/Unit/Traits/WithCustomisationsTest.php
index e5101454f..ede4b6584 100644
--- a/tests/Unit/Traits/WithCustomisationsTest.php
+++ b/tests/Unit/Traits/WithCustomisationsTest.php
@@ -22,9 +22,10 @@ public function configure(): void
         };
         $view = view('livewire-tables::datatable');
 
+        $temp->mountManagesFilters();
         $temp->boot();
         $temp->bootedComponentUtilities();
-        $temp->bootedWithData();
+        $temp->bootedManagesFilters();
         $temp->bootedWithColumns();
         $temp->bootedWithColumnSelect();
         $temp->bootedWithSecondaryHeader();
@@ -56,9 +57,10 @@ public function configure(): void
         };
         $view = view('livewire-tables::datatable');
 
+        $temp->mountManagesFilters();
         $temp->boot();
         $temp->bootedComponentUtilities();
-        $temp->bootedWithData();
+        $temp->bootedManagesFilters();
         $temp->bootedWithColumns();
         $temp->bootedWithColumnSelect();
         $temp->bootedWithSecondaryHeader();
@@ -90,9 +92,10 @@ public function configure(): void
         };
         $view = view('livewire-tables::datatable');
 
+        $temp->mountManagesFilters();
         $temp->boot();
         $temp->bootedComponentUtilities();
-        $temp->bootedWithData();
+        $temp->bootedManagesFilters();
         $temp->bootedWithColumns();
         $temp->bootedWithColumnSelect();
         $temp->bootedWithSecondaryHeader();
@@ -126,7 +129,6 @@ public function configure(): void
 
         $temp->boot();
         $temp->bootedComponentUtilities();
-        $temp->bootedWithData();
         $temp->bootedWithColumns();
         $temp->bootedWithColumnSelect();
         $temp->bootedWithSecondaryHeader();
diff --git a/tests/Unit/Traits/WithMountTest.php b/tests/Unit/Traits/WithMountTest.php
index f7934089e..0e660a57d 100644
--- a/tests/Unit/Traits/WithMountTest.php
+++ b/tests/Unit/Traits/WithMountTest.php
@@ -14,8 +14,8 @@ public function test_mounttable_gets_correct_first_item(): void
         $table = new PetsTableMount;
         $table->boot();
         $table->mount(102);
+        $table->mountManagesFilters();
         $table->bootedComponentUtilities();
-        $table->bootedWithData();
         $table->bootedWithColumns();
         $table->bootedWithColumnSelect();
         $table->bootedWithSecondaryHeader();
@@ -31,8 +31,9 @@ public function test_mounttable_gets_correct_first_item(): void
         $table2 = new PetsTableMount;
         $table2->boot();
         $table2->mount(202);
+        $table2->mountManagesFilters();
         $table2->bootedComponentUtilities();
-        $table2->bootedWithData();
+        $table2->bootedManagesFilters();
         $table2->bootedWithColumns();
         $table2->bootedWithColumnSelect();
         $table2->bootedWithSecondaryHeader();
@@ -47,8 +48,9 @@ public function test_mounttable_gets_correct_first_item(): void
         $table3 = new PetsTableMount;
         $table3->boot();
         $table3->mount();
+        $table3->mountManagesFilters();
+        $table3->bootedManagesFilters();
         $table3->bootedComponentUtilities();
-        $table3->bootedWithData();
         $table3->bootedWithColumns();
         $table3->bootedWithColumnSelect();
         $table3->bootedWithSecondaryHeader();
diff --git a/tests/Unit/Traits/WithSearchTest.php b/tests/Unit/Traits/WithSearchTest.php
index 37ab46f3d..25452f352 100644
--- a/tests/Unit/Traits/WithSearchTest.php
+++ b/tests/Unit/Traits/WithSearchTest.php
@@ -49,11 +49,11 @@ public function configure(): void
 
             }
         };
-
+        $testTableDefault->mountManagesFilters();
         $testTableDefault->configure();
         $testTableDefault->boot();
         $testTableDefault->bootedComponentUtilities();
-        $testTableDefault->bootedWithData();
+        $testTableDefault->bootedManagesFilters();
         $testTableDefault->bootedWithColumns();
         $testTableDefault->bootedWithColumnSelect();
         $testTableDefault->bootedWithSecondaryHeader();
@@ -90,10 +90,11 @@ public function configure(): void
             }
         };
 
+        $testTableTrimSearch->mountManagesFilters();
         $testTableTrimSearch->configure();
         $testTableTrimSearch->boot();
         $testTableTrimSearch->bootedComponentUtilities();
-        $testTableTrimSearch->bootedWithData();
+        $testTableTrimSearch->bootedManagesFilters();
         $testTableTrimSearch->bootedWithColumns();
         $testTableTrimSearch->bootedWithColumnSelect();
         $testTableTrimSearch->bootedWithSecondaryHeader();

From 567b9da9eda7571868038f4ebd50a1a1e52bfc50 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 4 Jan 2025 11:16:21 +0000
Subject: [PATCH 15/36] Migrate Filter Status into Own Trait (#2147)

* Migrate Filter Status into Own Trait

* Fix styling

* Update setFiltersStatus to protected

* Fix styling

* Restore filters behaviour to public

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../Configuration/FilterConfiguration.php     | 24 +-----
 .../Core/Filters/HandlesFilterTraits.php      |  1 +
 src/Traits/Core/Filters/HasFiltersStatus.php  | 47 ++++++++++
 src/Traits/Helpers/FilterHelpers.php          | 15 ----
 src/Traits/WithFilters.php                    |  3 -
 .../Traits/Core/Filters/FilterStatusTest.php  | 85 +++++++++++++++++++
 6 files changed, 134 insertions(+), 41 deletions(-)
 create mode 100644 src/Traits/Core/Filters/HasFiltersStatus.php
 create mode 100644 tests/Unit/Traits/Core/Filters/FilterStatusTest.php

diff --git a/src/Traits/Configuration/FilterConfiguration.php b/src/Traits/Configuration/FilterConfiguration.php
index 7e8400b86..059637361 100644
--- a/src/Traits/Configuration/FilterConfiguration.php
+++ b/src/Traits/Configuration/FilterConfiguration.php
@@ -2,26 +2,4 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
 
-trait FilterConfiguration
-{
-    public function setFiltersStatus(bool $status): self
-    {
-        $this->filtersStatus = $status;
-
-        return $this;
-    }
-
-    public function setFiltersEnabled(): self
-    {
-        $this->setFiltersStatus(true);
-
-        return $this;
-    }
-
-    public function setFiltersDisabled(): self
-    {
-        $this->setFiltersStatus(false);
-
-        return $this;
-    }
-}
+trait FilterConfiguration {}
diff --git a/src/Traits/Core/Filters/HandlesFilterTraits.php b/src/Traits/Core/Filters/HandlesFilterTraits.php
index d4f3c114e..249c303e3 100644
--- a/src/Traits/Core/Filters/HandlesFilterTraits.php
+++ b/src/Traits/Core/Filters/HandlesFilterTraits.php
@@ -9,5 +9,6 @@ trait HandlesFilterTraits
         HasFilterMenuStyling,
         HasFilterPillsStyling,
         HasFilterQueryString,
+        HasFiltersStatus,
         HasFiltersVisibility;
 }
diff --git a/src/Traits/Core/Filters/HasFiltersStatus.php b/src/Traits/Core/Filters/HasFiltersStatus.php
new file mode 100644
index 000000000..9558b896f
--- /dev/null
+++ b/src/Traits/Core/Filters/HasFiltersStatus.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Filters;
+
+use Livewire\Attributes\Locked;
+
+trait HasFiltersStatus
+{
+    #[Locked]
+    public bool $filtersStatus = true;
+
+    public function getFiltersStatus(): bool
+    {
+        return $this->filtersStatus;
+    }
+
+    public function filtersAreEnabled(): bool
+    {
+        return $this->getFiltersStatus() === true;
+    }
+
+    public function filtersAreDisabled(): bool
+    {
+        return $this->getFiltersStatus() === false;
+    }
+
+    public function setFiltersStatus(bool $status): self
+    {
+        $this->filtersStatus = $status;
+
+        return $this;
+    }
+
+    public function setFiltersEnabled(): self
+    {
+        $this->setFiltersStatus(true);
+
+        return $this;
+    }
+
+    public function setFiltersDisabled(): self
+    {
+        $this->setFiltersStatus(false);
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php
index 714eebfd5..f2924c883 100644
--- a/src/Traits/Helpers/FilterHelpers.php
+++ b/src/Traits/Helpers/FilterHelpers.php
@@ -11,21 +11,6 @@
 
 trait FilterHelpers
 {
-    public function getFiltersStatus(): bool
-    {
-        return $this->filtersStatus;
-    }
-
-    public function filtersAreEnabled(): bool
-    {
-        return $this->getFiltersStatus() === true;
-    }
-
-    public function filtersAreDisabled(): bool
-    {
-        return $this->getFiltersStatus() === false;
-    }
-
     public function hasFilters(): bool
     {
         return $this->getFiltersCount() > 0;
diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
index 9d099b3aa..19ff8306b 100644
--- a/src/Traits/WithFilters.php
+++ b/src/Traits/WithFilters.php
@@ -14,9 +14,6 @@ trait WithFilters
         FilterHelpers;
     use HandlesFilterTraits;
 
-    #[Locked]
-    public bool $filtersStatus = true;
-
     #[Locked]
     public int $filterCount;
 
diff --git a/tests/Unit/Traits/Core/Filters/FilterStatusTest.php b/tests/Unit/Traits/Core/Filters/FilterStatusTest.php
new file mode 100644
index 000000000..9021a0a1b
--- /dev/null
+++ b/tests/Unit/Traits/Core/Filters/FilterStatusTest.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Core\Filters;
+
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+#[Group('Filters')]
+final class FilterStatusTest extends TestCase
+{
+    public function test_can_check_if_filters_are_enabled(): void
+    {
+        $this->assertTrue($this->basicTable->filtersAreEnabled());
+    }
+
+    public function test_can_check_if_filters_can_be_disabled_when_enbled(): void
+    {
+
+        $mock = new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                parent::configure();
+                $this->setFiltersEnabled();
+            }
+
+            public function setFiltersToEnabled()
+            {
+                $this->setFiltersEnabled();
+            }
+
+            public function setFiltersToDisabled()
+            {
+                $this->setFiltersDisabled();
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertTrue($mock->filtersAreEnabled());
+        $this->assertFalse($mock->filtersAreDisabled());
+
+        $mock->setFiltersToDisabled();
+
+        $this->assertFalse($mock->filtersAreEnabled());
+        $this->assertTrue($mock->filtersAreDisabled());
+
+    }
+
+    public function test_can_check_if_filters_can_be_enabled_when_disabled(): void
+    {
+
+        $mock = new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                parent::configure();
+                $this->setFiltersDisabled();
+            }
+
+            public function setFiltersToEnabled()
+            {
+                $this->setFiltersEnabled();
+            }
+
+            public function setFiltersToDisabled()
+            {
+                $this->setFiltersDisabled();
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertTrue($mock->filtersAreDisabled());
+        $this->assertFalse($mock->filtersAreEnabled());
+
+        $mock->setFiltersToEnabled();
+        $this->assertTrue($mock->filtersAreEnabled());
+        $this->assertFalse($mock->filtersAreDisabled());
+
+    }
+}

From 15e18fbe147afa03fc7f7402a05777091d6bba19 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 4 Jan 2025 11:26:50 +0000
Subject: [PATCH 16/36] Update PCOV Workflow (#2148)

---
 .github/workflows/run-tests-pcov-pull.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
index b22ea41a9..38c961e84 100644
--- a/.github/workflows/run-tests-pcov-pull.yml
+++ b/.github/workflows/run-tests-pcov-pull.yml
@@ -88,7 +88,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit and Visuals Test Suite" --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml
+        run: php ./vendor/bin/phpunit --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml --testsuite "Laravel Livewire Tables Unit Test Suite","Laravel Livewire Tables Visuals Test Suite"
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v5

From 3f713830c4e7116ed4394f4af278d5723ebf9f9a Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 5 Jan 2025 22:02:44 +0000
Subject: [PATCH 17/36] Add configurable area test (#2149)

* Add ConfigurableAreaConfigurationTest

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../ConfigurableAreaConfigurationTest.php       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tests/Unit/Traits/Configuration/ConfigurableAreaConfigurationTest.php

diff --git a/tests/Unit/Traits/Configuration/ConfigurableAreaConfigurationTest.php b/tests/Unit/Traits/Configuration/ConfigurableAreaConfigurationTest.php
new file mode 100644
index 000000000..1be72604e
--- /dev/null
+++ b/tests/Unit/Traits/Configuration/ConfigurableAreaConfigurationTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
+
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class ConfigurableAreaConfigurationTest extends TestCase
+{
+    public function test_can_set_configurable_area(): void
+    {
+        $this->assertNull($this->basicTable->getConfigurableAreaFor('before-tools'));
+
+        $this->basicTable->setConfigurableArea('before-tools', 'path.to.my.view');
+
+        $this->assertSame('path.to.my.view', $this->basicTable->getConfigurableAreaFor('before-tools'));
+    }
+}

From 41c0bd0d73dbb969fb04c30fa4eb05b439dcc74e Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 6 Jan 2025 02:01:29 +0000
Subject: [PATCH 18/36] Tidy ColumnSelectHelpers & displayToolbarFilters Method
 (#2150)

* Tidy displayToolbarFilters Method

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/Helpers/ColumnSelectHelpers.php | 22 +++++++++++-----------
 src/Traits/Helpers/ToolsHelpers.php        |  8 +-------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/Traits/Helpers/ColumnSelectHelpers.php b/src/Traits/Helpers/ColumnSelectHelpers.php
index 961c62847..3a856f4e8 100644
--- a/src/Traits/Helpers/ColumnSelectHelpers.php
+++ b/src/Traits/Helpers/ColumnSelectHelpers.php
@@ -61,8 +61,6 @@ public function getSelectableSelectedColumns(): Collection
             ->values();
     }
 
-    public function getCurrentlySelectedCols(): void {}
-
     public function getUnSelectableColumns(): Collection
     {
         return $this->getColumns()
@@ -125,15 +123,6 @@ public function selectedVisibleColumns(): array
             ->toArray();
     }
 
-    public function getVisibleColumns(): array
-    {
-        return $this->getColumns()
-            ->reject(fn (Column $column) => $column->isHidden())
-            ->reject(fn (Column $column) => ($column->isSelectable() && ! $this->columnSelectIsEnabledForColumn($column)))
-            ->values()
-            ->toArray();
-    }
-
     public function selectAllColumns(): void
     {
         $this->selectedColumns = [];
@@ -208,4 +197,15 @@ protected function setupFirstColumnSelectRun(): void
         }
 
     }
+
+    /** To Be Removed */
+    /*
+    public function getVisibleColumns(): array
+    {
+        return $this->selectedVisibleColumns();
+    }
+
+    public function getCurrentlySelectedCols(): void {}
+    */
+
 }
diff --git a/src/Traits/Helpers/ToolsHelpers.php b/src/Traits/Helpers/ToolsHelpers.php
index a73b7fe53..c0ef1e07a 100644
--- a/src/Traits/Helpers/ToolsHelpers.php
+++ b/src/Traits/Helpers/ToolsHelpers.php
@@ -77,13 +77,7 @@ public function displayToolbarSearch(): bool
     #[Computed]
     public function displayToolbarFilters(): bool
     {
-        if ($this->filtersAreEnabled() && $this->filtersVisibilityIsEnabled() && $this->hasVisibleFilters()) {
-            return true;
-        } elseif ($this->filtersAreEnabled() && $this->showBulkActionsDropdownAlpine() && $this->shouldAlwaysHideBulkActionsDropdownOption() != true) {
-            return true;
-        }
-
-        return false;
+        return $this->filtersAreEnabled() && (($this->filtersVisibilityIsEnabled() && $this->hasVisibleFilters()) || ($this->showBulkActionsDropdownAlpine() && $this->shouldAlwaysHideBulkActionsDropdownOption() != true));
     }
 
     protected function hasToolbarColumnSelect(): bool

From 16a359088e0d72259e32c86f1bd446b1f829eb24 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 6 Jan 2025 04:06:04 +0000
Subject: [PATCH 19/36] Add SortingConfiguration Missing Test (#2151)

* Add SortingConfiguration Missing Test

* Fix styling

* Force Workflows

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../SortingConfigurationTest.php              | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/tests/Unit/Traits/Configuration/SortingConfigurationTest.php b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
index 5e4b6d5ca..4e5847aae 100644
--- a/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
@@ -2,6 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
 final class SortingConfigurationTest extends TestCase
@@ -92,4 +93,69 @@ public function test_can_set_sorting_pill_status(): void
 
         $this->assertTrue($this->basicTable->getSortingPillsStatus());
     }
+
+    public function test_default_sort_applies_correctly(): void
+    {
+        $tempDesc = new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                parent::configure();
+                $this->setSortingEnabled();
+                $this->setDefaultSort('name', 'desc');
+            }
+        };
+        $viewDesc = view('livewire-tables::datatable');
+
+        $tempDesc->boot();
+        $tempDesc->bootedComponentUtilities();
+        $tempDesc->bootedManagesFilters();
+        $tempDesc->bootedWithColumns();
+        $tempDesc->bootedWithColumnSelect();
+        $tempDesc->bootedWithSecondaryHeader();
+        $tempDesc->booted();
+        $tempDesc->mountManagesFilters();
+        $tempDesc->mountWithSorting();
+        $tempDesc->renderingWithColumns($viewDesc, $viewDesc->getData());
+        $tempDesc->renderingWithColumnSelect($viewDesc, $viewDesc->getData());
+        $tempDesc->renderingWithCustomisations($viewDesc, $viewDesc->getData());
+        $tempDesc->renderingWithData($viewDesc, $viewDesc->getData());
+        $tempDesc->renderingWithFooter($viewDesc, $viewDesc->getData());
+        $tempDesc->renderingWithReordering($viewDesc, $viewDesc->getData());
+        $tempDesc->renderingWithPagination($viewDesc, $viewDesc->getData());
+        $tempDesc->render();
+        $this->assertSame(['name' => 'desc'], $tempDesc->getSorts());
+        $this->assertSame('desc', $tempDesc->getSort('name'));
+
+        $tempAsc = new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                parent::configure();
+                $this->setSortingEnabled();
+                $this->setDefaultSort('name', 'asc');
+            }
+        };
+        $viewAsc = view('livewire-tables::datatable');
+        $tempAsc->boot();
+        $tempAsc->bootedComponentUtilities();
+        $tempAsc->bootedManagesFilters();
+        $tempAsc->bootedWithColumns();
+        $tempAsc->bootedWithColumnSelect();
+        $tempAsc->bootedWithSecondaryHeader();
+        $tempAsc->booted();
+        $tempAsc->mountManagesFilters();
+        $tempAsc->mountWithSorting();
+        $tempAsc->renderingWithColumns($viewAsc, $viewAsc->getData());
+        $tempAsc->renderingWithColumnSelect($viewAsc, $viewAsc->getData());
+        $tempAsc->renderingWithCustomisations($viewAsc, $viewAsc->getData());
+        $tempAsc->renderingWithData($viewAsc, $viewAsc->getData());
+        $tempAsc->renderingWithFooter($viewAsc, $viewAsc->getData());
+        $tempAsc->renderingWithReordering($viewAsc, $viewAsc->getData());
+        $tempAsc->renderingWithPagination($viewAsc, $viewAsc->getData());
+        $tempAsc->render();
+        $this->assertSame(['name' => 'asc'], $tempAsc->getSorts());
+        $this->assertSame('asc', $tempAsc->getSort('name'));
+
+    }
 }

From 50226f7c59641ec0b2fa4f5234c6ff9a405ab782 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 6 Jan 2025 04:42:13 +0000
Subject: [PATCH 20/36] Add Missing Search Tests (#2152)

---
 .../Traits/Configuration/SearchConfigurationTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Unit/Traits/Configuration/SearchConfigurationTest.php b/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
index 6b6635533..61f44d4dd 100644
--- a/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
@@ -74,8 +74,8 @@ public function test_cant_set_search_debounce_with_other_search_modifiers(): voi
     {
         $this->expectException(DataTableConfigurationException::class);
 
-        $this->basicTable->setSearchDebounce(1000);
         $this->basicTable->setSearchDefer();
+        $this->basicTable->setSearchDebounce(1000);
     }
 
     public function test_can_set_search_defer(): void
@@ -92,8 +92,8 @@ public function test_cant_set_search_defer_with_other_search_modifiers(): void
     {
         $this->expectException(DataTableConfigurationException::class);
 
-        $this->basicTable->setSearchDefer();
         $this->basicTable->setSearchDebounce(1000);
+        $this->basicTable->setSearchDefer();
     }
 
     public function test_can_set_search_lazy(): void
@@ -110,8 +110,8 @@ public function test_cant_set_search_lazy_with_other_search_modifiers(): void
     {
         $this->expectException(DataTableConfigurationException::class);
 
-        $this->basicTable->setSearchLazy();
         $this->basicTable->setSearchDebounce(1000);
+        $this->basicTable->setSearchLazy();
     }
 
     public function test_can_set_search_live(): void
@@ -128,8 +128,8 @@ public function test_cant_set_search_live_with_other_search_modifiers(): void
     {
         $this->expectException(DataTableConfigurationException::class);
 
-        $this->basicTable->setSearchLive();
         $this->basicTable->setSearchDebounce(1000);
+        $this->basicTable->setSearchLive();
     }
 
     public function test_can_set_search_blur(): void
@@ -146,8 +146,8 @@ public function test_cant_set_search_blur_with_other_search_modifiers(): void
     {
         $this->expectException(DataTableConfigurationException::class);
 
-        $this->basicTable->setSearchBlur();
         $this->basicTable->setSearchDefer();
+        $this->basicTable->setSearchBlur();
     }
 
     public function test_can_set_search_throttle(): void
@@ -165,8 +165,8 @@ public function test_cant_set_search_throttle_with_other_search_modifiers(): voi
     {
         $this->expectException(DataTableConfigurationException::class);
 
-        $this->basicTable->setSearchThrottle(1000);
         $this->basicTable->setSearchDefer();
+        $this->basicTable->setSearchThrottle(1000);
     }
 
     public function test_can_set_search_placeholder(): void

From 3d279b95fb527a2f65a4806db60cbe3311fbfccd Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 6 Jan 2025 05:05:10 +0000
Subject: [PATCH 21/36] Adjust SearchHelpersTest (#2153)

---
 .../Unit/Traits/Helpers/SearchHelpersTest.php | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/Unit/Traits/Helpers/SearchHelpersTest.php b/tests/Unit/Traits/Helpers/SearchHelpersTest.php
index b04d8fed8..1ba62f40e 100644
--- a/tests/Unit/Traits/Helpers/SearchHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/SearchHelpersTest.php
@@ -194,4 +194,24 @@ public function resetSearchConfiguration(): self
         $this->assertSame('.live.throttle.599ms', $temp->getSearchOptions());
 
     }
+
+    public function test_can_get_search_term_with_trim(): void
+    {
+        $this->basicTable->setTrimSearchStringEnabled();
+        $this->basicTable->setSearch('Anthony');
+        $this->assertSame('Anthony', $this->basicTable->getSearch());
+        $this->basicTable->setSearch('Bob    ');
+        $this->assertSame('Bob', $this->basicTable->getSearch());
+        $this->basicTable->setSearch('     Bill    ');
+        $this->assertSame('Bill', $this->basicTable->getSearch());
+    }
+
+    public function test_can_get_search_term_without_trim(): void
+    {
+        $this->basicTable->setTrimSearchStringDisabled();
+        $this->basicTable->setSearch('Ben    ');
+        $this->assertSame('Ben    ', $this->basicTable->getSearch());
+        $this->basicTable->setSearch('     Baz    ');
+        $this->assertSame('     Baz    ', $this->basicTable->getSearch());
+    }
 }

From 89107782306f78476cb61712f6030ebfad17b3e3 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 6 Jan 2025 05:29:15 +0000
Subject: [PATCH 22/36] Add test queryStringWithQueryString (#2154)

* Add test queryStringWithQueryString

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../Traits/Helpers/QueryStringHelpersTest.php | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 tests/Unit/Traits/Helpers/QueryStringHelpersTest.php

diff --git a/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
new file mode 100644
index 000000000..15ae787c4
--- /dev/null
+++ b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
+
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class QueryStringHelpersTest extends TestCase
+{
+    public function test_check_querystring_returns_empty_if_disabled(): void
+    {
+
+        $testTableQueryString = new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                parent::configure();
+                $this->setQueryStringDisabled();
+            }
+
+            public function getCurrentQueryStringBinding(): array
+            {
+                return $this->queryStringWithQueryString();
+            }
+        };
+
+        $testTableQueryString->mountManagesFilters();
+        $testTableQueryString->configure();
+        $testTableQueryString->boot();
+        $testTableQueryString->bootedComponentUtilities();
+        $testTableQueryString->bootedManagesFilters();
+        $testTableQueryString->bootedWithColumns();
+        $testTableQueryString->bootedWithColumnSelect();
+        $testTableQueryString->bootedWithSecondaryHeader();
+        $testTableQueryString->booted();
+
+        $this->assertSame([], $testTableQueryString->getCurrentQueryStringBinding());
+
+    }
+
+    public function test_check_querystring_returns_default_if_enabled(): void
+    {
+
+        $testTableQueryString = new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                parent::configure();
+                $this->setQueryStringEnabled();
+            }
+
+            public function getCurrentQueryStringBinding(): array
+            {
+                return $this->queryStringWithQueryString();
+            }
+        };
+
+        $testTableQueryString->mountManagesFilters();
+        $testTableQueryString->configure();
+        $testTableQueryString->boot();
+        $testTableQueryString->bootedComponentUtilities();
+        $testTableQueryString->bootedManagesFilters();
+        $testTableQueryString->bootedWithColumns();
+        $testTableQueryString->bootedWithColumnSelect();
+        $testTableQueryString->bootedWithSecondaryHeader();
+        $testTableQueryString->booted();
+
+        $this->assertSame(['table' => ['except' => null, 'history' => false, 'keep' => false, 'as' => 'table']], $testTableQueryString->getCurrentQueryStringBinding());
+
+    }
+}

From 940e0acced16fbba16678dc4a6925abde8968144 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 7 Jan 2025 22:19:23 +0000
Subject: [PATCH 23/36] Add missing tests (#2157)

* Add SortingConfiguration Missing Test

* Fix styling

* Force Workflows

* Fix styling

* Add Missing Tests

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

From 26f094b8c02b3ff9fab3c68bb39e3d75551578c0 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 8 Jan 2025 03:13:08 +0000
Subject: [PATCH 24/36] Tidy & Improve Collapsed Columns Behaviour (#2159)

* Tidy & Improve Collapsed Columns Behaviour

* Fix styling

* Add relevant tests

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../table/collapsed-columns.blade.php         |  86 +++----
 .../table/td/collapsed-columns.blade.php      | 131 ++++-------
 src/LaravelLivewireTablesServiceProvider.php  |  14 ++
 .../CollapsingColumnConfiguration.php         |   7 +
 .../Configuration/ColumnConfiguration.php     |   7 -
 .../Helpers/CollapsingColumnHelpers.php       | 122 ++++++++++
 src/Traits/Helpers/ColumnHelpers.php          | 114 ---------
 .../Columns/HasCollapsingColumnsStyling.php   |  58 +++++
 .../CollapsingColumnsStylingConfiguration.php |  30 ---
 .../Styling/HasCollapsingColumnsStyling.php   |  16 --
 .../CollapsingColumnsStylingHelpers.php       |  30 ---
 src/Traits/WithCollapsingColumns.php          |   8 +-
 src/Traits/WithColumns.php                    |   6 -
 src/Views/Traits/Columns/IsCollapsible.php    |  20 ++
 .../Helpers/CollapsingColumnsHelpersTest.php  | 217 ++++++++++++++++++
 .../Unit/Traits/Helpers/ColumnHelpersTest.php | 182 ---------------
 .../Helpers/ColumnCollapseHelpersTest.php     |  65 ++++++
 .../Traits/Helpers/ColumnHelpersTest.php      |  22 --
 18 files changed, 587 insertions(+), 548 deletions(-)
 create mode 100644 src/Traits/Styling/Columns/HasCollapsingColumnsStyling.php
 delete mode 100644 src/Traits/Styling/Configuration/CollapsingColumnsStylingConfiguration.php
 delete mode 100644 src/Traits/Styling/HasCollapsingColumnsStyling.php
 delete mode 100644 src/Traits/Styling/Helpers/CollapsingColumnsStylingHelpers.php
 create mode 100644 tests/Unit/Traits/Helpers/CollapsingColumnsHelpersTest.php
 create mode 100644 tests/Unit/Views/Traits/Helpers/ColumnCollapseHelpersTest.php

diff --git a/resources/views/components/table/collapsed-columns.blade.php b/resources/views/components/table/collapsed-columns.blade.php
index 1db467ce1..e3ccbbd0a 100644
--- a/resources/views/components/table/collapsed-columns.blade.php
+++ b/resources/views/components/table/collapsed-columns.blade.php
@@ -1,39 +1,16 @@
 @aware([ 'tableName', 'primaryKey','isTailwind','isBootstrap'])
 @props(['row', 'rowIndex'])
 
-@php
-    $customAttributes = $this->getTrAttributes($row, $rowIndex);
-@endphp
-
-@if ($this->collapsingColumnsAreEnabled() && $this->hasCollapsedColumns())
-    @php
-        $colspan = $this->getColspanCount();
-        $columns = collect();
-
-        if($this->shouldCollapseAlways())
-        {
-            $columns->push($this->getCollapsedAlwaysColumns());
-        }
-        if ($this->shouldCollapseOnMobile() && $this->shouldCollapseOnTablet()) {
-            $columns->push($this->getCollapsedMobileColumns());
-            $columns->push($this->getCollapsedTabletColumns());
-        } elseif ($this->shouldCollapseOnTablet() && ! $this->shouldCollapseOnMobile()) {
-            $columns->push($this->getCollapsedTabletColumns());
-        } elseif ($this->shouldCollapseOnMobile() && ! $this->shouldCollapseOnTablet()) {
-            $columns->push($this->getCollapsedMobileColumns());
-        }
-
-        $columns = $columns->collapse();
-    @endphp
-
-    <tr
-        x-data
+@if ($this->collapsingColumnsAreEnabled && $this->hasCollapsedColumns)
+    @php($customAttributes = $this->getTrAttributes($row, $rowIndex))
+    <tr x-data
         @toggle-row-content.window="($event.detail.tableName === '{{ $tableName }}' && $event.detail.row === {{ $rowIndex }}) ? $el.classList.toggle('{{ $isBootstrap ? 'd-none' : 'hidden' }}') : null"
-
-        wire:key="{{ $tableName }}-row-{{ $row->{$primaryKey} }}-collapsed-contents"
-        wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
         {{
-        $attributes->merge($customAttributes)
+            $attributes->merge([
+                    'wire:loading.class.delay' => 'opacity-50 dark:bg-gray-900 dark:opacity-60',
+                    'wire:key' => $tableName.'-row-'.$row->{$primaryKey}.'-collapsed-contents',
+                ])
+                ->merge($customAttributes)
                 ->class([
                     'hidden bg-white dark:bg-gray-700 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 === 0),
                     'hidden bg-gray-50 dark:bg-gray-800 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 !== 0),
@@ -42,36 +19,31 @@
                 ])
                 ->except(['default','default-styling','default-colors'])
         }}
-
     >
-        <td
-            @class([
+        <td colspan="{{ $this->getColspanCount }}" @class([
                 'text-left pt-4 pb-2 px-4' => $isTailwind,
                 'text-start pt-3 p-2' => $isBootstrap,
-            ])
-            colspan="{{ $colspan }}"
-        >
+        ])>
             <div>
-                @foreach($columns as $colIndex => $column)
-                    @continue($column->isHidden())
-                    @continue($this->columnSelectIsEnabled() && ! $this->columnSelectIsEnabledForColumn($column))
-
-                    <p wire:key="{{ $tableName }}-row-{{ $row->{$primaryKey} }}-collapsed-contents-{{ $colIndex }}"
-
-                        @class([
-                            'block mb-2' => $isTailwind && $column->shouldCollapseAlways(),
-                            'block mb-2 sm:hidden' => $isTailwind && !$column->shouldCollapseAlways() && !$column->shouldCollapseOnTablet() && !$column->shouldCollapseOnMobile(),
-                            'block mb-2 md:hidden' => $isTailwind && !$column->shouldCollapseAlways() && !$column->shouldCollapseOnTablet() && $column->shouldCollapseOnMobile(),
-                            'block mb-2 lg:hidden' => $isTailwind && !$column->shouldCollapseAlways() && ($column->shouldCollapseOnTablet() || $column->shouldCollapseOnMobile()),
-
-                            'd-block mb-2' => $isBootstrap && $column->shouldCollapseAlways(),
-                            'd-block mb-2 d-sm-none' => $isBootstrap && !$column->shouldCollapseAlways() && !$column->shouldCollapseOnTablet() && !$column->shouldCollapseOnMobile(),
-                            'd-block mb-2 d-md-none' => $isBootstrap && !$column->shouldCollapseAlways() && !$column->shouldCollapseOnTablet() && $column->shouldCollapseOnMobile(),
-                            'd-block mb-2 d-lg-none' => $isBootstrap && !$column->shouldCollapseAlways() && ($column->shouldCollapseOnTablet() || $column->shouldCollapseOnMobile()),
-
-                        ])
-                    >
-                        <strong>{{ $column->getTitle() }}</strong>: {{ $column->renderContents($row) }}
+                @foreach($this->getCollapsedColumnsForContent as $colIndex => $column)
+
+                    <p wire:key="{{ $tableName }}-row-{{ $row->{$primaryKey} }}-collapsed-contents-{{ $colIndex }}" @class([
+                            'block mb-2 hidden' => $isTailwind,
+                            'sm:block' => $isTailwind && $column->shouldCollapseAlways(),
+                            'sm:block md:hidden' => $isTailwind && !$column->shouldCollapseAlways() && !$column->shouldCollapseOnTablet() && $column->shouldCollapseOnMobile(),
+                            'sm:block lg:hidden' => $isTailwind && !$column->shouldCollapseAlways() && ($column->shouldCollapseOnTablet() || $column->shouldCollapseOnMobile()),
+
+                            'd-block mb-2' => $isBootstrap,
+                            'd-sm-none' => $isBootstrap && !$column->shouldCollapseAlways() && !$column->shouldCollapseOnTablet() && !$column->shouldCollapseOnMobile(),
+                            'd-md-none' => $isBootstrap && !$column->shouldCollapseAlways() && !$column->shouldCollapseOnTablet() && $column->shouldCollapseOnMobile(),
+                            'd-lg-none' => $isBootstrap && !$column->shouldCollapseAlways() && ($column->shouldCollapseOnTablet() || $column->shouldCollapseOnMobile()),
+                    ])>
+                        <strong>{{ $column->getTitle() }}</strong>: 
+                        @if($column->isHtml())
+                            {!! $column->setIndexes($rowIndex, $colIndex)->renderContents($row) !!}
+                        @else
+                            {{ $column->setIndexes($rowIndex, $colIndex)->renderContents($row) }}
+                        @endif
                     </p>
                 @endforeach
             </div>
diff --git a/resources/views/components/table/td/collapsed-columns.blade.php b/resources/views/components/table/td/collapsed-columns.blade.php
index 63294f432..078c1e39b 100644
--- a/resources/views/components/table/td/collapsed-columns.blade.php
+++ b/resources/views/components/table/td/collapsed-columns.blade.php
@@ -1,87 +1,52 @@
 @aware([ 'tableName','isTailwind','isBootstrap'])
 @props(['rowIndex', 'hidden' => false])
 
-@if ($this->collapsingColumnsAreEnabled() && $this->hasCollapsedColumns())
-    @if ($isTailwind)
-        <td x-data="{open:false}" wire:key="{{ $tableName }}-collapsingIcon-{{ $rowIndex }}-{{ md5(now()) }}"
-            {{
-                $attributes
-                    ->merge()
-                    ->class([
-                        'p-3 table-cell text-center',
-                        'sm:hidden' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet(),
-                        'md:hidden' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile(),
-                        'lg:hidden' => !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile()),
-                    ])
-            }}
-            :class="currentlyReorderingStatus ? 'laravel-livewire-tables-reorderingMinimised' : ''"
-        >
-            @if (! $hidden)
-                <button
-                    x-cloak x-show="!currentlyReorderingStatus"
-                    x-on:click.prevent="$dispatch('toggle-row-content', {'tableName': '{{ $tableName }}', 'row': {{ $rowIndex }}}); open = !open"
-                >
-                    <x-heroicon-o-plus-circle x-cloak x-show="!open" 
-                        {{ 
-                            $attributes->merge($this->getCollapsingColumnButtonExpandAttributes)
-                            ->class([
-                                'h-6 w-6' => $this->getCollapsingColumnButtonExpandAttributes['default-styling'] ?? true,
-                                'text-green-600' => $this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true,
-                            ])
-                            ->except(['default','default-styling','default-colors']) 
-                        }}
-                     />
-                    <x-heroicon-o-minus-circle x-cloak x-show="open" 
-                        {{ 
-                            $attributes->merge($this->getCollapsingColumnButtonCollapseAttributes)
-                            ->class([
-                                'h-6 w-6' => $this->getCollapsingColumnButtonCollapseAttributes['default-styling'] ?? true,
-                                'text-yellow-600' => $this->getCollapsingColumnButtonCollapseAttributes['default-colors'] ?? true,
-                            ])
-                            ->except(['default','default-styling','default-colors']) 
-                        }}
-                    />
-                </button>
-            @endif
-        </td>
-    @elseif ($isBootstrap)
-        <td x-data="{open:false}" wire:key="{{ $tableName }}-collapsingIcon-{{ $rowIndex }}-{{ md5(now()) }}" 
-            {{
-                $attributes
-                    ->class([
-                        'd-sm-none' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet(),
-                        'd-md-none' => !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile(),
-                        'd-lg-none' => !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile()),
-                    ])
-            }}
-            :class="currentlyReorderingStatus ? 'laravel-livewire-tables-reorderingMinimised' : ''"
-        >
-            @if (! $hidden)
-                <button
-                    x-cloak x-show="!currentlyReorderingStatus"
-                    x-on:click.prevent="$dispatch('toggle-row-content', {'tableName': '{{ $tableName }}', 'row': {{ $rowIndex }}});open = !open"
-                    class="border-0 bg-transparent p-0"
-                >
-                    <x-heroicon-o-plus-circle x-cloak x-show="!open"  
-                        {{ 
-                            $attributes->merge($this->getCollapsingColumnButtonExpandAttributes)
-                            ->class([
-                                'laravel-livewire-tables-btn-lg text-success' => $this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true,
-                            ])
-                            ->except(['default','default-styling','default-colors']) 
-                        }}
-                    />
-                    <x-heroicon-o-minus-circle x-cloak x-show="open" 
-                        {{ 
-                            $attributes->merge($this->getCollapsingColumnButtonExpandAttributes)
-                            ->class([
-                                'laravel-livewire-tables-btn-lg text-warning' => $this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true,
-                            ])
-                            ->except(['default','default-styling','default-colors']) 
-                        }}
-                    />
-                </button>
-            @endif
-        </td>
-    @endif
+@if ($this->collapsingColumnsAreEnabled && $this->hasCollapsedColumns)
+    <td x-data="{open:false}" wire:key="{{ $tableName }}-collapsingIcon-{{ $rowIndex }}-{{ md5(now()) }}"
+        {{
+            $attributes
+                ->merge()
+                ->class([
+                    'p-3 table-cell text-center' => $isTailwind,
+                    'sm:hidden' => $isTailwind && !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet(),
+                    'md:hidden' => $isTailwind && !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile(),
+                    'lg:hidden' => $isTailwind && !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile()),
+                    'd-sm-none' => $isBootstrap && !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet(),
+                    'd-md-none' => $isBootstrap && !$this->shouldCollapseAlways() && !$this->shouldCollapseOnTablet() && $this->shouldCollapseOnMobile(),
+                    'd-lg-none' => $isBootstrap && !$this->shouldCollapseAlways() && ($this->shouldCollapseOnTablet() || $this->shouldCollapseOnMobile()),
+                ])
+        }}
+        :class="currentlyReorderingStatus ? 'laravel-livewire-tables-reorderingMinimised' : ''"
+    >
+        @if (! $hidden)
+            <button
+                x-cloak x-show="!currentlyReorderingStatus"
+                x-on:click.prevent="$dispatch('toggle-row-content', {'tableName': '{{ $tableName }}', 'row': {{ $rowIndex }}}); open = !open"
+                @class([
+                    'border-0 bg-transparent p-0' => $isBootstrap
+                ])
+            >
+                <x-heroicon-o-plus-circle x-cloak x-show="!open" {{ 
+                    $attributes->merge($this->getCollapsingColumnButtonExpandAttributes)
+                        ->class([
+                            'h-6 w-6' => $isTailwind && ($this->getCollapsingColumnButtonExpandAttributes['default-styling'] ?? true),
+                            'text-green-600' => $isTailwind && ($this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true),
+                            'laravel-livewire-tables-btn-lg text-success' => $isBootstrap && ($this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true)
+                        ])
+                        ->except(['default','default-styling','default-colors']) 
+                    }}
+                />
+                <x-heroicon-o-minus-circle x-cloak x-show="open"  {{ 
+                    $attributes->merge($this->getCollapsingColumnButtonCollapseAttributes)
+                        ->class([
+                            'h-6 w-6' => $isTailwind && ($this->getCollapsingColumnButtonCollapseAttributes['default-styling'] ?? true),
+                            'text-yellow-600' => $isTailwind && ($this->getCollapsingColumnButtonCollapseAttributes['default-colors'] ?? true),
+                            'laravel-livewire-tables-btn-lg text-warning' => $isBootstrap && ($this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true),
+                        ])
+                        ->except(['default','default-styling','default-colors']) 
+                    }}
+                />
+            </button>
+        @endif 
+    </td>
 @endif
diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index 18babd7a1..2fa063768 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables;
 
 use Illuminate\Foundation\Console\AboutCommand;
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 use Livewire\ComponentHookRegistry;
 use Rappasoft\LaravelLivewireTables\Commands\MakeCommand;
@@ -39,6 +40,7 @@ public function boot(): void
         } else {
             $this->loadTranslationsFrom(__DIR__.'/../resources/lang/php', 'livewire-tables');
         }
+        $this->addBladeLoopDirective();
 
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'livewire-tables');
 
@@ -81,6 +83,18 @@ public function consoleCommands(): void
         }
     }
 
+    public function addBladeLoopDirective(): void
+    {
+        Blade::directive('tableloop', function ($expression) {
+            return "<?php foreach ($expression): ?>";
+        });
+
+        Blade::directive('endtableloop', function ($expression) {
+            return '<?php endforeach; ?>';
+        });
+
+    }
+
     public function register(): void
     {
         $this->mergeConfigFrom(
diff --git a/src/Traits/Configuration/CollapsingColumnConfiguration.php b/src/Traits/Configuration/CollapsingColumnConfiguration.php
index 88e883e7d..dada8b991 100644
--- a/src/Traits/Configuration/CollapsingColumnConfiguration.php
+++ b/src/Traits/Configuration/CollapsingColumnConfiguration.php
@@ -24,4 +24,11 @@ public function setCollapsingColumnsDisabled(): self
 
         return $this;
     }
+
+    public function unsetCollapsedStatuses(): void
+    {
+        unset($this->shouldAlwaysCollapse);
+        unset($this->shouldMobileCollapse);
+        unset($this->shouldTabletCollapse);
+    }
 }
diff --git a/src/Traits/Configuration/ColumnConfiguration.php b/src/Traits/Configuration/ColumnConfiguration.php
index 57de0b9f4..141ca918a 100644
--- a/src/Traits/Configuration/ColumnConfiguration.php
+++ b/src/Traits/Configuration/ColumnConfiguration.php
@@ -15,11 +15,4 @@ public function setAppendedColumns(array $appendedColumns): void
         $this->appendedColumns = collect($appendedColumns);
         $this->hasRunColumnSetup = false;
     }
-
-    public function unsetCollapsedStatuses(): void
-    {
-        unset($this->shouldAlwaysCollapse);
-        unset($this->shouldMobileCollapse);
-        unset($this->shouldTabletCollapse);
-    }
 }
diff --git a/src/Traits/Helpers/CollapsingColumnHelpers.php b/src/Traits/Helpers/CollapsingColumnHelpers.php
index e80e9da64..a7eb43dc1 100644
--- a/src/Traits/Helpers/CollapsingColumnHelpers.php
+++ b/src/Traits/Helpers/CollapsingColumnHelpers.php
@@ -2,7 +2,9 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
 
+use Illuminate\Support\Collection;
 use Livewire\Attributes\Computed;
+use Rappasoft\LaravelLivewireTables\Views\Column;
 
 trait CollapsingColumnHelpers
 {
@@ -23,6 +25,7 @@ public function collapsingColumnsAreEnabled(): bool
         return $this->getCollapsingColumnsStatus() === true;
     }
 
+    #[Computed]
     public function collapsingColumnsAreDisabled(): bool
     {
         return $this->getCollapsingColumnsStatus() === false;
@@ -33,4 +36,123 @@ public function showCollapsingColumnSections(): bool
     {
         return $this->collapsingColumnsAreEnabled() && $this->hasCollapsedColumns();
     }
+
+    #[Computed]
+    public function hasCollapsedColumns(): bool
+    {
+        return $this->hasCollapsingColumns() && ($this->shouldCollapseOnMobile() || $this->shouldCollapseOnTablet() || $this->shouldCollapseAlways());
+    }
+
+    #[Computed]
+    public function shouldCollapseOnMobile(): bool
+    {
+
+        if (! isset($this->shouldMobileCollapse)) {
+            $this->shouldMobileCollapse = ($this->getCollapsedMobileColumnsCount() > 0);
+        }
+
+        return $this->shouldMobileCollapse;
+
+    }
+
+    public function getCollapsedMobileColumns(): Collection
+    {
+        return $this->getColumns()
+            ->reject(fn (Column $column) => ($column->isHidden() || ($column->isSelectable() && ! $this->columnSelectIsEnabledForColumn($column))))
+            ->filter(fn (Column $column) => $column->shouldCollapseOnMobile())
+            ->values();
+    }
+
+    public function getCollapsedMobileColumnsCount(): int
+    {
+        return $this->getCollapsedMobileColumns()->count();
+    }
+
+    public function getVisibleMobileColumns(): Collection
+    {
+        return $this->getColumns()
+            ->reject(fn (Column $column) => $column->shouldCollapseOnMobile())
+            ->values();
+    }
+
+    public function getVisibleMobileColumnsCount(): int
+    {
+        return $this->getVisibleMobileColumns()->count();
+    }
+
+    #[Computed]
+    public function shouldCollapseOnTablet(): bool
+    {
+        if (! isset($this->shouldTabletCollapse)) {
+            $this->shouldTabletCollapse = ($this->getCollapsedTabletColumnsCount() > 0);
+        }
+
+        return $this->shouldTabletCollapse;
+
+    }
+
+    public function getCollapsedTabletColumns(): Collection
+    {
+        return $this->getColumns()
+            ->reject(fn (Column $column) => ($column->isHidden() || ($column->isSelectable() && ! $this->columnSelectIsEnabledForColumn($column))))
+            ->filter(fn (Column $column) => $column->shouldCollapseOnTablet())
+            ->values();
+    }
+
+    public function getCollapsedTabletColumnsCount(): int
+    {
+        return $this->getCollapsedTabletColumns()->count();
+    }
+
+    public function getVisibleTabletColumns(): Collection
+    {
+        return $this->getColumns()
+            ->reject(fn (Column $column) => $column->shouldCollapseOnTablet())
+            ->values();
+    }
+
+    public function getVisibleTabletColumnsCount(): int
+    {
+        return $this->getVisibleTabletColumns()->count();
+    }
+
+    public function getCollapsedAlwaysColumns(): Collection
+    {
+        return $this->getColumns()
+            ->reject(fn (Column $column) => ($column->isHidden() || ($column->isSelectable() && ! $this->columnSelectIsEnabledForColumn($column))))
+            ->filter(fn (Column $column) => $column->shouldCollapseAlways())
+            ->values();
+    }
+
+    public function getCollapsedAlwaysColumnsCount(): int
+    {
+        return $this->getCollapsedAlwaysColumns()->count();
+    }
+
+    #[Computed]
+    public function shouldCollapseAlways(): bool
+    {
+        if (! isset($this->shouldAlwaysCollapse)) {
+            $this->shouldAlwaysCollapse = ($this->getCollapsedAlwaysColumnsCount() > 0);
+        }
+
+        return $this->shouldAlwaysCollapse;
+    }
+
+    #[Computed]
+    public function getColspanCount(): int
+    {
+        return 100;
+    }
+
+    #[Computed]
+    public function getCollapsedColumnsForContent(): Collection
+    {
+        $colspan = $this->getColspanCount();
+        $columns = $this->getColumns()
+            ->reject(fn (Column $column) => ($column->isHidden() || ($column->isSelectable() && ! $this->columnSelectIsEnabledForColumn($column))))
+            ->reject(fn (Column $column) => $column->shouldNeverCollapse());
+
+        return $columns;
+    }
 }
diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 61f011a7e..beb4e2439 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -125,96 +125,6 @@ public function getColumnCount(): int
         return $this->getColumns()->count();
     }
 
-    #[Computed]
-    public function hasCollapsedColumns(): bool
-    {
-        if ($this->shouldCollapseOnMobile() || $this->shouldCollapseOnTablet() || $this->shouldCollapseAlways()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    #[Computed]
-    public function shouldCollapseOnMobile(): bool
-    {
-
-        if (! isset($this->shouldMobileCollapse)) {
-            $this->shouldMobileCollapse = ($this->getCollapsedMobileColumnsCount() > 0);
-        }
-
-        return $this->shouldMobileCollapse;
-
-    }
-
-    public function getCollapsedMobileColumns(): Collection
-    {
-        return $this->getColumns()
-            ->reject(fn (Column $column) => $column->isHidden())
-            ->reject(fn (Column $column) => ($column->isSelectable() && ! $this->columnSelectIsEnabledForColumn($column)))
-            ->filter(fn (Column $column) => $column->shouldCollapseOnMobile())
-            ->values();
-    }
-
-    public function getCollapsedMobileColumnsCount(): int
-    {
-        return $this->getCollapsedMobileColumns()->count();
-    }
-
-    public function getVisibleMobileColumns(): Collection
-    {
-        return $this->getColumns()
-            ->reject(fn (Column $column) => $column->shouldCollapseOnMobile())
-            ->values();
-    }
-
-    public function getVisibleMobileColumnsCount(): int
-    {
-        return $this->getVisibleMobileColumns()->count();
-    }
-
-    #[Computed]
-    public function shouldCollapseOnTablet(): bool
-    {
-        if (! isset($this->shouldTabletCollapse)) {
-            $this->shouldTabletCollapse = ($this->getCollapsedTabletColumnsCount() > 0);
-        }
-
-        return $this->shouldTabletCollapse;
-
-    }
-
-    public function getCollapsedTabletColumns(): Collection
-    {
-        return $this->getColumns()
-            ->reject(fn (Column $column) => $column->isHidden())
-            ->reject(fn (Column $column) => ($column->isSelectable() && ! $this->columnSelectIsEnabledForColumn($column)))
-            ->filter(fn (Column $column) => $column->shouldCollapseOnTablet())
-            ->values();
-    }
-
-    public function getCollapsedTabletColumnsCount(): int
-    {
-        return $this->getCollapsedTabletColumns()->count();
-    }
-
-    public function getVisibleTabletColumns(): Collection
-    {
-        return $this->getColumns()
-            ->reject(fn (Column $column) => $column->shouldCollapseOnTablet())
-            ->values();
-    }
-
-    public function getVisibleTabletColumnsCount(): int
-    {
-        return $this->getVisibleTabletColumns()->count();
-    }
-
-    public function getColspanCount(): int
-    {
-        return 100;
-    }
-
     public function getPrependedColumns(): Collection
     {
         return $this->prependedColumns ?? collect($this->prependColumns());
@@ -225,30 +135,6 @@ public function getAppendedColumns(): Collection
         return $this->appendedColumns ?? collect($this->appendColumns());
     }
 
-    public function getCollapsedAlwaysColumns(): Collection
-    {
-        return $this->getColumns()
-            ->reject(fn (Column $column) => $column->isHidden())
-            ->reject(fn (Column $column) => ($column->isSelectable() && ! $this->columnSelectIsEnabledForColumn($column)))
-            ->filter(fn (Column $column) => $column->shouldCollapseAlways())
-            ->values();
-    }
-
-    public function getCollapsedAlwaysColumnsCount(): int
-    {
-        return $this->getCollapsedAlwaysColumns()->count();
-    }
-
-    #[Computed]
-    public function shouldCollapseAlways(): bool
-    {
-        if (! isset($this->shouldAlwaysCollapse)) {
-            $this->shouldAlwaysCollapse = ($this->getCollapsedAlwaysColumnsCount() > 0);
-        }
-
-        return $this->shouldAlwaysCollapse;
-    }
-
     /**
      * Prepend columns.
      */
diff --git a/src/Traits/Styling/Columns/HasCollapsingColumnsStyling.php b/src/Traits/Styling/Columns/HasCollapsingColumnsStyling.php
new file mode 100644
index 000000000..d8b9b0ef7
--- /dev/null
+++ b/src/Traits/Styling/Columns/HasCollapsingColumnsStyling.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Columns;
+
+use Livewire\Attributes\Computed;
+
+trait HasCollapsingColumnsStyling
+{
+    protected array $collapsingColumnButtonCollapseAttributes = ['default-styling' => true, 'default-colors' => true];
+
+    protected array $collapsingColumnButtonExpandAttributes = ['default-styling' => true, 'default-colors' => true];
+
+    /**
+     * Used to set attributes for the Collapsed Column Collapse Button
+     *
+     * @param  array<mixed>  $collapsingColumnButtonCollapseAttributes
+     */
+    public function setCollapsingColumnButtonCollapseAttributes(array $collapsingColumnButtonCollapseAttributes): self
+    {
+        $this->collapsingColumnButtonCollapseAttributes = [...['default-colors' => false, 'default-styling' => false], ...$collapsingColumnButtonCollapseAttributes];
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the Collapsed Column Expand Button
+     *
+     * @param  array<mixed>  $collapsingColumnButtonExpandAttributes
+     */
+    public function setCollapsingColumnButtonExpandAttributes(array $collapsingColumnButtonExpandAttributes): self
+    {
+        $this->collapsingColumnButtonExpandAttributes = [...['default-colors' => false, 'default-styling' => false], ...$collapsingColumnButtonExpandAttributes];
+
+        return $this;
+    }
+
+    /**
+     * Retrieves attributes for the Collapsed Column Collapse Button
+     *
+     * @return array<mixed>
+     */
+    #[Computed]
+    public function getCollapsingColumnButtonCollapseAttributes(): array
+    {
+        return [...['default-styling' => true, 'default-colors' => true], ...$this->collapsingColumnButtonCollapseAttributes];
+    }
+
+    /**
+     * Retrieves attributes for the Collapsed Column Expand Button
+     *
+     * @return array<mixed>
+     */
+    #[Computed]
+    public function getCollapsingColumnButtonExpandAttributes(): array
+    {
+        return [...['default-styling' => true, 'default-colors' => true], ...$this->collapsingColumnButtonExpandAttributes];
+    }
+}
diff --git a/src/Traits/Styling/Configuration/CollapsingColumnsStylingConfiguration.php b/src/Traits/Styling/Configuration/CollapsingColumnsStylingConfiguration.php
deleted file mode 100644
index 9ab487907..000000000
--- a/src/Traits/Styling/Configuration/CollapsingColumnsStylingConfiguration.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
-
-trait CollapsingColumnsStylingConfiguration
-{
-    /**
-     * Used to set attributes for the Collapsed Column Collapse Button
-     *
-     * @param  array<mixed>  $collapsingColumnButtonCollapseAttributes
-     */
-    public function setCollapsingColumnButtonCollapseAttributes(array $collapsingColumnButtonCollapseAttributes): self
-    {
-        $this->collapsingColumnButtonCollapseAttributes = [...['default-colors' => false, 'default-styling' => false], ...$collapsingColumnButtonCollapseAttributes];
-
-        return $this;
-    }
-
-    /**
-     * Used to set attributes for the Collapsed Column Expand Button
-     *
-     * @param  array<mixed>  $collapsingColumnButtonExpandAttributes
-     */
-    public function setCollapsingColumnButtonExpandAttributes(array $collapsingColumnButtonExpandAttributes): self
-    {
-        $this->collapsingColumnButtonExpandAttributes = [...['default-colors' => false, 'default-styling' => false], ...$collapsingColumnButtonExpandAttributes];
-
-        return $this;
-    }
-}
diff --git a/src/Traits/Styling/HasCollapsingColumnsStyling.php b/src/Traits/Styling/HasCollapsingColumnsStyling.php
deleted file mode 100644
index 080130f78..000000000
--- a/src/Traits/Styling/HasCollapsingColumnsStyling.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling;
-
-use Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration\CollapsingColumnsStylingConfiguration;
-use Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers\CollapsingColumnsStylingHelpers;
-
-trait HasCollapsingColumnsStyling
-{
-    use CollapsingColumnsStylingConfiguration,
-        CollapsingColumnsStylingHelpers;
-
-    protected array $collapsingColumnButtonCollapseAttributes = ['default-styling' => true, 'default-colors' => true];
-
-    protected array $collapsingColumnButtonExpandAttributes = ['default-styling' => true, 'default-colors' => true];
-}
diff --git a/src/Traits/Styling/Helpers/CollapsingColumnsStylingHelpers.php b/src/Traits/Styling/Helpers/CollapsingColumnsStylingHelpers.php
deleted file mode 100644
index 416c79444..000000000
--- a/src/Traits/Styling/Helpers/CollapsingColumnsStylingHelpers.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers;
-
-use Livewire\Attributes\Computed;
-
-trait CollapsingColumnsStylingHelpers
-{
-    /**
-     * Retrieves attributes for the Collapsed Column Collapse Button
-     *
-     * @return array<mixed>
-     */
-    #[Computed]
-    public function getCollapsingColumnButtonCollapseAttributes(): array
-    {
-        return [...['default-styling' => true, 'default-colors' => true], ...$this->collapsingColumnButtonCollapseAttributes];
-    }
-
-    /**
-     * Retrieves attributes for the Collapsed Column Expand Button
-     *
-     * @return array<mixed>
-     */
-    #[Computed]
-    public function getCollapsingColumnButtonExpandAttributes(): array
-    {
-        return [...['default-styling' => true, 'default-colors' => true], ...$this->collapsingColumnButtonExpandAttributes];
-    }
-}
diff --git a/src/Traits/WithCollapsingColumns.php b/src/Traits/WithCollapsingColumns.php
index 37fef32d1..733f707a4 100644
--- a/src/Traits/WithCollapsingColumns.php
+++ b/src/Traits/WithCollapsingColumns.php
@@ -4,7 +4,7 @@
 
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\CollapsingColumnConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\CollapsingColumnHelpers;
-use Rappasoft\LaravelLivewireTables\Traits\Styling\HasCollapsingColumnsStyling;
+use Rappasoft\LaravelLivewireTables\Traits\Styling\Columns\HasCollapsingColumnsStyling;
 
 trait WithCollapsingColumns
 {
@@ -13,4 +13,10 @@ trait WithCollapsingColumns
         HasCollapsingColumnsStyling;
 
     protected bool $collapsingColumnsStatus = true;
+
+    protected ?bool $shouldAlwaysCollapse;
+
+    protected ?bool $shouldMobileCollapse;
+
+    protected ?bool $shouldTabletCollapse;
 }
diff --git a/src/Traits/WithColumns.php b/src/Traits/WithColumns.php
index 1e565ffe7..118e2a302 100644
--- a/src/Traits/WithColumns.php
+++ b/src/Traits/WithColumns.php
@@ -18,12 +18,6 @@ trait WithColumns
 
     protected ?Collection $appendedColumns;
 
-    protected ?bool $shouldAlwaysCollapse;
-
-    protected ?bool $shouldMobileCollapse;
-
-    protected ?bool $shouldTabletCollapse;
-
     protected bool $hasRunColumnSetup = false;
 
     /**
diff --git a/src/Views/Traits/Columns/IsCollapsible.php b/src/Views/Traits/Columns/IsCollapsible.php
index 2dc3439f2..6aebcf522 100644
--- a/src/Views/Traits/Columns/IsCollapsible.php
+++ b/src/Views/Traits/Columns/IsCollapsible.php
@@ -10,9 +10,12 @@ trait IsCollapsible
 
     protected bool $collapseAlways = false;
 
+    protected bool $collapseSometimes = false;
+
     public function collapseOnMobile(): self
     {
         $this->collapseOnMobile = true;
+        $this->collapseSometimes = true;
 
         return $this;
     }
@@ -28,6 +31,7 @@ public function shouldCollapseOnMobile(): bool
     public function collapseOnTablet(): self
     {
         $this->collapseOnTablet = true;
+        $this->collapseSometimes = true;
 
         return $this;
     }
@@ -40,6 +44,7 @@ public function shouldCollapseOnTablet(): bool
     public function collapseAlways(): self
     {
         $this->collapseAlways = true;
+        $this->collapseSometimes = true;
 
         return $this;
     }
@@ -48,4 +53,19 @@ public function shouldCollapseAlways(): bool
     {
         return $this->collapseAlways;
     }
+
+    public function shouldCollapseSometimes(): bool
+    {
+        return $this->collapseSometimes;
+    }
+
+    public function shouldNeverCollapse(): bool
+    {
+        return $this->collapseSometimes === false;
+    }
+
+    public function shouldCollapseNever(): bool
+    {
+        return ($this->shouldCollapseOnMobile() === false) && ($this->shouldCollapseOnTablet() === false) && ($this->shouldCollapseAlways() === false);
+    }
 }
diff --git a/tests/Unit/Traits/Helpers/CollapsingColumnsHelpersTest.php b/tests/Unit/Traits/Helpers/CollapsingColumnsHelpersTest.php
new file mode 100644
index 000000000..7412e58f4
--- /dev/null
+++ b/tests/Unit/Traits/Helpers/CollapsingColumnsHelpersTest.php
@@ -0,0 +1,217 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
+
+use Rappasoft\LaravelLivewireTables\Exceptions\NoColumnsException;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
+
+final class CollapsingColumnsHelpersTest extends TestCase
+{
+    public function test_can_tell_if_there_are_collapsable_columns(): void
+    {
+        $this->assertFalse($this->basicTable->hasCollapsedColumns());
+
+        $this->assertFalse($this->basicTable->getColumnBySelectName('id')->shouldCollapseOnMobile());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertTrue($this->basicTable->getColumnBySelectName('id')->shouldCollapseOnMobile());
+
+        $this->assertTrue($this->basicTable->hasCollapsedColumns());
+    }
+
+    public function test_can_tell_if_columns_should_collapse_on_mobile(): void
+    {
+        $this->assertFalse($this->basicTable->shouldCollapseOnMobile());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertTrue($this->basicTable->shouldCollapseOnMobile());
+    }
+
+    public function test_can_get_collapsed_mobile_columns(): void
+    {
+        $this->assertCount(0, $this->basicTable->getCollapsedMobileColumns());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
+        $this->basicTable->getColumnBySelectName('name')->collapseOnMobile();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertCount(2, $this->basicTable->getCollapsedMobileColumns());
+        $this->assertSame('ID', $this->basicTable->getCollapsedMobileColumns()[0]->getTitle());
+        $this->assertSame('Name', $this->basicTable->getCollapsedMobileColumns()[1]->getTitle());
+    }
+
+    public function test_can_get_collapsed_mobile_columns_count(): void
+    {
+        $this->assertSame(0, $this->basicTable->getCollapsedMobileColumnsCount());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
+        $this->basicTable->getColumnBySelectName('name')->collapseOnMobile();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertSame(2, $this->basicTable->getCollapsedMobileColumnsCount());
+    }
+
+    public function test_can_get_visible_mobile_columns(): void
+    {
+        $this->assertCount(9, $this->basicTable->getVisibleMobileColumns());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
+        $this->basicTable->getColumnBySelectName('name')->collapseOnMobile();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertCount(7, $this->basicTable->getVisibleMobileColumns());
+        $this->assertSame('Sort', $this->basicTable->getVisibleMobileColumns()->values()[0]->getTitle());
+        $this->assertSame('Age', $this->basicTable->getVisibleMobileColumns()->values()[1]->getTitle());
+        $this->assertSame('Breed', $this->basicTable->getVisibleMobileColumns()->values()[2]->getTitle());
+        $this->assertSame('Other', $this->basicTable->getVisibleMobileColumns()->values()[3]->getTitle());
+    }
+
+    public function test_can_get_visible_mobile_columns_count(): void
+    {
+        $this->assertSame(9, $this->basicTable->getVisibleMobileColumnsCount());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
+        $this->basicTable->getColumnBySelectName('name')->collapseOnMobile();
+
+        $this->assertSame(7, $this->basicTable->getVisibleMobileColumnsCount());
+    }
+
+    public function test_can_tell_if_columns_should_collapse_on_tablet(): void
+    {
+        $this->assertFalse($this->basicTable->shouldCollapseOnTablet());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertTrue($this->basicTable->shouldCollapseOnTablet());
+    }
+
+    public function test_can_get_collapsed_tablet_columns(): void
+    {
+        $this->assertCount(0, $this->basicTable->getCollapsedTabletColumns());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
+        $this->basicTable->getColumnBySelectName('name')->collapseOnTablet();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertCount(2, $this->basicTable->getCollapsedTabletColumns());
+        $this->assertSame('ID', $this->basicTable->getCollapsedTabletColumns()[0]->getTitle());
+        $this->assertSame('Name', $this->basicTable->getCollapsedTabletColumns()[1]->getTitle());
+    }
+
+    public function test_can_get_collapsed_tablet_columns_count(): void
+    {
+        $this->assertSame(0, $this->basicTable->getCollapsedTabletColumnsCount());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
+        $this->basicTable->getColumnBySelectName('name')->collapseOnTablet();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertSame(2, $this->basicTable->getCollapsedTabletColumnsCount());
+    }
+
+    public function test_can_get_visible_tablet_columns(): void
+    {
+        $this->assertCount(9, $this->basicTable->getVisibleTabletColumns());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
+        $this->basicTable->getColumnBySelectName('name')->collapseOnTablet();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertCount(7, $this->basicTable->getVisibleTabletColumns());
+        $this->assertSame('Sort', $this->basicTable->getVisibleTabletColumns()->values()[0]->getTitle());
+        $this->assertSame('Age', $this->basicTable->getVisibleTabletColumns()->values()[1]->getTitle());
+        $this->assertSame('Breed', $this->basicTable->getVisibleTabletColumns()->values()[2]->getTitle());
+        $this->assertSame('Other', $this->basicTable->getVisibleTabletColumns()->values()[3]->getTitle());
+    }
+
+    public function test_can_get_visible_tablet_columns_count(): void
+    {
+        $this->assertSame(9, $this->basicTable->getVisibleTabletColumnsCount());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
+        $this->basicTable->getColumnBySelectName('name')->collapseOnTablet();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertSame(7, $this->basicTable->getVisibleTabletColumnsCount());
+    }
+
+    // / *** ** //
+
+    public function test_can_tell_if_columns_should_collapse_always(): void
+    {
+        $this->assertFalse($this->basicTable->shouldCollapseAlways());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseAlways();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertTrue($this->basicTable->shouldCollapseAlways());
+    }
+
+    public function test_can_get_always_collapsed_columns(): void
+    {
+        $this->assertCount(0, $this->basicTable->getCollapsedAlwaysColumns());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseAlways();
+        $this->basicTable->getColumnBySelectName('name')->collapseAlways();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertCount(2, $this->basicTable->getCollapsedAlwaysColumns());
+        $this->assertSame('ID', $this->basicTable->getCollapsedAlwaysColumns()[0]->getTitle());
+        $this->assertSame('Name', $this->basicTable->getCollapsedAlwaysColumns()[1]->getTitle());
+    }
+
+    public function test_can_get_always_collapsed_columns_count(): void
+    {
+        $this->assertSame(0, $this->basicTable->getCollapsedAlwaysColumnsCount());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseAlways();
+        $this->basicTable->getColumnBySelectName('name')->collapseAlways();
+
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertSame(2, $this->basicTable->getCollapsedAlwaysColumnsCount());
+    }
+
+    public function test_can_get_collapsed_columns_for_content(): void
+    {
+        $this->assertCount(0, $this->basicTable->getCollapsedMobileColumns());
+        $this->assertCount(0, $this->basicTable->getCollapsedTabletColumns());
+
+        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
+        $this->basicTable->getColumnBySelectName('name')->collapseOnTablet();
+        $this->basicTable->getColumnBySelectName('age')->collapseAlways();
+        $this->basicTable->unsetCollapsedStatuses();
+
+        $this->assertCount(1, $this->basicTable->getCollapsedMobileColumns());
+        $this->assertCount(1, $this->basicTable->getCollapsedTabletColumns());
+        $this->assertCount(1, $this->basicTable->getCollapsedAlwaysColumns());
+
+        $this->assertSame(3, $this->basicTable->getCollapsedColumnsForContent()->count());
+
+        $this->assertSame('ID', $this->basicTable->getCollapsedColumnsForContent()->first()->getTitle());
+        $this->assertSame('Age', $this->basicTable->getCollapsedColumnsForContent()->last()->getTitle());
+        $this->assertSame('Name', $this->basicTable->getCollapsedColumnsForContent()->slice(1)->first()->getTitle());
+
+    }
+}
diff --git a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
index 0b786109f..f7f6eb55b 100644
--- a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
@@ -62,188 +62,6 @@ public function test_can_get_column_count(): void
         $this->assertSame(9, $this->basicTable->getColumnCount());
     }
 
-    public function test_can_tell_if_there_are_collapsable_columns(): void
-    {
-        $this->assertFalse($this->basicTable->hasCollapsedColumns());
-
-        $this->assertFalse($this->basicTable->getColumnBySelectName('id')->shouldCollapseOnMobile());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertTrue($this->basicTable->getColumnBySelectName('id')->shouldCollapseOnMobile());
-
-        $this->assertTrue($this->basicTable->hasCollapsedColumns());
-    }
-
-    public function test_can_tell_if_columns_should_collapse_on_mobile(): void
-    {
-        $this->assertFalse($this->basicTable->shouldCollapseOnMobile());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertTrue($this->basicTable->shouldCollapseOnMobile());
-    }
-
-    public function test_can_get_collapsed_mobile_columns(): void
-    {
-        $this->assertCount(0, $this->basicTable->getCollapsedMobileColumns());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
-        $this->basicTable->getColumnBySelectName('name')->collapseOnMobile();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertCount(2, $this->basicTable->getCollapsedMobileColumns());
-        $this->assertSame('ID', $this->basicTable->getCollapsedMobileColumns()[0]->getTitle());
-        $this->assertSame('Name', $this->basicTable->getCollapsedMobileColumns()[1]->getTitle());
-    }
-
-    public function test_can_get_collapsed_mobile_columns_count(): void
-    {
-        $this->assertSame(0, $this->basicTable->getCollapsedMobileColumnsCount());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
-        $this->basicTable->getColumnBySelectName('name')->collapseOnMobile();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertSame(2, $this->basicTable->getCollapsedMobileColumnsCount());
-    }
-
-    public function test_can_get_visible_mobile_columns(): void
-    {
-        $this->assertCount(9, $this->basicTable->getVisibleMobileColumns());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
-        $this->basicTable->getColumnBySelectName('name')->collapseOnMobile();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertCount(7, $this->basicTable->getVisibleMobileColumns());
-        $this->assertSame('Sort', $this->basicTable->getVisibleMobileColumns()->values()[0]->getTitle());
-        $this->assertSame('Age', $this->basicTable->getVisibleMobileColumns()->values()[1]->getTitle());
-        $this->assertSame('Breed', $this->basicTable->getVisibleMobileColumns()->values()[2]->getTitle());
-        $this->assertSame('Other', $this->basicTable->getVisibleMobileColumns()->values()[3]->getTitle());
-    }
-
-    public function test_can_get_visible_mobile_columns_count(): void
-    {
-        $this->assertSame(9, $this->basicTable->getVisibleMobileColumnsCount());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnMobile();
-        $this->basicTable->getColumnBySelectName('name')->collapseOnMobile();
-
-        $this->assertSame(7, $this->basicTable->getVisibleMobileColumnsCount());
-    }
-
-    public function test_can_tell_if_columns_should_collapse_on_tablet(): void
-    {
-        $this->assertFalse($this->basicTable->shouldCollapseOnTablet());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertTrue($this->basicTable->shouldCollapseOnTablet());
-    }
-
-    public function test_can_get_collapsed_tablet_columns(): void
-    {
-        $this->assertCount(0, $this->basicTable->getCollapsedTabletColumns());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
-        $this->basicTable->getColumnBySelectName('name')->collapseOnTablet();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertCount(2, $this->basicTable->getCollapsedTabletColumns());
-        $this->assertSame('ID', $this->basicTable->getCollapsedTabletColumns()[0]->getTitle());
-        $this->assertSame('Name', $this->basicTable->getCollapsedTabletColumns()[1]->getTitle());
-    }
-
-    public function test_can_get_collapsed_tablet_columns_count(): void
-    {
-        $this->assertSame(0, $this->basicTable->getCollapsedTabletColumnsCount());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
-        $this->basicTable->getColumnBySelectName('name')->collapseOnTablet();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertSame(2, $this->basicTable->getCollapsedTabletColumnsCount());
-    }
-
-    public function test_can_get_visible_tablet_columns(): void
-    {
-        $this->assertCount(9, $this->basicTable->getVisibleTabletColumns());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
-        $this->basicTable->getColumnBySelectName('name')->collapseOnTablet();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertCount(7, $this->basicTable->getVisibleTabletColumns());
-        $this->assertSame('Sort', $this->basicTable->getVisibleTabletColumns()->values()[0]->getTitle());
-        $this->assertSame('Age', $this->basicTable->getVisibleTabletColumns()->values()[1]->getTitle());
-        $this->assertSame('Breed', $this->basicTable->getVisibleTabletColumns()->values()[2]->getTitle());
-        $this->assertSame('Other', $this->basicTable->getVisibleTabletColumns()->values()[3]->getTitle());
-    }
-
-    public function test_can_get_visible_tablet_columns_count(): void
-    {
-        $this->assertSame(9, $this->basicTable->getVisibleTabletColumnsCount());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseOnTablet();
-        $this->basicTable->getColumnBySelectName('name')->collapseOnTablet();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertSame(7, $this->basicTable->getVisibleTabletColumnsCount());
-    }
-
-    // / *** ** //
-
-    public function test_can_tell_if_columns_should_collapse_always(): void
-    {
-        $this->assertFalse($this->basicTable->shouldCollapseAlways());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseAlways();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertTrue($this->basicTable->shouldCollapseAlways());
-    }
-
-    public function test_can_get_always_collapsed_columns(): void
-    {
-        $this->assertCount(0, $this->basicTable->getCollapsedAlwaysColumns());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseAlways();
-        $this->basicTable->getColumnBySelectName('name')->collapseAlways();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertCount(2, $this->basicTable->getCollapsedAlwaysColumns());
-        $this->assertSame('ID', $this->basicTable->getCollapsedAlwaysColumns()[0]->getTitle());
-        $this->assertSame('Name', $this->basicTable->getCollapsedAlwaysColumns()[1]->getTitle());
-    }
-
-    public function test_can_get_always_collapsed_columns_count(): void
-    {
-        $this->assertSame(0, $this->basicTable->getCollapsedAlwaysColumnsCount());
-
-        $this->basicTable->getColumnBySelectName('id')->collapseAlways();
-        $this->basicTable->getColumnBySelectName('name')->collapseAlways();
-
-        $this->basicTable->unsetCollapsedStatuses();
-
-        $this->assertSame(2, $this->basicTable->getCollapsedAlwaysColumnsCount());
-    }
-
     /*public function test_can_get_selectable_columns(): void
     {
         $selectable = $this->basicTable->getSelectableColumns()
diff --git a/tests/Unit/Views/Traits/Helpers/ColumnCollapseHelpersTest.php b/tests/Unit/Views/Traits/Helpers/ColumnCollapseHelpersTest.php
new file mode 100644
index 000000000..3bdfad549
--- /dev/null
+++ b/tests/Unit/Views/Traits/Helpers/ColumnCollapseHelpersTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Helpers;
+
+use Closure;
+use Illuminate\Database\Eloquent\Builder;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+
+final class ColumnCollapseHelpersTest extends TestCase
+{
+    public function test_can_check_if_column_should_collapse_on_mobile(): void
+    {
+        $column = Column::make('My Title');
+
+        $this->assertFalse($column->shouldCollapseOnMobile());
+        $this->assertFalse($column->shouldCollapseSometimes());
+        $this->assertTrue($column->shouldNeverCollapse());
+        $this->assertTrue($column->shouldCollapseNever());
+
+        $column->collapseOnMobile();
+
+        $this->assertTrue($column->shouldCollapseOnMobile());
+        $this->assertTrue($column->shouldCollapseSometimes());
+        $this->assertFalse($column->shouldNeverCollapse());
+        $this->assertFalse($column->shouldCollapseNever());
+
+    }
+
+    public function test_can_check_if_column_should_collapse_on_tablet(): void
+    {
+        $column = Column::make('My Title');
+
+        $this->assertFalse($column->shouldCollapseOnTablet());
+        $this->assertFalse($column->shouldCollapseSometimes());
+        $this->assertTrue($column->shouldNeverCollapse());
+        $this->assertTrue($column->shouldCollapseNever());
+
+        $column->collapseOnTablet();
+
+        $this->assertTrue($column->shouldCollapseOnTablet());
+        $this->assertTrue($column->shouldCollapseSometimes());
+        $this->assertFalse($column->shouldNeverCollapse());
+        $this->assertFalse($column->shouldCollapseNever());
+
+    }
+
+    public function test_can_check_if_column_should_collapse_always(): void
+    {
+        $column = Column::make('My Title');
+
+        $this->assertFalse($column->shouldCollapseAlways());
+        $this->assertFalse($column->shouldCollapseSometimes());
+        $this->assertTrue($column->shouldNeverCollapse());
+        $this->assertTrue($column->shouldCollapseNever());
+
+        $column->collapseAlways();
+
+        $this->assertTrue($column->shouldCollapseAlways());
+        $this->assertTrue($column->shouldCollapseSometimes());
+        $this->assertFalse($column->shouldNeverCollapse());
+        $this->assertFalse($column->shouldCollapseNever());
+
+    }
+}
diff --git a/tests/Unit/Views/Traits/Helpers/ColumnHelpersTest.php b/tests/Unit/Views/Traits/Helpers/ColumnHelpersTest.php
index 1e91f776e..6a8e3f09f 100644
--- a/tests/Unit/Views/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Unit/Views/Traits/Helpers/ColumnHelpersTest.php
@@ -75,28 +75,6 @@ public function test_can_check_if_column_is_label(): void
         $this->assertTrue($column->isLabel());
     }
 
-    public function test_can_check_if_column_should_collapse_on_mobile(): void
-    {
-        $column = Column::make('My Title');
-
-        $this->assertFalse($column->shouldCollapseOnMobile());
-
-        $column->collapseOnMobile();
-
-        $this->assertTrue($column->shouldCollapseOnMobile());
-    }
-
-    public function test_can_check_if_column_should_collapse_on_tablet(): void
-    {
-        $column = Column::make('My Title');
-
-        $this->assertFalse($column->shouldCollapseOnTablet());
-
-        $column->collapseOnTablet();
-
-        $this->assertTrue($column->shouldCollapseOnTablet());
-    }
-
     public function test_can_set_custom_sorting_pill_title(): void
     {
         $column = Column::make('My Title');

From f17a0d8841664e215de71349e498e24fb60f08cb Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 8 Jan 2025 03:36:24 +0000
Subject: [PATCH 25/36] Tidy computed properties behaviour (#2160)

* Split ComponentUtilities into traits

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/ComponentUtilities.php             | 31 +++--------
 .../Configuration/ComponentConfiguration.php  | 55 +------------------
 .../Component/HandlesComputedProperties.php   | 27 +++++++++
 .../Core/Component/HandlesEmptyMessage.php    | 30 ++++++++++
 .../Core/Component/HandlesFingerprint.php     | 34 ++++++++++++
 .../Component/HandlesOfflineIndicator.php     | 44 +++++++++++++++
 .../Core/Component/HandlesTableName.php       | 27 +++++++++
 src/Traits/Helpers/ComponentHelpers.php       | 53 ------------------
 8 files changed, 170 insertions(+), 131 deletions(-)
 create mode 100644 src/Traits/Core/Component/HandlesComputedProperties.php
 create mode 100644 src/Traits/Core/Component/HandlesEmptyMessage.php
 create mode 100644 src/Traits/Core/Component/HandlesFingerprint.php
 create mode 100644 src/Traits/Core/Component/HandlesOfflineIndicator.php
 create mode 100644 src/Traits/Core/Component/HandlesTableName.php

diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index d2121205f..617266776 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -6,29 +6,23 @@
 use Livewire\Attributes\Locked;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\ComponentConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Core\Component\{HandlesComputedProperties,HandlesEmptyMessage, HandlesFingerprint, HandlesOfflineIndicator,HandlesTableName};
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\ComponentHelpers;
 
 trait ComponentUtilities
 {
-    use ComponentConfiguration,
+    use HandlesTableName,
+        HandlesFingerprint,
+        HandlesEmptyMessage,
+        HandlesComputedProperties,
+        HandlesOfflineIndicator,
+        ComponentConfiguration,
         ComponentHelpers;
 
     public array $table = [];
 
     protected $model;
 
-    #[Locked]
-    public string $tableName = 'table';
-
-    #[Locked]
-    public ?string $dataTableFingerprint;
-
-    protected bool $offlineIndicatorStatus = true;
-
-    protected string $emptyMessage = 'No items found, try to broaden your search';
-
-    protected bool $useComputedProperties = true;
-
     protected bool $hasRunConfigure = false;
 
     /**
@@ -82,17 +76,6 @@ protected function runCoreConfiguration(): void
         }
     }
 
-    /**
-     * Returns a unique id for the table, used as an alias to identify one table from another session and query string to prevent conflicts
-     */
-    protected function generateDataTableFingerprint(): string
-    {
-        $className = str_split(static::class);
-        $crc32 = sprintf('%u', crc32(serialize($className)));
-
-        return base_convert($crc32, 10, 36);
-    }
-
     /**
      * 1. After the sorting method is hit we need to tell the table to go back into reordering mode
      */
diff --git a/src/Traits/Configuration/ComponentConfiguration.php b/src/Traits/Configuration/ComponentConfiguration.php
index fee44c87d..3587b03af 100644
--- a/src/Traits/Configuration/ComponentConfiguration.php
+++ b/src/Traits/Configuration/ComponentConfiguration.php
@@ -2,57 +2,4 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
 
-trait ComponentConfiguration
-{
-    /**
-     * Set the empty message
-     */
-    public function setEmptyMessage(string $message): self
-    {
-        $this->emptyMessage = $message;
-
-        return $this;
-    }
-
-    public function setOfflineIndicatorStatus(bool $status): self
-    {
-        $this->offlineIndicatorStatus = $status;
-
-        return $this;
-    }
-
-    public function setOfflineIndicatorEnabled(): self
-    {
-        $this->setOfflineIndicatorStatus(true);
-
-        return $this;
-    }
-
-    public function setOfflineIndicatorDisabled(): self
-    {
-        $this->setOfflineIndicatorStatus(false);
-
-        return $this;
-    }
-
-    public function setDataTableFingerprint(string $dataTableFingerprint): self
-    {
-        $this->dataTableFingerprint = $dataTableFingerprint;
-
-        return $this;
-    }
-
-    public function useComputedPropertiesEnabled(): self
-    {
-        $this->useComputedProperties = true;
-
-        return $this;
-    }
-
-    public function useComputedPropertiesDisabled(): self
-    {
-        $this->useComputedProperties = false;
-
-        return $this;
-    }
-}
+trait ComponentConfiguration {}
diff --git a/src/Traits/Core/Component/HandlesComputedProperties.php b/src/Traits/Core/Component/HandlesComputedProperties.php
new file mode 100644
index 000000000..d278ecae8
--- /dev/null
+++ b/src/Traits/Core/Component/HandlesComputedProperties.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Component;
+
+trait HandlesComputedProperties
+{
+    protected bool $useComputedProperties = true;
+
+    public function useComputedPropertiesEnabled(): self
+    {
+        $this->useComputedProperties = true;
+
+        return $this;
+    }
+
+    public function useComputedPropertiesDisabled(): self
+    {
+        $this->useComputedProperties = false;
+
+        return $this;
+    }
+
+    public function getComputedPropertiesStatus(): bool
+    {
+        return $this->useComputedProperties ?? false;
+    }
+}
diff --git a/src/Traits/Core/Component/HandlesEmptyMessage.php b/src/Traits/Core/Component/HandlesEmptyMessage.php
new file mode 100644
index 000000000..972b7cb41
--- /dev/null
+++ b/src/Traits/Core/Component/HandlesEmptyMessage.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Component;
+
+trait HandlesEmptyMessage
+{
+    protected string $emptyMessage = 'No items found, try to broaden your search';
+
+    /**
+     * Get the translated empty message of the table
+     */
+    public function getEmptyMessage(): string
+    {
+        if ($this->emptyMessage == 'No items found, try to broaden your search') {
+            return __($this->getLocalisationPath().'No items found, try to broaden your search');
+        }
+
+        return $this->emptyMessage;
+    }
+
+    /**
+     * Set the empty message
+     */
+    public function setEmptyMessage(string $message): self
+    {
+        $this->emptyMessage = $message;
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Core/Component/HandlesFingerprint.php b/src/Traits/Core/Component/HandlesFingerprint.php
new file mode 100644
index 000000000..b8ff168dd
--- /dev/null
+++ b/src/Traits/Core/Component/HandlesFingerprint.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Component;
+
+use Livewire\Attributes\Locked;
+
+trait HandlesFingerprint
+{
+    #[Locked]
+    public ?string $dataTableFingerprint;
+
+    public function getDataTableFingerprint(): string
+    {
+        return $this->dataTableFingerprint ?? ($this->dataTableFingerprint = $this->generateDataTableFingerprint());
+    }
+
+    public function setDataTableFingerprint(string $dataTableFingerprint): self
+    {
+        $this->dataTableFingerprint = $dataTableFingerprint;
+
+        return $this;
+    }
+
+    /**
+     * Returns a unique id for the table, used as an alias to identify one table from another session and query string to prevent conflicts
+     */
+    protected function generateDataTableFingerprint(): string
+    {
+        $className = str_split(static::class);
+        $crc32 = sprintf('%u', crc32(serialize($className)));
+
+        return base_convert($crc32, 10, 36);
+    }
+}
diff --git a/src/Traits/Core/Component/HandlesOfflineIndicator.php b/src/Traits/Core/Component/HandlesOfflineIndicator.php
new file mode 100644
index 000000000..47104cb58
--- /dev/null
+++ b/src/Traits/Core/Component/HandlesOfflineIndicator.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Component;
+
+trait HandlesOfflineIndicator
+{
+    protected bool $offlineIndicatorStatus = true;
+
+    public function getOfflineIndicatorStatus(): bool
+    {
+        return $this->offlineIndicatorStatus;
+    }
+
+    public function offlineIndicatorIsEnabled(): bool
+    {
+        return $this->getOfflineIndicatorStatus() === true;
+    }
+
+    public function offlineIndicatorIsDisabled(): bool
+    {
+        return $this->getOfflineIndicatorStatus() === false;
+    }
+
+    public function setOfflineIndicatorStatus(bool $status): self
+    {
+        $this->offlineIndicatorStatus = $status;
+
+        return $this;
+    }
+
+    public function setOfflineIndicatorEnabled(): self
+    {
+        $this->setOfflineIndicatorStatus(true);
+
+        return $this;
+    }
+
+    public function setOfflineIndicatorDisabled(): self
+    {
+        $this->setOfflineIndicatorStatus(false);
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Core/Component/HandlesTableName.php b/src/Traits/Core/Component/HandlesTableName.php
new file mode 100644
index 000000000..ce9c4a70d
--- /dev/null
+++ b/src/Traits/Core/Component/HandlesTableName.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Component;
+
+use Livewire\Attributes\{Computed,Locked};
+
+trait HandlesTableName
+{
+    #[Locked]
+    public string $tableName = 'table';
+
+    public function setTableName(string $name): string
+    {
+        return $this->tableName = $name;
+    }
+
+    #[Computed]
+    public function getTableName(): string
+    {
+        return $this->tableName;
+    }
+
+    public function isTableNamed(string $name): bool
+    {
+        return $this->tableName === $name;
+    }
+}
diff --git a/src/Traits/Helpers/ComponentHelpers.php b/src/Traits/Helpers/ComponentHelpers.php
index 06cf2ee16..88cd1906f 100644
--- a/src/Traits/Helpers/ComponentHelpers.php
+++ b/src/Traits/Helpers/ComponentHelpers.php
@@ -7,11 +7,6 @@
 
 trait ComponentHelpers
 {
-    public function getDataTableFingerprint(): string
-    {
-        return $this->dataTableFingerprint ?? ($this->dataTableFingerprint = $this->generateDataTableFingerprint());
-    }
-
     public function hasModel(): bool
     {
         return $this->model !== null;
@@ -25,57 +20,9 @@ public function getModel()
         return $this->model;
     }
 
-    /**
-     * Get the translated empty message of the table
-     */
-    public function getEmptyMessage(): string
-    {
-        if ($this->emptyMessage == 'No items found, try to broaden your search') {
-            return __($this->getLocalisationPath().'No items found, try to broaden your search');
-        }
-
-        return $this->emptyMessage;
-    }
-
-    public function getOfflineIndicatorStatus(): bool
-    {
-        return $this->offlineIndicatorStatus;
-    }
-
-    public function offlineIndicatorIsEnabled(): bool
-    {
-        return $this->getOfflineIndicatorStatus() === true;
-    }
-
-    public function offlineIndicatorIsDisabled(): bool
-    {
-        return $this->getOfflineIndicatorStatus() === false;
-    }
-
-    public function setTableName(string $name): string
-    {
-        return $this->tableName = $name;
-    }
-
-    #[Computed]
-    public function getTableName(): string
-    {
-        return $this->tableName;
-    }
-
     #[Computed]
     public function getTableId(): string
     {
         return $this->getTableAttributes()['id'] ?? 'table-'.$this->getTableName();
     }
-
-    public function isTableNamed(string $name): bool
-    {
-        return $this->tableName === $name;
-    }
-
-    public function getComputedPropertiesStatus(): bool
-    {
-        return $this->useComputedProperties ?? false;
-    }
 }

From 2368708e5e7445dec0249127ccc3f7e78c42baeb Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 8 Jan 2025 03:51:45 +0000
Subject: [PATCH 26/36] Add queryStringAliasTest (#2161)

---
 .../Traits/Helpers/QueryStringHelpersTest.php | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
index 15ae787c4..f98e6f6df 100644
--- a/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
@@ -68,4 +68,43 @@ public function getCurrentQueryStringBinding(): array
         $this->assertSame(['table' => ['except' => null, 'history' => false, 'keep' => false, 'as' => 'table']], $testTableQueryString->getCurrentQueryStringBinding());
 
     }
+
+    public function test_check_querystring_alias_returns_default_if_enabled(): void
+    {
+
+        $testTableQueryString = new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                parent::configure();
+                $this->setQueryStringEnabled();
+            }
+
+            public function getCurrentQueryStringBinding(): array
+            {
+                return $this->queryStringWithQueryString();
+            }
+        };
+
+        $testTableQueryString->mountManagesFilters();
+        $testTableQueryString->configure();
+        $testTableQueryString->boot();
+        $testTableQueryString->bootedComponentUtilities();
+        $testTableQueryString->bootedManagesFilters();
+        $testTableQueryString->bootedWithColumns();
+        $testTableQueryString->bootedWithColumnSelect();
+        $testTableQueryString->bootedWithSecondaryHeader();
+        $testTableQueryString->booted();
+
+        $this->assertFalse($testTableQueryString->hasQueryStringAlias());
+        $this->assertSame('table', $testTableQueryString->getQueryStringAlias());
+        $this->assertSame(['table' => ['except' => null, 'history' => false, 'keep' => false, 'as' => 'table']], $testTableQueryString->getCurrentQueryStringBinding());
+
+        $testTableQueryString->setQueryStringAlias('test123');
+
+        $this->assertTrue($testTableQueryString->hasQueryStringAlias());
+        $this->assertSame('test123', $testTableQueryString->getQueryStringAlias());
+        $this->assertSame(['table' => ['except' => null, 'history' => false, 'keep' => false, 'as' => 'test123']], $testTableQueryString->getCurrentQueryStringBinding());
+
+    }
 }

From a57de60bed8a61515dc4fa3c85bf683c5f856f5b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 8 Jan 2025 04:07:39 +0000
Subject: [PATCH 27/36] Add missing Columns Non Computed Test (#2162)

* Add missing Columns Non Computed Test

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../Component/HandlesComputedProperties.php   | 13 +++---
 tests/Unit/Traits/WithColumnsTest.php         | 43 +++++++++++++++++++
 2 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 tests/Unit/Traits/WithColumnsTest.php

diff --git a/src/Traits/Core/Component/HandlesComputedProperties.php b/src/Traits/Core/Component/HandlesComputedProperties.php
index d278ecae8..6e335c70b 100644
--- a/src/Traits/Core/Component/HandlesComputedProperties.php
+++ b/src/Traits/Core/Component/HandlesComputedProperties.php
@@ -6,18 +6,21 @@ trait HandlesComputedProperties
 {
     protected bool $useComputedProperties = true;
 
-    public function useComputedPropertiesEnabled(): self
+    protected function setComputedPropertiesStatus(bool $useComputedProperties): self
     {
-        $this->useComputedProperties = true;
+        $this->useComputedProperties = $useComputedProperties;
 
         return $this;
     }
 
-    public function useComputedPropertiesDisabled(): self
+    public function useComputedPropertiesEnabled(): self
     {
-        $this->useComputedProperties = false;
+        return $this->setComputedPropertiesStatus(true);
+    }
 
-        return $this;
+    public function useComputedPropertiesDisabled(): self
+    {
+        return $this->setComputedPropertiesStatus(false);
     }
 
     public function getComputedPropertiesStatus(): bool
diff --git a/tests/Unit/Traits/WithColumnsTest.php b/tests/Unit/Traits/WithColumnsTest.php
new file mode 100644
index 000000000..c258f92cf
--- /dev/null
+++ b/tests/Unit/Traits/WithColumnsTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits;
+
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class WithColumnsTest extends TestCase
+{
+    public function test_rendering_with_columns_returns_columns(): void
+    {
+
+        $testTableDefault = new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                parent::configure();
+                $this->useComputedPropertiesDisabled();
+
+            }
+        };
+
+        $view = view('livewire-tables::datatable');
+
+        $testTableDefault->boot();
+        $testTableDefault->mountManagesFilters();
+        $testTableDefault->bootedComponentUtilities();
+        $testTableDefault->bootedManagesFilters();
+        $testTableDefault->bootedWithColumns();
+        $testTableDefault->bootedWithColumnSelect();
+        $testTableDefault->bootedWithSecondaryHeader();
+        $testTableDefault->booted();
+        $testTableDefault->renderingWithColumns($view, $view->getData());
+        $testTableDefault->renderingWithColumnSelect($view, $view->getData());
+        $testTableDefault->renderingWithCustomisations($view, $view->getData());
+        $testTableDefault->renderingWithData($view, $view->getData());
+        $testTableDefault->renderingWithFooter($view, $view->getData());
+        $testTableDefault->renderingWithReordering($view, $view->getData());
+        $testTableDefault->renderingWithPagination($view, $view->getData());
+        $testTableDefault->render();
+        $this->assertSame(9, $view->getData()['columns']->count());
+    }
+}

From 6d7b59bc21e7635a2543e7ec5c540c8ee67e214e Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 8 Jan 2025 05:24:56 +0000
Subject: [PATCH 28/36] WithSearch Tweaks (#2163)

* Migrating Search Methods into Separate Traits

* Fix styling

* PHPStan Fixes

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../Core/Search/HandlesSearchFieldStyling.php |  11 ++
 .../Search/HandlesSearchModifiers.php}        | 115 +++++++--------
 .../Core/Search/HandlesSearchStatus.php       |  53 +++++++
 src/Traits/Core/Search/HandlesSearchTrim.php  |  34 +++++
 .../Core/Search/HandlesSearchVisibility.php   |  43 ++++++
 .../Search/Styling}/HasSearchIcon.php         |   2 +-
 .../Search/Styling}/HasSearchInput.php        |   2 +-
 src/Traits/Helpers/SearchHelpers.php          | 134 ------------------
 src/Traits/Styling/HasSearchFieldStyling.php  |  11 --
 src/Traits/WithSearch.php                     |  74 ++++++----
 10 files changed, 245 insertions(+), 234 deletions(-)
 create mode 100644 src/Traits/Core/Search/HandlesSearchFieldStyling.php
 rename src/Traits/{Configuration/SearchConfiguration.php => Core/Search/HandlesSearchModifiers.php} (65%)
 create mode 100644 src/Traits/Core/Search/HandlesSearchStatus.php
 create mode 100644 src/Traits/Core/Search/HandlesSearchTrim.php
 create mode 100644 src/Traits/Core/Search/HandlesSearchVisibility.php
 rename src/Traits/{Styling/Search => Core/Search/Styling}/HasSearchIcon.php (96%)
 rename src/Traits/{Styling/Search => Core/Search/Styling}/HasSearchInput.php (93%)
 delete mode 100644 src/Traits/Helpers/SearchHelpers.php
 delete mode 100644 src/Traits/Styling/HasSearchFieldStyling.php

diff --git a/src/Traits/Core/Search/HandlesSearchFieldStyling.php b/src/Traits/Core/Search/HandlesSearchFieldStyling.php
new file mode 100644
index 000000000..19956ee01
--- /dev/null
+++ b/src/Traits/Core/Search/HandlesSearchFieldStyling.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Search;
+
+use Rappasoft\LaravelLivewireTables\Traits\Core\Search\Styling\{HasSearchIcon, HasSearchInput};
+
+trait HandlesSearchFieldStyling
+{
+    use HasSearchIcon,
+        HasSearchInput;
+}
diff --git a/src/Traits/Configuration/SearchConfiguration.php b/src/Traits/Core/Search/HandlesSearchModifiers.php
similarity index 65%
rename from src/Traits/Configuration/SearchConfiguration.php
rename to src/Traits/Core/Search/HandlesSearchModifiers.php
index 2a1c6e926..edd597fd7 100644
--- a/src/Traits/Configuration/SearchConfiguration.php
+++ b/src/Traits/Core/Search/HandlesSearchModifiers.php
@@ -1,66 +1,90 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Search;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 
-trait SearchConfiguration
+trait HandlesSearchModifiers
 {
-    public function setSearch(string $query): self
-    {
-        if ($this->shouldTrimSearchString()) {
-            $this->search = trim($query);
-        } else {
-            $this->search = $query;
-        }
+    protected ?bool $searchFilterBlur = null;
 
-        return $this;
-    }
+    protected ?int $searchFilterDebounce = null;
 
-    public function setSearchStatus(bool $status): self
-    {
-        $this->searchStatus = $status;
+    protected ?bool $searchFilterDefer = null;
 
-        return $this;
-    }
+    protected ?bool $searchFilterLazy = null;
 
-    public function setSearchEnabled(): self
+    protected ?bool $searchFilterLive = null;
+
+    protected ?int $searchFilterThrottle = null;
+
+    public function hasSearchDebounce(): bool
     {
-        $this->setSearchStatus(true);
+        return $this->searchFilterDebounce !== null;
+    }
 
-        return $this;
+    public function getSearchDebounce(): ?int
+    {
+        return $this->searchFilterDebounce;
     }
 
-    /**
-     * @return $this
-     */
-    public function setSearchDisabled(): self
+    public function hasSearchDefer(): bool
     {
-        $this->setSearchStatus(false);
-        $this->search = '';
+        return $this->searchFilterDefer !== null;
+    }
 
-        return $this;
+    public function hasSearchLazy(): bool
+    {
+        return $this->searchFilterLazy !== null;
     }
 
-    public function setSearchVisibilityStatus(bool $status): self
+    public function hasSearchLive(): bool
     {
-        $this->searchVisibilityStatus = $status;
+        return $this->searchFilterLive !== null;
+    }
 
-        return $this;
+    public function hasSearchThrottle(): bool
+    {
+        return $this->searchFilterThrottle !== null;
     }
 
-    public function setSearchVisibilityEnabled(): self
+    public function getSearchThrottle(): ?int
     {
-        $this->setSearchVisibilityStatus(true);
+        return $this->searchFilterThrottle;
+    }
 
-        return $this;
+    public function hasSearchBlur(): bool
+    {
+        return $this->searchFilterBlur !== null;
     }
 
-    public function setSearchVisibilityDisabled(): self
+    public function getSearchOptions(): string
     {
-        $this->setSearchVisibilityStatus(false);
+        if ($this->hasSearchDebounce()) {
+            return '.live.debounce.'.$this->getSearchDebounce().'ms';
+        }
 
-        return $this;
+        if ($this->hasSearchDefer()) {
+            return '';
+        }
+
+        if ($this->hasSearchLive()) {
+            return '.live';
+        }
+
+        if ($this->hasSearchBlur()) {
+            return '.blur';
+        }
+
+        if ($this->hasSearchLazy()) {
+            return '.live.lazy';
+        }
+
+        if ($this->hasSearchThrottle()) {
+            return '.live.throttle.'.$this->getSearchThrottle().'ms';
+        }
+
+        return '.live';
     }
 
     /**
@@ -146,25 +170,4 @@ public function setSearchLazy(): self
 
         return $this;
     }
-
-    public function setTrimSearchString(bool $status): self
-    {
-        $this->trimSearchString = $status;
-
-        return $this;
-    }
-
-    public function setTrimSearchStringEnabled(): self
-    {
-        $this->setTrimSearchString(true);
-
-        return $this;
-    }
-
-    public function setTrimSearchStringDisabled(): self
-    {
-        $this->setTrimSearchString(false);
-
-        return $this;
-    }
 }
diff --git a/src/Traits/Core/Search/HandlesSearchStatus.php b/src/Traits/Core/Search/HandlesSearchStatus.php
new file mode 100644
index 000000000..1f32395f7
--- /dev/null
+++ b/src/Traits/Core/Search/HandlesSearchStatus.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Search;
+
+use Livewire\Attributes\{Computed, Locked};
+
+trait HandlesSearchStatus
+{
+    #[Locked]
+    public bool $searchStatus = true;
+
+    public function getSearchStatus(): bool
+    {
+        return $this->searchStatus;
+    }
+
+    #[Computed]
+    public function searchIsEnabled(): bool
+    {
+        return $this->getSearchStatus() === true;
+    }
+
+    public function searchIsDisabled(): bool
+    {
+        return $this->getSearchStatus() === false;
+    }
+
+    public function setSearchStatus(bool $status): self
+    {
+        $this->searchStatus = $status;
+
+        return $this;
+    }
+
+    public function setSearchEnabled(): self
+    {
+        $this->setSearchStatus(true);
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setSearchDisabled(): self
+    {
+        $this->search = '';
+
+        $this->setSearchStatus(false);
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Core/Search/HandlesSearchTrim.php b/src/Traits/Core/Search/HandlesSearchTrim.php
new file mode 100644
index 000000000..e4ec6b625
--- /dev/null
+++ b/src/Traits/Core/Search/HandlesSearchTrim.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Search;
+
+trait HandlesSearchTrim
+{
+    protected bool $trimSearchString = false;
+
+    public function shouldTrimSearchString(): bool
+    {
+        return $this->trimSearchString ?? false;
+    }
+
+    public function setTrimSearchString(bool $status): self
+    {
+        $this->trimSearchString = $status;
+
+        return $this;
+    }
+
+    public function setTrimSearchStringEnabled(): self
+    {
+        $this->setTrimSearchString(true);
+
+        return $this;
+    }
+
+    public function setTrimSearchStringDisabled(): self
+    {
+        $this->setTrimSearchString(false);
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Core/Search/HandlesSearchVisibility.php b/src/Traits/Core/Search/HandlesSearchVisibility.php
new file mode 100644
index 000000000..a73ccc9b9
--- /dev/null
+++ b/src/Traits/Core/Search/HandlesSearchVisibility.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Search;
+
+use Livewire\Attributes\Computed;
+
+trait HandlesSearchVisibility
+{
+    protected bool $searchVisibilityStatus = true;
+
+    public function getSearchVisibilityStatus(): bool
+    {
+        return $this->searchVisibilityStatus;
+    }
+
+    #[Computed]
+    public function searchVisibilityIsEnabled(): bool
+    {
+        return $this->getSearchVisibilityStatus() === true;
+    }
+
+    public function searchVisibilityIsDisabled(): bool
+    {
+        return $this->getSearchVisibilityStatus() === false;
+    }
+
+    public function setSearchVisibilityStatus(bool $status): self
+    {
+        $this->searchVisibilityStatus = $status;
+
+        return $this;
+    }
+
+    public function setSearchVisibilityEnabled(): self
+    {
+        return $this->setSearchVisibilityStatus(true);
+    }
+
+    public function setSearchVisibilityDisabled(): self
+    {
+        return $this->setSearchVisibilityStatus(false);
+    }
+}
diff --git a/src/Traits/Styling/Search/HasSearchIcon.php b/src/Traits/Core/Search/Styling/HasSearchIcon.php
similarity index 96%
rename from src/Traits/Styling/Search/HasSearchIcon.php
rename to src/Traits/Core/Search/Styling/HasSearchIcon.php
index 3a7cbd656..8133197d2 100644
--- a/src/Traits/Styling/Search/HasSearchIcon.php
+++ b/src/Traits/Core/Search/Styling/HasSearchIcon.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Search;
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Search\Styling;
 
 use Livewire\Attributes\Computed;
 
diff --git a/src/Traits/Styling/Search/HasSearchInput.php b/src/Traits/Core/Search/Styling/HasSearchInput.php
similarity index 93%
rename from src/Traits/Styling/Search/HasSearchInput.php
rename to src/Traits/Core/Search/Styling/HasSearchInput.php
index f4134be65..c7de9e78a 100644
--- a/src/Traits/Styling/Search/HasSearchInput.php
+++ b/src/Traits/Core/Search/Styling/HasSearchInput.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Search;
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\Search\Styling;
 
 trait HasSearchInput
 {
diff --git a/src/Traits/Helpers/SearchHelpers.php b/src/Traits/Helpers/SearchHelpers.php
deleted file mode 100644
index 9b96ec8dc..000000000
--- a/src/Traits/Helpers/SearchHelpers.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
-
-use Livewire\Attributes\Computed;
-
-trait SearchHelpers
-{
-    #[Computed]
-    public function hasSearch(): bool
-    {
-        return $this->search != '';
-    }
-
-    #[Computed]
-    public function getSearch(): string
-    {
-        return $this->search ?? '';
-    }
-
-    /**
-     * Search the search query from the table array
-     */
-    public function clearSearch(): void
-    {
-        $this->search = '';
-    }
-
-    public function getSearchStatus(): bool
-    {
-        return $this->searchStatus;
-    }
-
-    #[Computed]
-    public function searchIsEnabled(): bool
-    {
-        return $this->getSearchStatus() === true;
-    }
-
-    public function searchIsDisabled(): bool
-    {
-        return $this->getSearchStatus() === false;
-    }
-
-    public function getSearchVisibilityStatus(): bool
-    {
-        return $this->searchVisibilityStatus;
-    }
-
-    #[Computed]
-    public function searchVisibilityIsEnabled(): bool
-    {
-        return $this->getSearchVisibilityStatus() === true;
-    }
-
-    public function searchVisibilityIsDisabled(): bool
-    {
-        return $this->getSearchVisibilityStatus() === false;
-    }
-
-    public function hasSearchDebounce(): bool
-    {
-        return $this->searchFilterDebounce !== null;
-    }
-
-    public function getSearchDebounce(): ?int
-    {
-        return $this->searchFilterDebounce;
-    }
-
-    public function hasSearchDefer(): bool
-    {
-        return $this->searchFilterDefer !== null;
-    }
-
-    public function hasSearchLazy(): bool
-    {
-        return $this->searchFilterLazy !== null;
-    }
-
-    public function hasSearchLive(): bool
-    {
-        return $this->searchFilterLive !== null;
-    }
-
-    public function hasSearchThrottle(): bool
-    {
-        return $this->searchFilterThrottle !== null;
-    }
-
-    public function getSearchThrottle(): ?int
-    {
-        return $this->searchFilterThrottle;
-    }
-
-    public function hasSearchBlur(): bool
-    {
-        return $this->searchFilterBlur !== null;
-    }
-
-    public function getSearchOptions(): string
-    {
-        if ($this->hasSearchDebounce()) {
-            return '.live.debounce.'.$this->getSearchDebounce().'ms';
-        }
-
-        if ($this->hasSearchDefer()) {
-            return '';
-        }
-
-        if ($this->hasSearchLive()) {
-            return '.live';
-        }
-
-        if ($this->hasSearchBlur()) {
-            return '.blur';
-        }
-
-        if ($this->hasSearchLazy()) {
-            return '.live.lazy';
-        }
-
-        if ($this->hasSearchThrottle()) {
-            return '.live.throttle.'.$this->getSearchThrottle().'ms';
-        }
-
-        return '.live';
-    }
-
-    public function shouldTrimSearchString(): bool
-    {
-        return $this->trimSearchString ?? false;
-    }
-}
diff --git a/src/Traits/Styling/HasSearchFieldStyling.php b/src/Traits/Styling/HasSearchFieldStyling.php
deleted file mode 100644
index 01283773e..000000000
--- a/src/Traits/Styling/HasSearchFieldStyling.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Traits\Styling;
-
-use Rappasoft\LaravelLivewireTables\Traits\Styling\Search\{HasSearchIcon, HasSearchInput};
-
-trait HasSearchFieldStyling
-{
-    use HasSearchIcon,
-        HasSearchInput;
-}
diff --git a/src/Traits/WithSearch.php b/src/Traits/WithSearch.php
index f4befabf9..e3d5e7eaa 100644
--- a/src/Traits/WithSearch.php
+++ b/src/Traits/WithSearch.php
@@ -3,41 +3,22 @@
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
 use Illuminate\Database\Eloquent\Builder;
-use Livewire\Attributes\Locked;
+use Livewire\Attributes\Computed;
 use Rappasoft\LaravelLivewireTables\Events\SearchApplied;
-use Rappasoft\LaravelLivewireTables\Traits\Configuration\SearchConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings\HasQueryStringForSearch;
-use Rappasoft\LaravelLivewireTables\Traits\Helpers\SearchHelpers;
-use Rappasoft\LaravelLivewireTables\Traits\Styling\HasSearchFieldStyling;
+use Rappasoft\LaravelLivewireTables\Traits\Core\Search\{HandlesSearchFieldStyling, HandlesSearchModifiers,HandlesSearchStatus, HandlesSearchTrim,HandlesSearchVisibility};
 
 trait WithSearch
 {
-    use SearchConfiguration,
-        SearchHelpers;
-    use HasQueryStringForSearch;
-    use HasSearchFieldStyling;
+    use HandlesSearchStatus,
+        HandlesSearchModifiers,
+        HandlesSearchTrim,
+        HandlesSearchVisibility,
+        HasQueryStringForSearch,
+        HandlesSearchFieldStyling;
 
     public string $search = '';
 
-    #[Locked]
-    public bool $searchStatus = true;
-
-    protected bool $searchVisibilityStatus = true;
-
-    protected ?bool $searchFilterBlur = null;
-
-    protected ?int $searchFilterDebounce = null;
-
-    protected ?bool $searchFilterDefer = null;
-
-    protected ?bool $searchFilterLazy = null;
-
-    protected ?bool $searchFilterLive = null;
-
-    protected ?int $searchFilterThrottle = null;
-
-    protected bool $trimSearchString = false;
-
     // TODO
     public function applySearch(): Builder
     {
@@ -46,10 +27,6 @@ public function applySearch(): Builder
             $searchableColumns = $this->getSearchableColumns();
             $search = $this->getSearch();
 
-            if ($this->shouldTrimSearchString()) {
-                $search = trim($search);
-            }
-
             $this->callHook('searchUpdated', ['value' => $search]);
             $this->callTraitHook('searchUpdated', ['value' => $search]);
             if ($this->getEventStatusSearchApplied() && $search != null) {
@@ -90,4 +67,39 @@ public function updatedSearch(string|array|null $value): void
             $this->clearSearch();
         }
     }
+
+    #[Computed]
+    public function hasSearch(): bool
+    {
+        return $this->search != '';
+    }
+
+    #[Computed]
+    public function getSearch(): string
+    {
+        if ($this->shouldTrimSearchString() && $this->search != trim($this->search)) {
+            $this->search = trim($this->search);
+        }
+
+        return $this->search ?? '';
+    }
+
+    /**
+     * Search the search query from the table array
+     */
+    public function clearSearch(): void
+    {
+        $this->search = '';
+    }
+
+    public function setSearch(string $query): self
+    {
+        if ($this->shouldTrimSearchString()) {
+            $this->search = trim($query);
+        } else {
+            $this->search = $query;
+        }
+
+        return $this;
+    }
 }

From 2ecd09214b25f28f97d99f9b5a216bdd6ab14309 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 8 Jan 2025 05:52:25 +0000
Subject: [PATCH 29/36] Optimize Header/Footer (#2164)

* Optimize Header/Footer

* Fix styling

* Force TestRun

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/Helpers/ColumnHelpers.php               |  7 +++++++
 src/Traits/WithFooter.php                          | 14 --------------
 src/Traits/WithSecondaryHeader.php                 | 14 --------------
 tests/DataTableComponentTest.php                   |  1 -
 tests/TestCase.php                                 | 12 ------------
 .../Configuration/SortingConfigurationTest.php     |  4 ----
 tests/Unit/Traits/Helpers/ColumnHelpersTest.php    |  1 -
 .../Traits/Helpers/ColumnSelectHelpersTest.php     |  3 ---
 tests/Unit/Traits/Helpers/FilterHelpersTest.php    |  1 -
 .../Unit/Traits/Helpers/QueryStringHelpersTest.php |  3 ---
 tests/Unit/Traits/WithColumnsTest.php              |  2 --
 tests/Unit/Traits/WithCustomisationsTest.php       |  8 --------
 tests/Unit/Traits/WithMountTest.php                |  3 ---
 tests/Unit/Traits/WithSearchTest.php               |  2 --
 14 files changed, 7 insertions(+), 68 deletions(-)

diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index beb4e2439..97eb7a29b 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -27,6 +27,13 @@ protected function setupColumns(): void
                     ->setHasTableRowUrl($this->hasTableRowUrl())
                     ->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
 
+                if ($column->hasFooter()) {
+                    $this->columnsWithFooter = true;
+                }
+                if ($column->hasSecondaryHeader()) {
+                    $this->columnsWithSecondaryHeader = true;
+                }
+
                 if ($column instanceof AggregateColumn) {
                     if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
                         $this->addExtraWithCount($column->getDataSource());
diff --git a/src/Traits/WithFooter.php b/src/Traits/WithFooter.php
index 44b9f7dc0..781d80511 100644
--- a/src/Traits/WithFooter.php
+++ b/src/Traits/WithFooter.php
@@ -18,18 +18,4 @@ trait WithFooter
     protected bool $useHeaderAsFooterStatus = false;
 
     protected bool $columnsWithFooter = false;
-
-    public function setupFooter(): void
-    {
-        foreach ($this->getColumns() as $column) {
-            if ($column->hasFooter()) {
-                $this->columnsWithFooter = true;
-            }
-        }
-    }
-
-    public function renderingWithFooter(): void
-    {
-        $this->setupFooter();
-    }
 }
diff --git a/src/Traits/WithSecondaryHeader.php b/src/Traits/WithSecondaryHeader.php
index 11b08d51a..e093bd4da 100644
--- a/src/Traits/WithSecondaryHeader.php
+++ b/src/Traits/WithSecondaryHeader.php
@@ -15,18 +15,4 @@ trait WithSecondaryHeader
     protected bool $secondaryHeaderStatus = true;
 
     protected bool $columnsWithSecondaryHeader = false;
-
-    public function bootedWithSecondaryHeader(): void
-    {
-        $this->setupSecondaryHeader();
-    }
-
-    public function setupSecondaryHeader(): void
-    {
-        foreach ($this->getColumns() as $column) {
-            if ($column->hasSecondaryHeader()) {
-                $this->columnsWithSecondaryHeader = true;
-            }
-        }
-    }
 }
diff --git a/tests/DataTableComponentTest.php b/tests/DataTableComponentTest.php
index 62a1e46ec..15831df4e 100644
--- a/tests/DataTableComponentTest.php
+++ b/tests/DataTableComponentTest.php
@@ -73,7 +73,6 @@ public function test_minimum_one_column_expected(): void
         $table->bootedComponentUtilities();
         $table->bootedWithColumns();
         $table->bootedWithColumnSelect();
-        $table->bootedWithSecondaryHeader();
         $table->booted();
         $table->renderingWithPagination($view, []);
         $table->render();
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 70cc035de..f80c08875 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -102,13 +102,11 @@ protected function setupBasicTable()
         $this->basicTable->bootedComponentUtilities();
         $this->basicTable->bootedWithColumns();
         $this->basicTable->bootedWithColumnSelect();
-        $this->basicTable->bootedWithSecondaryHeader();
         $this->basicTable->booted();
         $this->basicTable->renderingWithColumns($view, $view->getData());
         $this->basicTable->renderingWithColumnSelect($view, $view->getData());
         $this->basicTable->renderingWithCustomisations($view, $view->getData());
         $this->basicTable->renderingWithData($view, $view->getData());
-        $this->basicTable->renderingWithFooter($view, $view->getData());
         $this->basicTable->renderingWithReordering($view, $view->getData());
         $this->basicTable->renderingWithPagination($view, $view->getData());
         $this->basicTable->render();
@@ -124,13 +122,11 @@ protected function setupEventsTable()
         $this->eventsTable->bootedManagesFilters();
         $this->eventsTable->bootedWithColumns();
         $this->eventsTable->bootedWithColumnSelect();
-        $this->eventsTable->bootedWithSecondaryHeader();
         $this->eventsTable->booted();
         $this->eventsTable->renderingWithColumns($view, $view->getData());
         $this->eventsTable->renderingWithColumnSelect($view, $view->getData());
         $this->eventsTable->renderingWithCustomisations($view, $view->getData());
         $this->eventsTable->renderingWithData($view, $view->getData());
-        $this->eventsTable->renderingWithFooter($view, $view->getData());
         $this->eventsTable->renderingWithReordering($view, $view->getData());
         $this->eventsTable->renderingWithPagination($view, $view->getData());
 
@@ -147,13 +143,11 @@ protected function setupBreedsTable()
         $this->breedsTable->bootedManagesFilters();
         $this->breedsTable->bootedWithColumns();
         $this->breedsTable->bootedWithColumnSelect();
-        $this->breedsTable->bootedWithSecondaryHeader();
         $this->breedsTable->booted();
         $this->breedsTable->renderingWithColumns($view, $view->getData());
         $this->breedsTable->renderingWithColumnSelect($view, $view->getData());
         $this->breedsTable->renderingWithCustomisations($view, $view->getData());
         $this->breedsTable->renderingWithData($view, $view->getData());
-        $this->breedsTable->renderingWithFooter($view, $view->getData());
         $this->breedsTable->renderingWithReordering($view, $view->getData());
         $this->breedsTable->renderingWithPagination($view, $view->getData());
         $this->breedsTable->render();
@@ -169,13 +163,11 @@ protected function setupPetOwnerTable()
         $this->petOwnerTable->bootedManagesFilters();
         $this->petOwnerTable->bootedWithColumns();
         $this->petOwnerTable->bootedWithColumnSelect();
-        $this->petOwnerTable->bootedWithSecondaryHeader();
         $this->petOwnerTable->booted();
         $this->petOwnerTable->renderingWithColumns($view, $view->getData());
         $this->petOwnerTable->renderingWithColumnSelect($view, $view->getData());
         $this->petOwnerTable->renderingWithCustomisations($view, $view->getData());
         $this->petOwnerTable->renderingWithData($view, $view->getData());
-        $this->petOwnerTable->renderingWithFooter($view, $view->getData());
         $this->petOwnerTable->renderingWithReordering($view, $view->getData());
         $this->petOwnerTable->renderingWithPagination($view, $view->getData());
         $this->petOwnerTable->render();
@@ -191,13 +183,11 @@ protected function setupSpeciesTable()
         $this->speciesTable->bootedManagesFilters();
         $this->speciesTable->bootedWithColumns();
         $this->speciesTable->bootedWithColumnSelect();
-        $this->speciesTable->bootedWithSecondaryHeader();
         $this->speciesTable->booted();
         $this->speciesTable->renderingWithColumns($view, $view->getData());
         $this->speciesTable->renderingWithColumnSelect($view, $view->getData());
         $this->speciesTable->renderingWithCustomisations($view, $view->getData());
         $this->speciesTable->renderingWithData($view, $view->getData());
-        $this->speciesTable->renderingWithFooter($view, $view->getData());
         $this->speciesTable->renderingWithReordering($view, $view->getData());
         $this->speciesTable->renderingWithPagination($view, $view->getData());
         $this->speciesTable->render();
@@ -214,13 +204,11 @@ protected function setupUnpaginatedTable()
         $this->unpaginatedTable->bootedManagesFilters();
         $this->unpaginatedTable->bootedWithColumns();
         $this->unpaginatedTable->bootedWithColumnSelect();
-        $this->unpaginatedTable->bootedWithSecondaryHeader();
         $this->unpaginatedTable->booted();
         $this->unpaginatedTable->renderingWithColumns($view, $view->getData());
         $this->unpaginatedTable->renderingWithColumnSelect($view, $view->getData());
         $this->unpaginatedTable->renderingWithCustomisations($view, $view->getData());
         $this->unpaginatedTable->renderingWithData($view, $view->getData());
-        $this->unpaginatedTable->renderingWithFooter($view, $view->getData());
         $this->unpaginatedTable->renderingWithReordering($view, $view->getData());
         $this->unpaginatedTable->renderingWithPagination($view, $view->getData());
         $this->unpaginatedTable->render();
diff --git a/tests/Unit/Traits/Configuration/SortingConfigurationTest.php b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
index 4e5847aae..9bbe071b4 100644
--- a/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
@@ -112,7 +112,6 @@ public function configure(): void
         $tempDesc->bootedManagesFilters();
         $tempDesc->bootedWithColumns();
         $tempDesc->bootedWithColumnSelect();
-        $tempDesc->bootedWithSecondaryHeader();
         $tempDesc->booted();
         $tempDesc->mountManagesFilters();
         $tempDesc->mountWithSorting();
@@ -120,7 +119,6 @@ public function configure(): void
         $tempDesc->renderingWithColumnSelect($viewDesc, $viewDesc->getData());
         $tempDesc->renderingWithCustomisations($viewDesc, $viewDesc->getData());
         $tempDesc->renderingWithData($viewDesc, $viewDesc->getData());
-        $tempDesc->renderingWithFooter($viewDesc, $viewDesc->getData());
         $tempDesc->renderingWithReordering($viewDesc, $viewDesc->getData());
         $tempDesc->renderingWithPagination($viewDesc, $viewDesc->getData());
         $tempDesc->render();
@@ -142,7 +140,6 @@ public function configure(): void
         $tempAsc->bootedManagesFilters();
         $tempAsc->bootedWithColumns();
         $tempAsc->bootedWithColumnSelect();
-        $tempAsc->bootedWithSecondaryHeader();
         $tempAsc->booted();
         $tempAsc->mountManagesFilters();
         $tempAsc->mountWithSorting();
@@ -150,7 +147,6 @@ public function configure(): void
         $tempAsc->renderingWithColumnSelect($viewAsc, $viewAsc->getData());
         $tempAsc->renderingWithCustomisations($viewAsc, $viewAsc->getData());
         $tempAsc->renderingWithData($viewAsc, $viewAsc->getData());
-        $tempAsc->renderingWithFooter($viewAsc, $viewAsc->getData());
         $tempAsc->renderingWithReordering($viewAsc, $viewAsc->getData());
         $tempAsc->renderingWithPagination($viewAsc, $viewAsc->getData());
         $tempAsc->render();
diff --git a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
index f7f6eb55b..e1e2fd5e6 100644
--- a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
@@ -199,7 +199,6 @@ public function columns(): array
         $testTable->bootedManagesFilters();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
-        $testTable->bootedWithSecondaryHeader();
         $testTable->booted();
 
     }
diff --git a/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
index 05ea4cdc9..581dce5f2 100644
--- a/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
@@ -125,7 +125,6 @@ public function configure(): void
         $testTable->bootedComponentUtilities();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
-        $testTable->bootedWithSecondaryHeader();
         $testTable->booted();
 
         $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns);
@@ -164,7 +163,6 @@ public function configure(): void
         $testTable->bootedManagesFilters();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
-        $testTable->bootedWithSecondaryHeader();
         $testTable->booted();
 
         $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns);
@@ -195,7 +193,6 @@ public function configure(): void
         $testTable->bootedComponentUtilities();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
-        $testTable->bootedWithSecondaryHeader();
         $testTable->booted();
 
         $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns);
diff --git a/tests/Unit/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
index 85c07c072..907624d30 100644
--- a/tests/Unit/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
@@ -232,7 +232,6 @@ public function configure(): void
         $testTable->bootedComponentUtilities();
         $testTable->bootedWithColumns();
         $testTable->bootedWithColumnSelect();
-        $testTable->bootedWithSecondaryHeader();
         $testTable->booted();
 
         $testTable->setFilter('breed_id_filter', '2');
diff --git a/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
index f98e6f6df..884094bac 100644
--- a/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
@@ -31,7 +31,6 @@ public function getCurrentQueryStringBinding(): array
         $testTableQueryString->bootedManagesFilters();
         $testTableQueryString->bootedWithColumns();
         $testTableQueryString->bootedWithColumnSelect();
-        $testTableQueryString->bootedWithSecondaryHeader();
         $testTableQueryString->booted();
 
         $this->assertSame([], $testTableQueryString->getCurrentQueryStringBinding());
@@ -62,7 +61,6 @@ public function getCurrentQueryStringBinding(): array
         $testTableQueryString->bootedManagesFilters();
         $testTableQueryString->bootedWithColumns();
         $testTableQueryString->bootedWithColumnSelect();
-        $testTableQueryString->bootedWithSecondaryHeader();
         $testTableQueryString->booted();
 
         $this->assertSame(['table' => ['except' => null, 'history' => false, 'keep' => false, 'as' => 'table']], $testTableQueryString->getCurrentQueryStringBinding());
@@ -93,7 +91,6 @@ public function getCurrentQueryStringBinding(): array
         $testTableQueryString->bootedManagesFilters();
         $testTableQueryString->bootedWithColumns();
         $testTableQueryString->bootedWithColumnSelect();
-        $testTableQueryString->bootedWithSecondaryHeader();
         $testTableQueryString->booted();
 
         $this->assertFalse($testTableQueryString->hasQueryStringAlias());
diff --git a/tests/Unit/Traits/WithColumnsTest.php b/tests/Unit/Traits/WithColumnsTest.php
index c258f92cf..14de629cd 100644
--- a/tests/Unit/Traits/WithColumnsTest.php
+++ b/tests/Unit/Traits/WithColumnsTest.php
@@ -28,13 +28,11 @@ public function configure(): void
         $testTableDefault->bootedManagesFilters();
         $testTableDefault->bootedWithColumns();
         $testTableDefault->bootedWithColumnSelect();
-        $testTableDefault->bootedWithSecondaryHeader();
         $testTableDefault->booted();
         $testTableDefault->renderingWithColumns($view, $view->getData());
         $testTableDefault->renderingWithColumnSelect($view, $view->getData());
         $testTableDefault->renderingWithCustomisations($view, $view->getData());
         $testTableDefault->renderingWithData($view, $view->getData());
-        $testTableDefault->renderingWithFooter($view, $view->getData());
         $testTableDefault->renderingWithReordering($view, $view->getData());
         $testTableDefault->renderingWithPagination($view, $view->getData());
         $testTableDefault->render();
diff --git a/tests/Unit/Traits/WithCustomisationsTest.php b/tests/Unit/Traits/WithCustomisationsTest.php
index ede4b6584..036840a01 100644
--- a/tests/Unit/Traits/WithCustomisationsTest.php
+++ b/tests/Unit/Traits/WithCustomisationsTest.php
@@ -28,13 +28,11 @@ public function configure(): void
         $temp->bootedManagesFilters();
         $temp->bootedWithColumns();
         $temp->bootedWithColumnSelect();
-        $temp->bootedWithSecondaryHeader();
         $temp->booted();
         $temp->renderingWithColumns($view, $view->getData());
         $temp->renderingWithColumnSelect($view, $view->getData());
         $temp->renderingWithCustomisations($view, $view->getData());
         $temp->renderingWithData($view, $view->getData());
-        $temp->renderingWithFooter($view, $view->getData());
         $temp->renderingWithReordering($view, $view->getData());
         $temp->renderingWithPagination($view, $view->getData());
         $temp->render();
@@ -63,13 +61,11 @@ public function configure(): void
         $temp->bootedManagesFilters();
         $temp->bootedWithColumns();
         $temp->bootedWithColumnSelect();
-        $temp->bootedWithSecondaryHeader();
         $temp->booted();
         $temp->renderingWithColumns($view, $view->getData());
         $temp->renderingWithColumnSelect($view, $view->getData());
         $temp->renderingWithCustomisations($view, $view->getData());
         $temp->renderingWithData($view, $view->getData());
-        $temp->renderingWithFooter($view, $view->getData());
         $temp->renderingWithReordering($view, $view->getData());
         $temp->renderingWithPagination($view, $view->getData());
         $temp->render();
@@ -98,13 +94,11 @@ public function configure(): void
         $temp->bootedManagesFilters();
         $temp->bootedWithColumns();
         $temp->bootedWithColumnSelect();
-        $temp->bootedWithSecondaryHeader();
         $temp->booted();
         $temp->renderingWithColumns($view, $view->getData());
         $temp->renderingWithColumnSelect($view, $view->getData());
         $temp->renderingWithCustomisations($view, $view->getData());
         $temp->renderingWithData($view, $view->getData());
-        $temp->renderingWithFooter($view, $view->getData());
         $temp->renderingWithReordering($view, $view->getData());
         $temp->renderingWithPagination($view, $view->getData());
         $temp->render();
@@ -131,13 +125,11 @@ public function configure(): void
         $temp->bootedComponentUtilities();
         $temp->bootedWithColumns();
         $temp->bootedWithColumnSelect();
-        $temp->bootedWithSecondaryHeader();
         $temp->booted();
         $temp->renderingWithColumns($view, $view->getData());
         $temp->renderingWithColumnSelect($view, $view->getData());
         $temp->renderingWithCustomisations($view, $view->getData());
         $temp->renderingWithData($view, $view->getData());
-        $temp->renderingWithFooter($view, $view->getData());
         $temp->renderingWithReordering($view, $view->getData());
         $temp->renderingWithPagination($view, $view->getData());
         $temp->render();
diff --git a/tests/Unit/Traits/WithMountTest.php b/tests/Unit/Traits/WithMountTest.php
index 0e660a57d..3a8b1e49d 100644
--- a/tests/Unit/Traits/WithMountTest.php
+++ b/tests/Unit/Traits/WithMountTest.php
@@ -18,7 +18,6 @@ public function test_mounttable_gets_correct_first_item(): void
         $table->bootedComponentUtilities();
         $table->bootedWithColumns();
         $table->bootedWithColumnSelect();
-        $table->bootedWithSecondaryHeader();
         $table->booted();
         $table->renderingWithPagination($view, []);
         $table->render();
@@ -36,7 +35,6 @@ public function test_mounttable_gets_correct_first_item(): void
         $table2->bootedManagesFilters();
         $table2->bootedWithColumns();
         $table2->bootedWithColumnSelect();
-        $table2->bootedWithSecondaryHeader();
         $table2->booted();
         $table2->renderingWithPagination($view, []);
         $table2->render();
@@ -53,7 +51,6 @@ public function test_mounttable_gets_correct_first_item(): void
         $table3->bootedComponentUtilities();
         $table3->bootedWithColumns();
         $table3->bootedWithColumnSelect();
-        $table3->bootedWithSecondaryHeader();
         $table3->booted();
         $table3->renderingWithPagination($view, []);
         $table3->render();
diff --git a/tests/Unit/Traits/WithSearchTest.php b/tests/Unit/Traits/WithSearchTest.php
index 25452f352..e014c5eb3 100644
--- a/tests/Unit/Traits/WithSearchTest.php
+++ b/tests/Unit/Traits/WithSearchTest.php
@@ -56,7 +56,6 @@ public function configure(): void
         $testTableDefault->bootedManagesFilters();
         $testTableDefault->bootedWithColumns();
         $testTableDefault->bootedWithColumnSelect();
-        $testTableDefault->bootedWithSecondaryHeader();
         $testTableDefault->booted();
 
         $this->assertSame('', $testTableDefault->search);
@@ -97,7 +96,6 @@ public function configure(): void
         $testTableTrimSearch->bootedManagesFilters();
         $testTableTrimSearch->bootedWithColumns();
         $testTableTrimSearch->bootedWithColumnSelect();
-        $testTableTrimSearch->bootedWithSecondaryHeader();
         $testTableTrimSearch->booted();
 
         $this->assertSame('', $testTableTrimSearch->search);

From 1d83e0ebe3d6413738ef22be78a5f738c96fea5b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 11 Jan 2025 04:22:55 +0000
Subject: [PATCH 30/36] Migrate LivewireComponentColumn methods and add some
 missing basic tests (#2168)

* Migrate methods and add some missing tests

* Fix styling

* Add Attribute Checks

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Views/Columns/LivewireComponentColumn.php | 40 +-------
 .../LivewireComponentColumnConfiguration.php  | 11 ++-
 .../LivewireComponentColumnHelpers.php        | 57 ++++++++++-
 .../Columns/LivewireComponentColumnTest.php   | 95 +++++++++++++++++++
 4 files changed, 159 insertions(+), 44 deletions(-)
 create mode 100644 tests/Unit/Views/Columns/LivewireComponentColumnTest.php

diff --git a/src/Views/Columns/LivewireComponentColumn.php b/src/Views/Columns/LivewireComponentColumn.php
index ce10d4268..add573962 100644
--- a/src/Views/Columns/LivewireComponentColumn.php
+++ b/src/Views/Columns/LivewireComponentColumn.php
@@ -16,43 +16,5 @@ class LivewireComponentColumn extends Column
     use LivewireComponentColumnConfiguration,
         LivewireComponentColumnHelpers;
 
-    protected string $livewireComponent;
-
-    public function component(string $livewireComponent): self
-    {
-        $this->livewireComponent = (Str::startsWith($livewireComponent, 'livewire:')) ? substr($livewireComponent, 9) : $livewireComponent;
-
-        return $this;
-    }
-
-    public function getContents(Model $row): null|string|HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
-    {
-        if ($this->isLabel()) {
-            throw new DataTableConfigurationException('You can not use a label column with a component column');
-        }
-
-        $attributes = [];
-        $value = $this->getValue($row);
-
-        if ($this->hasAttributesCallback()) {
-            $attributes = call_user_func($this->getAttributesCallback(), $value, $row, $this);
-
-            if (! is_array($attributes)) {
-                throw new DataTableConfigurationException('The return type of callback must be an array');
-            }
-        }
-
-        $implodedAttributes = collect($attributes)->map(function ($value, $key) {
-            return ':'.$key.'="$'.$key.'"';
-        })->implode(' ');
-
-        return new HtmlString(Blade::render(
-            '<livewire:dynamic-component :component="$component" '.$implodedAttributes.' :wire:key="'.$row->{$row->getKeyName()}.'" />',
-            [
-                'component' => $this->livewireComponent,
-                ...$attributes,
-            ],
-        ));
-
-    }
+    protected ?string $livewireComponent;
 }
diff --git a/src/Views/Traits/Configuration/LivewireComponentColumnConfiguration.php b/src/Views/Traits/Configuration/LivewireComponentColumnConfiguration.php
index 3f5507e13..417e3a81c 100644
--- a/src/Views/Traits/Configuration/LivewireComponentColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/LivewireComponentColumnConfiguration.php
@@ -2,11 +2,14 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views\Traits\Configuration;
 
+use Illuminate\Support\Str;
+
 trait LivewireComponentColumnConfiguration
 {
-    use ComponentColumnConfiguration;
-
-    protected string $componentView;
+    public function component(string $livewireComponent): self
+    {
+        $this->livewireComponent = (Str::startsWith($livewireComponent, 'livewire:')) ? substr($livewireComponent, 9) : $livewireComponent;
 
-    protected mixed $slotCallback;
+        return $this;
+    }
 }
diff --git a/src/Views/Traits/Helpers/LivewireComponentColumnHelpers.php b/src/Views/Traits/Helpers/LivewireComponentColumnHelpers.php
index 5bf8bea90..be047c5dc 100644
--- a/src/Views/Traits/Helpers/LivewireComponentColumnHelpers.php
+++ b/src/Views/Traits/Helpers/LivewireComponentColumnHelpers.php
@@ -2,7 +2,62 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views\Traits\Helpers;
 
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\HtmlString;
+use Illuminate\Support\Str;
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+
 trait LivewireComponentColumnHelpers
 {
-    use ComponentColumnHelpers;
+    /**
+     * Retrieves the defined Component View
+     */
+    public function getLivewireComponent(): ?string
+    {
+        return $this->livewireComponent ?? null;
+    }
+
+    /**
+     * Determines whether a Component View has been set
+     */
+    public function hasLivewireComponent(): bool
+    {
+        return isset($this->livewireComponent);
+    }
+
+    public function getContents(Model $row): null|string|HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
+    {
+        if (! $this->hasLivewireComponent()) {
+            throw new DataTableConfigurationException('You must define a Livewire Component for this column');
+        }
+
+        if ($this->isLabel()) {
+            throw new DataTableConfigurationException('You can not use a label column with a Livewire Component column');
+        }
+
+        $attributes = [];
+        $value = $this->getValue($row);
+
+        if ($this->hasAttributesCallback()) {
+            $attributes = call_user_func($this->getAttributesCallback(), $value, $row, $this);
+
+            if (! is_array($attributes)) {
+                throw new DataTableConfigurationException('The return type of callback must be an array');
+            }
+        }
+
+        $implodedAttributes = collect($attributes)->map(function ($value, $key) {
+            return ':'.$key.'="$'.$key.'"';
+        })->implode(' ');
+
+        return new HtmlString(Blade::render(
+            '<livewire:dynamic-component :component="$component" '.$implodedAttributes.' :wire:key="'.$row->{$row->getKeyName()}.'" />',
+            [
+                'component' => $this->getLivewireComponent(),
+                ...$attributes,
+            ],
+        ));
+
+    }
 }
diff --git a/tests/Unit/Views/Columns/LivewireComponentColumnTest.php b/tests/Unit/Views/Columns/LivewireComponentColumnTest.php
new file mode 100644
index 000000000..eab5d9972
--- /dev/null
+++ b/tests/Unit/Views/Columns/LivewireComponentColumnTest.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
+
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+use Rappasoft\LaravelLivewireTables\Views\Columns\LivewireComponentColumn;
+
+final class LivewireComponentColumnTest extends TestCase
+{
+    public function test_can_set_the_column_title(): void
+    {
+        $column = LivewireComponentColumn::make('Name', 'name');
+
+        $this->assertSame('Name', $column->getTitle());
+    }
+
+    public function test_can_not_be_a_label_without_component(): void
+    {
+        $this->expectException(DataTableConfigurationException::class);
+
+        $column = LivewireComponentColumn::make('Total Users')->label(fn () => 'My Label')->getContents(Pet::find(1));
+
+    }
+
+    public function test_can_not_be_a_label_with_component(): void
+    {
+        $this->expectException(DataTableConfigurationException::class);
+
+        $column = LivewireComponentColumn::make('Total Users')->component('test-component')->label(fn () => 'My Label')->getContents(Pet::find(1));
+
+    }
+
+    public function test_can_add_livewire_component(): void
+    {
+        $column = LivewireComponentColumn::make('Name', 'name');
+
+        $this->assertFalse($column->hasLivewireComponent());
+        $column->component('test-component');
+        $this->assertTrue($column->hasLivewireComponent());
+    }
+
+    public function test_can_get_livewire_component(): void
+    {
+        $column = LivewireComponentColumn::make('Name', 'name');
+
+        $this->assertFalse($column->hasLivewireComponent());
+        $this->assertNull($column->getLivewireComponent());
+
+        $column->component('test-component');
+
+        $this->assertTrue($column->hasLivewireComponent());
+        $this->assertSame('test-component', $column->getLivewireComponent());
+    }
+
+    public function test_can_not_avoid_defining_livewire_component(): void
+    {
+        $this->expectException(DataTableConfigurationException::class);
+
+        $contents = LivewireComponentColumn::make('Name')->getContents(Pet::find(1));
+
+    }
+
+    public function test_attributes_should_return_array(): void
+    {
+        $this->expectException(DataTableConfigurationException::class);
+
+        $column = LivewireComponentColumn::make('Name')->component('test-component')->attributes(fn ($value, $row, Column $column) => 'test');
+
+        $column->getContents(Pet::find(1));
+    }
+
+    public function test_can_check_attribute_callback_presence(): void
+    {
+        $column = LivewireComponentColumn::make('Name', 'name')->component('test-component');
+        $this->assertFalse($column->hasAttributesCallback());
+    }
+
+    public function test_can_set_attribute_callback(): void
+    {
+        $column = LivewireComponentColumn::make('Name', 'name')->component('test-component');
+        $this->assertFalse($column->hasAttributesCallback());
+
+        $column->attributes(function ($row) {
+            return [
+                'class' => '!rounded-lg self-center',
+                'default' => true,
+            ];
+        });
+
+        $this->assertTrue($column->hasAttributesCallback());
+    }
+}

From 19b3723897ad131b436351b278ae3a24a4f7c9f5 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 11 Jan 2025 04:57:41 +0000
Subject: [PATCH 31/36] Clean up Column Component View and Slot behaviours
 (#2169)

* Clean up Column Component View and Slot behaviours

* Fix styling

* Restore Trait

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Views/Columns/ComponentColumn.php         | 14 ++-----
 src/Views/Columns/ViewComponentColumn.php     |  6 +--
 src/Views/Traits/Columns/HasComponentView.php | 25 ++++++++++++
 src/Views/Traits/Columns/HasSlot.php          | 39 +++++++++++++++++++
 .../ComponentColumnConfiguration.php          | 20 ----------
 .../ViewComponentColumnConfiguration.php      | 10 -----
 .../Traits/Helpers/ComponentColumnHelpers.php | 26 -------------
 .../Helpers/ViewComponentColumnHelpers.php    | 16 --------
 8 files changed, 71 insertions(+), 85 deletions(-)
 create mode 100644 src/Views/Traits/Columns/HasComponentView.php
 create mode 100644 src/Views/Traits/Columns/HasSlot.php
 delete mode 100644 src/Views/Traits/Configuration/ComponentColumnConfiguration.php
 delete mode 100644 src/Views/Traits/Helpers/ComponentColumnHelpers.php

diff --git a/src/Views/Columns/ComponentColumn.php b/src/Views/Columns/ComponentColumn.php
index 82eccf622..ad4b4ee60 100644
--- a/src/Views/Columns/ComponentColumn.php
+++ b/src/Views/Columns/ComponentColumn.php
@@ -7,17 +7,14 @@
 use Illuminate\View\ComponentAttributeBag;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Views\Column;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\{HasComponentView, HasSlot};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\ComponentColumnConfiguration;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\ComponentColumnHelpers;
 
 class ComponentColumn extends Column
 {
-    use ComponentColumnConfiguration,
-        ComponentColumnHelpers;
-
-    protected string $componentView;
-
-    protected mixed $slotCallback = null;
+    use HasComponentView,
+        HasSlot;
 
     public function __construct(string $title, ?string $from = null)
     {
@@ -46,10 +43,7 @@ public function getContents(Model $row): null|string|HtmlString|DataTableConfigu
             }
         }
         if ($this->hasSlotCallback()) {
-            $slotContent = call_user_func($this->getSlotCallback(), $value, $row, $this);
-            if (is_string($slotContent)) {
-                $slotContent = new HtmlString($slotContent);
-            }
+            $slotContent = $this->getSlotContent($row, $value);
         }
 
         return view($this->getComponentView(), [
diff --git a/src/Views/Columns/ViewComponentColumn.php b/src/Views/Columns/ViewComponentColumn.php
index 17b012130..78a070678 100644
--- a/src/Views/Columns/ViewComponentColumn.php
+++ b/src/Views/Columns/ViewComponentColumn.php
@@ -6,6 +6,7 @@
 use Illuminate\Support\HtmlString;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Views\Column;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\HasComponentView;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\ViewComponentColumnConfiguration;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\ViewComponentColumnHelpers;
 use ReflectionClass;
@@ -13,9 +14,8 @@
 class ViewComponentColumn extends Column
 {
     use ViewComponentColumnConfiguration,
-        ViewComponentColumnHelpers;
-
-    protected ?string $componentView;
+        ViewComponentColumnHelpers,
+        HasComponentView;
 
     protected ?string $customComponentView;
 
diff --git a/src/Views/Traits/Columns/HasComponentView.php b/src/Views/Traits/Columns/HasComponentView.php
new file mode 100644
index 000000000..27fccc623
--- /dev/null
+++ b/src/Views/Traits/Columns/HasComponentView.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Columns;
+
+trait HasComponentView
+{
+    protected string $componentView;
+
+    public function component(string $component): self
+    {
+        $this->componentView = 'components.'.$component;
+
+        return $this;
+    }
+
+    public function getComponentView(): string
+    {
+        return $this->componentView;
+    }
+
+    public function hasComponentView(): bool
+    {
+        return isset($this->componentView);
+    }
+}
diff --git a/src/Views/Traits/Columns/HasSlot.php b/src/Views/Traits/Columns/HasSlot.php
new file mode 100644
index 000000000..aecfffc77
--- /dev/null
+++ b/src/Views/Traits/Columns/HasSlot.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Columns;
+
+use Closure;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\HtmlString;
+
+trait HasSlot
+{
+    protected ?Closure $slotCallback = null;
+
+    public function getSlotContent(Model $row, mixed $value): string|HtmlString
+    {
+        $slotContent = call_user_func($this->getSlotCallback(), $value, $row, $this);
+        if (is_string($slotContent)) {
+            $slotContent = new HtmlString($slotContent);
+        }
+
+        return $slotContent;
+    }
+
+    public function getSlotCallback(): ?callable
+    {
+        return $this->slotCallback;
+    }
+
+    public function hasSlotCallback(): bool
+    {
+        return isset($this->slotCallback) && $this->slotCallback !== null;
+    }
+
+    public function slot(callable $callback): self
+    {
+        $this->slotCallback = $callback;
+
+        return $this;
+    }
+}
diff --git a/src/Views/Traits/Configuration/ComponentColumnConfiguration.php b/src/Views/Traits/Configuration/ComponentColumnConfiguration.php
deleted file mode 100644
index 2f627ff15..000000000
--- a/src/Views/Traits/Configuration/ComponentColumnConfiguration.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Configuration;
-
-trait ComponentColumnConfiguration
-{
-    public function component(string $component): self
-    {
-        $this->componentView = 'components.'.$component;
-
-        return $this;
-    }
-
-    public function slot(callable $callback): self
-    {
-        $this->slotCallback = $callback;
-
-        return $this;
-    }
-}
diff --git a/src/Views/Traits/Configuration/ViewComponentColumnConfiguration.php b/src/Views/Traits/Configuration/ViewComponentColumnConfiguration.php
index 17a630742..87c4f7995 100644
--- a/src/Views/Traits/Configuration/ViewComponentColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/ViewComponentColumnConfiguration.php
@@ -4,16 +4,6 @@
 
 trait ViewComponentColumnConfiguration
 {
-    /**
-     * Defines the View Component to be used for the Column
-     */
-    public function component(string $component): self
-    {
-        $this->componentView = $component;
-
-        return $this;
-    }
-
     public function customComponent(string $customComponentView): self
     {
         $this->customComponentView = $customComponentView;
diff --git a/src/Views/Traits/Helpers/ComponentColumnHelpers.php b/src/Views/Traits/Helpers/ComponentColumnHelpers.php
deleted file mode 100644
index eebd83d43..000000000
--- a/src/Views/Traits/Helpers/ComponentColumnHelpers.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Views\Traits\Helpers;
-
-trait ComponentColumnHelpers
-{
-    public function getSlotCallback(): ?callable
-    {
-        return $this->slotCallback;
-    }
-
-    public function hasSlotCallback(): bool
-    {
-        return $this->slotCallback !== null;
-    }
-
-    public function getComponentView(): string
-    {
-        return $this->componentView;
-    }
-
-    public function hasComponentView(): bool
-    {
-        return isset($this->componentView);
-    }
-}
diff --git a/src/Views/Traits/Helpers/ViewComponentColumnHelpers.php b/src/Views/Traits/Helpers/ViewComponentColumnHelpers.php
index 0dcddc278..f1c4d9bb7 100644
--- a/src/Views/Traits/Helpers/ViewComponentColumnHelpers.php
+++ b/src/Views/Traits/Helpers/ViewComponentColumnHelpers.php
@@ -4,22 +4,6 @@
 
 trait ViewComponentColumnHelpers
 {
-    /**
-     * Retrieves the defined Component View
-     */
-    public function getComponentView(): string
-    {
-        return $this->componentView;
-    }
-
-    /**
-     * Determines whether a Component View has been set
-     */
-    public function hasComponentView(): bool
-    {
-        return isset($this->componentView);
-    }
-
     public function hasCustomComponent(): bool
     {
         return isset($this->customComponentView);

From 8dc509c28fa44745dabd47d0488da6e280498f6c Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 11 Jan 2025 05:23:06 +0000
Subject: [PATCH 32/36] Add initial tests for LivewireComponentArrayFilter
 (#2170)

* Add initial tests for LivewireComponentArrayFilter

* Fix styling

* Add LivewireComponentArrayFilter isEmpty check

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../Filters/LivewireComponentArrayFilter.php  |  2 +-
 .../LivewireComponentArrayFilterTest.php      | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 tests/Unit/Views/Filters/LivewireComponentArrayFilterTest.php

diff --git a/src/Views/Filters/LivewireComponentArrayFilter.php b/src/Views/Filters/LivewireComponentArrayFilter.php
index f4505750c..ce2c005a3 100644
--- a/src/Views/Filters/LivewireComponentArrayFilter.php
+++ b/src/Views/Filters/LivewireComponentArrayFilter.php
@@ -25,7 +25,7 @@ public function validate(array $value): array|bool
 
     public function isEmpty(array $value = []): bool
     {
-        return empty($value);
+        return empty($value) || (count($value) == 1 && (is_null($value[0]) || $value[0] == ''));
     }
 
     /**
diff --git a/tests/Unit/Views/Filters/LivewireComponentArrayFilterTest.php b/tests/Unit/Views/Filters/LivewireComponentArrayFilterTest.php
new file mode 100644
index 000000000..eb83ff7cd
--- /dev/null
+++ b/tests/Unit/Views/Filters/LivewireComponentArrayFilterTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Views\Filters\LivewireComponentArrayFilter;
+
+#[Group('Filters')]
+final class LivewireComponentArrayFilterTest extends FilterTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::$filterInstance = LivewireComponentArrayFilter::make('Active');
+    }
+
+    public function test_can_get_filter_callback(): void
+    {
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
+
+        self::$filterInstance
+            ->filter(function (Builder $builder, array $values) {
+                return $builder->whereIn('name', $values);
+            });
+
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
+    }
+
+    public function test_can_set_livewire_component_filter_to_text(): void
+    {
+        $this->assertSame(['test'], self::$filterInstance->validate(['test']));
+        $this->assertSame([123], self::$filterInstance->validate([123]));
+
+    }
+
+    public function test_can_get_if_livewire_component_filter_empty(): void
+    {
+        $this->assertTrue(self::$filterInstance->isEmpty());
+        $this->assertTrue(self::$filterInstance->isEmpty([]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['']));
+        $this->assertFalse(self::$filterInstance->isEmpty(['123']));
+        $this->assertFalse(self::$filterInstance->isEmpty(['test']));
+        $this->assertFalse(self::$filterInstance->isEmpty([1234]));
+
+    }
+
+    public function test_can_get_filter_default_value(): void
+    {
+        $this->assertSame([], self::$filterInstance->getDefaultValue());
+    }
+}

From d1f6a2ee5a2034fdf1fb41e6e0c4a5ff8a9f48e4 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 11 Jan 2025 05:51:35 +0000
Subject: [PATCH 33/36] Update ChangeLog (#2171)

---
 CHANGELOG.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a6bf1d2a..d1d1da620 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,44 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+
+## [v3.6.0] - UNRELEASED
+
+### Bug Fixes
+- Ensure Default Sorting Is Shown in Pills by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2138
+- Filters
+  - Find Filters Before Query by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2143
+  - Migrate Filter Code Appropriately by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2146
+  - Migrate Filter Status into Own Trait by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2147
+
+### Tweaks
+- Enable InputAttributes for SelectFilter by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2133
+- Tidy ComponentUtilities, Migrate ColumnSelectQueryString by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2135
+- TH Fixes - Clean-up, efficiency, and Sort Icons fixes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2140
+- Add hasCollapsedColumns as Computed by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2141
+- Tidy up Blade Class Definitions by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2145
+- Tidy ColumnSelectHelpers & displayToolbarFilters Method by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2150
+- Tidy & Improve Collapsed Columns Behaviour by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2159
+- Tidy computed properties behaviour by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2160
+- WithSearch Tweaks by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2163
+- Optimize Header/Footer by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2164
+- Clean up Column Component View and Slot behaviours by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2169
+
+### Testing
+- Add Missing Test for getCustomSortingPillDirectionsLabel with invalid direction by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2130
+- Add Custom FIlter Input Attributes, Cleanup Filter Tests by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2131
+- Separate the Unit and Visuals Test Suites by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2144
+- Update PCOV Workflow by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2148
+- Add configurable area test by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2149
+- Add SortingConfiguration Missing Test by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2151
+- Add Missing Search Tests by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2152
+- Adjust SearchHelpersTest by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2153
+- Add test queryStringWithQueryString by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2154
+- Add missing tests by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2157
+- Add queryStringAliasTest by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2161
+- Migrate LivewireComponentColumn methods and add some missing basic tests by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2168
+- Add initial tests for LivewireComponentArrayFilter by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2170
+
 ## [v3.5.10] - 2024-12-11
 ### Tweaks
 - Migrate additional Styling into separate traits by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2127

From 4761dfea345f8605e0ca44e40968b9e1755096b2 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 11 Jan 2025 07:03:27 +0000
Subject: [PATCH 34/36] Tweak tests - centralised  (#2172)

* Centralise tests on base classes

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 tests/Http/Livewire/BaseTable.php             |  62 +++++++++
 tests/Http/Livewire/BreedsTable.php           |  25 +---
 .../BrokenSecondaryHeaderTable.php            |  25 +---
 .../FailingTables/NoBuildMethodTable.php      |   3 +-
 .../Livewire/FailingTables/NoColumnsTable.php |  83 +-----------
 .../FailingTables/NoPrimaryKeyTable.php       |   3 +-
 tests/Http/Livewire/PetsTable.php             |  25 +---
 .../Http/Livewire/PetsTableCustomFilters.php  |  86 +-----------
 tests/Http/Livewire/PetsTableMount.php        | 128 +-----------------
 tests/Http/Livewire/PetsTableUnpaginated.php  |  66 +--------
 tests/Http/Livewire/PetsTableWithOwner.php    |  31 +----
 tests/Http/Livewire/SpeciesTable.php          |   3 +-
 tests/TestCase.php                            |  91 +------------
 tests/{ => Unit}/DataTableComponentTest.php   |   3 +-
 .../Configuration/SearchConfigurationTest.php |  33 +----
 .../SortingConfigurationTest.php              |  44 ++----
 .../Unit/Traits/Core/CustomAttributesTest.php |  19 +--
 .../Traits/Core/Filters/FilterStatusTest.php  |   6 +-
 .../Unit/Traits/Helpers/ColumnHelpersTest.php |   9 +-
 .../Helpers/ColumnSelectHelpersTest.php       |  27 +---
 .../Unit/Traits/Helpers/FilterHelpersTest.php |  10 +-
 .../Traits/Helpers/QueryStringHelpersTest.php |  27 +---
 tests/Unit/Traits/WithColumnsTest.php         |  17 +--
 tests/Unit/Traits/WithCustomisationsTest.php  |  64 ++-------
 tests/Unit/Traits/WithSearchTest.php          |  18 +--
 25 files changed, 135 insertions(+), 773 deletions(-)
 create mode 100644 tests/Http/Livewire/BaseTable.php
 rename tests/{ => Unit}/DataTableComponentTest.php (96%)

diff --git a/tests/Http/Livewire/BaseTable.php b/tests/Http/Livewire/BaseTable.php
new file mode 100644
index 000000000..98394bfba
--- /dev/null
+++ b/tests/Http/Livewire/BaseTable.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire;
+
+use Rappasoft\LaravelLivewireTables\DataTableComponent;
+
+abstract class BaseTable extends DataTableComponent
+{
+    public string $paginationTest = 'standard';
+
+    public function enableDetailedPagination(string $type = 'standard')
+    {
+        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
+        $this->setPaginationMethod($type);
+        $this->setDisplayPaginationDetailsEnabled();
+
+    }
+
+    public function disableDetailedPagination(string $type = 'standard')
+    {
+        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
+        $this->setPaginationMethod($type);
+        $this->setDisplayPaginationDetailsDisabled();
+    }
+
+    public function setPaginationTest(string $type)
+    {
+        $this->paginationTest = $type;
+    }
+
+    public function bootAll()
+    {
+        $view = view('livewire-tables::datatable');
+
+        $this->boot();
+        $this->bootedComponentUtilities();
+        $this->bootedManagesFilters();
+        $this->bootedWithColumns();
+        $this->bootedWithColumnSelect();
+        $this->booted();
+        $this->mountManagesFilters();
+        $this->mountComponentUtilities();
+        $this->mountWithSorting();
+        $this->renderAll($view);
+    }
+
+    public function renderAll($view = null)
+    {
+        if (is_null($view)) {
+            $view = view('livewire-tables::datatable');
+        }
+        $this->renderingWithColumns($view, $view->getData());
+        $this->renderingWithColumnSelect($view, $view->getData());
+        $this->renderingWithCustomisations($view, $view->getData());
+        $this->renderingWithData($view, $view->getData());
+        $this->renderingWithReordering($view, $view->getData());
+        $this->renderingWithPagination($view, $view->getData());
+        $this->render();
+
+        return $view;
+    }
+}
diff --git a/tests/Http/Livewire/BreedsTable.php b/tests/Http/Livewire/BreedsTable.php
index 18a32995c..e9f8ac9ad 100644
--- a/tests/Http/Livewire/BreedsTable.php
+++ b/tests/Http/Livewire/BreedsTable.php
@@ -3,7 +3,6 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire;
 
 use Illuminate\Database\Eloquent\Builder;
-use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
@@ -18,32 +17,10 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-class BreedsTable extends DataTableComponent
+class BreedsTable extends BaseTable
 {
     public $model = Breed::class;
 
-    public string $paginationTest = 'standard';
-
-    public function enableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsEnabled();
-
-    }
-
-    public function disableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsDisabled();
-    }
-
-    public function setPaginationTest(string $type)
-    {
-        $this->paginationTest = $type;
-    }
-
     public function configure(): void
     {
         $this->setPrimaryKey('id');
diff --git a/tests/Http/Livewire/FailingTables/BrokenSecondaryHeaderTable.php b/tests/Http/Livewire/FailingTables/BrokenSecondaryHeaderTable.php
index cbdf8a837..5e1aaddcb 100644
--- a/tests/Http/Livewire/FailingTables/BrokenSecondaryHeaderTable.php
+++ b/tests/Http/Livewire/FailingTables/BrokenSecondaryHeaderTable.php
@@ -4,37 +4,16 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BaseTable;
 use Rappasoft\LaravelLivewireTables\Tests\Models\{Breed,Pet,Species};
 use Rappasoft\LaravelLivewireTables\Views\Column;
 use Rappasoft\LaravelLivewireTables\Views\Columns\{ImageColumn,LinkColumn};
 use Rappasoft\LaravelLivewireTables\Views\Filters\{DateFilter,DateTimeFilter,MultiSelectDropdownFilter,MultiSelectFilter,NumberFilter,SelectFilter,TextFilter};
 
-class BrokenSecondaryHeaderTable extends DataTableComponent
+class BrokenSecondaryHeaderTable extends BaseTable
 {
     public $model = Pet::class;
 
-    public string $paginationTest = 'standard';
-
-    public function enableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsEnabled();
-
-    }
-
-    public function disableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsDisabled();
-    }
-
-    public function setPaginationTest(string $type)
-    {
-        $this->paginationTest = $type;
-    }
-
     public function configure(): void
     {
         $this->setPrimaryKey('id');
diff --git a/tests/Http/Livewire/FailingTables/NoBuildMethodTable.php b/tests/Http/Livewire/FailingTables/NoBuildMethodTable.php
index 273046ce4..9e5dd97b5 100644
--- a/tests/Http/Livewire/FailingTables/NoBuildMethodTable.php
+++ b/tests/Http/Livewire/FailingTables/NoBuildMethodTable.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BaseTable;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
 use Rappasoft\LaravelLivewireTables\Views\Column;
@@ -17,7 +18,7 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-class NoBuildMethodTable extends DataTableComponent
+class NoBuildMethodTable extends BaseTable
 {
     public function configure(): void
     {
diff --git a/tests/Http/Livewire/FailingTables/NoColumnsTable.php b/tests/Http/Livewire/FailingTables/NoColumnsTable.php
index 380ba6824..ea76aaa7c 100644
--- a/tests/Http/Livewire/FailingTables/NoColumnsTable.php
+++ b/tests/Http/Livewire/FailingTables/NoColumnsTable.php
@@ -2,95 +2,16 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables;
 
-use Illuminate\Database\Eloquent\Builder;
-use Rappasoft\LaravelLivewireTables\DataTableComponent;
-use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
-use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
-use Rappasoft\LaravelLivewireTables\Views\Filters\DateFilter;
-use Rappasoft\LaravelLivewireTables\Views\Filters\DateTimeFilter;
-use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter;
-use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter;
-use Rappasoft\LaravelLivewireTables\Views\Filters\NumberFilter;
-use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
-use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-class NoColumnsTable extends DataTableComponent
+class NoColumnsTable extends PetsTable
 {
     public $model = Pet::class;
 
-    public function configure(): void
-    {
-        $this->setPrimaryKey('id');
-    }
-
     public function columns(): array
     {
         return [
         ];
     }
-
-    public function filters(): array
-    {
-        return [
-            MultiSelectFilter::make('Breed')
-                ->options(
-                    Breed::query()
-                        ->orderBy('name')
-                        ->get()
-                        ->keyBy('id')
-                        ->map(fn ($breed) => $breed->name)
-                        ->toArray()
-                )
-                ->filter(function (Builder $builder, array $values) {
-                    return $builder->whereIn('breed_id', $values);
-                }),
-            MultiSelectDropdownFilter::make('Species')
-                ->options(
-                    Species::query()
-                        ->orderBy('name')
-                        ->get()
-                        ->keyBy('id')
-                        ->map(fn ($species) => $species->name)
-                        ->toArray()
-                )
-                ->filter(function (Builder $builder, array $values) {
-                    return $builder->whereIn('species_id', $values);
-                }),
-            NumberFilter::make('Breed ID', 'breed_id_filter')
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->where('breed_id', '=', $value);
-                }),
-
-            TextFilter::make('Pet Name', 'pet_name_filter')
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->where('pets.name', '=', $value);
-                }),
-
-            DateFilter::make('Last Visit After Date', 'last_visit_date_filter')
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->whereDate('pets.last_visit', '=>', $value);
-                }),
-
-            DateTimeFilter::make('Last Visit Before DateTime', 'last_visit_datetime_filter')
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->whereDate('pets.last_visit', '<=', $value);
-                }),
-
-            SelectFilter::make('Breed SelectFilter', 'breed_select_filter')
-                ->options(
-                    Breed::query()
-                        ->orderBy('name')
-                        ->get()
-                        ->keyBy('id')
-                        ->map(fn ($breed) => $breed->name)
-                        ->toArray()
-                )
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->where('breed_id', $value);
-                })
-                ->setCustomFilterLabel('livewire-tables::tests.testFilterLabel')
-                ->setFilterPillBlade('livewire-tables::tests.testFilterPills'),
-        ];
-    }
 }
diff --git a/tests/Http/Livewire/FailingTables/NoPrimaryKeyTable.php b/tests/Http/Livewire/FailingTables/NoPrimaryKeyTable.php
index be6f0100c..02d05ed74 100644
--- a/tests/Http/Livewire/FailingTables/NoPrimaryKeyTable.php
+++ b/tests/Http/Livewire/FailingTables/NoPrimaryKeyTable.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BaseTable;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
@@ -18,7 +19,7 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-class NoPrimaryKeyTable extends DataTableComponent
+class NoPrimaryKeyTable extends BaseTable
 {
     public $model = Pet::class;
 
diff --git a/tests/Http/Livewire/PetsTable.php b/tests/Http/Livewire/PetsTable.php
index 32024f7a5..9985f222b 100644
--- a/tests/Http/Livewire/PetsTable.php
+++ b/tests/Http/Livewire/PetsTable.php
@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\App;
 use Livewire\Attributes\On;
-use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
@@ -20,37 +19,15 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-class PetsTable extends DataTableComponent
+class PetsTable extends BaseTable
 {
     public $model = Pet::class;
 
-    public string $paginationTest = 'standard';
-
     public function changeLocale(string $locale)
     {
         App::setLocale($locale);
     }
 
-    public function enableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsEnabled();
-
-    }
-
-    public function disableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsDisabled();
-    }
-
-    public function setPaginationTest(string $type)
-    {
-        $this->paginationTest = $type;
-    }
-
     public function configure(): void
     {
         $this->setPrimaryKey('id');
diff --git a/tests/Http/Livewire/PetsTableCustomFilters.php b/tests/Http/Livewire/PetsTableCustomFilters.php
index ef717c99d..8613b21c3 100644
--- a/tests/Http/Livewire/PetsTableCustomFilters.php
+++ b/tests/Http/Livewire/PetsTableCustomFilters.php
@@ -18,92 +18,8 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-class PetsTableCustomFilters extends DataTableComponent
+class PetsTableCustomFilters extends PetsTable
 {
-    public $model = Pet::class;
-
-    public string $paginationTest = 'standard';
-
-    public function enableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsEnabled();
-
-    }
-
-    public function disableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsDisabled();
-    }
-
-    public function setPaginationTest(string $type)
-    {
-        $this->paginationTest = $type;
-    }
-
-    public function configure(): void
-    {
-        $this->setPrimaryKey('id');
-    }
-
-    public function columns(): array
-    {
-        return [
-            Column::make('ID', 'id')
-                ->sortable()
-                ->setSortingPillTitle('Key')
-                ->setSortingPillDirections('0-9', '9-0'),
-            Column::make('Sort')
-                ->sortable()
-                ->excludeFromColumnSelect(),
-            Column::make('Name')
-                ->sortable()
-                ->secondaryHeader($this->getFilterByKey('pet_name_filter'))
-                ->footerFilter('pet_name_filter')
-                ->searchable(),
-
-            Column::make('Age'),
-
-            Column::make('Breed', 'breed.name')
-                ->secondaryHeaderFilter('breed')
-                ->footer($this->getFilterByKey('breed'))
-                ->sortable(
-                    fn (Builder $query, string $direction) => $query->orderBy('pets.id', $direction)
-                )
-                ->searchable(
-                    fn (Builder $query, $searchTerm) => $query->orWhere('breed.name', $searchTerm)
-                ),
-
-            Column::make('Other')
-                ->label(function ($row, Column $column) {
-                    return 'Other';
-                })
-                ->footer(function ($rows) {
-                    return 'Count: '.$rows->count();
-                }),
-
-            LinkColumn::make('Link')
-                ->title(fn ($row) => 'Edit')
-                ->location(fn ($row) => 'http://www.google.com')
-                ->attributes(fn ($row) => [
-                    'class' => 'rounded-full',
-                    'alt' => $row->name.' Avatar',
-                ]),
-            ImageColumn::make('RowImg')
-                ->location(fn ($row) => 'test'.$row->id)
-                ->attributes(fn ($row) => [
-                    'class' => 'rounded-full',
-                    'alt' => $row->name.' Avatar',
-                ]),
-            Column::make('Last Visit', 'last_visit')
-                ->sortable()
-                ->deselected(),
-        ];
-    }
-
     public function filters(): array
     {
         return [
diff --git a/tests/Http/Livewire/PetsTableMount.php b/tests/Http/Livewire/PetsTableMount.php
index 7021dfe7a..1d69e8066 100644
--- a/tests/Http/Livewire/PetsTableMount.php
+++ b/tests/Http/Livewire/PetsTableMount.php
@@ -18,10 +18,8 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-class PetsTableMount extends DataTableComponent
+class PetsTableMount extends PetsTable
 {
-    public $model = Pet::class;
-
     public ?int $mountBreed = null;
 
     public function mount(?int $mountBreed = null)
@@ -31,130 +29,6 @@ public function mount(?int $mountBreed = null)
         }
     }
 
-    public function configure(): void
-    {
-        $this->setPrimaryKey('id');
-    }
-
-    public function columns(): array
-    {
-        return [
-            Column::make('ID', 'id')
-                ->sortable()
-                ->setSortingPillTitle('Key')
-                ->setSortingPillDirections('0-9', '9-0'),
-            Column::make('Sort')
-                ->sortable()
-                ->excludeFromColumnSelect(),
-            Column::make('Name')
-                ->sortable()
-                ->secondaryHeader($this->getFilterByKey('pet_name_filter'))
-                ->footerFilter('pet_name_filter')
-                ->searchable(),
-
-            Column::make('Age'),
-
-            Column::make('Breed', 'breed.name')
-                ->secondaryHeaderFilter('breed')
-                ->footer($this->getFilterByKey('breed'))
-                ->sortable(
-                    fn (Builder $query, string $direction) => $query->orderBy('pets.id', $direction)
-                )
-                ->searchable(
-                    fn (Builder $query, $searchTerm) => $query->orWhere('breed.name', $searchTerm)
-                ),
-
-            Column::make('Other')
-                ->label(function ($row, Column $column) {
-                    return 'Other';
-                })
-                ->footer(function ($rows) {
-                    return 'Count: '.$rows->count();
-                }),
-
-            LinkColumn::make('Link')
-                ->title(fn ($row) => 'Edit')
-                ->location(fn ($row) => 'http://www.google.com')
-                ->attributes(fn ($row) => [
-                    'class' => 'rounded-full',
-                    'alt' => $row->name.' Avatar',
-                ]),
-            ImageColumn::make('RowImg')
-                ->location(fn ($row) => 'test'.$row->id)
-                ->attributes(fn ($row) => [
-                    'class' => 'rounded-full',
-                    'alt' => $row->name.' Avatar',
-                ]),
-            Column::make('Last Visit', 'last_visit')
-                ->sortable()
-                ->deselected(),
-        ];
-    }
-
-    public function filters(): array
-    {
-        return [
-            MultiSelectFilter::make('Breed')
-                ->options(
-                    Breed::query()
-                        ->orderBy('name')
-                        ->get()
-                        ->keyBy('id')
-                        ->map(fn ($breed) => $breed->name)
-                        ->toArray()
-                )
-                ->filter(function (Builder $builder, array $values) {
-                    return $builder->whereIn('breed_id', $values);
-                }),
-            MultiSelectDropdownFilter::make('Species')
-                ->options(
-                    Species::query()
-                        ->orderBy('name')
-                        ->get()
-                        ->keyBy('id')
-                        ->map(fn ($species) => $species->name)
-                        ->toArray()
-                )
-                ->filter(function (Builder $builder, array $values) {
-                    return $builder->whereIn('species_id', $values);
-                }),
-            NumberFilter::make('Breed ID', 'breed_id_filter')
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->where('breed_id', '=', $value);
-                }),
-
-            TextFilter::make('Pet Name', 'pet_name_filter')
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->where('pets.name', '=', $value);
-                }),
-
-            DateFilter::make('Last Visit After Date', 'last_visit_date_filter')
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->whereDate('pets.last_visit', '=>', $value);
-                }),
-
-            DateTimeFilter::make('Last Visit Before DateTime', 'last_visit_datetime_filter')
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->whereDate('pets.last_visit', '<=', $value);
-                }),
-
-            SelectFilter::make('Breed SelectFilter', 'breed_select_filter')
-                ->options(
-                    Breed::query()
-                        ->orderBy('name')
-                        ->get()
-                        ->keyBy('id')
-                        ->map(fn ($breed) => $breed->name)
-                        ->toArray()
-                )
-                ->filter(function (Builder $builder, string $value) {
-                    return $builder->where('breed_id', $value);
-                })
-                ->setCustomFilterLabel('livewire-tables::tests.testFilterLabel')
-                ->setFilterPillBlade('livewire-tables::tests.testFilterPills'),
-        ];
-    }
-
     public function builder(): Builder
     {
         if (isset($this->mountBreed)) {
diff --git a/tests/Http/Livewire/PetsTableUnpaginated.php b/tests/Http/Livewire/PetsTableUnpaginated.php
index 502b1f938..013b2e0ab 100644
--- a/tests/Http/Livewire/PetsTableUnpaginated.php
+++ b/tests/Http/Livewire/PetsTableUnpaginated.php
@@ -18,72 +18,8 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-class PetsTableUnpaginated extends DataTableComponent
+class PetsTableUnpaginated extends PetsTable
 {
-    public $model = Pet::class;
-
-    public string $paginationTest = 'standard';
-
-    public function configure(): void
-    {
-        $this->setPrimaryKey('id');
-    }
-
-    public function columns(): array
-    {
-        return [
-            Column::make('ID', 'id')
-                ->sortable()
-                ->setSortingPillTitle('Key')
-                ->setSortingPillDirections('0-9', '9-0'),
-            Column::make('Sort')
-                ->sortable()
-                ->excludeFromColumnSelect(),
-            Column::make('Name')
-                ->sortable()
-                ->secondaryHeader($this->getFilterByKey('pet_name_filter'))
-                ->footerFilter('pet_name_filter')
-                ->searchable(),
-
-            Column::make('Age'),
-
-            Column::make('Breed', 'breed.name')
-                ->secondaryHeaderFilter('breed')
-                ->footer($this->getFilterByKey('breed'))
-                ->sortable(
-                    fn (Builder $query, string $direction) => $query->orderBy('pets.id', $direction)
-                )
-                ->searchable(
-                    fn (Builder $query, $searchTerm) => $query->orWhere('breed.name', $searchTerm)
-                ),
-
-            Column::make('Other')
-                ->label(function ($row, Column $column) {
-                    return 'Other';
-                })
-                ->footer(function ($rows) {
-                    return 'Count: '.$rows->count();
-                }),
-
-            LinkColumn::make('Link')
-                ->title(fn ($row) => 'Edit')
-                ->location(fn ($row) => 'http://www.google.com')
-                ->attributes(fn ($row) => [
-                    'class' => 'rounded-full',
-                    'alt' => $row->name.' Avatar',
-                ]),
-            ImageColumn::make('RowImg')
-                ->location(fn ($row) => 'test'.$row->id)
-                ->attributes(fn ($row) => [
-                    'class' => 'rounded-full',
-                    'alt' => $row->name.' Avatar',
-                ]),
-            Column::make('Last Visit', 'last_visit')
-                ->sortable()
-                ->deselected(),
-        ];
-    }
-
     public function filters(): array
     {
         return [
diff --git a/tests/Http/Livewire/PetsTableWithOwner.php b/tests/Http/Livewire/PetsTableWithOwner.php
index fa8b6290d..0f07022dc 100644
--- a/tests/Http/Livewire/PetsTableWithOwner.php
+++ b/tests/Http/Livewire/PetsTableWithOwner.php
@@ -20,37 +20,8 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-class PetsTableWithOwner extends DataTableComponent
+class PetsTableWithOwner extends PetsTable
 {
-    public $model = Pet::class;
-
-    public string $paginationTest = 'standard';
-
-    public function enableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsEnabled();
-
-    }
-
-    public function disableDetailedPagination(string $type = 'standard')
-    {
-        $this->setPerPageAccepted([1, 3, 5, 10, 15, 25, 50])->setPerPage(3);
-        $this->setPaginationMethod($type);
-        $this->setDisplayPaginationDetailsDisabled();
-    }
-
-    public function setPaginationTest(string $type)
-    {
-        $this->paginationTest = $type;
-    }
-
-    public function configure(): void
-    {
-        $this->setPrimaryKey('id');
-    }
-
     public function columns(): array
     {
         return [
diff --git a/tests/Http/Livewire/SpeciesTable.php b/tests/Http/Livewire/SpeciesTable.php
index 5e8c136a2..f5986ad20 100644
--- a/tests/Http/Livewire/SpeciesTable.php
+++ b/tests/Http/Livewire/SpeciesTable.php
@@ -2,12 +2,11 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire;
 
-use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 use Rappasoft\LaravelLivewireTables\Views\Columns\{AvgColumn,CountColumn,SumColumn};
 
-class SpeciesTable extends DataTableComponent
+class SpeciesTable extends BaseTable
 {
     public $model = Species::class;
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
index f80c08875..aba2a3bc6 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -96,101 +96,35 @@ protected function setupBasicTable()
     {
         $view = view('livewire-tables::datatable');
         $this->basicTable = new PetsTable;
-        $this->basicTable->mountManagesFilters();
-        $this->basicTable->boot();
-        $this->basicTable->bootedManagesFilters();
-        $this->basicTable->bootedComponentUtilities();
-        $this->basicTable->bootedWithColumns();
-        $this->basicTable->bootedWithColumnSelect();
-        $this->basicTable->booted();
-        $this->basicTable->renderingWithColumns($view, $view->getData());
-        $this->basicTable->renderingWithColumnSelect($view, $view->getData());
-        $this->basicTable->renderingWithCustomisations($view, $view->getData());
-        $this->basicTable->renderingWithData($view, $view->getData());
-        $this->basicTable->renderingWithReordering($view, $view->getData());
-        $this->basicTable->renderingWithPagination($view, $view->getData());
-        $this->basicTable->render();
+        $this->basicTable->bootAll();
     }
 
     protected function setupEventsTable()
     {
         $view = view('livewire-tables::datatable');
         $this->eventsTable = new PetsTableEvents;
-        $this->eventsTable->mountManagesFilters();
-        $this->eventsTable->boot();
-        $this->eventsTable->bootedComponentUtilities();
-        $this->eventsTable->bootedManagesFilters();
-        $this->eventsTable->bootedWithColumns();
-        $this->eventsTable->bootedWithColumnSelect();
-        $this->eventsTable->booted();
-        $this->eventsTable->renderingWithColumns($view, $view->getData());
-        $this->eventsTable->renderingWithColumnSelect($view, $view->getData());
-        $this->eventsTable->renderingWithCustomisations($view, $view->getData());
-        $this->eventsTable->renderingWithData($view, $view->getData());
-        $this->eventsTable->renderingWithReordering($view, $view->getData());
-        $this->eventsTable->renderingWithPagination($view, $view->getData());
-
-        $this->eventsTable->render();
+        $this->eventsTable->bootAll();
     }
 
     protected function setupBreedsTable()
     {
         $view = view('livewire-tables::datatable');
         $this->breedsTable = new BreedsTable;
-        $this->breedsTable->mountManagesFilters();
-        $this->breedsTable->boot();
-        $this->breedsTable->bootedComponentUtilities();
-        $this->breedsTable->bootedManagesFilters();
-        $this->breedsTable->bootedWithColumns();
-        $this->breedsTable->bootedWithColumnSelect();
-        $this->breedsTable->booted();
-        $this->breedsTable->renderingWithColumns($view, $view->getData());
-        $this->breedsTable->renderingWithColumnSelect($view, $view->getData());
-        $this->breedsTable->renderingWithCustomisations($view, $view->getData());
-        $this->breedsTable->renderingWithData($view, $view->getData());
-        $this->breedsTable->renderingWithReordering($view, $view->getData());
-        $this->breedsTable->renderingWithPagination($view, $view->getData());
-        $this->breedsTable->render();
+        $this->breedsTable->bootAll();
     }
 
     protected function setupPetOwnerTable()
     {
         $view = view('livewire-tables::datatable');
         $this->petOwnerTable = new PetsTableWithOwner;
-        $this->petOwnerTable->mountManagesFilters();
-        $this->petOwnerTable->boot();
-        $this->petOwnerTable->bootedComponentUtilities();
-        $this->petOwnerTable->bootedManagesFilters();
-        $this->petOwnerTable->bootedWithColumns();
-        $this->petOwnerTable->bootedWithColumnSelect();
-        $this->petOwnerTable->booted();
-        $this->petOwnerTable->renderingWithColumns($view, $view->getData());
-        $this->petOwnerTable->renderingWithColumnSelect($view, $view->getData());
-        $this->petOwnerTable->renderingWithCustomisations($view, $view->getData());
-        $this->petOwnerTable->renderingWithData($view, $view->getData());
-        $this->petOwnerTable->renderingWithReordering($view, $view->getData());
-        $this->petOwnerTable->renderingWithPagination($view, $view->getData());
-        $this->petOwnerTable->render();
+        $this->petOwnerTable->bootAll();
     }
 
     protected function setupSpeciesTable()
     {
         $view = view('livewire-tables::datatable');
         $this->speciesTable = new SpeciesTable;
-        $this->speciesTable->mountManagesFilters();
-        $this->speciesTable->boot();
-        $this->speciesTable->bootedComponentUtilities();
-        $this->speciesTable->bootedManagesFilters();
-        $this->speciesTable->bootedWithColumns();
-        $this->speciesTable->bootedWithColumnSelect();
-        $this->speciesTable->booted();
-        $this->speciesTable->renderingWithColumns($view, $view->getData());
-        $this->speciesTable->renderingWithColumnSelect($view, $view->getData());
-        $this->speciesTable->renderingWithCustomisations($view, $view->getData());
-        $this->speciesTable->renderingWithData($view, $view->getData());
-        $this->speciesTable->renderingWithReordering($view, $view->getData());
-        $this->speciesTable->renderingWithPagination($view, $view->getData());
-        $this->speciesTable->render();
+        $this->speciesTable->bootAll();
     }
 
     protected function setupUnpaginatedTable()
@@ -198,20 +132,7 @@ protected function setupUnpaginatedTable()
 
         $view = view('livewire-tables::datatable');
         $this->unpaginatedTable = new PetsTableUnpaginated;
-        $this->unpaginatedTable->mountManagesFilters();
-        $this->unpaginatedTable->boot();
-        $this->unpaginatedTable->bootedComponentUtilities();
-        $this->unpaginatedTable->bootedManagesFilters();
-        $this->unpaginatedTable->bootedWithColumns();
-        $this->unpaginatedTable->bootedWithColumnSelect();
-        $this->unpaginatedTable->booted();
-        $this->unpaginatedTable->renderingWithColumns($view, $view->getData());
-        $this->unpaginatedTable->renderingWithColumnSelect($view, $view->getData());
-        $this->unpaginatedTable->renderingWithCustomisations($view, $view->getData());
-        $this->unpaginatedTable->renderingWithData($view, $view->getData());
-        $this->unpaginatedTable->renderingWithReordering($view, $view->getData());
-        $this->unpaginatedTable->renderingWithPagination($view, $view->getData());
-        $this->unpaginatedTable->render();
+        $this->unpaginatedTable->bootAll();
 
     }
 
diff --git a/tests/DataTableComponentTest.php b/tests/Unit/DataTableComponentTest.php
similarity index 96%
rename from tests/DataTableComponentTest.php
rename to tests/Unit/DataTableComponentTest.php
index 15831df4e..46502d83d 100644
--- a/tests/DataTableComponentTest.php
+++ b/tests/Unit/DataTableComponentTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit;
 
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\NoColumnsTable;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\NoPrimaryKeyTable;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
 class DataTableComponentTest extends TestCase
 {
diff --git a/tests/Unit/Traits/Configuration/SearchConfigurationTest.php b/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
index 61f44d4dd..54fedd3a4 100644
--- a/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
@@ -185,19 +185,13 @@ public function test_can_set_search_field_attributes(): void
         {
             public ?array $testAttributesArray;
 
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-
             public function pubSetSearchFieldAttributes(array $attributes)
             {
                 $this->setSearchFieldAttributes($attributes);
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertSame(['default' => true, 'default-colors' => true, 'default-styling' => true], $mock->getSearchFieldAttributes());
 
@@ -213,11 +207,6 @@ public function test_can_set_search_icon(): void
         {
             public ?array $testAttributesArray;
 
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-
             public function pubSetSearchFieldAttributes(array $attributes)
             {
                 $this->setSearchFieldAttributes($attributes);
@@ -234,8 +223,7 @@ public function pubSetSearchIconAttributes(array $attributes)
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertFalse($mock->hasSearchIcon());
         $mock->pubSetSearchIcon('heroicon-m-magnifying-glass-2');
@@ -251,11 +239,6 @@ public function test_can_set_search_icon_status(): void
         {
             public ?array $testAttributesArray;
 
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-            }
-
             public function pubSetSearchFieldAttributes(array $attributes)
             {
                 $this->setSearchFieldAttributes($attributes);
@@ -272,8 +255,7 @@ public function pubSetSearchIconDisabled()
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertFalse($mock->hasSearchIcon());
         $mock->pubSetSearchIconEnabled();
@@ -290,12 +272,6 @@ public function test_can_set_search_icon_attributes(): void
         {
             public ?array $testAttributesArray;
 
-            public function configure(): void
-            {
-                $this->setDataTableFingerprint('test');
-
-            }
-
             public function pubSetSearchFieldAttributes(array $attributes)
             {
                 $this->setSearchFieldAttributes($attributes);
@@ -312,8 +288,7 @@ public function pubSetSearchIconAttributes(array $attributes)
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertSame('h-4 w-4', $mock->getSearchIconClasses());
         $this->assertSame([
diff --git a/tests/Unit/Traits/Configuration/SortingConfigurationTest.php b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
index 9bbe071b4..2664f60d4 100644
--- a/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
@@ -105,25 +105,6 @@ public function configure(): void
                 $this->setDefaultSort('name', 'desc');
             }
         };
-        $viewDesc = view('livewire-tables::datatable');
-
-        $tempDesc->boot();
-        $tempDesc->bootedComponentUtilities();
-        $tempDesc->bootedManagesFilters();
-        $tempDesc->bootedWithColumns();
-        $tempDesc->bootedWithColumnSelect();
-        $tempDesc->booted();
-        $tempDesc->mountManagesFilters();
-        $tempDesc->mountWithSorting();
-        $tempDesc->renderingWithColumns($viewDesc, $viewDesc->getData());
-        $tempDesc->renderingWithColumnSelect($viewDesc, $viewDesc->getData());
-        $tempDesc->renderingWithCustomisations($viewDesc, $viewDesc->getData());
-        $tempDesc->renderingWithData($viewDesc, $viewDesc->getData());
-        $tempDesc->renderingWithReordering($viewDesc, $viewDesc->getData());
-        $tempDesc->renderingWithPagination($viewDesc, $viewDesc->getData());
-        $tempDesc->render();
-        $this->assertSame(['name' => 'desc'], $tempDesc->getSorts());
-        $this->assertSame('desc', $tempDesc->getSort('name'));
 
         $tempAsc = new class extends PetsTable
         {
@@ -134,22 +115,17 @@ public function configure(): void
                 $this->setDefaultSort('name', 'asc');
             }
         };
+
+        $viewDesc = view('livewire-tables::datatable');
+        $tempDesc->bootAll();
+        $tempDesc->renderAll($viewDesc);
         $viewAsc = view('livewire-tables::datatable');
-        $tempAsc->boot();
-        $tempAsc->bootedComponentUtilities();
-        $tempAsc->bootedManagesFilters();
-        $tempAsc->bootedWithColumns();
-        $tempAsc->bootedWithColumnSelect();
-        $tempAsc->booted();
-        $tempAsc->mountManagesFilters();
-        $tempAsc->mountWithSorting();
-        $tempAsc->renderingWithColumns($viewAsc, $viewAsc->getData());
-        $tempAsc->renderingWithColumnSelect($viewAsc, $viewAsc->getData());
-        $tempAsc->renderingWithCustomisations($viewAsc, $viewAsc->getData());
-        $tempAsc->renderingWithData($viewAsc, $viewAsc->getData());
-        $tempAsc->renderingWithReordering($viewAsc, $viewAsc->getData());
-        $tempAsc->renderingWithPagination($viewAsc, $viewAsc->getData());
-        $tempAsc->render();
+        $tempAsc->bootAll();
+        $tempAsc->renderAll($viewAsc);
+
+        $this->assertSame(['name' => 'desc'], $tempDesc->getSorts());
+        $this->assertSame('desc', $tempDesc->getSort('name'));
+
         $this->assertSame(['name' => 'asc'], $tempAsc->getSorts());
         $this->assertSame('asc', $tempAsc->getSort('name'));
 
diff --git a/tests/Unit/Traits/Core/CustomAttributesTest.php b/tests/Unit/Traits/Core/CustomAttributesTest.php
index 0f76c067d..3966a8dad 100644
--- a/tests/Unit/Traits/Core/CustomAttributesTest.php
+++ b/tests/Unit/Traits/Core/CustomAttributesTest.php
@@ -17,12 +17,12 @@ public function test_can_get_custom_attribute_defaults_false_standard_mode(): vo
 
             public function configure(): void
             {
+                $this->setPrimaryKey('id');
                 $this->setDataTableFingerprint('test');
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertSame([
             'default' => false,
@@ -39,12 +39,13 @@ public function test_can_get_custom_attribute_defaults_false_classic_mode(): voi
 
             public function configure(): void
             {
+                $this->setPrimaryKey('id');
+
                 $this->setDataTableFingerprint('test');
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertSame([
             'default-colors' => false,
@@ -60,12 +61,13 @@ public function test_can_get_custom_attribute_defaults_true_standard_mode(): voi
 
             public function configure(): void
             {
+                $this->setPrimaryKey('id');
+
                 $this->setDataTableFingerprint('test');
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertSame([
             'default' => true,
@@ -82,12 +84,13 @@ public function test_can_get_custom_attribute_defaults_true_classic_mode(): void
 
             public function configure(): void
             {
+                $this->setPrimaryKey('id');
+
                 $this->setDataTableFingerprint('test');
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertSame([
             'default-colors' => true,
diff --git a/tests/Unit/Traits/Core/Filters/FilterStatusTest.php b/tests/Unit/Traits/Core/Filters/FilterStatusTest.php
index 9021a0a1b..7c72a2d7f 100644
--- a/tests/Unit/Traits/Core/Filters/FilterStatusTest.php
+++ b/tests/Unit/Traits/Core/Filters/FilterStatusTest.php
@@ -36,8 +36,7 @@ public function setFiltersToDisabled()
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertTrue($mock->filtersAreEnabled());
         $this->assertFalse($mock->filtersAreDisabled());
@@ -71,8 +70,7 @@ public function setFiltersToDisabled()
             }
         };
 
-        $mock->configure();
-        $mock->boot();
+        $mock->bootAll();
 
         $this->assertTrue($mock->filtersAreDisabled());
         $this->assertFalse($mock->filtersAreEnabled());
diff --git a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
index e1e2fd5e6..793d639e2 100644
--- a/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
@@ -192,14 +192,7 @@ public function columns(): array
                 return [];
             }
         };
-        $testTable->mountManagesFilters();
-        $testTable->configure();
-        $testTable->boot();
-        $testTable->bootedComponentUtilities();
-        $testTable->bootedManagesFilters();
-        $testTable->bootedWithColumns();
-        $testTable->bootedWithColumnSelect();
-        $testTable->booted();
+        $testTable->bootAll();
 
     }
 }
diff --git a/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
index 581dce5f2..87ecf605b 100644
--- a/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
@@ -118,14 +118,7 @@ public function configure(): void
                 parent::configure();
             }
         };
-        $testTable->mountManagesFilters();
-        $testTable->configure();
-        $testTable->boot();
-        $testTable->bootedManagesFilters();
-        $testTable->bootedComponentUtilities();
-        $testTable->bootedWithColumns();
-        $testTable->bootedWithColumnSelect();
-        $testTable->booted();
+        $testTable->bootAll();
 
         $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns);
 
@@ -156,14 +149,7 @@ public function configure(): void
                 $this->enableColumnSelectEvent();
             }
         };
-        $testTable->mountManagesFilters();
-        $testTable->configure();
-        $testTable->boot();
-        $testTable->bootedComponentUtilities();
-        $testTable->bootedManagesFilters();
-        $testTable->bootedWithColumns();
-        $testTable->bootedWithColumnSelect();
-        $testTable->booted();
+        $testTable->bootAll();
 
         $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns);
 
@@ -186,14 +172,7 @@ public function configure(): void
                 $this->disableColumnSelectEvent();
             }
         };
-        $testTable->mountManagesFilters();
-        $testTable->configure();
-        $testTable->boot();
-        $testTable->bootedManagesFilters();
-        $testTable->bootedComponentUtilities();
-        $testTable->bootedWithColumns();
-        $testTable->bootedWithColumnSelect();
-        $testTable->booted();
+        $testTable->bootAll();
 
         $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns);
         $testTable->selectedColumns = ['id', 'sort', 'name', 'age', 'breed', 'other', 'rowimg'];
diff --git a/tests/Unit/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
index 907624d30..b9104cbd0 100644
--- a/tests/Unit/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
@@ -224,15 +224,7 @@ public function configure(): void
                 parent::configure();
             }
         };
-        $testTable->mountManagesFilters();
-
-        $testTable->configure();
-        $testTable->boot();
-        $testTable->bootedManagesFilters();
-        $testTable->bootedComponentUtilities();
-        $testTable->bootedWithColumns();
-        $testTable->bootedWithColumnSelect();
-        $testTable->booted();
+        $testTable->bootAll();
 
         $testTable->setFilter('breed_id_filter', '2');
         $testTable->updatedFilterComponents('2', 'breed_id_filter');
diff --git a/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
index 884094bac..8725e0c1a 100644
--- a/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/QueryStringHelpersTest.php
@@ -24,14 +24,7 @@ public function getCurrentQueryStringBinding(): array
             }
         };
 
-        $testTableQueryString->mountManagesFilters();
-        $testTableQueryString->configure();
-        $testTableQueryString->boot();
-        $testTableQueryString->bootedComponentUtilities();
-        $testTableQueryString->bootedManagesFilters();
-        $testTableQueryString->bootedWithColumns();
-        $testTableQueryString->bootedWithColumnSelect();
-        $testTableQueryString->booted();
+        $testTableQueryString->bootAll();
 
         $this->assertSame([], $testTableQueryString->getCurrentQueryStringBinding());
 
@@ -54,14 +47,7 @@ public function getCurrentQueryStringBinding(): array
             }
         };
 
-        $testTableQueryString->mountManagesFilters();
-        $testTableQueryString->configure();
-        $testTableQueryString->boot();
-        $testTableQueryString->bootedComponentUtilities();
-        $testTableQueryString->bootedManagesFilters();
-        $testTableQueryString->bootedWithColumns();
-        $testTableQueryString->bootedWithColumnSelect();
-        $testTableQueryString->booted();
+        $testTableQueryString->bootAll();
 
         $this->assertSame(['table' => ['except' => null, 'history' => false, 'keep' => false, 'as' => 'table']], $testTableQueryString->getCurrentQueryStringBinding());
 
@@ -84,14 +70,7 @@ public function getCurrentQueryStringBinding(): array
             }
         };
 
-        $testTableQueryString->mountManagesFilters();
-        $testTableQueryString->configure();
-        $testTableQueryString->boot();
-        $testTableQueryString->bootedComponentUtilities();
-        $testTableQueryString->bootedManagesFilters();
-        $testTableQueryString->bootedWithColumns();
-        $testTableQueryString->bootedWithColumnSelect();
-        $testTableQueryString->booted();
+        $testTableQueryString->bootAll();
 
         $this->assertFalse($testTableQueryString->hasQueryStringAlias());
         $this->assertSame('table', $testTableQueryString->getQueryStringAlias());
diff --git a/tests/Unit/Traits/WithColumnsTest.php b/tests/Unit/Traits/WithColumnsTest.php
index 14de629cd..c53753500 100644
--- a/tests/Unit/Traits/WithColumnsTest.php
+++ b/tests/Unit/Traits/WithColumnsTest.php
@@ -22,20 +22,9 @@ public function configure(): void
 
         $view = view('livewire-tables::datatable');
 
-        $testTableDefault->boot();
-        $testTableDefault->mountManagesFilters();
-        $testTableDefault->bootedComponentUtilities();
-        $testTableDefault->bootedManagesFilters();
-        $testTableDefault->bootedWithColumns();
-        $testTableDefault->bootedWithColumnSelect();
-        $testTableDefault->booted();
-        $testTableDefault->renderingWithColumns($view, $view->getData());
-        $testTableDefault->renderingWithColumnSelect($view, $view->getData());
-        $testTableDefault->renderingWithCustomisations($view, $view->getData());
-        $testTableDefault->renderingWithData($view, $view->getData());
-        $testTableDefault->renderingWithReordering($view, $view->getData());
-        $testTableDefault->renderingWithPagination($view, $view->getData());
-        $testTableDefault->render();
+        $testTableDefault->bootAll();
+        $view = $testTableDefault->renderAll();
+
         $this->assertSame(9, $view->getData()['columns']->count());
     }
 }
diff --git a/tests/Unit/Traits/WithCustomisationsTest.php b/tests/Unit/Traits/WithCustomisationsTest.php
index 036840a01..3c54fcd4f 100644
--- a/tests/Unit/Traits/WithCustomisationsTest.php
+++ b/tests/Unit/Traits/WithCustomisationsTest.php
@@ -22,20 +22,9 @@ public function configure(): void
         };
         $view = view('livewire-tables::datatable');
 
-        $temp->mountManagesFilters();
-        $temp->boot();
-        $temp->bootedComponentUtilities();
-        $temp->bootedManagesFilters();
-        $temp->bootedWithColumns();
-        $temp->bootedWithColumnSelect();
-        $temp->booted();
-        $temp->renderingWithColumns($view, $view->getData());
-        $temp->renderingWithColumnSelect($view, $view->getData());
-        $temp->renderingWithCustomisations($view, $view->getData());
-        $temp->renderingWithData($view, $view->getData());
-        $temp->renderingWithReordering($view, $view->getData());
-        $temp->renderingWithPagination($view, $view->getData());
-        $temp->render();
+        $temp->bootAll();
+        $view = $temp->renderAll();
+
         $layoutConfig = $view->getData()['layoutConfig'];
 
         $this->assertSame($temp->getLayout(), $layoutConfig->view);
@@ -55,20 +44,9 @@ public function configure(): void
         };
         $view = view('livewire-tables::datatable');
 
-        $temp->mountManagesFilters();
-        $temp->boot();
-        $temp->bootedComponentUtilities();
-        $temp->bootedManagesFilters();
-        $temp->bootedWithColumns();
-        $temp->bootedWithColumnSelect();
-        $temp->booted();
-        $temp->renderingWithColumns($view, $view->getData());
-        $temp->renderingWithColumnSelect($view, $view->getData());
-        $temp->renderingWithCustomisations($view, $view->getData());
-        $temp->renderingWithData($view, $view->getData());
-        $temp->renderingWithReordering($view, $view->getData());
-        $temp->renderingWithPagination($view, $view->getData());
-        $temp->render();
+        $temp->bootAll();
+        $view = $temp->renderAll();
+
         $layoutConfig = $view->getData()['layoutConfig'];
 
         $this->assertSame($temp->getSection(), $layoutConfig->slotOrSection);
@@ -88,20 +66,8 @@ public function configure(): void
         };
         $view = view('livewire-tables::datatable');
 
-        $temp->mountManagesFilters();
-        $temp->boot();
-        $temp->bootedComponentUtilities();
-        $temp->bootedManagesFilters();
-        $temp->bootedWithColumns();
-        $temp->bootedWithColumnSelect();
-        $temp->booted();
-        $temp->renderingWithColumns($view, $view->getData());
-        $temp->renderingWithColumnSelect($view, $view->getData());
-        $temp->renderingWithCustomisations($view, $view->getData());
-        $temp->renderingWithData($view, $view->getData());
-        $temp->renderingWithReordering($view, $view->getData());
-        $temp->renderingWithPagination($view, $view->getData());
-        $temp->render();
+        $temp->bootAll();
+        $view = $temp->renderAll();
         $layoutConfig = $view->getData()['layoutConfig'];
 
         $this->assertSame($temp->getSlot(), $layoutConfig->slotOrSection);
@@ -121,18 +87,8 @@ public function configure(): void
         };
         $view = view('livewire-tables::datatable');
 
-        $temp->boot();
-        $temp->bootedComponentUtilities();
-        $temp->bootedWithColumns();
-        $temp->bootedWithColumnSelect();
-        $temp->booted();
-        $temp->renderingWithColumns($view, $view->getData());
-        $temp->renderingWithColumnSelect($view, $view->getData());
-        $temp->renderingWithCustomisations($view, $view->getData());
-        $temp->renderingWithData($view, $view->getData());
-        $temp->renderingWithReordering($view, $view->getData());
-        $temp->renderingWithPagination($view, $view->getData());
-        $temp->render();
+        $temp->bootAll();
+        $view = $temp->renderAll();
         $layoutConfig = $view->getData()['layoutConfig'];
         $this->assertSame('extends', $layoutConfig->type);
         $this->assertSame($temp->getExtends(), $layoutConfig->view);
diff --git a/tests/Unit/Traits/WithSearchTest.php b/tests/Unit/Traits/WithSearchTest.php
index e014c5eb3..9342c21c2 100644
--- a/tests/Unit/Traits/WithSearchTest.php
+++ b/tests/Unit/Traits/WithSearchTest.php
@@ -49,14 +49,7 @@ public function configure(): void
 
             }
         };
-        $testTableDefault->mountManagesFilters();
-        $testTableDefault->configure();
-        $testTableDefault->boot();
-        $testTableDefault->bootedComponentUtilities();
-        $testTableDefault->bootedManagesFilters();
-        $testTableDefault->bootedWithColumns();
-        $testTableDefault->bootedWithColumnSelect();
-        $testTableDefault->booted();
+        $testTableDefault->bootAll();
 
         $this->assertSame('', $testTableDefault->search);
 
@@ -89,14 +82,7 @@ public function configure(): void
             }
         };
 
-        $testTableTrimSearch->mountManagesFilters();
-        $testTableTrimSearch->configure();
-        $testTableTrimSearch->boot();
-        $testTableTrimSearch->bootedComponentUtilities();
-        $testTableTrimSearch->bootedManagesFilters();
-        $testTableTrimSearch->bootedWithColumns();
-        $testTableTrimSearch->bootedWithColumnSelect();
-        $testTableTrimSearch->booted();
+        $testTableTrimSearch->bootAll();
 
         $this->assertSame('', $testTableTrimSearch->search);
 

From fe00cff15ec3b7e6fa53360ec9c91182df4b2b50 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 11 Jan 2025 08:40:47 +0000
Subject: [PATCH 35/36] Adjustments for ComponentColumn (#2173)

* Adjustments for ComponentColumn

* Fix styling
---
 src/Views/Traits/Columns/HasComponentView.php |  8 ++-
 tests/TestCase.php                            |  2 +
 tests/TestServiceProvider.php                 | 17 ++++++
 .../Views/Columns/ComponentColumnTest.php     | 60 +++++++++++++++++++
 .../Views/Columns/ViewComponentColumnTest.php |  2 +-
 tests/Unit/Views/ComponentColumnTest.php      | 33 ----------
 tests/views/test.blade.php                    |  3 +
 7 files changed, 90 insertions(+), 35 deletions(-)
 create mode 100644 tests/TestServiceProvider.php
 delete mode 100644 tests/Unit/Views/ComponentColumnTest.php
 create mode 100644 tests/views/test.blade.php

diff --git a/src/Views/Traits/Columns/HasComponentView.php b/src/Views/Traits/Columns/HasComponentView.php
index 27fccc623..388421adc 100644
--- a/src/Views/Traits/Columns/HasComponentView.php
+++ b/src/Views/Traits/Columns/HasComponentView.php
@@ -2,13 +2,19 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views\Traits\Columns;
 
+use Illuminate\Support\Facades\View;
+
 trait HasComponentView
 {
     protected string $componentView;
 
     public function component(string $component): self
     {
-        $this->componentView = 'components.'.$component;
+        if (View::exists('components.'.$component)) {
+            $this->componentView = 'components.'.$component;
+        } elseif (View::exists($component)) {
+            $this->componentView = $component;
+        }
 
         return $this;
     }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index aba2a3bc6..39b40d0fc 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -16,6 +16,7 @@
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Species;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Veterinary;
+use Rappasoft\LaravelLivewireTables\Tests\TestServiceProvider;
 
 class TestCase extends Orchestra
 {
@@ -139,6 +140,7 @@ protected function setupUnpaginatedTable()
     protected function getPackageProviders($app): array
     {
         return [
+            TestServiceProvider::class,
             LivewireServiceProvider::class,
             LaravelLivewireTablesServiceProvider::class,
             BladeIconsServiceProvider::class,
diff --git a/tests/TestServiceProvider.php b/tests/TestServiceProvider.php
new file mode 100644
index 000000000..d3714c914
--- /dev/null
+++ b/tests/TestServiceProvider.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests;
+
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\ServiceProvider;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Components\TestComponent;
+
+class TestServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Blade::component('test-component', TestComponent::class);
+        $this->loadViewsFrom(__DIR__.'/views', 'livewire-tables-test');
+
+    }
+}
diff --git a/tests/Unit/Views/Columns/ComponentColumnTest.php b/tests/Unit/Views/Columns/ComponentColumnTest.php
index 343cab77a..bded51dc5 100644
--- a/tests/Unit/Views/Columns/ComponentColumnTest.php
+++ b/tests/Unit/Views/Columns/ComponentColumnTest.php
@@ -2,7 +2,9 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
+use Illuminate\Support\Facades\Blade;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Components\TestComponent;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Column;
@@ -10,6 +12,11 @@
 
 final class ComponentColumnTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
     public function test_can_set_the_column_title(): void
     {
         $column = ComponentColumn::make('Name', 'name');
@@ -34,4 +41,57 @@ public function test_can_not_be_both_collapsible_on_mobile_and_on_tablet(): void
         $column->getContents($row);
 
     }
+
+    public function test_can_set_custom_slot(): void
+    {
+        $column = ComponentColumn::make('Age 2', 'age')
+            ->attributes(fn ($value, $row, Column $column) => [
+                'age' => $row->age,
+            ])
+            ->slot(fn ($value, $row, Column $column) => [
+                ($row->age < 2) => 'test1',
+                ($row->age > 2) => 'test2',
+            ]);
+        $this->assertTrue($column->hasSlotCallback());
+    }
+
+    public function test_can_get_custom_slot(): void
+    {
+
+        $column = ComponentColumn::make('Age 2', 'age')
+            ->attributes(fn ($value, $row, Column $column) => [
+                'age' => $row->age,
+            ])
+            ->slot(fn ($value, $row, Column $column) => (($row->age < 10) ? 'youngslot' : 'oldslot'))
+            ->component('livewire-tables-test::test');
+
+        $pet1 = Pet::where('age', '>', 11)->first();
+        $pet1_contents = $column->getContents($pet1);
+        $this->assertSame('oldslot', $pet1_contents->getData()['slot']->__toString());
+
+        $pet2 = Pet::where('age', '<', 5)->first();
+        $pet2_contents = $column->getContents($pet2);
+        $this->assertSame('youngslot', $pet2_contents->getData()['slot']->__toString());
+
+    }
+
+    public function test_can_get_attributes(): void
+    {
+
+        $column = ComponentColumn::make('Age 2', 'age')
+            ->attributes(fn ($value, $row, Column $column) => [
+                'age' => $row->age,
+            ])
+            ->slot(fn ($value, $row, Column $column) => (($row->age < 10) ? 'youngslot' : 'oldslot'))
+            ->component('livewire-tables-test::test');
+
+        $pet1 = Pet::where('age', '>', 11)->first();
+        $pet1_contents = $column->getContents($pet1);
+        $this->assertSame(22, $pet1_contents->getData()['attributes']['age']);
+
+        $pet2 = Pet::where('age', '<', 5)->first();
+        $pet2_contents = $column->getContents($pet2);
+        $this->assertSame(2, $pet2_contents->getData()['attributes']['age']);
+
+    }
 }
diff --git a/tests/Unit/Views/Columns/ViewComponentColumnTest.php b/tests/Unit/Views/Columns/ViewComponentColumnTest.php
index 2edcf4c53..c5d138d71 100644
--- a/tests/Unit/Views/Columns/ViewComponentColumnTest.php
+++ b/tests/Unit/Views/Columns/ViewComponentColumnTest.php
@@ -33,7 +33,7 @@ public function test_can_have_component_view(): void
             ]);
 
         $this->assertFalse($column->hasComponentView());
-        $column->component('test-component');
+        $column->component('livewire-tables-test::test');
         $this->assertTrue($column->hasComponentView());
     }
 
diff --git a/tests/Unit/Views/ComponentColumnTest.php b/tests/Unit/Views/ComponentColumnTest.php
deleted file mode 100644
index ba36e2f44..000000000
--- a/tests/Unit/Views/ComponentColumnTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views;
-
-use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
-use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
-use Rappasoft\LaravelLivewireTables\Tests\TestCase;
-use Rappasoft\LaravelLivewireTables\Views\Columns\ComponentColumn;
-
-final class ComponentColumnTest extends TestCase
-{
-    public function test_component_column_attributes_callback_return_can_not_be_an_string()
-    {
-        $this->expectException(DataTableConfigurationException::class);
-        ComponentColumn::make('Name')
-            ->component('alert')
-            ->attributes(fn () => 'string')->getContents(Pet::find(1));
-    }
-
-    public function test_component_column_component_has_to_be_an_string()
-    {
-        $column = ComponentColumn::make('Name')
-            ->component('alert');
-        $this->assertEquals('components.alert', $column->getComponentView());
-    }
-
-    public function test_component_column_component_view_has_to_be_set()
-    {
-        $this->expectException(DataTableConfigurationException::class);
-        ComponentColumn::make('Name')
-            ->getContents(Pet::find(1));
-    }
-}
diff --git a/tests/views/test.blade.php b/tests/views/test.blade.php
new file mode 100644
index 000000000..70dc7f6ea
--- /dev/null
+++ b/tests/views/test.blade.php
@@ -0,0 +1,3 @@
+<div>
+    test
+</div>
\ No newline at end of file

From 6598b2516b48efb884a4a76b3e28ae9fe6a18bd0 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 11 Jan 2025 08:53:40 +0000
Subject: [PATCH 36/36] Update ChangeLog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1d1da620..deb5a8ab2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - WithSearch Tweaks by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2163
 - Optimize Header/Footer by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2164
 - Clean up Column Component View and Slot behaviours by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2169
+- Adjustments for ComponentColumn - cleaning up behaviours by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2173
 
 ### Testing
 - Add Missing Test for getCustomSortingPillDirectionsLabel with invalid direction by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2130
@@ -39,6 +40,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Add queryStringAliasTest by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2161
 - Migrate LivewireComponentColumn methods and add some missing basic tests by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2168
 - Add initial tests for LivewireComponentArrayFilter by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2170
+- Improve centralisation of tests by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2172
 
 ## [v3.5.10] - 2024-12-11
 ### Tweaks