From 30d65ac20b5b6d035f13bf2785134da13e3de043 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 16 Aug 2024 07:59:25 +0100
Subject: [PATCH 001/103] Add explanation of setRefreshMethod (#1857)

---
 docs/misc/refreshing.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/misc/refreshing.md b/docs/misc/refreshing.md
index e318bfdc7..5e07f69b6 100644
--- a/docs/misc/refreshing.md
+++ b/docs/misc/refreshing.md
@@ -42,11 +42,16 @@ public function configure(): void
 
 ## setRefreshMethod
 
-Fire a specific action when polling.
+Fire a specific action when polling.  This is only necessary when you wish to call additional actions on each refresh.  You must have a public function with the same name as the refresh method.
 
 ```php
 public function configure(): void
 {
-    $this->setRefreshMethod('refresh');
+    $this->setRefreshMethod('refreshTable');
+}
+
+public function refreshTable()
+{
+    // Custom Code Here
 }
 ```

From b3137d95e5d5bb7c7f5c60e587567d6960d55d6e Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 17 Aug 2024 23:23:27 +0100
Subject: [PATCH 002/103] Unlocking Entangled Items (#1859)

* Unlock properties locked in error

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 CHANGELOG.md                   | 4 ++++
 src/Traits/WithBulkActions.php | 4 ++++
 src/Traits/WithFilters.php     | 4 +++-
 src/Traits/WithPagination.php  | 3 +++
 src/Traits/WithReordering.php  | 5 +++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5957e1bac..55abcde31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.7] - 2024-08-18
+### Bug Fixes
+- Correct a locked property that is entangled in js, and add comments around some key properties to prevent reoccurrence by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1859
+
 ## [v3.4.6] - 2024-08-15
 ### New Features
 - Column Features - deselectedIf/selectedIf by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1846
diff --git a/src/Traits/WithBulkActions.php b/src/Traits/WithBulkActions.php
index f7121cf2d..c36b87bb4 100644
--- a/src/Traits/WithBulkActions.php
+++ b/src/Traits/WithBulkActions.php
@@ -12,14 +12,17 @@ trait WithBulkActions
 
     public bool $bulkActionsStatus = true;
 
+    // Entangled in JS
     public bool $selectAll = false;
 
     public array $bulkActions = [];
 
     public array $bulkActionConfirms = [];
 
+    // Entangled in JS
     public array $selected = [];
 
+    // Entangled in JS
     public bool $hideBulkActionsWhenEmpty = false;
 
     public ?string $bulkActionConfirmDefaultMessage;
@@ -46,6 +49,7 @@ trait WithBulkActions
 
     protected array $bulkActionsMenuItemAttributes = ['default-colors' => true, 'default-styling' => true];
 
+    // Entangled in JS
     public bool $delaySelectAll = false;
 
     public function bulkActions(): array
diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
index 1499fa1d0..d843f2a71 100644
--- a/src/Traits/WithFilters.php
+++ b/src/Traits/WithFilters.php
@@ -22,7 +22,7 @@ trait WithFilters
     #[Locked]
     public bool $filterPillsStatus = true;
 
-    #[Locked]
+    // Entangled in JS
     public bool $filterSlideDownDefaultVisible = false;
 
     #[Locked]
@@ -31,8 +31,10 @@ trait WithFilters
     #[Locked]
     public int $filterCount;
 
+    // Set in JS
     public array $filterComponents = [];
 
+    // Set in Frontend
     public array $appliedFilters = [];
 
     public array $filterGenericData = [];
diff --git a/src/Traits/WithPagination.php b/src/Traits/WithPagination.php
index 28be97ee5..571c2b76c 100644
--- a/src/Traits/WithPagination.php
+++ b/src/Traits/WithPagination.php
@@ -32,10 +32,13 @@ trait WithPagination
     #[Locked]
     public bool $perPageVisibilityStatus = true;
 
+    // Entangled in JS
     public array $paginationCurrentItems = [];
 
+    // Entangled in JS
     public int $paginationCurrentCount = 0;
 
+    // Entangled in JS
     public ?int $paginationTotalItemCount = null;
 
     public array $numberOfPaginatorsRendered = [];
diff --git a/src/Traits/WithReordering.php b/src/Traits/WithReordering.php
index f9e833e4b..2251fe2c4 100644
--- a/src/Traits/WithReordering.php
+++ b/src/Traits/WithReordering.php
@@ -11,14 +11,19 @@ trait WithReordering
     use ReorderingConfiguration,
         ReorderingHelpers;
 
+    // Entangled in JS
     public bool $reorderStatus = false;
 
+    // Entangled in JS
     public bool $currentlyReorderingStatus = false;
 
+    // Entangled in JS
     public bool $hideReorderColumnUnlessReorderingStatus = false;
 
+    // Entangled in JS
     public bool $reorderDisplayColumn = false;
 
+    // Retrieved in JS
     public string $defaultReorderColumn = 'sort';
 
     public array $orderedItems = [];

From b6890e920324c7366533b346d14d3c3323bdfb26 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 18 Aug 2024 03:10:38 +0100
Subject: [PATCH 003/103] Add dispatch on updated filter components (#1861)

* Add additional dispatch

* Add FilterApplied Event

* Add Filter Event Dispatch Tests

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 CHANGELOG.md                               |  4 ++++
 src/Traits/WithFilters.php                 |  5 +++++
 tests/Traits/Visuals/FilterVisualsTest.php | 14 ++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55abcde31..5843df9ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## UNRELEASED
+### New Features
+- Add an event dispatch for Filter Was Set when filterComponents is updated by @lrljoe
+
 ## [v3.4.7] - 2024-08-18
 ### Bug Fixes
 - Correct a locked property that is entangled in js, and add comments around some key properties to prevent reoccurrence by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1859
diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
index d843f2a71..49c91da8c 100644
--- a/src/Traits/WithFilters.php
+++ b/src/Traits/WithFilters.php
@@ -5,6 +5,7 @@
 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\Helpers\FilterHelpers;
 
@@ -103,6 +104,10 @@ public function updatedFilterComponents(string|array|null $value, string $filter
         } 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/Traits/Visuals/FilterVisualsTest.php b/tests/Traits/Visuals/FilterVisualsTest.php
index 221ee7836..5b34da945 100644
--- a/tests/Traits/Visuals/FilterVisualsTest.php
+++ b/tests/Traits/Visuals/FilterVisualsTest.php
@@ -49,6 +49,20 @@ public function test_filter_pills_show_when_enabled(): void
             ->assertSee('Applied Filters');
     }
 
+    public function test_event_dispatched_when_filterComponents_set(): void
+    {
+        Livewire::test(PetsTable::class)
+            ->set('filterComponents.breed', [1])
+            ->assertDispatched('filter-was-set');
+    }
+
+    public function test_event_dispatched_when_setFilter_dispatched(): void
+    {
+        Livewire::test(PetsTable::class)
+            ->dispatch('setFilter', filterKey: 'breed', value: [1])
+            ->assertDispatched('filter-was-set');
+    }
+
     public function test_filter_pills_show_when_visible(): void
     {
         Livewire::test(PetsTable::class)

From fb646a54fe929aa76ff44caa76b7470923ded6aa Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 18 Aug 2024 03:12:50 +0100
Subject: [PATCH 004/103] v3.4.8

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5843df9ce..7f47783c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,9 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## UNRELEASED
+## [v3.4.8] - 2024-08-18
 ### New Features
-- Add an event dispatch for Filter Was Set when filterComponents is updated by @lrljoe
+- Add an event dispatch for Filter Was Set when filterComponents is updated by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1861
 
 ## [v3.4.7] - 2024-08-18
 ### Bug Fixes

From 8eafffe945c0af2a2f2333e162d3bb4f253a48c6 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 21 Aug 2024 22:38:15 +0100
Subject: [PATCH 005/103] Fix superfluous bulk actions tr < (#1868)

---
 resources/views/components/table/tr/bulk-actions.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/table/tr/bulk-actions.blade.php b/resources/views/components/table/tr/bulk-actions.blade.php
index 7c7815b91..73201debf 100644
--- a/resources/views/components/table/tr/bulk-actions.blade.php
+++ b/resources/views/components/table/tr/bulk-actions.blade.php
@@ -97,7 +97,7 @@ class="btn btn-primary btn-sm"
                     </div>
                 </template>
 
-                <<template x-if="selectedItems.length !== paginationTotalItemCount && !selectAllStatus">
+                <template x-if="selectedItems.length !== paginationTotalItemCount && !selectAllStatus">
                     <div wire:key="{{ $tableName }}-some-selected">
                         <span>
                             @lang('You have selected')

From d1a563f48abf7b5351f5dda1247f659efeee26df Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 21 Aug 2024 23:00:11 +0100
Subject: [PATCH 006/103] Default useComputedProperties to False (#1869)

---
 src/Traits/ComponentUtilities.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index d065b25ed..815cd216e 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -45,7 +45,7 @@ trait ComponentUtilities
 
     protected array $extraWithAvgs = [];
 
-    protected bool $useComputedProperties = true;
+    protected bool $useComputedProperties = false;
 
     /**
      * Set any configuration options

From da50aa12f2502097b93977e7e22b6411072f7a4e Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 21 Aug 2024 23:04:22 +0100
Subject: [PATCH 007/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f47783c3..1e917bd8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.9] - 2024-08-21
+### Bug Fixes
+- Default UseComputedProperties to False to allow previously published views to work by default by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1869
+- Fix superfluous bulk actions tr > by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1868
+
 ## [v3.4.8] - 2024-08-18
 ### New Features
 - Add an event dispatch for Filter Was Set when filterComponents is updated by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1861

From 74c35e2dfec84661541aeb6ac424164d60790fe2 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Thu, 22 Aug 2024 00:51:34 +0100
Subject: [PATCH 008/103] Add Action Buttons (#1864)

* Make ActionButtons An Optional Feature in Beta


---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/misc/actions.md                          | 207 ++++++++++++
 .../components/includes/actions.blade.php     |  12 +
 resources/views/datatable.blade.php           |   5 +
 .../views/includes/actions/button.blade.php   |  24 ++
 src/Traits/HasAllTraits.php                   |   1 +
 src/Traits/WithActions.php                    |  48 +++
 src/Views/Action.php                          |  44 +++
 src/Views/Actions/Action.php                  |  13 +
 .../Traits/Actions/HasActionAttributes.php    |  30 ++
 src/Views/Traits/Actions/HasRoute.php         |  29 ++
 src/Views/Traits/Core/HasAttributes.php       |   2 +-
 src/Views/Traits/Core/HasIcon.php             |  42 +++
 src/Views/Traits/Core/HasLabel.php            |  13 +
 src/Views/Traits/Core/HasTheme.php            |  35 ++
 src/Views/Traits/Core/HasWireActions.php      |  67 ++++
 tests/Views/Actions/ActionTest.php            | 310 ++++++++++++++++++
 16 files changed, 881 insertions(+), 1 deletion(-)
 create mode 100644 docs/misc/actions.md
 create mode 100644 resources/views/components/includes/actions.blade.php
 create mode 100644 resources/views/includes/actions/button.blade.php
 create mode 100644 src/Traits/WithActions.php
 create mode 100644 src/Views/Action.php
 create mode 100644 src/Views/Actions/Action.php
 create mode 100644 src/Views/Traits/Actions/HasActionAttributes.php
 create mode 100644 src/Views/Traits/Actions/HasRoute.php
 create mode 100644 src/Views/Traits/Core/HasIcon.php
 create mode 100644 src/Views/Traits/Core/HasLabel.php
 create mode 100644 src/Views/Traits/Core/HasTheme.php
 create mode 100644 src/Views/Traits/Core/HasWireActions.php
 create mode 100644 tests/Views/Actions/ActionTest.php

diff --git a/docs/misc/actions.md b/docs/misc/actions.md
new file mode 100644
index 000000000..7ee964e13
--- /dev/null
+++ b/docs/misc/actions.md
@@ -0,0 +1,207 @@
+---
+title: Actions (beta)
+weight: 4
+---
+
+Actions is a beta feature, that allows for the creation of Action Buttons that appear above the toolbar.  These are ideal for common Actions that do not impact existing records, such as a "Create", "Assign", "Back" buttons.
+
+This is NOT recommended for production use at this point in time.
+
+## Usage
+To use "Actions", while it is in beta, you must include the following Trait in your table:
+```php
+use Rappasoft\LaravelLivewireTables\Traits\WithActions;
+```
+
+Once out of beta, this will not be required.
+
+## Component Available Methods
+### setActionWrapperAttributes
+
+This is used to set attributes for the "div" that wraps all defined Action Buttons:
+
+```php
+    public function configure(): void
+    {
+        $this->setActionWrapperAttributes([
+            'class' => 'space-x-4'
+        ]);
+    }
+```
+
+### actions()
+
+Define your actions using the actions() method:
+
+```php
+public function actions(): array
+{
+    return [
+        Action::make('View Dashboard')
+        ->setRoute('dashboard'),
+    ];
+}
+```
+
+## Button Available Methods
+
+### setActionAttributes
+
+setActionAttributes is used to pass any attributes that you wish to implement on the "button" element for the action button.  By default it will merge with the default classes. 
+
+You can set "default-styling" and "default-colors" to false to replace, rather than over-ride either default-styling or default-colors.
+```php
+public function actions(): array
+{
+    return [
+        Action::make('View Dashboard')
+            ->setActionAttributes([
+                'class' => 'dark:bg-blue-500 dark:text-white dark:border-blue-600 dark:hover:border-blue-900 dark:hover:bg-blue-800', 
+                'default-colors' => false, // Will over-ride the default colors
+                'default-styling' => true // Will use the default styling
+            ]),
+    ];
+}
+```
+
+### setIcon
+
+setIcon is used to set an icon for the action button
+
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Edit Item')
+        ->setIcon("fas fa-edit"),
+    ];
+}
+```
+
+### setIconAttributes
+
+setIconAttributes is used to set any additional attributes for the Icon for the action button
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Edit Item')
+        ->setIcon("fas fa-edit")
+        ->setIconAttributes(['class' => 'font-4xl text-4xl']),
+    ];
+}
+```
+
+### setRoute
+
+Used for non-wireable butons, to set the route that the action button should take the user to upon clicking.
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Dashboard')
+        ->setRoute('dashboard')
+    ];
+}
+```
+
+### wireNavigate
+
+Used in conjunction with setRoute - makes the link "wire:navigate" rather than default behaviour
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Dashboard')
+        ->setRoute('dashboard')
+        ->wireNavigate()
+    ];
+}
+```
+
+### setWireAction
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Create 2')
+        ->setWireAction("wire:click")
+    ];
+}
+```
+
+### setWireActionParams
+Specify the action & parameters to pass to the wire:click method
+
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Create 2')
+        ->setWireAction("wire:click")
+        ->setWireActionParams(['id' => 'test']),
+    ];
+}
+```
+
+### setWireActionDispatchParams
+
+Use $dispatch rather than a typical wire:click action
+
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Create 2')
+        ->setWireAction("wire:click")
+        ->setWireActionDispatchParams("'openModal', { component: 'test-modal' }"),
+    ];
+}
+```
+
+### setView
+
+This is used to set a Custom View for the Button
+
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Edit Item')
+        ->setView("buttons.edit"),
+    ];
+}
+```
+
+## Extending
+
+You can extend the Base Action class which can be a useful timesaver, when you wish to re-use the same look/feel of an Action, but wish to set a different route (for example).
+You can set any defaults in the __construct method, ensuring that the parent constructor is called first!
+
+```php
+use Rappasoft\LaravelLivewireTables\Views\Action;
+
+class EditAction extends Action
+{
+    public function __construct(?string $label = null)
+    {
+        parent::__construct($label);
+        $this
+            ->setActionAttributes([
+                'class' => 'dark:bg-blue-500 dark:text-white dark:border-blue-600 dark:hover:border-blue-900 dark:hover:bg-blue-800', 
+                'default-colors' => false, 
+                'default-styling' => true
+            ])
+            ->setIcon("fas fa-edit")
+            ->setIconAttributes([
+                'class' => 'font-4xl text-4xl'
+            ]);
+    }
+}
+```
+
+You may define a Custom View to be used via either the setView method, or by defining the view directly in your class.
+```php
+    protected string $view = 'buttons.edit-action';
+```
+
diff --git a/resources/views/components/includes/actions.blade.php b/resources/views/components/includes/actions.blade.php
new file mode 100644
index 000000000..422381ed1
--- /dev/null
+++ b/resources/views/components/includes/actions.blade.php
@@ -0,0 +1,12 @@
+<div {{ $attributes
+            ->merge($this->getActionWrapperAttributes())
+            ->class(['flex flex-cols justify-center' => $this->isTailwind && $this->getActionWrapperAttributes()['default-styling'] ?? true])
+            ->class(['' => $this->isTailwind && $this->getActionWrapperAttributes()['default-colors'] ?? true])
+            ->class(['d-flex flex-cols justify-center' => $this->isBootstrap && $this->getActionWrapperAttributes()['default-styling'] ?? true])
+            ->class(['' => $this->isBootstrap && $this->getActionWrapperAttributes()['default-colors'] ?? true])
+            ->except(['default-styling','default-colors'])
+        }} >
+    @foreach($this->getActions as $action)
+        {{ $action->render() }}
+    @endforeach
+</div>
\ No newline at end of file
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index 88eadc23a..02cb79d0f 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -8,6 +8,11 @@
 
 <div x-data="laravellivewiretable($wire, '{{ $this->showBulkActionsDropdownAlpine() }}', '{{ $tableId }}', '{{ $primaryKey }}')">
     <x-livewire-tables::wrapper :component="$this" :tableName="$tableName" :$primaryKey :$isTailwind :$isBootstrap :$isBootstrap4 :$isBootstrap5>
+        @if(method_exists($this,'hasActions') && $this->hasActions())
+            <x-livewire-tables::includes.actions/>    
+        @endif
+    
+
         @if ($this->hasConfigurableAreaFor('before-tools'))
             @include($this->getConfigurableAreaFor('before-tools'), $this->getParametersForConfigurableArea('before-tools'))
         @endif
diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php
new file mode 100644
index 000000000..0d22c2c91
--- /dev/null
+++ b/resources/views/includes/actions/button.blade.php
@@ -0,0 +1,24 @@
+<a {{ $attributes->merge()
+            ->class(['justify-center text-center items-center inline-flex 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])
+            ->except(['default-styling', 'default-colors'])
+        }} 
+           @if($action->hasWireAction())
+            {{ $action->getWireAction() }}="{{ $action->getWireActionParams() }}"
+           @endif
+           @if($action->getWireNavigateEnabled())
+            wire:navigate
+           @endif
+        >
+            {{ $action->getLabel() }}
+
+        @if($action->hasIcon())
+            <i {{ $action->getIconAttributes()
+                ->class(["ms-1 ". $action->getIcon() => $isBootstrap])
+                ->class(["ml-1 ". $action->getIcon() => $isTailwind])
+                ->except('default-styling')
+            }}></i>
+        @endif
+</a>
\ No newline at end of file
diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index d4287dc04..0f2553eca 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -8,6 +8,7 @@ trait HasAllTraits
     use WithTableHooks;
     use WithLoadingPlaceholder;
     use ComponentUtilities,
+        //WithActions,
         WithData,
         WithColumns,
         WithSorting,
diff --git a/src/Traits/WithActions.php b/src/Traits/WithActions.php
new file mode 100644
index 000000000..31f563a98
--- /dev/null
+++ b/src/Traits/WithActions.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits;
+
+use Illuminate\Support\Collection;
+use Livewire\Attributes\Computed;
+use Rappasoft\LaravelLivewireTables\Views\Action;
+
+trait WithActions
+{
+    protected array $actionWrapperAttributes = ['default-styling' => true, 'default-colors' => true];
+
+    protected function actions(): array
+    {
+        return [];
+    }
+
+    public function setActionWrapperAttributes(array $actionWrapperAttributes): self
+    {
+        $this->actionWrapperAttributes = [...['default-styling' => true, 'default-colors' => true], ...$actionWrapperAttributes];
+
+        return $this;
+    }
+
+    #[Computed]
+    public function getActionWrapperAttributes(): array
+    {
+        return [...['default-styling' => true, 'default-colors' => true], ...$this->actionWrapperAttributes];
+    }
+
+    #[Computed]
+    public function hasActions(): bool
+    {
+        return (new Collection($this->actions()))
+            ->filter(fn ($action) => $action instanceof Action)->count() > 0;
+    }
+
+    #[Computed]
+    public function getActions(): Collection
+    {
+        return (new Collection($this->actions()))
+            ->filter(fn ($action) => $action instanceof Action)
+            ->each(function (Action $action, int $key) {
+                $action->setTheme($this->getTheme());
+            });
+
+    }
+}
diff --git a/src/Views/Action.php b/src/Views/Action.php
new file mode 100644
index 000000000..3c6570328
--- /dev/null
+++ b/src/Views/Action.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views;
+
+use Illuminate\View\Component;
+use Illuminate\View\ComponentAttributeBag;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Actions\{HasActionAttributes, HasRoute};
+use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\HasVisibility;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasIcon, HasLabel, HasTheme, HasView, HasWireActions};
+
+class Action extends Component
+{
+    use HasActionAttributes;
+    use HasIcon;
+    use HasLabel;
+    use HasRoute;
+    use HasTheme;
+    use HasView;
+    use HasVisibility;
+    use HasWireActions;
+
+    protected string $view = 'livewire-tables::includes.actions.button';
+
+    public function __construct(?string $label = null)
+    {
+        $this->label = trim(__($label));
+    }
+
+    public static function make(?string $label = null): self
+    {
+        return new static($label);
+    }
+
+    public function render(): null|string|\Illuminate\Support\HtmlString|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
+    {
+        $view = view($this->getView())
+            ->withAction($this)
+            ->withIsBootstrap($this->isBootstrap())
+            ->withIsTailwind($this->isTailwind())
+            ->withAttributes($this->getActionAttributes());
+
+        return $view;
+    }
+}
diff --git a/src/Views/Actions/Action.php b/src/Views/Actions/Action.php
new file mode 100644
index 000000000..e30ce0114
--- /dev/null
+++ b/src/Views/Actions/Action.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Actions;
+
+use Rappasoft\LaravelLivewireTables\Views\Action as BaseAction;
+
+class Action extends BaseAction
+{
+    public function __construct(?string $label = null)
+    {
+        parent::__construct($label);
+    }
+}
diff --git a/src/Views/Traits/Actions/HasActionAttributes.php b/src/Views/Traits/Actions/HasActionAttributes.php
new file mode 100644
index 000000000..b672f45ae
--- /dev/null
+++ b/src/Views/Traits/Actions/HasActionAttributes.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Actions;
+
+use Illuminate\View\ComponentAttributeBag;
+
+trait HasActionAttributes
+{
+    protected array $actionAttributes = ['default-styling' => true, 'default-colors' => true];
+
+    public function setActionAttributes(array $actionAttributes): self
+    {
+        $this->actionAttributes = [...['default-styling' => true, 'default-colors' => true], ...$actionAttributes];
+
+        return $this;
+    }
+
+    public function getActionAttributes(): ComponentAttributeBag
+    {
+        $actionAttributes = [...['default-styling' => true, 'default-colors' => true], ...$this->actionAttributes];
+
+        if (! $this->hasWireAction() && method_exists($this, 'getRoute')) {
+            $actionAttributes['href'] = $this->getRoute();
+        } else {
+            $actionAttributes['href'] = '#';
+        }
+
+        return new ComponentAttributeBag($actionAttributes);
+    }
+}
diff --git a/src/Views/Traits/Actions/HasRoute.php b/src/Views/Traits/Actions/HasRoute.php
new file mode 100644
index 000000000..5b2696469
--- /dev/null
+++ b/src/Views/Traits/Actions/HasRoute.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Actions;
+
+trait HasRoute
+{
+    public string $route = '#';
+
+    public function route(string $route): self
+    {
+        $this->route = $route;
+        $this->attributes['href'] = $route;
+
+        return $this;
+    }
+
+    public function setRoute(string $route): self
+    {
+        $this->route = $route;
+        $this->attributes['href'] = $route;
+
+        return $this;
+    }
+
+    public function getRoute(): string
+    {
+        return $this->route;
+    }
+}
diff --git a/src/Views/Traits/Core/HasAttributes.php b/src/Views/Traits/Core/HasAttributes.php
index 2978d5822..76220d4bc 100644
--- a/src/Views/Traits/Core/HasAttributes.php
+++ b/src/Views/Traits/Core/HasAttributes.php
@@ -5,7 +5,7 @@
 use Closure;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\View\ComponentAttributeBag;
-use Rappasoft\LaravelLivewireTables\Views\{Column,Filter};
+use Rappasoft\LaravelLivewireTables\Views\{Action, Column,Filter};
 
 trait HasAttributes
 {
diff --git a/src/Views/Traits/Core/HasIcon.php b/src/Views/Traits/Core/HasIcon.php
new file mode 100644
index 000000000..bd80ca841
--- /dev/null
+++ b/src/Views/Traits/Core/HasIcon.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Core;
+
+use Illuminate\View\ComponentAttributeBag;
+use Livewire\Attributes\Computed;
+
+trait HasIcon
+{
+    public ?string $icon;
+
+    public array $iconAttributes = ['default-styling' => true];
+
+    public function setIcon(string $icon): self
+    {
+        $this->icon = $icon;
+
+        return $this;
+    }
+
+    public function hasIcon(): bool
+    {
+        return isset($this->icon);
+    }
+
+    public function getIcon(): string
+    {
+        return $this->icon;
+    }
+
+    public function setIconAttributes(array $iconAttributes): self
+    {
+        $this->iconAttributes = [...['default-styling' => true], ...$iconAttributes];
+
+        return $this;
+    }
+
+    public function getIconAttributes(): ComponentAttributeBag
+    {
+        return new ComponentAttributeBag([...['default-styling' => true], ...$this->iconAttributes]);
+    }
+}
diff --git a/src/Views/Traits/Core/HasLabel.php b/src/Views/Traits/Core/HasLabel.php
new file mode 100644
index 000000000..cfb2f13c5
--- /dev/null
+++ b/src/Views/Traits/Core/HasLabel.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Core;
+
+trait HasLabel
+{
+    public string $label = '';
+
+    public function getLabel(): string
+    {
+        return $this->label;
+    }
+}
diff --git a/src/Views/Traits/Core/HasTheme.php b/src/Views/Traits/Core/HasTheme.php
new file mode 100644
index 000000000..65ccfb885
--- /dev/null
+++ b/src/Views/Traits/Core/HasTheme.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Core;
+
+trait HasTheme
+{
+    protected string $theme = 'tailwind';
+
+    public function setTheme(string $theme): self
+    {
+        $this->theme = $theme;
+
+        return $this;
+    }
+
+    public function isTailwind(): bool
+    {
+        return $this->theme != 'bootstrap-4' && $this->theme != 'bootstrap-5';
+    }
+
+    public function isBootstrap(): bool
+    {
+        return $this->theme == 'bootstrap-4' || $this->theme == 'bootstrap-5';
+    }
+
+    public function isBootstrap4(): bool
+    {
+        return $this->theme == 'bootstrap-4';
+    }
+
+    public function isBootstrap5(): bool
+    {
+        return $this->theme == 'bootstrap-5';
+    }
+}
diff --git a/src/Views/Traits/Core/HasWireActions.php b/src/Views/Traits/Core/HasWireActions.php
new file mode 100644
index 000000000..04d96a050
--- /dev/null
+++ b/src/Views/Traits/Core/HasWireActions.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Core;
+
+use Illuminate\Database\Eloquent\Model;
+
+trait HasWireActions
+{
+    protected bool $shouldWireNavigate = false;
+
+    protected ?string $wireAction = null;
+
+    protected ?string $wireActionParams = null;
+
+    public function wireNavigate(): self
+    {
+        $this->shouldWireNavigate = true;
+
+        return $this;
+    }
+
+    public function getWireNavigateEnabled(): bool
+    {
+        return $this->shouldWireNavigate;
+    }
+
+    public function hasWireAction(): bool
+    {
+        return isset($this->wireAction);
+    }
+
+    public function getWireAction(): string
+    {
+        return $this->wireAction;
+    }
+
+    public function setWireAction(string $wireAction): self
+    {
+        $this->wireAction = $wireAction;
+
+        return $this;
+    }
+
+    public function hasWireActionParams(): bool
+    {
+        return isset($this->wireActionParams);
+    }
+
+    public function getWireActionParams(): string
+    {
+        return $this->wireActionParams;
+    }
+
+    public function setWireActionParams(string $wireActionParams): self
+    {
+        $this->wireActionParams = $wireActionParams;
+
+        return $this;
+    }
+
+    public function setWireActionDispatchParams(string $wireActionParams): self
+    {
+        $this->setWireActionParams('$dispatch('.$wireActionParams.')');
+
+        return $this;
+    }
+}
diff --git a/tests/Views/Actions/ActionTest.php b/tests/Views/Actions/ActionTest.php
new file mode 100644
index 000000000..936d1f22f
--- /dev/null
+++ b/tests/Views/Actions/ActionTest.php
@@ -0,0 +1,310 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Views\Actions;
+
+use Illuminate\View\ComponentAttributeBag;
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{PetsTable,PetsTableAttributes};
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+use Rappasoft\LaravelLivewireTables\Views\Actions\Action;
+
+final class ActionTest extends TestCase
+{
+    public function test_can_get_action_button_label(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->setIcon('fas fa-minus')
+            ->setIconAttributes(['class' => 'font-sm text-sm'])
+            ->wireNavigate()
+            ->route('dashboard2');
+
+        $this->assertSame('Update Summaries', $action->getLabel());
+    }
+
+    public function test_can_get_action_button_icon(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes([
+                'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
+                'default-styling' => true,
+                'default-colors' => true,
+            ])
+            ->wireNavigate()
+            ->route('dashboard2');
+        $this->assertFalse($action->hasIcon());
+        $action->setIcon('fas fa-minus');
+        $this->assertTrue($action->hasIcon());
+        $this->assertSame('fas fa-minus', $action->getIcon());
+        $this->assertSame('fas fa-minus', $action->icon);
+
+    }
+
+    public function test_can_get_action_button_icon_attributes(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes([
+                'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
+                'default-styling' => true,
+                'default-colors' => true,
+            ])
+            ->wireNavigate()
+            ->route('dashboard2');
+        $this->assertFalse($action->hasIcon());
+
+        $action->setIconAttributes(['class' => 'font-sm text-sm']);
+        $bag = new \Illuminate\View\ComponentAttributeBag(['default-styling' => true, 'class' => 'font-sm text-sm']);
+
+        $this->assertSame($bag->getAttributes(), $action->getIconAttributes()->getAttributes());
+        $this->assertSame(['default-styling' => true, 'class' => 'font-sm text-sm'], $action->iconAttributes);
+
+    }
+
+    public function test_can_get_action_button_route(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->setIcon('fas fa-minus')
+            ->setIconAttributes(['class' => 'font-sm text-sm'])
+            ->wireNavigate();
+        $this->assertSame('#', $action->getRoute());
+        $this->assertSame('#', $action->route);
+        $action->route('dashboard2');
+        $this->assertSame('dashboard2', $action->route);
+
+        $this->assertSame('dashboard2', $action->getRoute());
+        $action->setRoute('dashboard4');
+        $this->assertSame('dashboard4', $action->getRoute());
+    }
+
+    public function test_can_set_action_button_to_wire_navigate(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->route('dashboard2');
+        $this->assertFalse($action->getWireNavigateEnabled());
+        $action->wireNavigate();
+        $this->assertTrue($action->getWireNavigateEnabled());
+    }
+
+    public function test_can_get_action_button_action_attributes(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->wireNavigate()
+            ->route('dashboard2');
+        $this->assertSame((new ComponentAttributeBag([
+            'default-styling' => true,
+            'default-colors' => true,
+            'href' => 'dashboard2',
+        ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
+
+        $action->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true]);
+        $this->assertSame((new ComponentAttributeBag([
+            'default-styling' => true,
+            'default-colors' => true,
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
+            'href' => 'dashboard2',
+        ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
+
+        $action->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true]);
+        $this->assertSame((new ComponentAttributeBag([
+            'default-styling' => true,
+            'default-colors' => true,
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
+            'href' => 'dashboard2',
+        ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
+
+        $action->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => false]);
+        $this->assertSame((new ComponentAttributeBag([
+            'default-styling' => true,
+            'default-colors' => false,
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
+            'href' => 'dashboard2',
+        ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
+
+        $action->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-colors' => false]);
+        $this->assertSame((new ComponentAttributeBag([
+            'default-styling' => true,
+            'default-colors' => false,
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
+            'href' => 'dashboard2',
+        ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
+
+    }
+
+    public function test_can_check_has_wire_action(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->setIcon('fas fa-minus')
+            ->setIconAttributes(['class' => 'font-sm text-sm']);
+
+        $this->assertFalse($action->hasWireAction());
+
+        $action->setWireAction('wire:click')
+            ->setWireActionParams("\$dispatch('openModal', { component: 'test-modal', arguments: JSON.parse('{\u0022modelID\u0022:\u0022\u0022}') })");
+
+        $this->assertTrue($action->hasWireAction());
+    }
+
+    public function test_can_get_wire_action(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->setIcon('fas fa-minus')
+            ->setIconAttributes(['class' => 'font-sm text-sm'])
+            ->setWireAction('wire:click')
+            ->setWireActionParams("\$dispatch('openModal', { component: 'test-modal', arguments: JSON.parse('{\u0022modelID\u0022:\u0022\u0022}') })");
+
+        $this->assertTrue($action->hasWireAction());
+
+        $this->assertSame('wire:click', $action->getWireAction());
+
+    }
+
+    public function test_can_get_wire_action_dispatch(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->setIcon('fas fa-minus')
+            ->setIconAttributes(['class' => 'font-sm text-sm'])
+            ->setWireAction('wire:click')
+            ->setWireActionDispatchParams("'openModal', { component: 'test-modal', arguments: JSON.parse('{\u0022modelID\u0022:\u0022\u0022}') }");
+        $this->assertTrue($action->hasWireAction());
+
+        $this->assertSame('wire:click', $action->getWireAction());
+        $this->assertSame("\$dispatch('openModal', { component: 'test-modal', arguments: JSON.parse('{\u0022modelID\u0022:\u0022\u0022}') })", $action->getWireActionParams());
+
+    }
+
+    public function test_can_get_wire_action_params(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->setIcon('fas fa-minus')
+            ->setIconAttributes(['class' => 'font-sm text-sm'])
+            ->setWireAction('wire:click')
+            ->setWireActionParams('testactionparams');
+
+        $this->assertTrue($action->hasWireActionParams());
+        $this->assertTrue($action->hasWireAction());
+
+        $this->assertSame('testactionparams', $action->getWireActionParams());
+        $this->assertSame('wire:click', $action->getWireAction());
+
+    }
+
+    public function test_can_set_action_wrapper_attributes(): void
+    {
+        $petsTable = (new class extends PetsTable
+        {
+            use \Rappasoft\LaravelLivewireTables\Traits\WithActions;
+
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        });
+        $this->assertSame(['default-styling' => true, 'default-colors' => true], $petsTable->getActionWrapperAttributes());
+        $petsTable->setActionWrapperAttributes(['default-styling' => false, 'class' => 'bg-blue-500']);
+        $this->assertSame([
+            'default-styling' => false,
+            'default-colors' => true,
+            'class' => 'bg-blue-500',
+        ], $petsTable->getActionWrapperAttributes());
+
+        $petsTable->setActionWrapperAttributes(['default-colors' => false, 'class' => 'bg-red-500']);
+        $this->assertSame([
+            'default-styling' => true,
+            'default-colors' => false,
+            'class' => 'bg-red-500',
+        ], $petsTable->getActionWrapperAttributes());
+
+    }
+
+    public function test_can_check_that_route_is_appended_to_attributes(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->route('dashboard22');
+        $this->assertSame((new ComponentAttributeBag([
+            'default-styling' => true,
+            'default-colors' => true,
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
+            'href' => 'dashboard22',
+        ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
+    }
+
+    public function test_can_check_that_route_is_not_appended_to_attributes_with_wireaction(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->route('dashboard22')
+            ->setWireAction('wire:click')
+            ->setWireActionParams('testactionparams');
+        $this->assertSame((new ComponentAttributeBag([
+            'default-styling' => true,
+            'default-colors' => true,
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
+            'href' => '#',
+        ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
+    }
+
+    public function test_can_check_has_actions(): void
+    {
+        $petsTable = (new class extends PetsTable
+        {
+            use \Rappasoft\LaravelLivewireTables\Traits\WithActions;
+
+            public function actions()
+            {
+                return [
+                    \Rappasoft\LaravelLivewireTables\Views\Actions\Action::make('Test Edit 1')
+                        ->setRoute('dashboard24'),
+                ];
+            }
+
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        });
+        $this->assertTrue($petsTable->hasActions());
+
+        $this->assertSame(1, $petsTable->getActions()->count());
+
+    }
+
+    public function test_action_renders_correctly(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
+                'default-styling' => true,
+                'default-colors' => true]
+            )
+            ->route('dashboard22');
+
+        $this->assertStringContainsString('<a class="focus:border-indigo-300 focus:ring-indigo-200 justify-center text-center items-center inline-flex 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());
+    }
+}

From 46d2752f188f5a5ad424aebd4ebcc1f1f2d25de3 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 17:36:00 +0100
Subject: [PATCH 009/103] FixDateRangeFilter (#1872)

---
 docs/filter-types/filters-daterange.md         |  5 +++--
 resources/js/laravel-livewire-tables.js        | 11 ++++++-----
 resources/js/laravel-livewire-tables.min.js    |  2 +-
 resources/js/partials/filter-date-range.js     | 11 ++++++-----
 resources/js/partials/filter-date-range.min.js |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/docs/filter-types/filters-daterange.md b/docs/filter-types/filters-daterange.md
index 1d12e30b1..71241daba 100644
--- a/docs/filter-types/filters-daterange.md
+++ b/docs/filter-types/filters-daterange.md
@@ -46,6 +46,7 @@ public function filters(): array
 A full list of options is below, please see the Flatpickr documentation for reference as to purpose:
 | Config Option  | Type | Default | Description | 
 | ------------- | ------------- | ------------- | ------------- |
+| allowInvalidPreload | Boolean | true | Allows the preloading of an invalid date. When disabled, the field will be cleared if the provided date is invalid |
 | allowInput | Boolean | false | Allows the user to enter a date directly into the input field. By default, direct entry is disabled. | 
 | altFormat | String | "F j, Y" | Exactly the same as date format, but for the altInput field | 
 | altInput | Boolean | false | Show the user a readable date (as per altFormat), but return something totally different to the server. | 
@@ -153,7 +154,7 @@ If using the CDN approach, ensure the following config matches:
 Then include the following in your layout:
 ```html
 // Flatpickr Core Script
-<script src="https://npmcdn.com/flatpickr" async></script>
+<script src="https://npmcdn.com/flatpickr" defer></script>
 
 // Flatpickr Core CSS
 <link rel="stylesheet" href="https://npmcdn.com/flatpickr/dist/flatpickr.min.css">
@@ -193,5 +194,5 @@ You can also add locales using the Flatpickr CDN, ensuring that these are loaded
 
 For example to add German (de), ensure that the following is in the "head" section of your layout, ideally before your app.js
 ```html
-<script src="https://npmcdn.com/flatpickr/dist/l10n/de.js" async></script>
+<script src="https://npmcdn.com/flatpickr/dist/l10n/de.js" defer></script>
 ```
\ No newline at end of file
diff --git a/resources/js/laravel-livewire-tables.js b/resources/js/laravel-livewire-tables.js
index 7d48524d2..b83a405e3 100644
--- a/resources/js/laravel-livewire-tables.js
+++ b/resources/js/laravel-livewire-tables.js
@@ -311,7 +311,7 @@ document.addEventListener('alpine:init', () => {
             altFormat: filterConfig['altFormat'] ?? "F j, Y",
             altInput: filterConfig['altInput'] ?? false,
             allowInput: filterConfig['allowInput'] ?? false,
-            allowInvalidPreload: true,
+            allowInvalidPreload: filterConfig['allowInvalidPreload'] ?? true,
             ariaDateFormat: filterConfig['ariaDateFormat'] ?? "F j, Y",
             clickOpens: true,
             dateFormat: filterConfig['dateFormat'] ?? "Y-m-d",
@@ -333,15 +333,16 @@ document.addEventListener('alpine:init', () => {
             },
             onChange: function (selectedDates, dateStr, instance) {
                 if (selectedDates.length > 1) {
-                    var startDate = dateStr.split(' ')[0];
-                    var endDate = dateStr.split(' ')[2];
+                    var dates = dateStr.split(' ');
+
                     var wireDateArray = {};
                     window.childElementOpen = false;
                     window.filterPopoverOpen = false;
-                    wireDateArray = { 'minDate': startDate, 'maxDate': endDate };
+                    wireDateArray = { 'minDate': dates[0], 'maxDate': (typeof dates[2] === "undefined") ? dates[0] : dates[2] };
                     wire.set('filterComponents.' + filterKey, wireDateArray);
                 }
-            }
+
+            },
         }),
         setupWire() {
             if (this.wireValues !== undefined) {
diff --git a/resources/js/laravel-livewire-tables.min.js b/resources/js/laravel-livewire-tables.min.js
index f9b60100f..42be51fb0 100644
--- a/resources/js/laravel-livewire-tables.min.js
+++ b/resources/js/laravel-livewire-tables.min.js
@@ -1 +1 @@
-document.addEventListener('alpine:init',()=>{Alpine.data('laravellivewiretable',(wire,showBulkActionsAlpine,tableID,primaryKeyName)=>({listeners:[],childElementOpen:!1,filtersOpen:wire.entangle('filterSlideDownDefaultVisible'),paginationCurrentCount:wire.entangle('paginationCurrentCount'),paginationTotalItemCount:wire.entangle('paginationTotalItemCount'),paginationCurrentItems:wire.entangle('paginationCurrentItems'),selectedItems:wire.entangle('selected'),selectAllStatus:wire.entangle('selectAll'),delaySelectAll:wire.entangle('delaySelectAll'),hideBulkActionsWhenEmpty:wire.entangle('hideBulkActionsWhenEmpty'),dragging:!1,reorderEnabled:!1,sourceID:'',targetID:'',evenRowClasses:'',oddRowClasses:'',currentlyHighlightedElement:'',evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:wire.get('defaultReorderColumn'),reorderStatus:wire.entangle('reorderStatus'),currentlyReorderingStatus:wire.entangle('currentlyReorderingStatus'),hideReorderColumnUnlessReorderingStatus:wire.entangle('hideReorderColumnUnlessReorderingStatus'),reorderDisplayColumn:wire.entangle('reorderDisplayColumn'),dragStart(a){this.$nextTick(()=>this.setupEvenOddClasses());this.sourceID=a.target.id;a.dataTransfer.effectAllowed='move';a.dataTransfer.setData('text/plain',a.target.id);a.target.classList.add('laravel-livewire-tables-dragging')},dragOverEvent(A){typeof this.currentlyHighlightedElement=='object'&&this.currentlyHighlightedElement.classList.remove('laravel-livewire-tables-highlight-bottom','laravel-livewire-tables-highlight-top');let b=A.target.closest('tr');this.currentlyHighlightedElement=b;A.offsetY<(b.getBoundingClientRect().height/2)?(b.classList.add('laravel-livewire-tables-highlight-top'),b.classList.remove('laravel-livewire-tables-highlight-bottom')):(b.classList.remove('laravel-livewire-tables-highlight-top'),b.classList.add('laravel-livewire-tables-highlight-bottom'))},dragLeaveEvent(_){_.target.closest('tr').classList.remove('laravel-livewire-tables-highlight-bottom','laravel-livewire-tables-highlight-top')},dropEvent(B){typeof this.currentlyHighlightedElement=='object'&&this.currentlyHighlightedElement.classList.remove('laravel-livewire-tables-highlight-bottom','laravel-livewire-tables-highlight-top');let c=B.target.closest('tr');let C=B.target.closest('tr').parentNode;let d=document.getElementById(this.sourceID).closest('tr');d.classList.remove('laravel-livewire-table-dragging');let e=d.rowIndex;let f=c.rowIndex;let g=document.getElementById(tableID);B.offsetY>(c.getBoundingClientRect().height/2)?C.insertBefore(d,c.nextSibling):C.insertBefore(d,c);f<e;let h='even';for(let i=1,_b;_b=g.rows[i];i++)if(!_b.classList.contains('hidden')&&!_b.classList.contains('md:hidden'))h==='even'?(_b.classList.remove(...this.oddNotInEven),_b.classList.add(...this.evenNotInOdd),h='odd'):(_b.classList.remove(...this.evenNotInOdd),_b.classList.add(...this.oddNotInEven),h='even')},reorderToggle(){if(this.currentlyReorderingStatus)wire.disableReordering();else{this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0);this.setupEvenOddClasses();wire.enableReordering()}this.$nextTick(()=>this.setupEvenOddClasses())},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1);wire.disableReordering()},updateOrderedItems(){let _a=document.getElementById(tableID);let D=[];for(let i=1,_B;_B=_a.rows[i];i++)D.push({[primaryKeyName]:_B.getAttribute('rowpk'),[this.defaultReorderColumn]:i});wire.storeReorder(D)},setupEvenOddClasses(){if(this.evenNotInOdd.length===void 0||this.evenNotInOdd.length==0||this.oddNotInEven.length===void 0||this.oddNotInEven.length==0){let _A=document.getElementById(tableID).getElementsByTagName('tbody')[0];let E=[];let _c=[];(_A.rows[0]!==void 0&&_A.rows[1]!==void 0)&&(E=[..._A.rows[0].classList],_c=[..._A.rows[1].classList],this.evenNotInOdd=E.filter(aA=>!_c.includes(aA)),this.oddNotInEven=_c.filter(aB=>!E.includes(aB)),E=[],_c=[])}},toggleSelectAll(){if(!showBulkActionsAlpine)return;if(this.paginationTotalItemCount===this.selectedItems.length){this.clearSelected();this.selectAllStatus=!1}else this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected()},setAllItemsSelected(){if(!showBulkActionsAlpine)return;this.selectAllStatus=!0;this.selectAllOnPage()},setAllSelected(){if(!showBulkActionsAlpine)return;this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):(wire.setAllSelected())},clearSelected(){if(!showBulkActionsAlpine)return;this.selectAllStatus=!1;wire.clearSelected()},selectAllOnPage(){if(!showBulkActionsAlpine)return;let aC=this.selectedItems;var aD=this.paginationCurrentItems.values();for(const aE of aD)aC.push(`${aE}`);this.selectedItems=[...new Set(aC)]},destroy(){for(const aF of this.listeners)aF()}}));Alpine.data('booleanFilter',(aG,aH,_C,_d)=>({switchOn:!1,value:aG.entangle(`filterComponents.${aH}`).live,init(){this.switchOn=!1;this.value!==void 0&&(this.switchOn=!!+this.value);this.listeners.push(Livewire.on('filter-was-set',aI=>{(aI.tableName==_C&&aI.filterKey==aH)&&(this.switchOn=aI.value??_d)}))}}));Alpine.data('numberRangeFilter',(aJ,aK,aL,_D,_e)=>({allFilters:aJ.entangle('filterComponents',!1),originalMin:0,originalMax:100,filterMin:0,filterMax:100,currentMin:0,currentMax:100,hasUpdate:!1,wireValues:aJ.entangle(`filterComponents.${aK}`,!1),defaultMin:_D['minRange'],defaultMax:_D['maxRange'],restrictUpdates:!1,initialiseStyles(){let aM=document.getElementById(aL);aM.style.setProperty('--value-a',this.wireValues['min']??this.filterMin);aM.style.setProperty('--text-value-a',JSON.stringify(this.wireValues['min']??this.filterMin));aM.style.setProperty('--value-b',this.wireValues['max']??this.filterMax);aM.style.setProperty('--text-value-b',JSON.stringify(this.wireValues['max']??this.filterMax))},updateStyles(aN,aO){let aP=document.getElementById(aL);aP.style.setProperty('--value-a',aN);aP.style.setProperty('--text-value-a',JSON.stringify(aN));aP.style.setProperty('--value-b',aO);aP.style.setProperty('--text-value-b',JSON.stringify(aO))},setupWire(){this.wireValues!==void 0?(this.filterMin=this.originalMin=(this.wireValues['min']!==void 0)?this.wireValues['min']:this.defaultMin,this.filterMax=this.originalMax=(this.wireValues['max']!==void 0)?this.wireValues['max']:this.defaultMax):(this.filterMin=this.originalMin=this.defaultMin,this.filterMax=this.originalMax=this.defaultMax);this.updateStyles(this.filterMin,this.filterMax)},allowUpdates(){this.updateWire()},updateWire(){let aQ=parseInt(this.filterMin);let aR=parseInt(this.filterMax);if(aQ!=this.originalMin||aR!=this.originalMax){aR<aQ&&(this.filterMin=aR,this.filterMax=aQ);this.hasUpdate=!0;this.originalMin=aQ;this.originalMax=aR}this.updateStyles(this.filterMin,this.filterMax)},updateWireable(){this.hasUpdate&&(this.hasUpdate=!1,this.wireValues={'min':this.filterMin,'max':this.filterMax},aJ.set(`filterComponents.${aK}`,this.wireValues))},init(){this.initialiseStyles();this.setupWire();this.$watch('allFilters',value=>this.setupWire())}}));Alpine.data('flatpickrFilter',(aS,aT,aU,aV,_E)=>({wireValues:aS.entangle(`filterComponents.${aT}`),flatpickrInstance:flatpickr(aV,{mode:'range',altFormat:aU['altFormat']??'F j, Y',altInput:aU['altInput']??!1,allowInput:aU['allowInput']??!1,allowInvalidPreload:!0,ariaDateFormat:aU['ariaDateFormat']??'F j, Y',clickOpens:!0,dateFormat:aU['dateFormat']??'Y-m-d',defaultDate:aU['defaultDate']??null,defaultHour:aU['defaultHour']??12,defaultMinute:aU['defaultMinute']??0,enableTime:aU['enableTime']??!1,enableSeconds:aU['enableSeconds']??!1,hourIncrement:aU['hourIncrement']??1,locale:aU['locale']??'en',minDate:aU['earliestDate']??null,maxDate:aU['latestDate']??null,minuteIncrement:aU['minuteIncrement']??5,shorthandCurrentMonth:aU['shorthandCurrentMonth']??!1,time_24hr:aU['time_24hr']??!1,weekNumbers:aU['weekNumbers']??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(aW,aX,aY){if(aW.length>1){var aZ=aX.split(' ')[0],bA=aX.split(' ')[2],F={};window.childElementOpen=window.filterPopoverOpen=!1;F={'minDate':aZ,'maxDate':bA};aS.set(`filterComponents.${aT}`,F)}}}),setupWire(){if(this.wireValues!==void 0)if(this.wireValues.minDate!==void 0&&this.wireValues.maxDate!==void 0){this.flatpickrInstance.setDate([this.wireValues.minDate,this.wireValues.maxDate])}else this.flatpickrInstance.setDate([]);else this.flatpickrInstance.setDate([])},init(){this.setupWire();this.$watch('wireValues',value=>this.setupWire())}}));Alpine.data('tableWrapper',(wire,showBulkActionsAlpine)=>({listeners:[],childElementOpen:!1,filtersOpen:wire.entangle('filterSlideDownDefaultVisible'),paginationCurrentCount:wire.entangle('paginationCurrentCount'),paginationTotalItemCount:wire.entangle('paginationTotalItemCount'),paginationCurrentItems:wire.entangle('paginationCurrentItems'),selectedItems:wire.entangle('selected'),selectAllStatus:wire.entangle('selectAll'),delaySelectAll:wire.entangle('delaySelectAll'),hideBulkActionsWhenEmpty:wire.entangle('hideBulkActionsWhenEmpty'),toggleSelectAll(){if(!showBulkActionsAlpine)return;if(this.paginationTotalItemCount===this.selectedItems.length){this.clearSelected();this.selectAllStatus=!1}else this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected()},setAllItemsSelected(){if(!showBulkActionsAlpine)return;this.selectAllStatus=!0;this.selectAllOnPage()},setAllSelected(){if(!showBulkActionsAlpine)return;this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):(wire.setAllSelected())},clearSelected(){if(!showBulkActionsAlpine)return;this.selectAllStatus=!1;wire.clearSelected()},selectAllOnPage(){if(!showBulkActionsAlpine)return;let bB=this.selectedItems;var bC=this.paginationCurrentItems.values();for(const bD of bC)bB.push(`${bD}`);this.selectedItems=[...new Set(bB)]},destroy(){for(const bE of this.listeners)bE()}}));Alpine.data('reorderFunction',(wire,tableID,primaryKeyName)=>({dragging:!1,reorderEnabled:!1,sourceID:'',targetID:'',evenRowClasses:'',oddRowClasses:'',currentlyHighlightedElement:'',evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:wire.get('defaultReorderColumn'),reorderStatus:wire.get('reorderStatus'),currentlyReorderingStatus:wire.entangle('currentlyReorderingStatus'),hideReorderColumnUnlessReorderingStatus:wire.entangle('hideReorderColumnUnlessReorderingStatus'),reorderDisplayColumn:wire.entangle('reorderDisplayColumn'),dragStart(bF){this.$nextTick(()=>this.setupEvenOddClasses());this.sourceID=bF.target.id;bF.dataTransfer.effectAllowed='move';bF.dataTransfer.setData('text/plain',bF.target.id);bF.target.classList.add('laravel-livewire-tables-dragging')},dragOverEvent(bG){typeof this.currentlyHighlightedElement=='object'&&this.currentlyHighlightedElement.classList.remove('laravel-livewire-tables-highlight-bottom','laravel-livewire-tables-highlight-top');let bH=bG.target.closest('tr');this.currentlyHighlightedElement=bH;bG.offsetY<(bH.getBoundingClientRect().height/2)?(bH.classList.add('laravel-livewire-tables-highlight-top'),bH.classList.remove('laravel-livewire-tables-highlight-bottom')):(bH.classList.remove('laravel-livewire-tables-highlight-top'),bH.classList.add('laravel-livewire-tables-highlight-bottom'))},dragLeaveEvent(bI){bI.target.closest('tr').classList.remove('laravel-livewire-tables-highlight-bottom','laravel-livewire-tables-highlight-top')},dropEvent(bJ){typeof this.currentlyHighlightedElement=='object'&&this.currentlyHighlightedElement.classList.remove('laravel-livewire-tables-highlight-bottom','laravel-livewire-tables-highlight-top');let bK=bJ.target.closest('tr');let bL=bJ.target.closest('tr').parentNode;let bM=document.getElementById(this.sourceID).closest('tr');bM.classList.remove('laravel-livewire-table-dragging');let bN=bM.rowIndex;let _f=bK.rowIndex;let G=document.getElementById(tableID);bJ.offsetY>(bK.getBoundingClientRect().height/2)?bL.insertBefore(bM,bK.nextSibling):bL.insertBefore(bM,bK);_f<bN;let H='even';for(let i=1,bO;bO=G.rows[i];i++)if(!bO.classList.contains('hidden')&&!bO.classList.contains('md:hidden'))H==='even'?(bO.classList.remove(...this.oddNotInEven),bO.classList.add(...this.evenNotInOdd),H='odd'):(bO.classList.remove(...this.evenNotInOdd),bO.classList.add(...this.oddNotInEven),H='even')},reorderToggle(){this.$nextTick(()=>this.setupEvenOddClasses());if(this.currentlyReorderingStatus)wire.disableReordering();else{this.setupEvenOddClasses();this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0);wire.enableReordering()}},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1);wire.disableReordering()},updateOrderedItems(){let bP=document.getElementById(tableID);let bQ=[];for(let i=1,bR;bR=bP.rows[i];i++)bQ.push({[primaryKeyName]:bR.getAttribute('rowpk'),[this.defaultReorderColumn]:i});wire.storeReorder(bQ)},setupEvenOddClasses(){if(this.evenNotInOdd.length===void 0||this.evenNotInOdd.length==0||this.oddNotInEven.length===void 0||this.oddNotInEven.length==0){let bS=document.getElementById(tableID).getElementsByTagName('tbody')[0];let bT=[];let bU=[];(bS.rows[0]!==void 0&&bS.rows[1]!==void 0)&&(bT=[...bS.rows[0].classList],bU=[...bS.rows[1].classList],this.evenNotInOdd=bT.filter(bV=>!bU.includes(bV)),this.oddNotInEven=bU.filter(bW=>!bT.includes(bW)),bT=[],bU=[])}},init(){}}))});
+document.addEventListener("alpine:init",()=>{Alpine.data("laravellivewiretable",(e,t,l,i)=>({listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.entangle("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=t.rowIndex,n=document.getElementById(l),o=a;e.offsetY>t.getBoundingClientRect().height/2?i.insertBefore(s,t.nextSibling):i.insertBefore(s,t),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.currentlyReorderingStatus?e.disableReordering():(this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),this.setupEvenOddClasses(),e.enableReordering()),this.$nextTick(()=>{this.setupEvenOddClasses()})},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let t=document.getElementById(l),s=[];for(let a=1,r;r=t.rows[a];a++)s.push({[i]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(l).getElementsByTagName("tbody")[0],t=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(t=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=t.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!t.includes(e)),t=[],i=[])}},toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("booleanFilter",(e,t,l,i)=>({switchOn:!1,value:e.entangle("filterComponents."+t).live,init(){this.switchOn=!1,void 0!==this.value&&(this.switchOn=Boolean(Number(this.value))),this.listeners.push(Livewire.on("filter-was-set",e=>{e.tableName==l&&e.filterKey==t&&(this.switchOn=e.value??i)}))}})),Alpine.data("numberRangeFilter",(e,t,l,i,s)=>({allFilters:e.entangle("filterComponents",!1),originalMin:0,originalMax:100,filterMin:0,filterMax:100,currentMin:0,currentMax:100,hasUpdate:!1,wireValues:e.entangle("filterComponents."+t,!1),defaultMin:i.minRange,defaultMax:i.maxRange,restrictUpdates:!1,initialiseStyles(){let e=document.getElementById(l);e.style.setProperty("--value-a",this.wireValues.min??this.filterMin),e.style.setProperty("--text-value-a",JSON.stringify(this.wireValues.min??this.filterMin)),e.style.setProperty("--value-b",this.wireValues.max??this.filterMax),e.style.setProperty("--text-value-b",JSON.stringify(this.wireValues.max??this.filterMax))},updateStyles(e,t){let i=document.getElementById(l);i.style.setProperty("--value-a",e),i.style.setProperty("--text-value-a",JSON.stringify(e)),i.style.setProperty("--value-b",t),i.style.setProperty("--text-value-b",JSON.stringify(t))},setupWire(){void 0!==this.wireValues?(this.filterMin=this.originalMin=void 0!==this.wireValues.min?this.wireValues.min:this.defaultMin,this.filterMax=this.originalMax=void 0!==this.wireValues.max?this.wireValues.max:this.defaultMax):(this.filterMin=this.originalMin=this.defaultMin,this.filterMax=this.originalMax=this.defaultMax),this.updateStyles(this.filterMin,this.filterMax)},allowUpdates(){this.updateWire()},updateWire(){let e=parseInt(this.filterMin),t=parseInt(this.filterMax);(e!=this.originalMin||t!=this.originalMax)&&(t<e&&(this.filterMin=t,this.filterMax=e),this.hasUpdate=!0,this.originalMin=e,this.originalMax=t),this.updateStyles(this.filterMin,this.filterMax)},updateWireable(){this.hasUpdate&&(this.hasUpdate=!1,this.wireValues={min:this.filterMin,max:this.filterMax},e.set("filterComponents."+t,this.wireValues))},init(){this.initialiseStyles(),this.setupWire(),this.$watch("allFilters",e=>this.setupWire())}})),Alpine.data("flatpickrFilter",(e,t,l,i,s)=>({wireValues:e.entangle("filterComponents."+t),flatpickrInstance:flatpickr(i,{mode:"range",altFormat:l.altFormat??"F j, Y",altInput:l.altInput??!1,allowInput:l.allowInput??!1,allowInvalidPreload:l.allowInvalidPreload??!0,ariaDateFormat:l.ariaDateFormat??"F j, Y",clickOpens:!0,dateFormat:l.dateFormat??"Y-m-d",defaultDate:l.defaultDate??null,defaultHour:l.defaultHour??12,defaultMinute:l.defaultMinute??0,enableTime:l.enableTime??!1,enableSeconds:l.enableSeconds??!1,hourIncrement:l.hourIncrement??1,locale:l.locale??"en",minDate:l.earliestDate??null,maxDate:l.latestDate??null,minuteIncrement:l.minuteIncrement??5,shorthandCurrentMonth:l.shorthandCurrentMonth??!1,time_24hr:l.time_24hr??!1,weekNumbers:l.weekNumbers??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(l,i,s){if(l.length>1){var a=i.split(" "),r={};window.childElementOpen=!1,window.filterPopoverOpen=!1,r={minDate:a[0],maxDate:void 0===a[2]?a[0]:a[2]},e.set("filterComponents."+t,r)}}}),setupWire(){if(void 0!==this.wireValues){if(void 0!==this.wireValues.minDate&&void 0!==this.wireValues.maxDate){let e=[this.wireValues.minDate,this.wireValues.maxDate];this.flatpickrInstance.setDate(e)}else this.flatpickrInstance.setDate([])}else this.flatpickrInstance.setDate([])},init(){this.setupWire(),this.$watch("wireValues",e=>this.setupWire())}})),Alpine.data("tableWrapper",(e,t)=>({listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("reorderFunction",(e,t,l)=>({dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.get("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let l=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=l.rowIndex,n=document.getElementById(t),o=a;e.offsetY>l.getBoundingClientRect().height/2?i.insertBefore(s,l.nextSibling):i.insertBefore(s,l),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.currentlyReorderingStatus?e.disableReordering():(this.setupEvenOddClasses(),this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),e.enableReordering())},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let i=document.getElementById(t),s=[];for(let a=1,r;r=i.rows[a];a++)s.push({[l]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(t).getElementsByTagName("tbody")[0],l=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(l=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=l.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!l.includes(e)),l=[],i=[])}},init(){}}))});
\ No newline at end of file
diff --git a/resources/js/partials/filter-date-range.js b/resources/js/partials/filter-date-range.js
index f28f42d93..aa630347e 100644
--- a/resources/js/partials/filter-date-range.js
+++ b/resources/js/partials/filter-date-range.js
@@ -8,7 +8,7 @@ function fpf() {
             altFormat: filterConfig['altFormat'] ?? "F j, Y",
             altInput: filterConfig['altInput'] ?? false,
             allowInput: filterConfig['allowInput'] ?? false,
-            allowInvalidPreload: true,
+            allowInvalidPreload: filterConfig['allowInvalidPreload'] ?? true,
             ariaDateFormat: filterConfig['ariaDateFormat'] ?? "F j, Y",
             clickOpens: true,
             dateFormat: filterConfig['dateFormat'] ?? "Y-m-d",
@@ -30,15 +30,16 @@ function fpf() {
             },
             onChange: function (selectedDates, dateStr, instance) {
                 if (selectedDates.length > 1) {
-                    var startDate = dateStr.split(' ')[0];
-                    var endDate = dateStr.split(' ')[2];
+                    var dates = dateStr.split(' ');
+
                     var wireDateArray = {};
                     window.childElementOpen = false;
                     window.filterPopoverOpen = false;
-                    wireDateArray = { 'minDate': startDate, 'maxDate': endDate };
+                    wireDateArray = { 'minDate': dates[0], 'maxDate': (typeof dates[2] === "undefined") ? dates[0] : dates[2] };
                     wire.set('filterComponents.' + filterKey, wireDateArray);
                 }
-            }
+
+            },
         }),
         setupWire() {
             if (this.wireValues !== undefined) {
diff --git a/resources/js/partials/filter-date-range.min.js b/resources/js/partials/filter-date-range.min.js
index 7a7e5b158..e789c0b05 100644
--- a/resources/js/partials/filter-date-range.min.js
+++ b/resources/js/partials/filter-date-range.min.js
@@ -1 +1 @@
-function a(){Alpine.data('flatpickrFilter',(A,b,c,d,e)=>({wireValues:A.entangle(`filterComponents.${b}`),flatpickrInstance:flatpickr(d,{mode:'range',altFormat:c['altFormat']??'F j, Y',altInput:c['altInput']??!1,allowInput:c['allowInput']??!1,allowInvalidPreload:!0,ariaDateFormat:c['ariaDateFormat']??'F j, Y',clickOpens:!0,dateFormat:c['dateFormat']??'Y-m-d',defaultDate:c['defaultDate']??null,defaultHour:c['defaultHour']??12,defaultMinute:c['defaultMinute']??0,enableTime:c['enableTime']??!1,enableSeconds:c['enableSeconds']??!1,hourIncrement:c['hourIncrement']??1,locale:c['locale']??'en',minDate:c['earliestDate']??null,maxDate:c['latestDate']??null,minuteIncrement:c['minuteIncrement']??5,shorthandCurrentMonth:c['shorthandCurrentMonth']??!1,time_24hr:c['time_24hr']??!1,weekNumbers:c['weekNumbers']??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(_,B,C){if(_.length>1){var D=B.split(' ')[0],E=B.split(' ')[2],f={};window.childElementOpen=window.filterPopoverOpen=!1;f={'minDate':D,'maxDate':E};A.set(`filterComponents.${b}`,f)}}}),setupWire(){if(this.wireValues!==void 0)if(this.wireValues.minDate!==void 0&&this.wireValues.maxDate!==void 0){this.flatpickrInstance.setDate([this.wireValues.minDate,this.wireValues.maxDate])}else this.flatpickrInstance.setDate([]);else this.flatpickrInstance.setDate([])},init(){this.setupWire();this.$watch('wireValues',value=>this.setupWire())}}))}export default a;
+function fpf(){Alpine.data("flatpickrFilter",(e,t,a,n,l)=>({wireValues:e.entangle("filterComponents."+t),flatpickrInstance:flatpickr(n,{mode:"range",altFormat:a.altFormat??"F j, Y",altInput:a.altInput??!1,allowInput:a.allowInput??!1,allowInvalidPreload:a.allowInvalidPreload??!0,ariaDateFormat:a.ariaDateFormat??"F j, Y",clickOpens:!0,dateFormat:a.dateFormat??"Y-m-d",defaultDate:a.defaultDate??null,defaultHour:a.defaultHour??12,defaultMinute:a.defaultMinute??0,enableTime:a.enableTime??!1,enableSeconds:a.enableSeconds??!1,hourIncrement:a.hourIncrement??1,locale:a.locale??"en",minDate:a.earliestDate??null,maxDate:a.latestDate??null,minuteIncrement:a.minuteIncrement??5,shorthandCurrentMonth:a.shorthandCurrentMonth??!1,time_24hr:a.time_24hr??!1,weekNumbers:a.weekNumbers??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(a,n,l){if(a.length>1){var i=n.split(" "),r={};window.childElementOpen=!1,window.filterPopoverOpen=!1,r={minDate:i[0],maxDate:void 0===i[2]?i[0]:i[2]},e.set("filterComponents."+t,r)}}}),setupWire(){if(void 0!==this.wireValues){if(void 0!==this.wireValues.minDate&&void 0!==this.wireValues.maxDate){let e=[this.wireValues.minDate,this.wireValues.maxDate];this.flatpickrInstance.setDate(e)}else this.flatpickrInstance.setDate([])}else this.flatpickrInstance.setDate([])},init(){this.setupWire(),this.$watch("wireValues",e=>this.setupWire())}}))}export default fpf;
\ No newline at end of file

From 7aa42682aca666c1eb0210c568f07cd8fe5cc048 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 17:47:58 +0100
Subject: [PATCH 010/103] Adjust Methods - useComputedProperties (#1873)

* Adjust Methods - useComputedProperties

* Adjust ActionTest
---
 docs/misc/actions.md               | 8 --------
 src/Traits/ComponentUtilities.php  | 2 +-
 src/Traits/HasAllTraits.php        | 2 +-
 src/Traits/WithSorting.php         | 2 +-
 tests/Views/Actions/ActionTest.php | 2 +-
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/docs/misc/actions.md b/docs/misc/actions.md
index 7ee964e13..34850a090 100644
--- a/docs/misc/actions.md
+++ b/docs/misc/actions.md
@@ -7,14 +7,6 @@ Actions is a beta feature, that allows for the creation of Action Buttons that a
 
 This is NOT recommended for production use at this point in time.
 
-## Usage
-To use "Actions", while it is in beta, you must include the following Trait in your table:
-```php
-use Rappasoft\LaravelLivewireTables\Traits\WithActions;
-```
-
-Once out of beta, this will not be required.
-
 ## Component Available Methods
 ### setActionWrapperAttributes
 
diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index 815cd216e..d065b25ed 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -45,7 +45,7 @@ trait ComponentUtilities
 
     protected array $extraWithAvgs = [];
 
-    protected bool $useComputedProperties = false;
+    protected bool $useComputedProperties = true;
 
     /**
      * Set any configuration options
diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index 0f2553eca..7f048a4a8 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -8,7 +8,7 @@ trait HasAllTraits
     use WithTableHooks;
     use WithLoadingPlaceholder;
     use ComponentUtilities,
-        //WithActions,
+        WithActions,
         WithData,
         WithColumns,
         WithSorting,
diff --git a/src/Traits/WithSorting.php b/src/Traits/WithSorting.php
index 3c0127a31..78c8e9a73 100644
--- a/src/Traits/WithSorting.php
+++ b/src/Traits/WithSorting.php
@@ -31,7 +31,7 @@ trait WithSorting
 
     public string $defaultSortingLabelDesc = 'Z-A';
 
-    protected function queryStringWithSorting(): array
+    public function queryStringWithSorting(): array
     {
         if ($this->queryStringIsEnabled() && $this->sortingIsEnabled()) {
             return [
diff --git a/tests/Views/Actions/ActionTest.php b/tests/Views/Actions/ActionTest.php
index 936d1f22f..9e262803b 100644
--- a/tests/Views/Actions/ActionTest.php
+++ b/tests/Views/Actions/ActionTest.php
@@ -267,7 +267,7 @@ public function test_can_check_has_actions(): void
         {
             use \Rappasoft\LaravelLivewireTables\Traits\WithActions;
 
-            public function actions()
+            public function actions(): array
             {
                 return [
                     \Rappasoft\LaravelLivewireTables\Views\Actions\Action::make('Test Edit 1')

From 3456674a32718d74daa5edee73fa54d336cd952b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 18:12:42 +0100
Subject: [PATCH 011/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e917bd8a..571d6645b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.10] - 2024-08-23
+### Bug Fixes
+- Default UseComputedProperties to True to default to new views by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1873
+- Allow Single Date DateRangeFilter by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1872
+
 ## [v3.4.9] - 2024-08-21
 ### Bug Fixes
 - Default UseComputedProperties to False to allow previously published views to work by default by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1869

From 32fe628d5c9af368d0a119e5ec29b4136d2851ec Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 18:34:23 +0100
Subject: [PATCH 012/103] AllowDeleteDateRangeFilter (#1875)

---
 resources/js/laravel-livewire-tables.js                  | 9 +++++++--
 resources/js/laravel-livewire-tables.min.js              | 2 +-
 .../views/components/tools/filters/date-range.blade.php  | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/resources/js/laravel-livewire-tables.js b/resources/js/laravel-livewire-tables.js
index b83a405e3..306c3857d 100644
--- a/resources/js/laravel-livewire-tables.js
+++ b/resources/js/laravel-livewire-tables.js
@@ -334,16 +334,21 @@ document.addEventListener('alpine:init', () => {
             onChange: function (selectedDates, dateStr, instance) {
                 if (selectedDates.length > 1) {
                     var dates = dateStr.split(' ');
-
                     var wireDateArray = {};
                     window.childElementOpen = false;
                     window.filterPopoverOpen = false;
                     wireDateArray = { 'minDate': dates[0], 'maxDate': (typeof dates[2] === "undefined") ? dates[0] : dates[2] };
                     wire.set('filterComponents.' + filterKey, wireDateArray);
                 }
-
             },
         }),
+        changedValue: function(value) {
+            if (value.length < 5)
+            {
+                this.flatpickrInstance.setDate([]);   
+                wire.set('filterComponents.' + filterKey, {});
+            }
+        },
         setupWire() {
             if (this.wireValues !== undefined) {
                 if (this.wireValues.minDate !== undefined && this.wireValues.maxDate !== undefined) {
diff --git a/resources/js/laravel-livewire-tables.min.js b/resources/js/laravel-livewire-tables.min.js
index 42be51fb0..35cecdd4f 100644
--- a/resources/js/laravel-livewire-tables.min.js
+++ b/resources/js/laravel-livewire-tables.min.js
@@ -1 +1 @@
-document.addEventListener("alpine:init",()=>{Alpine.data("laravellivewiretable",(e,t,l,i)=>({listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.entangle("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=t.rowIndex,n=document.getElementById(l),o=a;e.offsetY>t.getBoundingClientRect().height/2?i.insertBefore(s,t.nextSibling):i.insertBefore(s,t),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.currentlyReorderingStatus?e.disableReordering():(this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),this.setupEvenOddClasses(),e.enableReordering()),this.$nextTick(()=>{this.setupEvenOddClasses()})},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let t=document.getElementById(l),s=[];for(let a=1,r;r=t.rows[a];a++)s.push({[i]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(l).getElementsByTagName("tbody")[0],t=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(t=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=t.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!t.includes(e)),t=[],i=[])}},toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("booleanFilter",(e,t,l,i)=>({switchOn:!1,value:e.entangle("filterComponents."+t).live,init(){this.switchOn=!1,void 0!==this.value&&(this.switchOn=Boolean(Number(this.value))),this.listeners.push(Livewire.on("filter-was-set",e=>{e.tableName==l&&e.filterKey==t&&(this.switchOn=e.value??i)}))}})),Alpine.data("numberRangeFilter",(e,t,l,i,s)=>({allFilters:e.entangle("filterComponents",!1),originalMin:0,originalMax:100,filterMin:0,filterMax:100,currentMin:0,currentMax:100,hasUpdate:!1,wireValues:e.entangle("filterComponents."+t,!1),defaultMin:i.minRange,defaultMax:i.maxRange,restrictUpdates:!1,initialiseStyles(){let e=document.getElementById(l);e.style.setProperty("--value-a",this.wireValues.min??this.filterMin),e.style.setProperty("--text-value-a",JSON.stringify(this.wireValues.min??this.filterMin)),e.style.setProperty("--value-b",this.wireValues.max??this.filterMax),e.style.setProperty("--text-value-b",JSON.stringify(this.wireValues.max??this.filterMax))},updateStyles(e,t){let i=document.getElementById(l);i.style.setProperty("--value-a",e),i.style.setProperty("--text-value-a",JSON.stringify(e)),i.style.setProperty("--value-b",t),i.style.setProperty("--text-value-b",JSON.stringify(t))},setupWire(){void 0!==this.wireValues?(this.filterMin=this.originalMin=void 0!==this.wireValues.min?this.wireValues.min:this.defaultMin,this.filterMax=this.originalMax=void 0!==this.wireValues.max?this.wireValues.max:this.defaultMax):(this.filterMin=this.originalMin=this.defaultMin,this.filterMax=this.originalMax=this.defaultMax),this.updateStyles(this.filterMin,this.filterMax)},allowUpdates(){this.updateWire()},updateWire(){let e=parseInt(this.filterMin),t=parseInt(this.filterMax);(e!=this.originalMin||t!=this.originalMax)&&(t<e&&(this.filterMin=t,this.filterMax=e),this.hasUpdate=!0,this.originalMin=e,this.originalMax=t),this.updateStyles(this.filterMin,this.filterMax)},updateWireable(){this.hasUpdate&&(this.hasUpdate=!1,this.wireValues={min:this.filterMin,max:this.filterMax},e.set("filterComponents."+t,this.wireValues))},init(){this.initialiseStyles(),this.setupWire(),this.$watch("allFilters",e=>this.setupWire())}})),Alpine.data("flatpickrFilter",(e,t,l,i,s)=>({wireValues:e.entangle("filterComponents."+t),flatpickrInstance:flatpickr(i,{mode:"range",altFormat:l.altFormat??"F j, Y",altInput:l.altInput??!1,allowInput:l.allowInput??!1,allowInvalidPreload:l.allowInvalidPreload??!0,ariaDateFormat:l.ariaDateFormat??"F j, Y",clickOpens:!0,dateFormat:l.dateFormat??"Y-m-d",defaultDate:l.defaultDate??null,defaultHour:l.defaultHour??12,defaultMinute:l.defaultMinute??0,enableTime:l.enableTime??!1,enableSeconds:l.enableSeconds??!1,hourIncrement:l.hourIncrement??1,locale:l.locale??"en",minDate:l.earliestDate??null,maxDate:l.latestDate??null,minuteIncrement:l.minuteIncrement??5,shorthandCurrentMonth:l.shorthandCurrentMonth??!1,time_24hr:l.time_24hr??!1,weekNumbers:l.weekNumbers??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(l,i,s){if(l.length>1){var a=i.split(" "),r={};window.childElementOpen=!1,window.filterPopoverOpen=!1,r={minDate:a[0],maxDate:void 0===a[2]?a[0]:a[2]},e.set("filterComponents."+t,r)}}}),setupWire(){if(void 0!==this.wireValues){if(void 0!==this.wireValues.minDate&&void 0!==this.wireValues.maxDate){let e=[this.wireValues.minDate,this.wireValues.maxDate];this.flatpickrInstance.setDate(e)}else this.flatpickrInstance.setDate([])}else this.flatpickrInstance.setDate([])},init(){this.setupWire(),this.$watch("wireValues",e=>this.setupWire())}})),Alpine.data("tableWrapper",(e,t)=>({listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("reorderFunction",(e,t,l)=>({dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.get("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let l=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=l.rowIndex,n=document.getElementById(t),o=a;e.offsetY>l.getBoundingClientRect().height/2?i.insertBefore(s,l.nextSibling):i.insertBefore(s,l),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.currentlyReorderingStatus?e.disableReordering():(this.setupEvenOddClasses(),this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),e.enableReordering())},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let i=document.getElementById(t),s=[];for(let a=1,r;r=i.rows[a];a++)s.push({[l]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(t).getElementsByTagName("tbody")[0],l=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(l=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=l.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!l.includes(e)),l=[],i=[])}},init(){}}))});
\ No newline at end of file
+document.addEventListener("alpine:init",()=>{Alpine.data("laravellivewiretable",(e,t,l,i)=>({listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.entangle("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=t.rowIndex,n=document.getElementById(l),o=a;e.offsetY>t.getBoundingClientRect().height/2?i.insertBefore(s,t.nextSibling):i.insertBefore(s,t),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.currentlyReorderingStatus?e.disableReordering():(this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),this.setupEvenOddClasses(),e.enableReordering()),this.$nextTick(()=>{this.setupEvenOddClasses()})},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let t=document.getElementById(l),s=[];for(let a=1,r;r=t.rows[a];a++)s.push({[i]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(l).getElementsByTagName("tbody")[0],t=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(t=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=t.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!t.includes(e)),t=[],i=[])}},toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("booleanFilter",(e,t,l,i)=>({switchOn:!1,value:e.entangle("filterComponents."+t).live,init(){this.switchOn=!1,void 0!==this.value&&(this.switchOn=Boolean(Number(this.value))),this.listeners.push(Livewire.on("filter-was-set",e=>{e.tableName==l&&e.filterKey==t&&(this.switchOn=e.value??i)}))}})),Alpine.data("numberRangeFilter",(e,t,l,i,s)=>({allFilters:e.entangle("filterComponents",!1),originalMin:0,originalMax:100,filterMin:0,filterMax:100,currentMin:0,currentMax:100,hasUpdate:!1,wireValues:e.entangle("filterComponents."+t,!1),defaultMin:i.minRange,defaultMax:i.maxRange,restrictUpdates:!1,initialiseStyles(){let e=document.getElementById(l);e.style.setProperty("--value-a",this.wireValues.min??this.filterMin),e.style.setProperty("--text-value-a",JSON.stringify(this.wireValues.min??this.filterMin)),e.style.setProperty("--value-b",this.wireValues.max??this.filterMax),e.style.setProperty("--text-value-b",JSON.stringify(this.wireValues.max??this.filterMax))},updateStyles(e,t){let i=document.getElementById(l);i.style.setProperty("--value-a",e),i.style.setProperty("--text-value-a",JSON.stringify(e)),i.style.setProperty("--value-b",t),i.style.setProperty("--text-value-b",JSON.stringify(t))},setupWire(){void 0!==this.wireValues?(this.filterMin=this.originalMin=void 0!==this.wireValues.min?this.wireValues.min:this.defaultMin,this.filterMax=this.originalMax=void 0!==this.wireValues.max?this.wireValues.max:this.defaultMax):(this.filterMin=this.originalMin=this.defaultMin,this.filterMax=this.originalMax=this.defaultMax),this.updateStyles(this.filterMin,this.filterMax)},allowUpdates(){this.updateWire()},updateWire(){let e=parseInt(this.filterMin),t=parseInt(this.filterMax);(e!=this.originalMin||t!=this.originalMax)&&(t<e&&(this.filterMin=t,this.filterMax=e),this.hasUpdate=!0,this.originalMin=e,this.originalMax=t),this.updateStyles(this.filterMin,this.filterMax)},updateWireable(){this.hasUpdate&&(this.hasUpdate=!1,this.wireValues={min:this.filterMin,max:this.filterMax},e.set("filterComponents."+t,this.wireValues))},init(){this.initialiseStyles(),this.setupWire(),this.$watch("allFilters",e=>this.setupWire())}})),Alpine.data("flatpickrFilter",(e,t,l,i,s)=>({wireValues:e.entangle("filterComponents."+t),flatpickrInstance:flatpickr(i,{mode:"range",altFormat:l.altFormat??"F j, Y",altInput:l.altInput??!1,allowInput:l.allowInput??!1,allowInvalidPreload:l.allowInvalidPreload??!0,ariaDateFormat:l.ariaDateFormat??"F j, Y",clickOpens:!0,dateFormat:l.dateFormat??"Y-m-d",defaultDate:l.defaultDate??null,defaultHour:l.defaultHour??12,defaultMinute:l.defaultMinute??0,enableTime:l.enableTime??!1,enableSeconds:l.enableSeconds??!1,hourIncrement:l.hourIncrement??1,locale:l.locale??"en",minDate:l.earliestDate??null,maxDate:l.latestDate??null,minuteIncrement:l.minuteIncrement??5,shorthandCurrentMonth:l.shorthandCurrentMonth??!1,time_24hr:l.time_24hr??!1,weekNumbers:l.weekNumbers??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(l,i,s){if(l.length>1){var a=i.split(" "),r={};window.childElementOpen=!1,window.filterPopoverOpen=!1,r={minDate:a[0],maxDate:void 0===a[2]?a[0]:a[2]},e.set("filterComponents."+t,r)}}}),changedValue:function(l){l.length<5&&(this.flatpickrInstance.setDate([]),e.set("filterComponents."+t,{}))},setupWire(){if(void 0!==this.wireValues){if(void 0!==this.wireValues.minDate&&void 0!==this.wireValues.maxDate){let e=[this.wireValues.minDate,this.wireValues.maxDate];this.flatpickrInstance.setDate(e)}else this.flatpickrInstance.setDate([])}else this.flatpickrInstance.setDate([])},init(){this.setupWire(),this.$watch("wireValues",e=>this.setupWire())}})),Alpine.data("tableWrapper",(e,t)=>({listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("reorderFunction",(e,t,l)=>({dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.get("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let l=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=l.rowIndex,n=document.getElementById(t),o=a;e.offsetY>l.getBoundingClientRect().height/2?i.insertBefore(s,l.nextSibling):i.insertBefore(s,l),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.currentlyReorderingStatus?e.disableReordering():(this.setupEvenOddClasses(),this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),e.enableReordering())},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let i=document.getElementById(t),s=[];for(let a=1,r;r=i.rows[a];a++)s.push({[l]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(t).getElementsByTagName("tbody")[0],l=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(l=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=l.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!l.includes(e)),l=[],i=[])}},init(){}}))});
\ No newline at end of file
diff --git a/resources/views/components/tools/filters/date-range.blade.php b/resources/views/components/tools/filters/date-range.blade.php
index bdca66903..4d233b1e4 100644
--- a/resources/views/components/tools/filters/date-range.blade.php
+++ b/resources/views/components/tools/filters/date-range.blade.php
@@ -14,6 +14,7 @@
             type="text"
             x-ref="dateRangeInput"
             x-on:click="init"
+            x-on:change="changedValue($refs.dateRangeInput.value)"
             value="{{ $filter->getDateString(isset($this->appliedFilters[$filterKey]) ? $this->appliedFilters[$filterKey] : '') }}"
             wire:key="{{ $filter->generateWireKey($tableName, 'dateRange') }}"
             id="{{ $tableName }}-filter-dateRange-{{ $filterKey }}"

From 1f0c14d9c034d7537f4c6441ab98aea6d7be3d65 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 18:35:18 +0100
Subject: [PATCH 013/103] Fix ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 571d6645b..3a1fd1153 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 ### Bug Fixes
 - Default UseComputedProperties to True to default to new views by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1873
 - Allow Single Date DateRangeFilter by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1872
+- Allow clearing of DateRangeFilter by Text Box by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1875
 
 ## [v3.4.9] - 2024-08-21
 ### Bug Fixes

From b80be2dcbb0319d33696109766b1706c2c2a96fd Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 19:00:14 +0100
Subject: [PATCH 014/103] Update Docs (#1876)

---
 .../{customisations.md => styling.md}         |  2 +-
 docs/datatable/available-methods.md           | 14 ++++-
 docs/footer/available-methods.md              | 63 +------------------
 docs/footer/styling.md                        | 62 ++++++++++++++++++
 docs/secondary-header/available-methods.md    | 63 +------------------
 docs/secondary-header/styling.md              | 62 ++++++++++++++++++
 docs/usage/common-issues.md                   | 23 +++++++
 7 files changed, 167 insertions(+), 122 deletions(-)
 rename docs/bulk-actions/{customisations.md => styling.md} (94%)
 create mode 100644 docs/footer/styling.md
 create mode 100644 docs/secondary-header/styling.md
 create mode 100644 docs/usage/common-issues.md

diff --git a/docs/bulk-actions/customisations.md b/docs/bulk-actions/styling.md
similarity index 94%
rename from docs/bulk-actions/customisations.md
rename to docs/bulk-actions/styling.md
index dfe64e2e8..af4d26b38 100644
--- a/docs/bulk-actions/customisations.md
+++ b/docs/bulk-actions/styling.md
@@ -1,5 +1,5 @@
 ---
-title: Customising Style
+title: Styling
 weight: 5
 ---
 
diff --git a/docs/datatable/available-methods.md b/docs/datatable/available-methods.md
index b897d6708..13d4091b3 100644
--- a/docs/datatable/available-methods.md
+++ b/docs/datatable/available-methods.md
@@ -18,9 +18,21 @@ public function configure(): void
 }
 ```
 
+### useComputedPropertiesDisabled
+
+If you have published the Views **prior to v3.4.5**, and do not wish to remove the published views, then you should add the following call, which will disable the new Computed Properties behaviour.  Note that publishing the views is not recommended!
+
+```php
+public function configure(): void
+{
+  $this->useComputedPropertiesDisabled();
+}
+```
+
+
 ## Attributes
 
-Documentation for Data Table Styling/Attributes is now: <a href="https://rappasoft.com/docs/laravel-livewire-tables/v3/columns/styling" aria-label="Documentation for Data Table Styling" >Here</a>
+Documentation for Data Table Styling/Attributes is now: [Here](../datatable/styling)
 
 ## Offline
 
diff --git a/docs/footer/available-methods.md b/docs/footer/available-methods.md
index 455b4d9d3..5dca23f70 100644
--- a/docs/footer/available-methods.md
+++ b/docs/footer/available-methods.md
@@ -82,66 +82,9 @@ public function configure(): void
 }
 ```
 
----
-
-## setFooterTrAttributes
-
-Set any attributes on the footer row element.
-
-```php
-public function configure(): void
-{
-    $this->setFooterTrAttributes(function($rows) {
-        return ['class' => 'bg-gray-100'];
-    });
-}
-```
-
-By default, this replaces the default classes on the tr element, if you would like to keep them, set the default flag to true.
-
-```php
-public function configure(): void
-{
-    $this->setFooterTrAttributes(function($rows) {
-        return [
-            'default' => true,
-            'class' => 'bg-gray-100'
-        ];
-    });
-}
-```
-
-## setFooterTdAttributes
-
-Set any attributes on the footer row cells.
-
-```php
-public function configure(): void
-{
-    $this->setFooterTdAttributes(function(Column $column, $rows) {
-        if ($column->isField('id')) {
-            return ['class' => 'text-red-500'];
-        }
-    });
-}
-```
-
-By default, this replaces the default classes on the td element, if you would like to keep them, set the default flag to true.
-
-```php
-public function configure(): void
-{
-    $this->setFooterTdAttributes(function(Column $column, $rows) {
-        if ($column->isField('id')) {
-            return [
-                'default' => true,
-                'class' => 'text-red-500'
-            ];
-        }
-    });
-}
-```
 
 ---
 
-See also [footer column configuration](../columns/footer).
\ No newline at end of file
+See also 
+[footer styling](./styling).
+[footer column configuration](../columns/footer).
\ No newline at end of file
diff --git a/docs/footer/styling.md b/docs/footer/styling.md
new file mode 100644
index 000000000..e1685896a
--- /dev/null
+++ b/docs/footer/styling.md
@@ -0,0 +1,62 @@
+---
+title: Styling
+weight: 2
+---
+
+## setFooterTrAttributes
+
+Set any attributes on the footer row element.
+
+```php
+public function configure(): void
+{
+    $this->setFooterTrAttributes(function($rows) {
+        return ['class' => 'bg-gray-100'];
+    });
+}
+```
+
+By default, this replaces the default classes on the tr element, if you would like to keep them, set the default flag to true.
+
+```php
+public function configure(): void
+{
+    $this->setFooterTrAttributes(function($rows) {
+        return [
+            'default' => true,
+            'class' => 'bg-gray-100'
+        ];
+    });
+}
+```
+
+## setFooterTdAttributes
+
+Set any attributes on the footer row cells.
+
+```php
+public function configure(): void
+{
+    $this->setFooterTdAttributes(function(Column $column, $rows) {
+        if ($column->isField('id')) {
+            return ['class' => 'text-red-500'];
+        }
+    });
+}
+```
+
+By default, this replaces the default classes on the td element, if you would like to keep them, set the default flag to true.
+
+```php
+public function configure(): void
+{
+    $this->setFooterTdAttributes(function(Column $column, $rows) {
+        if ($column->isField('id')) {
+            return [
+                'default' => true,
+                'class' => 'text-red-500'
+            ];
+        }
+    });
+}
+```
diff --git a/docs/secondary-header/available-methods.md b/docs/secondary-header/available-methods.md
index 740c02db5..6bd85d5c3 100644
--- a/docs/secondary-header/available-methods.md
+++ b/docs/secondary-header/available-methods.md
@@ -43,66 +43,9 @@ public function configure(): void
 }
 ```
 
----
-
-## setSecondaryHeaderTrAttributes
-
-Set any attributes on the secondary header row element.
-
-```php
-public function configure(): void
-{
-    $this->setSecondaryHeaderTrAttributes(function($rows) {
-        return ['class' => 'bg-gray-100'];
-    });
-}
-```
-
-By default, this replaces the default classes on the tr element, if you would like to keep them, set the default flag to true.
-
-```php
-public function configure(): void
-{
-    $this->setSecondaryHeaderTrAttributes(function($rows) {
-        return [
-            'default' => true,
-            'class' => 'bg-gray-100'
-        ];
-    });
-}
-```
-
-## setSecondaryHeaderTdAttributes
-
-Set any attributes on the secondary header row cells.
-
-```php
-public function configure(): void
-{
-    $this->setSecondaryHeaderTdAttributes(function(Column $column, $rows) {
-        if ($column->isField('id')) {
-            return ['class' => 'text-red-500'];
-        }
-    });
-}
-```
-
-By default, this replaces the default classes on the td element, if you would like to keep them, set the default flag to true.
-
-```php
-public function configure(): void
-{
-    $this->setSecondaryHeaderTdAttributes(function(Column $column, $rows) {
-        if ($column->isField('id')) {
-            return [
-                'default' => true,
-                'class' => 'text-red-500'
-            ];
-        }
-    });
-}
-```
 
 ---
 
-See also [secondary header column configuration](../columns/secondary-header).
\ No newline at end of file
+See also:
+[secondary header styling](./styling).
+[secondary header column configuration](../columns/secondary-header).
\ No newline at end of file
diff --git a/docs/secondary-header/styling.md b/docs/secondary-header/styling.md
new file mode 100644
index 000000000..8eb97e517
--- /dev/null
+++ b/docs/secondary-header/styling.md
@@ -0,0 +1,62 @@
+---
+title: Styling
+weight: 2
+---
+
+## setSecondaryHeaderTrAttributes
+
+Set any attributes on the secondary header row element.
+
+```php
+public function configure(): void
+{
+    $this->setSecondaryHeaderTrAttributes(function($rows) {
+        return ['class' => 'bg-gray-100'];
+    });
+}
+```
+
+By default, this replaces the default classes on the tr element, if you would like to keep them, set the default flag to true.
+
+```php
+public function configure(): void
+{
+    $this->setSecondaryHeaderTrAttributes(function($rows) {
+        return [
+            'default' => true,
+            'class' => 'bg-gray-100'
+        ];
+    });
+}
+```
+
+## setSecondaryHeaderTdAttributes
+
+Set any attributes on the secondary header row cells.
+
+```php
+public function configure(): void
+{
+    $this->setSecondaryHeaderTdAttributes(function(Column $column, $rows) {
+        if ($column->isField('id')) {
+            return ['class' => 'text-red-500'];
+        }
+    });
+}
+```
+
+By default, this replaces the default classes on the td element, if you would like to keep them, set the default flag to true.
+
+```php
+public function configure(): void
+{
+    $this->setSecondaryHeaderTdAttributes(function(Column $column, $rows) {
+        if ($column->isField('id')) {
+            return [
+                'default' => true,
+                'class' => 'text-red-500'
+            ];
+        }
+    });
+}
+```
diff --git a/docs/usage/common-issues.md b/docs/usage/common-issues.md
new file mode 100644
index 000000000..34b3b5eb1
--- /dev/null
+++ b/docs/usage/common-issues.md
@@ -0,0 +1,23 @@
+---
+title: Common Issues
+weight: 4
+---
+
+### Property Errors
+
+The strong recommendation is to not publish the views for this package.  The vast majority of elements can be customised using methods within the package.
+
+See "Available Methods" in most sections for details, some examples:
+[DataTable Styling](../datatable/styling)
+[Bulk Actions Styling](../bulk-actions/styling)
+
+### Previously Published Views
+
+The strong recommendation is to not publish the views for this package.  If you have published the views prior to v3.4.5, and do not wish to remove these, then you should add the following method, to disable the newer (more efficient) behaviour:
+
+```php
+public function configure(): void
+{
+  $this->useComputedPropertiesDisabled();
+}
+```

From f0c5d04c6aa912f9bc693328e8070958d3678932 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 19:01:08 +0100
Subject: [PATCH 015/103] Update ChangeLog - Add Docs Update

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a1fd1153..5c6ff504c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Allow Single Date DateRangeFilter by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1872
 - Allow clearing of DateRangeFilter by Text Box by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1875
 
+### Docs
+- Docs Update by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1876
+
 ## [v3.4.9] - 2024-08-21
 ### Bug Fixes
 - Default UseComputedProperties to False to allow previously published views to work by default by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1869

From ec5401a02129a32018419cd59c08c476e1b480cc Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 19:59:17 +0100
Subject: [PATCH 016/103] Add setIconLeft/setIconRight (#1877)

* Add setIconLeft/setIconRight

* Fix styling

* Adjust Test

* Adjust ActionTest

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/misc/actions.md                          | 32 ++++++++++++++++
 .../views/includes/actions/button.blade.php   | 23 +++++++----
 src/Views/Traits/Core/HasIcon.php             | 21 ++++++++++
 tests/Views/Actions/ActionTest.php            | 38 ++++++++++++++++++-
 4 files changed, 106 insertions(+), 8 deletions(-)

diff --git a/docs/misc/actions.md b/docs/misc/actions.md
index 34850a090..8a46a7b0c 100644
--- a/docs/misc/actions.md
+++ b/docs/misc/actions.md
@@ -84,6 +84,38 @@ public function actions(): array
 }
 ```
 
+### setIconLeft
+
+setIconLeft is used to prepend the Icon to the Text (Non-Default Behaviour)
+
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Edit Item')
+        ->setIcon("fas fa-edit")
+        ->setIconAttributes(['class' => 'font-4xl text-4xl'])
+        ->setIconLeft(),
+    ];
+}
+```
+
+### setIconRight
+
+setIconRight is used to append the Icon to the Text (Default Behaviour)
+
+```php
+public function actions(): array
+{
+    return [
+        Action::make('Edit Item')
+        ->setIcon("fas fa-edit")
+        ->setIconAttributes(['class' => 'font-4xl text-4xl'])
+        ->setIconRight(),
+    ];
+}
+```
+
 ### setRoute
 
 Used for non-wireable butons, to set the route that the action button should take the user to upon clicking.
diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php
index 0d22c2c91..878be5b0b 100644
--- a/resources/views/includes/actions/button.blade.php
+++ b/resources/views/includes/actions/button.blade.php
@@ -1,5 +1,5 @@
 <a {{ $attributes->merge()
-            ->class(['justify-center text-center items-center inline-flex 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(['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])
@@ -12,13 +12,22 @@
             wire:navigate
            @endif
         >
-            {{ $action->getLabel() }}
 
-        @if($action->hasIcon())
+        @if($action->hasIcon() && $action->getIconRight())
+            <span>{{ $action->getLabel() }}</span>
             <i {{ $action->getIconAttributes()
-                ->class(["ms-1 ". $action->getIcon() => $isBootstrap])
-                ->class(["ml-1 ". $action->getIcon() => $isTailwind])
-                ->except('default-styling')
-            }}></i>
+                    ->class(["ms-1 ". $action->getIcon() => $isBootstrap])
+                    ->class(["ml-1 ". $action->getIcon() => $isTailwind])
+                    ->except('default-styling')
+                }}
+            ></i>
+        @elseif($action->hasIcon() && !$action->getIconRight())
+            <i {{ $action->getIconAttributes()
+                    ->class(["ms-1 ". $action->getIcon() => $isBootstrap])
+                    ->class(["ml-1 ". $action->getIcon() => $isTailwind])
+                    ->except('default-styling')
+                }}
+            ></i>
+            <span>{{ $action->getLabel() }}</span>
         @endif
 </a>
\ No newline at end of file
diff --git a/src/Views/Traits/Core/HasIcon.php b/src/Views/Traits/Core/HasIcon.php
index bd80ca841..3056e45c5 100644
--- a/src/Views/Traits/Core/HasIcon.php
+++ b/src/Views/Traits/Core/HasIcon.php
@@ -11,6 +11,8 @@ trait HasIcon
 
     public array $iconAttributes = ['default-styling' => true];
 
+    public bool $iconRight = true;
+
     public function setIcon(string $icon): self
     {
         $this->icon = $icon;
@@ -39,4 +41,23 @@ public function getIconAttributes(): ComponentAttributeBag
     {
         return new ComponentAttributeBag([...['default-styling' => true], ...$this->iconAttributes]);
     }
+
+    public function getIconRight(): bool
+    {
+        return $this->iconRight ?? true;
+    }
+
+    public function setIconLeft(): self
+    {
+        $this->iconRight = false;
+
+        return $this;
+    }
+
+    public function setIconRight(): self
+    {
+        $this->iconRight = true;
+
+        return $this;
+    }
 }
diff --git a/tests/Views/Actions/ActionTest.php b/tests/Views/Actions/ActionTest.php
index 9e262803b..f33d30bcb 100644
--- a/tests/Views/Actions/ActionTest.php
+++ b/tests/Views/Actions/ActionTest.php
@@ -296,6 +296,42 @@ public function exportBulk($items)
 
     }
 
+    public function test_can_set_icon_to_right_default(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->setIcon('fas fa-minus')
+            ->setIconAttributes(['class' => 'font-sm text-sm'])
+            ->setWireAction('wire:click')
+            ->setWireActionParams('testactionparams');
+        $this->assertTrue($action->getIconRight());
+    }
+
+    public function test_can_set_icon_to_left(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->setIcon('fas fa-minus')
+            ->setIconAttributes(['class' => 'font-sm text-sm'])
+            ->setIconLeft()
+            ->setWireAction('wire:click')
+            ->setWireActionParams('testactionparams');
+        $this->assertFalse($action->getIconRight());
+    }
+
+    public function test_can_set_icon_to_right(): void
+    {
+        $action = Action::make('Update Summaries')
+            ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
+            ->setIcon('fas fa-minus')
+            ->setIconAttributes(['class' => 'font-sm text-sm'])
+            ->setWireAction('wire:click')
+            ->setWireActionParams('testactionparams')
+            ->setIconLeft()
+            ->setIconRight();
+        $this->assertTrue($action->getIconRight());
+    }
+
     public function test_action_renders_correctly(): void
     {
         $action = Action::make('Update Summaries')
@@ -305,6 +341,6 @@ 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 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="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());
     }
 }

From ae019cf030d0a4d6641ec404633c9a9c102722d8 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 20:00:11 +0100
Subject: [PATCH 017/103] Adjust ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c6ff504c..90dc7f8c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.11] - 2024-08-23
+### New Features
+- Add setIconLeft/setIconRight for Actions by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1877
+
 ## [v3.4.10] - 2024-08-23
 ### Bug Fixes
 - Default UseComputedProperties to True to default to new views by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1873

From edc7ea3a4cd7300fcbeb5bf755db465be838da44 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 23 Aug 2024 20:19:30 +0100
Subject: [PATCH 018/103] Adjust Action Button Icon Margin (#1880)

* Adjust Action Button Icon Margin

* Adjust ChangeLog
---
 CHANGELOG.md                                      | 4 ++++
 resources/views/includes/actions/button.blade.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90dc7f8c7..5f17a89a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.12] - 2024-08-23
+### Tweaks
+- Adjust Action Button Margins by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1880
+
 ## [v3.4.11] - 2024-08-23
 ### New Features
 - Add setIconLeft/setIconRight for Actions by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1877
diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php
index 878be5b0b..e4a9b137c 100644
--- a/resources/views/includes/actions/button.blade.php
+++ b/resources/views/includes/actions/button.blade.php
@@ -24,7 +24,7 @@
         @elseif($action->hasIcon() && !$action->getIconRight())
             <i {{ $action->getIconAttributes()
                     ->class(["ms-1 ". $action->getIcon() => $isBootstrap])
-                    ->class(["ml-1 ". $action->getIcon() => $isTailwind])
+                    ->class(["mr-1 ". $action->getIcon() => $isTailwind])
                     ->except('default-styling')
                 }}
             ></i>

From 6766707bb48780a20a38ff384ce2b5e0eae00aa0 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 25 Aug 2024 00:38:50 +0100
Subject: [PATCH 019/103] Change Order of "Getting Started" section (#1883)

* Change Order of "Getting Started" section

* Change to "UsersTable"
---
 docs/start/commands.md  | 6 +++---
 docs/start/rendering.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/start/commands.md b/docs/start/commands.md
index 21759f770..606b57dfc 100644
--- a/docs/start/commands.md
+++ b/docs/start/commands.md
@@ -1,16 +1,16 @@
 ---
 title: Commands
-weight: 6
+weight: 5
 ---
 
 ## Generating Datatable Components
 
 To generate a new datatable component you can use the `make:datatable` command:
 
-Create a new datatable component called `UserTable` in `App\Livewire` that uses the `App\Models\User` model.
+Create a new datatable component called `UsersTable` in `App\Livewire` that uses the `App\Models\User` model.
 
 ```bash
-php artisan make:datatable UserTable User
+php artisan make:datatable UsersTable User
 ```
 
 ### Custom Model Path
diff --git a/docs/start/rendering.md b/docs/start/rendering.md
index e21320aca..5931502d1 100644
--- a/docs/start/rendering.md
+++ b/docs/start/rendering.md
@@ -1,6 +1,6 @@
 ---
 title: Rendering
-weight: 5
+weight: 6
 ---
 
 ## Rendering Components

From 39c5032f551da39bd0b7bab75aa9610debfe4251 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 25 Aug 2024 02:02:15 +0100
Subject: [PATCH 020/103] Add Button with No Icon (#1887)

---
 resources/views/includes/actions/button.blade.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php
index e4a9b137c..84fe37120 100644
--- a/resources/views/includes/actions/button.blade.php
+++ b/resources/views/includes/actions/button.blade.php
@@ -29,5 +29,7 @@
                 }}
             ></i>
             <span>{{ $action->getLabel() }}</span>
+        @else
+            <span>{{ $action->getLabel() }}</span>
         @endif
 </a>
\ No newline at end of file

From 918bd317a0923ec3caea7f899bd644b97e7e9009 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 25 Aug 2024 02:08:05 +0100
Subject: [PATCH 021/103] Add a "Recommended" approach (#1886)

* Add a "Recommended" approach

* Add blurb to Recommended
---
 docs/start/commands.md         |  2 +-
 docs/start/configuration.md    |  2 +-
 docs/start/including-assets.md |  2 +-
 docs/start/installation.md     |  2 +-
 docs/start/recommended.md      | 90 ++++++++++++++++++++++++++++++++++
 docs/start/rendering.md        |  2 +-
 6 files changed, 95 insertions(+), 5 deletions(-)
 create mode 100644 docs/start/recommended.md

diff --git a/docs/start/commands.md b/docs/start/commands.md
index 606b57dfc..0529abd06 100644
--- a/docs/start/commands.md
+++ b/docs/start/commands.md
@@ -1,6 +1,6 @@
 ---
 title: Commands
-weight: 5
+weight: 6
 ---
 
 ## Generating Datatable Components
diff --git a/docs/start/configuration.md b/docs/start/configuration.md
index 75aef5083..3e264c578 100644
--- a/docs/start/configuration.md
+++ b/docs/start/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: Configuration
-weight: 4
+weight: 5
 ---
 
 ## Publishing Assets
diff --git a/docs/start/including-assets.md b/docs/start/including-assets.md
index cbc25cb70..b0c782fe8 100644
--- a/docs/start/including-assets.md
+++ b/docs/start/including-assets.md
@@ -1,6 +1,6 @@
 ---
 title: Including Assets
-weight: 3
+weight: 4
 ---
 
 ## Package Specific Code
diff --git a/docs/start/installation.md b/docs/start/installation.md
index d09a68879..11d07fa01 100644
--- a/docs/start/installation.md
+++ b/docs/start/installation.md
@@ -1,6 +1,6 @@
 ---
 title: Installation
-weight: 2
+weight: 3
 ---
 
 You can install the package via composer:
diff --git a/docs/start/recommended.md b/docs/start/recommended.md
new file mode 100644
index 000000000..e0b1ca3ff
--- /dev/null
+++ b/docs/start/recommended.md
@@ -0,0 +1,90 @@
+---
+title: Recommended
+weight: 2
+---
+
+While the package is very customisable, and supports a number of different approaches.  The below is the recommended approach, that gives the best performance for the tables:
+
+## Installation
+```
+composer require rappasoft/laravel-livewire-tables
+```
+
+## Publish the Tables Config
+```
+php artisan vendor:publish --tag="livewire-tables-config"
+```
+
+## Livewire Tables Config Updates
+Update the published Livewire Tables Config (config/livewire-tables.php) and set the following to false:
+```php
+    /**
+     * Cache Rappasoft Frontend Assets
+     */
+    'cache_assets' => false,
+
+    /**
+     * Enable or Disable automatic injection of core assets
+     */
+    'inject_core_assets_enabled' => false,
+
+    /**
+     * Enable or Disable automatic injection of third-party assets
+     */
+    'inject_third_party_assets_enabled' => false,
+
+    /**
+     * Enable Blade Directives (Not required if automatically injecting or using bundler approaches)
+     */
+    'enable_blade_directives' => false,
+```
+
+## Bundling the Assets
+As you have now told the package not to inject the assets, add the following to your resources/js/app.js file:
+
+```js
+import '../../vendor/rappasoft/laravel-livewire-tables/resources/imports/laravel-livewire-tables-all.js';
+```
+
+## Update Layouts
+Ensure that your layouts do not reference any of the following blade directives, as these are not required with the above approach
+```
+    <!-- Adds the Core Table Styles -->
+    @rappasoftTableStyles
+    
+    <!-- Adds any relevant Third-Party Styles (Used for DateRangeFilter (Flatpickr) and NumberRangeFilter) -->
+    @rappasoftTableThirdPartyStyles
+
+    <!-- Adds the Core Table Scripts -->
+    @rappasoftTableScripts
+
+    <!-- Adds any relevant Third-Party Scripts (e.g. Flatpickr) -->
+    @rappasoftTableThirdPartyScripts
+```
+
+## Tailwind Specific
+If using Tailwind, you should update your tailwind.config.js file, adding the following to the "content" section under module.exports.  This ensures that the Livewire Tables specific core classes are included.
+
+```js
+    './vendor/rappasoft/laravel-livewire-tables/resources/views/*.blade.php',
+    './vendor/rappasoft/laravel-livewire-tables/resources/views/**/*.blade.php',
+```
+
+It is also recommended to add the paths to any Livewire Tables components, for example:
+```js
+    './app/Livewire/*.php',
+    './app/Livewire/**/*.php',
+```
+So that any classes used in setTdAttributes or similar are included!
+
+## Run your build process
+```
+npm run build
+```
+
+## Clear Cached Views
+```
+php artisan view:clear
+```
+
+You may of course run view:cache at this point.
\ No newline at end of file
diff --git a/docs/start/rendering.md b/docs/start/rendering.md
index 5931502d1..4e9e1e4fe 100644
--- a/docs/start/rendering.md
+++ b/docs/start/rendering.md
@@ -1,6 +1,6 @@
 ---
 title: Rendering
-weight: 6
+weight: 7
 ---
 
 ## Rendering Components

From 1d18cb2eaf807fef442c13f2e71f54f3de04df85 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 25 Aug 2024 02:09:47 +0100
Subject: [PATCH 022/103] v3.4.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f17a89a1..ef5caafc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.13] - 2024-08-25
+### Bug Fixes
+- Fix for Action Button with no icon by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1887
+
+### Docs
+- Add a Recommended Approach document by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1886
+- Reorder the "Getting Started" docs by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1884
+
 ## [v3.4.12] - 2024-08-23
 ### Tweaks
 - Adjust Action Button Margins by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1880

From 8cafe98c6c9317c1065c603776c1ecaab6e3d445 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 25 Aug 2024 04:24:45 +0100
Subject: [PATCH 023/103] Set actions position (#1889)

* Add displayActionsInToolbar and actionsPosition

* Add docs and tests for setActionsInToolbar

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/misc/actions.md                          |  55 ++++++++
 .../components/includes/actions.blade.php     |  15 ++-
 .../views/components/tools/toolbar.blade.php  |   8 ++
 resources/views/datatable.blade.php           |   2 +-
 .../Configuration/ActionsConfiguration.php    |  52 ++++++++
 src/Traits/Helpers/ActionsHelpers.php         |  46 +++++++
 src/Traits/WithActions.php                    |  43 ++-----
 .../Traits/Actions/HasActionAttributes.php    |   6 +-
 src/Views/Traits/Core/HasIcon.php             |   6 +-
 tests/Traits/Visuals/ActionsVisualsTest.php   | 118 ++++++++++++++++++
 tests/Views/Actions/ActionTest.php            |  87 ++++++++++---
 11 files changed, 376 insertions(+), 62 deletions(-)
 create mode 100644 src/Traits/Configuration/ActionsConfiguration.php
 create mode 100644 src/Traits/Helpers/ActionsHelpers.php
 create mode 100644 tests/Traits/Visuals/ActionsVisualsTest.php

diff --git a/docs/misc/actions.md b/docs/misc/actions.md
index 8a46a7b0c..1030183d5 100644
--- a/docs/misc/actions.md
+++ b/docs/misc/actions.md
@@ -21,6 +21,61 @@ This is used to set attributes for the "div" that wraps all defined Action Butto
     }
 ```
 
+### setActionsInToolbarEnabled
+
+Displays the Actions within the Toolbar.  Default is displaying above the Toolbar.
+
+```php
+    public function configure(): void
+    {
+        $this->setActionsInToolbarEnabled();
+    }
+```
+
+### setActionsInToolbarDisabled
+
+Displays the Actions above the Toolbar, default behaviour
+```php
+    public function configure(): void
+    {
+        $this->setActionsInToolbarDisabled();
+    }
+```
+
+
+### setActionsLeft
+
+Displays the Actions justified to the left
+
+```php
+    public function configure(): void
+    {
+        $this->setActionsLeft();
+    }
+```
+
+### setActionsCenter
+
+Displays the Actions justified to the center
+
+```php
+    public function configure(): void
+    {
+        $this->setActionsCenter();
+    }
+```
+
+### setActionsRight
+
+Displays the Actions justified to the right
+
+```php
+    public function configure(): void
+    {
+        $this->setActionsRight();
+    }
+```
+
 ### actions()
 
 Define your actions using the actions() method:
diff --git a/resources/views/components/includes/actions.blade.php b/resources/views/components/includes/actions.blade.php
index 422381ed1..2c354e7ba 100644
--- a/resources/views/components/includes/actions.blade.php
+++ b/resources/views/components/includes/actions.blade.php
@@ -1,9 +1,14 @@
 <div {{ $attributes
-            ->merge($this->getActionWrapperAttributes())
-            ->class(['flex flex-cols justify-center' => $this->isTailwind && $this->getActionWrapperAttributes()['default-styling'] ?? true])
-            ->class(['' => $this->isTailwind && $this->getActionWrapperAttributes()['default-colors'] ?? true])
-            ->class(['d-flex flex-cols justify-center' => $this->isBootstrap && $this->getActionWrapperAttributes()['default-styling'] ?? true])
-            ->class(['' => $this->isBootstrap && $this->getActionWrapperAttributes()['default-colors'] ?? true])
+            ->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'])
             ->except(['default-styling','default-colors'])
         }} >
     @foreach($this->getActions as $action)
diff --git a/resources/views/components/tools/toolbar.blade.php b/resources/views/components/tools/toolbar.blade.php
index 56cd2ec76..c0e1a217d 100644
--- a/resources/views/components/tools/toolbar.blade.php
+++ b/resources/views/components/tools/toolbar.blade.php
@@ -36,6 +36,10 @@
             <x-livewire-tables::tools.toolbar.items.filter-button />
         @endif
 
+        @if($this->hasActions && $this->showActionsInToolbar && $this->getActionsPosition == 'left')
+            <x-livewire-tables::includes.actions/>    
+        @endif
+
         @if ($this->hasConfigurableAreaFor('toolbar-left-end'))
             <div x-cloak x-show="!currentlyReorderingStatus" @class([
                 'mb-3 mb-md-0 input-group' => $this->isBootstrap,
@@ -56,6 +60,10 @@
             @include($this->getConfigurableAreaFor('toolbar-right-start'), $this->getParametersForConfigurableArea('toolbar-right-start'))
         @endif
 
+        @if($this->hasActions && $this->showActionsInToolbar && $this->getActionsPosition == 'right')
+            <x-livewire-tables::includes.actions/>    
+        @endif
+
         @if ($this->showBulkActionsDropdownAlpine() && $this->shouldAlwaysHideBulkActionsDropdownOption != true)
             <x-livewire-tables::tools.toolbar.items.bulk-actions />
         @endif
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index 02cb79d0f..f2877c961 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -8,7 +8,7 @@
 
 <div x-data="laravellivewiretable($wire, '{{ $this->showBulkActionsDropdownAlpine() }}', '{{ $tableId }}', '{{ $primaryKey }}')">
     <x-livewire-tables::wrapper :component="$this" :tableName="$tableName" :$primaryKey :$isTailwind :$isBootstrap :$isBootstrap4 :$isBootstrap5>
-        @if(method_exists($this,'hasActions') && $this->hasActions())
+        @if($this->hasActions && !$this->showActionsInToolbar)
             <x-livewire-tables::includes.actions/>    
         @endif
     
diff --git a/src/Traits/Configuration/ActionsConfiguration.php b/src/Traits/Configuration/ActionsConfiguration.php
new file mode 100644
index 000000000..89b5e08b6
--- /dev/null
+++ b/src/Traits/Configuration/ActionsConfiguration.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
+
+trait ActionsConfiguration
+{
+    public function setActionWrapperAttributes(array $actionWrapperAttributes): self
+    {
+        $this->actionWrapperAttributes = [...$this->actionWrapperAttributes, ...$actionWrapperAttributes];
+
+        return $this;
+    }
+
+    public function setActionsInToolbar(bool $status): self
+    {
+        $this->displayActionsInToolbar = $status;
+
+        return $this;
+    }
+
+    public function setActionsInToolbarEnabled(): self
+    {
+        return $this->setActionsInToolbar(true);
+    }
+
+    public function setActionsInToolbarDisabled(): self
+    {
+        return $this->setActionsInToolbar(false);
+    }
+
+    protected function setActionsPosition(string $position): self
+    {
+        $this->actionsPosition = ($position == 'left' || $position == 'center' || $position == 'right') ? $position : 'right';
+
+        return $this;
+    }
+
+    public function setActionsLeft(): self
+    {
+        return $this->setActionsPosition('left');
+    }
+
+    public function setActionsCenter(): self
+    {
+        return $this->setActionsPosition('center');
+    }
+
+    public function setActionsRight(): self
+    {
+        return $this->setActionsPosition('right');
+    }
+}
diff --git a/src/Traits/Helpers/ActionsHelpers.php b/src/Traits/Helpers/ActionsHelpers.php
new file mode 100644
index 000000000..7e8e6e5fe
--- /dev/null
+++ b/src/Traits/Helpers/ActionsHelpers.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
+
+use Illuminate\Support\Collection;
+use Livewire\Attributes\Computed;
+use Rappasoft\LaravelLivewireTables\Views\Action;
+
+trait ActionsHelpers
+{
+    #[Computed]
+    public function showActionsInToolbar(): bool
+    {
+        return $this->displayActionsInToolbar ?? false;
+    }
+
+    #[Computed]
+    public function getActionsPosition(): string
+    {
+        return $this->actionsPosition ?? 'right';
+    }
+
+    #[Computed]
+    public function getActionWrapperAttributes(): array
+    {
+        return [...['class' => '', 'default-styling' => true, 'default-colors' => true], ...$this->actionWrapperAttributes];
+    }
+
+    #[Computed]
+    public function hasActions(): bool
+    {
+        return (new Collection($this->actions()))
+            ->filter(fn ($action) => $action instanceof Action)->count() > 0;
+    }
+
+    #[Computed]
+    public function getActions(): Collection
+    {
+        return (new Collection($this->actions()))
+            ->filter(fn ($action) => $action instanceof Action)
+            ->each(function (Action $action, int $key) {
+                $action->setTheme($this->getTheme());
+            });
+
+    }
+}
diff --git a/src/Traits/WithActions.php b/src/Traits/WithActions.php
index 31f563a98..1d78fa675 100644
--- a/src/Traits/WithActions.php
+++ b/src/Traits/WithActions.php
@@ -2,47 +2,22 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
-use Illuminate\Support\Collection;
-use Livewire\Attributes\Computed;
-use Rappasoft\LaravelLivewireTables\Views\Action;
+use Rappasoft\LaravelLivewireTables\Traits\Configuration\ActionsConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Helpers\ActionsHelpers;
 
 trait WithActions
 {
-    protected array $actionWrapperAttributes = ['default-styling' => true, 'default-colors' => true];
+    use ActionsConfiguration,
+        ActionsHelpers;
 
-    protected function actions(): array
-    {
-        return [];
-    }
+    protected array $actionWrapperAttributes = ['class' => '', 'default-styling' => true, 'default-colors' => true];
 
-    public function setActionWrapperAttributes(array $actionWrapperAttributes): self
-    {
-        $this->actionWrapperAttributes = [...['default-styling' => true, 'default-colors' => true], ...$actionWrapperAttributes];
+    protected bool $displayActionsInToolbar = false;
 
-        return $this;
-    }
+    protected string $actionsPosition = 'right';
 
-    #[Computed]
-    public function getActionWrapperAttributes(): array
-    {
-        return [...['default-styling' => true, 'default-colors' => true], ...$this->actionWrapperAttributes];
-    }
-
-    #[Computed]
-    public function hasActions(): bool
-    {
-        return (new Collection($this->actions()))
-            ->filter(fn ($action) => $action instanceof Action)->count() > 0;
-    }
-
-    #[Computed]
-    public function getActions(): Collection
+    protected function actions(): array
     {
-        return (new Collection($this->actions()))
-            ->filter(fn ($action) => $action instanceof Action)
-            ->each(function (Action $action, int $key) {
-                $action->setTheme($this->getTheme());
-            });
-
+        return [];
     }
 }
diff --git a/src/Views/Traits/Actions/HasActionAttributes.php b/src/Views/Traits/Actions/HasActionAttributes.php
index b672f45ae..1ff1dc66c 100644
--- a/src/Views/Traits/Actions/HasActionAttributes.php
+++ b/src/Views/Traits/Actions/HasActionAttributes.php
@@ -6,18 +6,18 @@
 
 trait HasActionAttributes
 {
-    protected array $actionAttributes = ['default-styling' => true, 'default-colors' => true];
+    protected array $actionAttributes = ['class' => '', 'default-styling' => true, 'default-colors' => true];
 
     public function setActionAttributes(array $actionAttributes): self
     {
-        $this->actionAttributes = [...['default-styling' => true, 'default-colors' => true], ...$actionAttributes];
+        $this->actionAttributes = [...$this->actionAttributes, ...$actionAttributes];
 
         return $this;
     }
 
     public function getActionAttributes(): ComponentAttributeBag
     {
-        $actionAttributes = [...['default-styling' => true, 'default-colors' => true], ...$this->actionAttributes];
+        $actionAttributes = [...['class' => '', 'default-styling' => true, 'default-colors' => true], ...$this->actionAttributes];
 
         if (! $this->hasWireAction() && method_exists($this, 'getRoute')) {
             $actionAttributes['href'] = $this->getRoute();
diff --git a/src/Views/Traits/Core/HasIcon.php b/src/Views/Traits/Core/HasIcon.php
index 3056e45c5..e8230c184 100644
--- a/src/Views/Traits/Core/HasIcon.php
+++ b/src/Views/Traits/Core/HasIcon.php
@@ -9,7 +9,7 @@ trait HasIcon
 {
     public ?string $icon;
 
-    public array $iconAttributes = ['default-styling' => true];
+    public array $iconAttributes = ['class' => '', 'default-styling' => true];
 
     public bool $iconRight = true;
 
@@ -32,14 +32,14 @@ public function getIcon(): string
 
     public function setIconAttributes(array $iconAttributes): self
     {
-        $this->iconAttributes = [...['default-styling' => true], ...$iconAttributes];
+        $this->iconAttributes = [...$this->iconAttributes, ...$iconAttributes];
 
         return $this;
     }
 
     public function getIconAttributes(): ComponentAttributeBag
     {
-        return new ComponentAttributeBag([...['default-styling' => true], ...$this->iconAttributes]);
+        return new ComponentAttributeBag([...['class' => '', 'default-styling' => true], ...$this->iconAttributes]);
     }
 
     public function getIconRight(): bool
diff --git a/tests/Traits/Visuals/ActionsVisualsTest.php b/tests/Traits/Visuals/ActionsVisualsTest.php
new file mode 100644
index 000000000..85ce07865
--- /dev/null
+++ b/tests/Traits/Visuals/ActionsVisualsTest.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+
+use Livewire\Livewire;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class ActionsVisualsTest extends TestCase
+{
+    public function test_can_align_actions_left(): void
+    {
+        $petsTable = (new class extends PetsTable
+        {
+            use \Rappasoft\LaravelLivewireTables\Traits\WithActions;
+
+            public function actions(): array
+            {
+                return [
+                    \Rappasoft\LaravelLivewireTables\Views\Actions\Action::make('Test Edit 1')
+                        ->setRoute('dashboard24'),
+                ];
+            }
+
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+                $this->setActionWrapperAttributes(['class' => 'flex flex-cols space-x-4 py-4', 'default-styling' => false]);
+                $this->setActionsLeft();
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        });
+        Livewire::test($petsTable)
+            ->assertSeeHtml('<div class="justify-start flex flex-cols space-x-4 py-4" >');
+
+    }
+
+    public function test_can_align_actions_center(): void
+    {
+        $petsTable = (new class extends PetsTable
+        {
+            use \Rappasoft\LaravelLivewireTables\Traits\WithActions;
+
+            public function actions(): array
+            {
+                return [
+                    \Rappasoft\LaravelLivewireTables\Views\Actions\Action::make('Test Edit 1')
+                        ->setRoute('dashboard24'),
+                ];
+            }
+
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+                $this->setActionWrapperAttributes(['class' => 'flex flex-cols space-x-4 py-4', 'default-styling' => false]);
+                $this->setActionsCenter();
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        });
+        Livewire::test($petsTable)
+            ->assertSeeHtml('<div class="justify-center flex flex-cols space-x-4 py-4" >');
+
+    }
+
+    public function test_can_align_actions_right(): void
+    {
+        $petsTable = (new class extends PetsTable
+        {
+            use \Rappasoft\LaravelLivewireTables\Traits\WithActions;
+
+            public function actions(): array
+            {
+                return [
+                    \Rappasoft\LaravelLivewireTables\Views\Actions\Action::make('Test Edit 1')
+                        ->setRoute('dashboard24'),
+                ];
+            }
+
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+                $this->setActionWrapperAttributes(['class' => 'flex flex-cols space-x-4 py-4', 'default-styling' => false]);
+                $this->setActionsRight();
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        });
+        Livewire::test($petsTable)
+            ->assertSeeHtml('<div class="justify-end flex flex-cols space-x-4 py-4" >');
+
+    }
+}
diff --git a/tests/Views/Actions/ActionTest.php b/tests/Views/Actions/ActionTest.php
index f33d30bcb..b8bf5f240 100644
--- a/tests/Views/Actions/ActionTest.php
+++ b/tests/Views/Actions/ActionTest.php
@@ -54,10 +54,10 @@ public function test_can_get_action_button_icon_attributes(): void
         $this->assertFalse($action->hasIcon());
 
         $action->setIconAttributes(['class' => 'font-sm text-sm']);
-        $bag = new \Illuminate\View\ComponentAttributeBag(['default-styling' => true, 'class' => 'font-sm text-sm']);
+        $bag = new \Illuminate\View\ComponentAttributeBag(['class' => 'font-sm text-sm', 'default-styling' => true]);
 
         $this->assertSame($bag->getAttributes(), $action->getIconAttributes()->getAttributes());
-        $this->assertSame(['default-styling' => true, 'class' => 'font-sm text-sm'], $action->iconAttributes);
+        $this->assertSame(['class' => 'font-sm text-sm', 'default-styling' => true], $action->iconAttributes);
 
     }
 
@@ -94,6 +94,7 @@ public function test_can_get_action_button_action_attributes(): void
             ->wireNavigate()
             ->route('dashboard2');
         $this->assertSame((new ComponentAttributeBag([
+            'class' => '',
             'default-styling' => true,
             'default-colors' => true,
             'href' => 'dashboard2',
@@ -101,33 +102,33 @@ public function test_can_get_action_button_action_attributes(): void
 
         $action->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true]);
         $this->assertSame((new ComponentAttributeBag([
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'default-styling' => true,
             'default-colors' => true,
-            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'href' => 'dashboard2',
         ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
 
         $action->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true]);
         $this->assertSame((new ComponentAttributeBag([
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'default-styling' => true,
             'default-colors' => true,
-            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'href' => 'dashboard2',
         ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
 
         $action->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => false]);
         $this->assertSame((new ComponentAttributeBag([
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'default-styling' => true,
             'default-colors' => false,
-            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'href' => 'dashboard2',
         ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
 
         $action->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-colors' => false]);
         $this->assertSame((new ComponentAttributeBag([
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'default-styling' => true,
             'default-colors' => false,
-            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'href' => 'dashboard2',
         ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
 
@@ -199,8 +200,6 @@ public function test_can_set_action_wrapper_attributes(): void
     {
         $petsTable = (new class extends PetsTable
         {
-            use \Rappasoft\LaravelLivewireTables\Traits\WithActions;
-
             public function configure(): void
             {
                 $this->setPrimaryKey('id');
@@ -216,19 +215,19 @@ public function exportBulk($items)
                 return $items;
             }
         });
-        $this->assertSame(['default-styling' => true, 'default-colors' => true], $petsTable->getActionWrapperAttributes());
+        $this->assertSame(['class' => '', 'default-styling' => true, 'default-colors' => true], $petsTable->getActionWrapperAttributes());
         $petsTable->setActionWrapperAttributes(['default-styling' => false, 'class' => 'bg-blue-500']);
         $this->assertSame([
+            'class' => 'bg-blue-500',
             'default-styling' => false,
             'default-colors' => true,
-            'class' => 'bg-blue-500',
         ], $petsTable->getActionWrapperAttributes());
 
         $petsTable->setActionWrapperAttributes(['default-colors' => false, 'class' => 'bg-red-500']);
         $this->assertSame([
-            'default-styling' => true,
-            'default-colors' => false,
             'class' => 'bg-red-500',
+            'default-styling' => false,
+            'default-colors' => false,
         ], $petsTable->getActionWrapperAttributes());
 
     }
@@ -239,9 +238,9 @@ public function test_can_check_that_route_is_appended_to_attributes(): void
             ->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
             ->route('dashboard22');
         $this->assertSame((new ComponentAttributeBag([
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'default-styling' => true,
             'default-colors' => true,
-            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'href' => 'dashboard22',
         ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
     }
@@ -254,9 +253,9 @@ public function test_can_check_that_route_is_not_appended_to_attributes_with_wir
             ->setWireAction('wire:click')
             ->setWireActionParams('testactionparams');
         $this->assertSame((new ComponentAttributeBag([
+            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'default-styling' => true,
             'default-colors' => true,
-            'class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800',
             'href' => '#',
         ]))->getAttributes(), $action->getActionAttributes()->getAttributes());
     }
@@ -265,8 +264,6 @@ public function test_can_check_has_actions(): void
     {
         $petsTable = (new class extends PetsTable
         {
-            use \Rappasoft\LaravelLivewireTables\Traits\WithActions;
-
             public function actions(): array
             {
                 return [
@@ -343,4 +340,62 @@ public function test_action_renders_correctly(): void
 
         $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());
     }
+
+    public function test_can_set_action_position(): void
+    {
+        $petsTable = (new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        });
+
+        $this->assertSame('right', $petsTable->getActionsPosition());
+        $petsTable->setActionsLeft();
+        $this->assertSame('left', $petsTable->getActionsPosition());
+        $petsTable->setActionsCenter();
+        $this->assertSame('center', $petsTable->getActionsPosition());
+        $petsTable->setActionsRight();
+        $this->assertSame('right', $petsTable->getActionsPosition());
+
+    }
+
+    public function test_can_set_action_toolbar(): void
+    {
+        $petsTable = (new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        });
+
+        $this->assertFalse($petsTable->showActionsInToolbar());
+        $petsTable->setActionsInToolbarEnabled();
+        $this->assertTrue($petsTable->showActionsInToolbar());
+        $petsTable->setActionsInToolbarDisabled();
+        $this->assertFalse($petsTable->showActionsInToolbar());
+
+    }
 }

From 5007627065227bc1a00a23c442e613d972f2508c Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 25 Aug 2024 04:27:02 +0100
Subject: [PATCH 024/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef5caafc2..e45450eaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.14] - 2024-08-25
+### New Features
+- Set Action Position (Left/Center/Right) and Set Actions in Toolbar by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1889
+
 ## [v3.4.13] - 2024-08-25
 ### Bug Fixes
 - Fix for Action Button with no icon by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1887

From d0da3b1f809cc496e4788b449020afc9a4ac58d0 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 25 Aug 2024 06:13:49 +0100
Subject: [PATCH 025/103] Doc Type Fixes (#1891)

* Update NumberFilter and TypeHints

* Update DateFilter/DateTimeFilter and ConfigurableAreasHelpers for typehints and array key exists

* Add Float Test for NumberFilter

* Add ColorColumn View Test

* Adjust ColumnSelectConfigurationTest

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/Configuration/FooterConfiguration.php  |  4 ++--
 .../SecondaryHeaderConfiguration.php              |  4 ++--
 .../Configuration/TableAttributeConfiguration.php | 12 ++++++------
 src/Traits/Helpers/ConfigurableAreasHelpers.php   | 15 ++++-----------
 src/Traits/Helpers/SearchHelpers.php              |  6 +++++-
 src/Traits/WithFooter.php                         |  4 ++--
 src/Traits/WithSecondaryHeader.php                |  4 ++--
 src/Traits/WithTableAttributes.php                | 12 ++++++------
 src/Views/Columns/ColorColumn.php                 |  2 +-
 src/Views/Filters/DateFilter.php                  | 12 +++++++++---
 src/Views/Filters/DateTimeFilter.php              | 12 +++++++++---
 src/Views/Filters/NumberFilter.php                | 12 ++++++++++--
 .../Configuration/ColorColumnConfiguration.php    |  2 +-
 src/Views/Traits/Core/HasFooter.php               |  2 +-
 src/Views/Traits/Core/HasSecondaryHeader.php      |  2 +-
 src/Views/Traits/Helpers/ColorColumnHelpers.php   |  2 +-
 .../ColumnSelectConfigurationTest.php             |  4 +++-
 tests/Views/Columns/ColorColumnTest.php           | 10 ++++++++++
 tests/Views/Filters/NumberFilterTest.php          |  3 ++-
 19 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/src/Traits/Configuration/FooterConfiguration.php b/src/Traits/Configuration/FooterConfiguration.php
index a438724fc..b84193312 100644
--- a/src/Traits/Configuration/FooterConfiguration.php
+++ b/src/Traits/Configuration/FooterConfiguration.php
@@ -46,14 +46,14 @@ public function setUseHeaderAsFooterDisabled(): self
         return $this;
     }
 
-    public function setFooterTrAttributes(callable $callback): self
+    public function setFooterTrAttributes(\Closure $callback): self
     {
         $this->footerTrAttributesCallback = $callback;
 
         return $this;
     }
 
-    public function setFooterTdAttributes(callable $callback): self
+    public function setFooterTdAttributes(\Closure $callback): self
     {
         $this->footerTdAttributesCallback = $callback;
 
diff --git a/src/Traits/Configuration/SecondaryHeaderConfiguration.php b/src/Traits/Configuration/SecondaryHeaderConfiguration.php
index 6982c47db..62acb5992 100644
--- a/src/Traits/Configuration/SecondaryHeaderConfiguration.php
+++ b/src/Traits/Configuration/SecondaryHeaderConfiguration.php
@@ -25,14 +25,14 @@ public function setSecondaryHeaderDisabled(): self
         return $this;
     }
 
-    public function setSecondaryHeaderTrAttributes(callable $callback): self
+    public function setSecondaryHeaderTrAttributes(\Closure $callback): self
     {
         $this->secondaryHeaderTrAttributesCallback = $callback;
 
         return $this;
     }
 
-    public function setSecondaryHeaderTdAttributes(callable $callback): self
+    public function setSecondaryHeaderTdAttributes(\Closure $callback): self
     {
         $this->secondaryHeaderTdAttributesCallback = $callback;
 
diff --git a/src/Traits/Configuration/TableAttributeConfiguration.php b/src/Traits/Configuration/TableAttributeConfiguration.php
index 972fd8604..01cf7376d 100644
--- a/src/Traits/Configuration/TableAttributeConfiguration.php
+++ b/src/Traits/Configuration/TableAttributeConfiguration.php
@@ -68,7 +68,7 @@ public function setTbodyAttributes(array $attributes = []): self
     /**
      * Set a list of attributes to override on the th elements
      */
-    public function setThAttributes(callable $callback): self
+    public function setThAttributes(\Closure $callback): self
     {
         $this->thAttributesCallback = $callback;
 
@@ -78,7 +78,7 @@ public function setThAttributes(callable $callback): self
     /**
      * Set a list of attributes to override on the th sort button elements
      */
-    public function setThSortButtonAttributes(callable $callback): self
+    public function setThSortButtonAttributes(\Closure $callback): self
     {
         $this->thSortButtonAttributesCallback = $callback;
 
@@ -88,7 +88,7 @@ public function setThSortButtonAttributes(callable $callback): self
     /**
      * Set a list of attributes to override on the td elements
      */
-    public function setTrAttributes(callable $callback): self
+    public function setTrAttributes(\Closure $callback): self
     {
         $this->trAttributesCallback = $callback;
 
@@ -98,21 +98,21 @@ public function setTrAttributes(callable $callback): self
     /**
      * Set a list of attributes to override on the td elements
      */
-    public function setTdAttributes(callable $callback): self
+    public function setTdAttributes(\Closure $callback): self
     {
         $this->tdAttributesCallback = $callback;
 
         return $this;
     }
 
-    public function setTableRowUrl(callable $callback): self
+    public function setTableRowUrl(\Closure $callback): self
     {
         $this->trUrlCallback = $callback;
 
         return $this;
     }
 
-    public function setTableRowUrlTarget(callable $callback): self
+    public function setTableRowUrlTarget(\Closure $callback): self
     {
         $this->trUrlTargetCallback = $callback;
 
diff --git a/src/Traits/Helpers/ConfigurableAreasHelpers.php b/src/Traits/Helpers/ConfigurableAreasHelpers.php
index 440f95ef4..23f50be55 100644
--- a/src/Traits/Helpers/ConfigurableAreasHelpers.php
+++ b/src/Traits/Helpers/ConfigurableAreasHelpers.php
@@ -21,12 +21,9 @@ public function hasConfigurableAreaFor(string $area): bool
         return isset($this->configurableAreas[$area]) && $this->getConfigurableAreaFor($area) !== null;
     }
 
-    /**
-     * @param  string|array<mixed>  $area
-     */
-    public function getConfigurableAreaFor($area): ?string
+    public function getConfigurableAreaFor(string $area): ?string
     {
-        $area = $this->configurableAreas[$area] ?? null;
+        $area = array_key_exists($area, $this->configurableAreas) ? $this->configurableAreas[$area] : null;
 
         if (is_array($area)) {
             return $area[0];
@@ -35,13 +32,9 @@ public function getConfigurableAreaFor($area): ?string
         return $area;
     }
 
-    /**
-     * @param  string|array<mixed>  $area
-     * @return array<mixed>
-     */
-    public function getParametersForConfigurableArea($area): array
+    public function getParametersForConfigurableArea(string $area): array
     {
-        $area = $this->configurableAreas[$area] ?? null;
+        $area = array_key_exists($area, $this->configurableAreas) ? $this->configurableAreas[$area] : null;
 
         if (is_array($area) && isset($area[1]) && is_array($area[1])) {
             return $area[1];
diff --git a/src/Traits/Helpers/SearchHelpers.php b/src/Traits/Helpers/SearchHelpers.php
index 2647dede0..4cde87290 100644
--- a/src/Traits/Helpers/SearchHelpers.php
+++ b/src/Traits/Helpers/SearchHelpers.php
@@ -123,7 +123,11 @@ public function getSearchOptions(): string
 
     public function getSearchPlaceholder(): string
     {
-        return $this->hasSearchPlaceholder() ? $this->searchPlaceholder : __('Search');
+        if ($this->hasSearchPlaceholder()) {
+            return $this->searchPlaceholder;
+        }
+
+        return __('Search');
     }
 
     public function hasSearchPlaceholder(): bool
diff --git a/src/Traits/WithFooter.php b/src/Traits/WithFooter.php
index b1035cf29..8412d10fe 100644
--- a/src/Traits/WithFooter.php
+++ b/src/Traits/WithFooter.php
@@ -16,9 +16,9 @@ trait WithFooter
 
     protected bool $columnsWithFooter = false;
 
-    protected ?object $footerTrAttributesCallback;
+    protected ?\Closure $footerTrAttributesCallback;
 
-    protected ?object $footerTdAttributesCallback;
+    protected ?\Closure $footerTdAttributesCallback;
 
     public function setupFooter(): void
     {
diff --git a/src/Traits/WithSecondaryHeader.php b/src/Traits/WithSecondaryHeader.php
index 875d0ae03..30ab4a797 100644
--- a/src/Traits/WithSecondaryHeader.php
+++ b/src/Traits/WithSecondaryHeader.php
@@ -14,9 +14,9 @@ trait WithSecondaryHeader
 
     protected bool $columnsWithSecondaryHeader = false;
 
-    protected ?object $secondaryHeaderTrAttributesCallback;
+    protected ?\Closure $secondaryHeaderTrAttributesCallback;
 
-    protected ?object $secondaryHeaderTdAttributesCallback;
+    protected ?\Closure $secondaryHeaderTdAttributesCallback;
 
     public function bootedWithSecondaryHeader(): void
     {
diff --git a/src/Traits/WithTableAttributes.php b/src/Traits/WithTableAttributes.php
index b58c6baf0..0ec1884c1 100644
--- a/src/Traits/WithTableAttributes.php
+++ b/src/Traits/WithTableAttributes.php
@@ -21,15 +21,15 @@ trait WithTableAttributes
 
     protected array $tbodyAttributes = [];
 
-    protected ?object $thAttributesCallback;
+    protected ?\Closure $thAttributesCallback;
 
-    protected ?object $thSortButtonAttributesCallback;
+    protected ?\Closure $thSortButtonAttributesCallback;
 
-    protected ?object $trAttributesCallback;
+    protected ?\Closure $trAttributesCallback;
 
-    protected ?object $tdAttributesCallback;
+    protected ?\Closure $tdAttributesCallback;
 
-    protected ?object $trUrlCallback;
+    protected ?\Closure $trUrlCallback;
 
-    protected ?object $trUrlTargetCallback;
+    protected ?\Closure $trUrlTargetCallback;
 }
diff --git a/src/Views/Columns/ColorColumn.php b/src/Views/Columns/ColorColumn.php
index 4d078add8..3c46013b7 100644
--- a/src/Views/Columns/ColorColumn.php
+++ b/src/Views/Columns/ColorColumn.php
@@ -17,7 +17,7 @@ class ColorColumn extends Column
         ColorColumnHelpers;
     use HasDefaultStringValue;
 
-    public ?object $colorCallback = null;
+    public ?\Closure $colorCallback;
 
     protected string $view = 'livewire-tables::includes.columns.color';
 
diff --git a/src/Views/Filters/DateFilter.php b/src/Views/Filters/DateFilter.php
index a3747adff..66965547a 100644
--- a/src/Views/Filters/DateFilter.php
+++ b/src/Views/Filters/DateFilter.php
@@ -23,14 +23,20 @@ public function validate(string $value): string|bool
     {
         $this->setInputDateFormat('Y-m-d')->setOutputDateFormat($this->getConfig('pillFormat') ?? 'Y-m-d');
         $carbonDate = $this->createCarbonDate($value);
+        if ($carbonDate instanceof \Carbon\Carbon) {
+            return $carbonDate->format('Y-m-d');
+        }
 
-        return ($carbonDate === false) ? false : $carbonDate->format('Y-m-d');
+        return false;
     }
 
-    public function getFilterPillValue($value): array|string|bool|null
+    public function getFilterPillValue($value): ?string
     {
         if ($this->validate($value)) {
-            return $this->outputTranslatedDate($this->createCarbonDate($value));
+            $carbonDate = $this->createCarbonDate($value);
+            if ($carbonDate instanceof \Carbon\Carbon) {
+                return $this->outputTranslatedDate($carbonDate);
+            }
         }
 
         return null;
diff --git a/src/Views/Filters/DateTimeFilter.php b/src/Views/Filters/DateTimeFilter.php
index b499f8d09..3df56e7be 100644
--- a/src/Views/Filters/DateTimeFilter.php
+++ b/src/Views/Filters/DateTimeFilter.php
@@ -24,14 +24,20 @@ public function validate(string $value): string|bool
         $this->setInputDateFormat('Y-m-d\TH:i')->setOutputDateFormat($this->getConfig('pillFormat'));
 
         $carbonDate = $this->createCarbonDate($value);
+        if ($carbonDate instanceof \Carbon\Carbon) {
+            return $carbonDate->format('Y-m-d\TH:i');
+        }
 
-        return ($carbonDate === false) ? false : $carbonDate->format('Y-m-d\TH:i');
+        return false;
     }
 
-    public function getFilterPillValue($value): array|string|bool|null
+    public function getFilterPillValue($value): ?string
     {
         if ($this->validate($value)) {
-            return $this->outputTranslatedDate($this->createCarbonDate($value));
+            $carbonDate = $this->createCarbonDate($value);
+            if ($carbonDate && $carbonDate instanceof \Carbon\Carbon) {
+                return $this->outputTranslatedDate($carbonDate);
+            }
         }
 
         return null;
diff --git a/src/Views/Filters/NumberFilter.php b/src/Views/Filters/NumberFilter.php
index 6af596822..d942396cc 100644
--- a/src/Views/Filters/NumberFilter.php
+++ b/src/Views/Filters/NumberFilter.php
@@ -15,8 +15,16 @@ class NumberFilter extends Filter
 
     protected string $view = 'livewire-tables::components.tools.filters.number';
 
-    public function validate(mixed $value): float|int|bool
+    public function validate(float|int|string|array $value): float|int|string|false
     {
-        return is_numeric($value) ? $value : false;
+        if (is_array($value)) {
+            return false;
+        } elseif (is_float($value)) {
+            return (float) $value;
+        } elseif (is_int($value)) {
+            return (int) $value;
+        }
+
+        return false;
     }
 }
diff --git a/src/Views/Traits/Configuration/ColorColumnConfiguration.php b/src/Views/Traits/Configuration/ColorColumnConfiguration.php
index 014e2cb80..1e0671b6a 100644
--- a/src/Views/Traits/Configuration/ColorColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/ColorColumnConfiguration.php
@@ -6,7 +6,7 @@
 
 trait ColorColumnConfiguration
 {
-    public function color(callable $callback): self
+    public function color(\Closure $callback): self
     {
         $this->colorCallback = $callback;
 
diff --git a/src/Views/Traits/Core/HasFooter.php b/src/Views/Traits/Core/HasFooter.php
index 1b4e015ad..54078f188 100644
--- a/src/Views/Traits/Core/HasFooter.php
+++ b/src/Views/Traits/Core/HasFooter.php
@@ -63,7 +63,7 @@ public function footerCallbackIsFilter(): bool
         return $callback instanceof Filter;
     }
 
-    public function getFooterContents(mixed $rows, array $filterGenericData): string|HtmlString
+    public function getFooterContents(mixed $rows, array $filterGenericData): \Illuminate\Contracts\Foundation\Application|\Illuminate\View\Factory|\Illuminate\View\View|string|HtmlString
     {
         $value = null;
         $callback = $this->getFooterCallback();
diff --git a/src/Views/Traits/Core/HasSecondaryHeader.php b/src/Views/Traits/Core/HasSecondaryHeader.php
index 1626fed68..666a9d312 100644
--- a/src/Views/Traits/Core/HasSecondaryHeader.php
+++ b/src/Views/Traits/Core/HasSecondaryHeader.php
@@ -63,7 +63,7 @@ public function secondaryHeaderCallbackIsFilter(): bool
         return $callback instanceof Filter;
     }
 
-    public function getSecondaryHeaderContents(mixed $rows, array $filterGenericData): string|HtmlString
+    public function getSecondaryHeaderContents(mixed $rows, array $filterGenericData): \Illuminate\Contracts\Foundation\Application|\Illuminate\View\Factory|\Illuminate\View\View|string|HtmlString
     {
         $value = null;
         $callback = $this->getSecondaryHeaderCallback();
diff --git a/src/Views/Traits/Helpers/ColorColumnHelpers.php b/src/Views/Traits/Helpers/ColorColumnHelpers.php
index d437243e7..3f46b9085 100644
--- a/src/Views/Traits/Helpers/ColorColumnHelpers.php
+++ b/src/Views/Traits/Helpers/ColorColumnHelpers.php
@@ -10,7 +10,7 @@ trait ColorColumnHelpers
     // TODO: Test
     public function getColor(Model|int $row): string
     {
-        return $this->hasColorCallback() ? app()->call($this->getColorCallback(), ['row' => $row]) : ($this->getValue($row));
+        return $this->hasColorCallback() ? app()->call($this->getColorCallback(), ['row' => $row, 'value' => $row->{$this->getFrom()} ?? '']) : ($this->getValue($row));
     }
 
     public function getColorCallback(): ?callable
diff --git a/tests/Traits/Configuration/ColumnSelectConfigurationTest.php b/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
index 98ef5dde5..2daf1e25a 100644
--- a/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
+++ b/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
@@ -99,7 +99,7 @@ public function test_can_check_all_columns_get_selected(): void
 
     }
 
-    public function test_check_get_selected_columns()
+    public function test_check_get_selected_columns(): void
     {
 
         $this->basicTable->deselectAllColumns();
@@ -116,6 +116,8 @@ public function test_can_check_all_columns_get_selected_and_extra_methods_work()
     {
         $this->assertTrue($this->basicTable->allSelectedColumnsAreVisibleByDefault());
 
+        $this->assertSame(8, count($this->basicTable->getDefaultVisibleColumns()));
+
         $this->assertTrue($this->basicTable->allVisibleColumnsAreSelected());
 
         $this->basicTable->deselectAllColumns();
diff --git a/tests/Views/Columns/ColorColumnTest.php b/tests/Views/Columns/ColorColumnTest.php
index 5288dbee7..62708c259 100644
--- a/tests/Views/Columns/ColorColumnTest.php
+++ b/tests/Views/Columns/ColorColumnTest.php
@@ -19,6 +19,9 @@ public function test_can_get_the_column_view(): void
         $column = ColorColumn::make('Favorite Color', 'favorite_color');
 
         $this->assertSame('livewire-tables::includes.columns.color', $column->getView());
+        $column->setView('test-color-column');
+        $this->assertSame('test-color-column', $column->getView());
+
     }
 
     public function test_can_infer_field_name_from_title_if_no_from(): void
@@ -35,6 +38,13 @@ public function test_can_set_base_field_from_from(): void
         $this->assertSame('favorite_color', $column->getField());
     }
 
+    public function test_can_set_view(): void
+    {
+        $column = ColorColumn::make('Favorite Color', 'favorite_color');
+
+        $this->assertSame('livewire-tables::includes.columns.color', $column->getView());
+    }
+
     public function test_can_set_default_value(): void
     {
         $column = ColorColumn::make('Favorite Color', 'favorite_color')->defaultValue('#FEFEFE');
diff --git a/tests/Views/Filters/NumberFilterTest.php b/tests/Views/Filters/NumberFilterTest.php
index 8c0f9bf54..17c2dc066 100644
--- a/tests/Views/Filters/NumberFilterTest.php
+++ b/tests/Views/Filters/NumberFilterTest.php
@@ -157,7 +157,8 @@ public function test_can_set_number_filter_to_number(): void
     {
         $filter = NumberFilter::make('BreedID');
         $this->assertSame(123, $filter->validate(123));
-        $this->assertSame(123, $filter->validate('123'));
+        $this->assertSame(123.51, $filter->validate(123.51));
+        $this->assertFalse($filter->validate('123'));
     }
 
     public function test_can_get_if_number_filter_empty(): void

From 2a977ec8d8623ee136c2b74e1641d0eb19970d22 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 25 Aug 2024 07:35:31 +0100
Subject: [PATCH 026/103] BooleanColumn - Toggleable Callback (#1892)

* Add Docs, Code for Toggleable Columns

* Add Confirmation Option

* Tweak Blade - Standardise

* Add Tests for Toggleable

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/column-types/boolean_columns.md          | 40 ++++++++++
 .../views/includes/columns/boolean.blade.php  | 75 ++++++++++---------
 src/Views/Columns/BooleanColumn.php           | 11 +++
 .../BooleanColumnConfiguration.php            | 22 +++---
 .../Traits/Helpers/BooleanColumnHelpers.php   | 10 +++
 tests/Views/Columns/BooleanColumnTest.php     | 29 +++++++
 6 files changed, 137 insertions(+), 50 deletions(-)

diff --git a/docs/column-types/boolean_columns.md b/docs/column-types/boolean_columns.md
index 8732db839..1888fa659 100644
--- a/docs/column-types/boolean_columns.md
+++ b/docs/column-types/boolean_columns.md
@@ -80,6 +80,46 @@ BooleanColumn::make('Active')
     ->yesNo()
 ```
 
+### Toggleable
+
+You may call a defined public function, which should live within your Table Component, to allow "toggling" against your database:
+
+```php
+BooleanColumn::make('Active', 'status')
+    ->toggleable('changeStatus'),
+```
+
+Then your "changeStatus" method may look like
+```php
+    public function changeStatus(int $id)
+    {
+        $item = $this->model::find($id);
+        $item->status = !$item->status;
+        $item->save();
+    }
+```
+
+### Toggleable Confirmation Message
+
+You may define a confirmation message prior to executing your toggleable() method.  The method will only be executed upon confirming.
+```php
+BooleanColumn::make('Active', 'status')
+    ->confirmMessage('Are you sure that you want to change the status?')
+    ->toggleable('changeStatus'),
+```
+
+Then your "changeStatus" method may look like
+```php
+    public function changeStatus(int $id)
+    {
+        $item = $this->model::find($id);
+        $item->status = !$item->status;
+        $item->save();
+    }
+```
+
+
+### Additional Methods
 Please also see the following for other available methods:
 <ul>
     <li>
diff --git a/resources/views/includes/columns/boolean.blade.php b/resources/views/includes/columns/boolean.blade.php
index 1fb338512..3c48f56dc 100644
--- a/resources/views/includes/columns/boolean.blade.php
+++ b/resources/views/includes/columns/boolean.blade.php
@@ -1,40 +1,27 @@
-@if ($isTailwind)
-    @if ($status)
-        @if ($type === 'icons')
-            @if ($successValue === true)
-                <x-heroicon-o-check-circle class="inline-block h-5 w-5 text-green-500" />
-            @else
-                <x-heroicon-o-check-circle class="inline-block h-5 w-5 text-red-500" />
-            @endif
-        @elseif ($type === 'yes-no')
-            @if ($successValue === true)
-                <span>Yes</span>
-            @else
-                <span>No</span>
-            @endif
-        @endif
-    @else
-        @if ($type === 'icons')
-            @if ($successValue === false)
-                <x-heroicon-o-x-circle class="inline-block h-5 w-5 text-green-500" />
-            @else
-                <x-heroicon-o-x-circle class="inline-block h-5 w-5 text-red-500" />
-            @endif
-        @elseif ($type === 'yes-no')
-            @if ($successValue === false)
-                <span>Yes</span>
-            @else
-                <span>No</span>
-            @endif
-        @endif
-    @endif
-@elseif ($isBootstrap)
+@if($isToggleable && $toggleMethod != '')
+    <button wire:click="{{ $toggleMethod }}('{{ $rowPrimaryKey }}')" 
+    @if($hasConfirmMessage) wire:confirm="{{ $confirmMessage }}" @endif
+>
+@endif
     @if ($status)
         @if ($type === 'icons')
             @if ($successValue === true)
-                <x-heroicon-o-check-circle  class="d-inline-block text-success laravel-livewire-tables-btn-small" />
-            @else
-                <x-heroicon-o-check-circle class="d-inline-block text-danger laravel-livewire-tables-btn-small" />
+                <x-heroicon-o-check-circle 
+                    @class(
+                        [
+                            "inline-block h-5 w-5 text-green-500" => $isTailwind,
+                            "d-inline-block text-success laravel-livewire-tables-btn-small" => $isBootstrap
+                        ]
+                    ) 
+                />
+            @else
+                <x-heroicon-o-check-circle @class(
+                        [
+                            "inline-block h-5 w-5 text-red-500" => $isTailwind,
+                            "d-inline-block text-danger laravel-livewire-tables-btn-small" => $isBootstrap
+                        ]
+                    )
+                />
             @endif
         @elseif ($type === 'yes-no')
             @if ($successValue === true)
@@ -46,9 +33,21 @@
     @else
         @if ($type === 'icons')
             @if ($successValue === false)
-                <x-heroicon-o-x-circle class="d-inline-block text-success laravel-livewire-tables-btn-small" />
-            @else
-                <x-heroicon-o-x-circle class="d-inline-block text-danger laravel-livewire-tables-btn-small" />
+                <x-heroicon-o-x-circle @class(
+                        [
+                            "inline-block h-5 w-5 text-green-500" => $isTailwind,
+                            "d-inline-block text-success laravel-livewire-tables-btn-small" => $isBootstrap
+                        ]
+                    )  
+                />
+            @else
+                <x-heroicon-o-x-circle @class(
+                        [
+                            "inline-block h-5 w-5 text-red-500" => $isTailwind,
+                            "d-inline-block text-danger laravel-livewire-tables-btn-small" => $isBootstrap
+                        ]
+                    ) 
+                />
             @endif
         @elseif ($type === 'yes-no')
             @if ($successValue === false)
@@ -58,4 +57,6 @@
             @endif
         @endif
     @endif
+@if($isToggleable && $toggleMethod != '')
+    </button>
 @endif
diff --git a/src/Views/Columns/BooleanColumn.php b/src/Views/Columns/BooleanColumn.php
index 1177f6e37..38dcf7216 100644
--- a/src/Views/Columns/BooleanColumn.php
+++ b/src/Views/Columns/BooleanColumn.php
@@ -7,12 +7,14 @@
 use Rappasoft\LaravelLivewireTables\Views\Column;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\BooleanColumnConfiguration;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasCallback;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasConfirmation;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\BooleanColumnHelpers;
 
 class BooleanColumn extends Column
 {
     use BooleanColumnConfiguration,
         BooleanColumnHelpers,
+        HasConfirmation,
         HasCallback;
 
     protected string $type = 'icons';
@@ -21,6 +23,10 @@ class BooleanColumn extends Column
 
     protected string $view = 'livewire-tables::includes.columns.boolean';
 
+    protected bool $isToggleable = false;
+
+    protected ?string $toggleMethod;
+
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
     {
         if ($this->isLabel()) {
@@ -30,6 +36,11 @@ public function getContents(Model $row): null|string|\Illuminate\Support\HtmlStr
         $value = $this->getValue($row);
 
         return view($this->getView())
+            ->withRowPrimaryKey($row->{$row->getKeyName()})
+            ->withIsToggleable($this->getIsToggleable())
+            ->withToggleMethod($this->getIsToggleable() ? $this->getToggleMethod() : '')
+            ->withHasConfirmMessage($this->hasConfirmMessage())
+            ->withConfirmMessage($this->hasConfirmMessage() ? $this->getConfirmMessage() : '')
             ->withIsTailwind($this->isTailwind())
             ->withIsBootstrap($this->isBootstrap())
             ->withSuccessValue($this->getSuccessValue())
diff --git a/src/Views/Traits/Configuration/BooleanColumnConfiguration.php b/src/Views/Traits/Configuration/BooleanColumnConfiguration.php
index 05f39c329..68e98880a 100644
--- a/src/Views/Traits/Configuration/BooleanColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/BooleanColumnConfiguration.php
@@ -6,9 +6,6 @@
 
 trait BooleanColumnConfiguration
 {
-    /**
-     * @return $this
-     */
     public function setSuccessValue(bool $value): self
     {
         $this->successValue = $value;
@@ -16,9 +13,6 @@ public function setSuccessValue(bool $value): self
         return $this;
     }
 
-    /**
-     * @return $this
-     */
     public function setView(string $view): self
     {
         $this->view = $view;
@@ -26,9 +20,6 @@ public function setView(string $view): self
         return $this;
     }
 
-    /**
-     * @return $this
-     */
     public function icons(): self
     {
         $this->type = 'icons';
@@ -36,13 +27,18 @@ public function icons(): self
         return $this;
     }
 
-    /**
-     * @return $this
-     */
-    public function yesNo()
+    public function yesNo(): self
     {
         $this->type = 'yes-no';
 
         return $this;
     }
+
+    public function toggleable(string $toggleMethod): self
+    {
+        $this->isToggleable = true;
+        $this->toggleMethod = $toggleMethod;
+
+        return $this;
+    }
 }
diff --git a/src/Views/Traits/Helpers/BooleanColumnHelpers.php b/src/Views/Traits/Helpers/BooleanColumnHelpers.php
index 537d1c9b4..ae8bd33fb 100644
--- a/src/Views/Traits/Helpers/BooleanColumnHelpers.php
+++ b/src/Views/Traits/Helpers/BooleanColumnHelpers.php
@@ -15,4 +15,14 @@ public function getType(): string
     {
         return $this->type;
     }
+
+    public function getIsToggleable(): bool
+    {
+        return $this->isToggleable ?? false;
+    }
+
+    public function getToggleMethod(): ?string
+    {
+        return $this->toggleMethod ?? null;
+    }
 }
diff --git a/tests/Views/Columns/BooleanColumnTest.php b/tests/Views/Columns/BooleanColumnTest.php
index 24b2663a8..6280af52c 100644
--- a/tests/Views/Columns/BooleanColumnTest.php
+++ b/tests/Views/Columns/BooleanColumnTest.php
@@ -77,4 +77,33 @@ public function test_can_return_status_false(): void
         $curVal = $column->hasCallback() ? call_user_func($column->getCallback(), $value, $row) : (bool) $value === true;
         $this->assertSame($curVal, false);
     }
+
+    public function test_can_set_toggleable(): void
+    {
+        $column = BooleanColumn::make('Name', 'name');
+
+        $this->assertFalse($column->getIsToggleable());
+        $this->assertNull($column->getToggleMethod());
+        $column->toggleable('changeStatus');
+        $this->assertTrue($column->getIsToggleable());
+        $this->assertSame('changeStatus', $column->getToggleMethod());
+    }
+
+    public function test_can_set_toggleable_with_confirm_message(): void
+    {
+        $column = BooleanColumn::make('Name', 'name')
+            ->toggleable('changeStatus');
+
+        $this->assertTrue($column->getIsToggleable());
+        $this->assertSame('changeStatus', $column->getToggleMethod());
+
+        $this->assertFalse($column->hasConfirmMessage());
+
+        $column->confirmMessage('Are you sure?');
+
+        $this->assertTrue($column->hasConfirmMessage());
+
+        $this->assertSame('Are you sure?', $column->getConfirmMessage());
+
+    }
 }

From a61ba21606ad66523d502b7a02a3a863ac0d0deb Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 25 Aug 2024 07:38:24 +0100
Subject: [PATCH 027/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e45450eaf..4958d0393 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.15] - 2024-08-25
+### New Features
+- BooleanColumn - Toggleable Callback by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1892
+
+### Tweaks
+- Doc Type Fixes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1891
+
 ## [v3.4.14] - 2024-08-25
 ### New Features
 - Set Action Position (Left/Center/Right) and Set Actions in Toolbar by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1889

From c14692b92fc48976b842c201d8a0d3a652b2c72f Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 26 Aug 2024 20:56:30 +0100
Subject: [PATCH 028/103] Enable/Disable Tools/Toolbar (#1896)

* Customised Toolbar Approach


---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/misc/tools.md                            |  59 ++++++++++
 .../views/components/tools/toolbar.blade.php  |  10 --
 resources/views/datatable.blade.php           |  10 +-
 .../Configuration/ToolsConfiguration.php      |  40 +++++++
 src/Traits/HasAllTraits.php                   |   3 +-
 src/Traits/Helpers/SortingHelpers.php         |   2 +-
 src/Traits/Helpers/ToolsHelpers.php           | 108 ++++++++++++++++++
 src/Traits/WithTools.php                      |  16 +++
 tests/Traits/Helpers/ToolsHelpersTest.php     | 103 +++++++++++++++++
 9 files changed, 338 insertions(+), 13 deletions(-)
 create mode 100644 docs/misc/tools.md
 create mode 100644 src/Traits/Configuration/ToolsConfiguration.php
 create mode 100644 src/Traits/Helpers/ToolsHelpers.php
 create mode 100644 src/Traits/WithTools.php
 create mode 100644 tests/Traits/Helpers/ToolsHelpersTest.php

diff --git a/docs/misc/tools.md b/docs/misc/tools.md
new file mode 100644
index 000000000..7904caa0c
--- /dev/null
+++ b/docs/misc/tools.md
@@ -0,0 +1,59 @@
+---
+title: Tools
+weight: 9
+---
+
+The Table offers additional configuration to show/hide the Tools/Toolbar sections:
+## Tools
+Contains:
+- Filter Pills
+- Sorting Pills
+- The Toolbar
+
+## Toolbar
+Contains:
+- Actions (if set to Toolbar)
+- Column Select dropdown
+- Configurable Areas for Toolbar
+- Filters Button/Dropdown/Popover
+- Pagination dropdown
+- Reorder Button
+- Search Input
+
+## Component Available Methods
+
+### setToolsEnabled
+The Default Behaviour, Tools Are Enabled.  But will only be rendered if there are available/enabled elements.  If the Toolbar is enabled, this takes into account any Toolbar elements that are present.
+```php
+    public function configure(): void
+    {
+        $this->setToolsEnabled();
+    }
+```
+
+### setToolsDisabled
+Disables the Tools section, this includes the Toolbar, and Sort/Filter pills
+```php
+    public function configure(): void
+    {
+        $this->setToolsDisabled();
+    }
+```
+
+### setToolBarEnabled
+The Default Behaviour, ToolBar is Enabled.  But will only be rendered if there are available/enabled elements
+```php
+    public function configure(): void
+    {
+        $this->setToolBarEnabled();
+    }
+```
+
+### setToolBarDisabled
+Disables the Toolbar, which contains the Reorder, Filters, Search, Column Select, Pagination buttons/options.  Does not impact the Filter/Sort pills (if enabled)
+```php
+    public function configure(): void
+    {
+        $this->setToolBarDisabled();
+    }
+```
\ No newline at end of file
diff --git a/resources/views/components/tools/toolbar.blade.php b/resources/views/components/tools/toolbar.blade.php
index c0e1a217d..8a3c8901b 100644
--- a/resources/views/components/tools/toolbar.blade.php
+++ b/resources/views/components/tools/toolbar.blade.php
@@ -1,10 +1,6 @@
 @aware(['component', 'tableName','isTailwind','isBootstrap'])
 @props([])
 
-@if ($this->hasConfigurableAreaFor('before-toolbar'))
-    @include($this->getConfigurableAreaFor('before-toolbar'), $this->getParametersForConfigurableArea('before-toolbar'))
-@endif
-
 <div @class([
         'd-md-flex justify-content-between mb-3' => $this->isBootstrap,
         'md:flex md:justify-between mb-4 px-4 md:p-0' => $this->isTailwind,
@@ -90,9 +86,3 @@
     <x-livewire-tables::tools.toolbar.items.filter-slidedown  />
 @endif
 
-
-@if ($this->hasConfigurableAreaFor('after-toolbar'))
-    <div x-cloak x-show="!currentlyReorderingStatus" >
-        @include($this->getConfigurableAreaFor('after-toolbar'), $this->getParametersForConfigurableArea('after-toolbar'))
-    </div>
-@endif
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index f2877c961..6cf84f2ce 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -17,6 +17,7 @@
             @include($this->getConfigurableAreaFor('before-tools'), $this->getParametersForConfigurableArea('before-tools'))
         @endif
 
+        @if($this->shouldShowTools)
         <x-livewire-tables::tools>
             @if ($this->showSortPillsSection)
                 <x-livewire-tables::tools.sorting-pills />
@@ -24,8 +25,15 @@
             @if($this->showFilterPillsSection)
                 <x-livewire-tables::tools.filter-pills />
             @endif
-            <x-livewire-tables::tools.toolbar />
+
+            @includeWhen($this->hasConfigurableAreaFor('before-toolbar'), $this->getConfigurableAreaFor('before-toolbar'), $this->getParametersForConfigurableArea('before-toolbar'))
+            @if($this->shouldShowToolBar)
+                <x-livewire-tables::tools.toolbar />
+            @endif
+            @includeWhen($this->hasConfigurableAreaFor('after-toolbar'), $this->getConfigurableAreaFor('after-toolbar'), $this->getParametersForConfigurableArea('after-toolbar'))
+            
         </x-livewire-tables::tools>
+        @endif
 
         <x-livewire-tables::table>
             
diff --git a/src/Traits/Configuration/ToolsConfiguration.php b/src/Traits/Configuration/ToolsConfiguration.php
new file mode 100644
index 000000000..08fe1b95d
--- /dev/null
+++ b/src/Traits/Configuration/ToolsConfiguration.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
+
+trait ToolsConfiguration
+{
+    public function setToolsStatus(bool $status): self
+    {
+        $this->toolsStatus = $status;
+
+        return $this;
+    }
+
+    public function setToolsEnabled(): self
+    {
+        return $this->setToolsStatus(true);
+    }
+
+    public function setToolsDisabled(): self
+    {
+        return $this->setToolsStatus(false);
+    }
+
+    public function setToolBarStatus(bool $status): self
+    {
+        $this->toolBarStatus = $status;
+
+        return $this;
+    }
+
+    public function setToolBarEnabled(): self
+    {
+        return $this->setToolBarStatus(true);
+    }
+
+    public function setToolBarDisabled(): self
+    {
+        return $this->setToolBarStatus(false);
+    }
+}
diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index 7f048a4a8..567afccd3 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -27,5 +27,6 @@ trait HasAllTraits
         WithRefresh,
         WithReordering,
         WithSecondaryHeader,
-        WithTableAttributes;
+        WithTableAttributes,
+        WithTools;
 }
diff --git a/src/Traits/Helpers/SortingHelpers.php b/src/Traits/Helpers/SortingHelpers.php
index c78ec9a2f..a0043d41e 100644
--- a/src/Traits/Helpers/SortingHelpers.php
+++ b/src/Traits/Helpers/SortingHelpers.php
@@ -164,6 +164,6 @@ public function getDefaultSortingLabelDesc(): string
     #[Computed]
     public function showSortPillsSection(): bool
     {
-        return $this->sortingPillsAreEnabled() && $this->hasSorts();
+        return $this->sortingIsEnabled() && $this->sortingPillsAreEnabled() && $this->hasSorts();
     }
 }
diff --git a/src/Traits/Helpers/ToolsHelpers.php b/src/Traits/Helpers/ToolsHelpers.php
new file mode 100644
index 000000000..a73b7fe53
--- /dev/null
+++ b/src/Traits/Helpers/ToolsHelpers.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
+
+use Livewire\Attributes\Computed;
+
+trait ToolsHelpers
+{
+    public function getToolsStatus(): bool
+    {
+        return $this->toolsStatus;
+    }
+
+    public function getToolBarStatus(): bool
+    {
+        return $this->toolBarStatus;
+    }
+
+    #[Computed]
+    public function shouldShowTools(): bool
+    {
+        if ($this->getToolsStatus()) {
+            if ($this->shouldShowToolBar()) {
+                return true;
+            } else {
+                if ($this->showSortPillsSection()) { // Sort Pills Are Enabled
+                    return true;
+                } elseif ($this->showFilterPillsSection()) { // Filter Pills Are Enable)
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        } else {
+            return false;
+        }
+    }
+
+    #[Computed]
+    public function shouldShowToolBar(): bool
+    {
+        if ($this->getToolsStatus() == false) {
+            return false;
+        }
+
+        if ($this->getToolBarStatus()) {
+            if (
+                $this->hasToolbarConfigurableAreas() || // Has Configured Toolbar Configurable Areas
+                $this->hasToolbarActions() ||  // Actions Exist In Toolbar
+                $this->hasToolbarReorder() ||  // If Reorder Is Enabled
+                $this->hasToolbarColumnSelect() || // Column Select Enabled
+                $this->displayToolbarSearch() || // If Search Is Enabled
+                $this->displayToolbarFilters() ||  // If Filters Are Enabled
+                $this->displayToolbarPagination()  // Pagination Selection Is Enabled
+            ) {
+                return true;
+            }
+
+            return false;
+        }
+
+        return false;
+    }
+
+    #[Computed]
+    public function displayToolbarPagination(): bool
+    {
+        return $this->paginationIsEnabled() && $this->perPageVisibilityIsEnabled();
+    }
+
+    #[Computed]
+    public function displayToolbarSearch(): bool
+    {
+        return $this->searchIsEnabled() && $this->searchVisibilityIsEnabled();
+    }
+
+    #[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;
+    }
+
+    protected function hasToolbarColumnSelect(): bool
+    {
+        return $this->columnSelectIsEnabled();
+    }
+
+    protected function hasToolbarReorder(): bool
+    {
+        return $this->reorderIsEnabled();
+    }
+
+    protected function hasToolbarConfigurableAreas(): bool
+    {
+        return $this->hasConfigurableAreaFor('toolbar-left-end') || $this->hasConfigurableAreaFor('toolbar-left-start') || $this->hasConfigurableAreaFor('toolbar-right-start') || $this->hasConfigurableAreaFor('toolbar-right-end');
+    }
+
+    protected function hasToolbarActions(): bool
+    {
+        return $this->hasActions() && $this->showActionsInToolbar();
+    }
+}
diff --git a/src/Traits/WithTools.php b/src/Traits/WithTools.php
new file mode 100644
index 000000000..31d91a57a
--- /dev/null
+++ b/src/Traits/WithTools.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits;
+
+use Rappasoft\LaravelLivewireTables\Traits\Configuration\ToolsConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Helpers\ToolsHelpers;
+
+trait WithTools
+{
+    use ToolsConfiguration,
+        ToolsHelpers;
+
+    protected bool $toolsStatus = true;
+
+    protected bool $toolBarStatus = true;
+}
diff --git a/tests/Traits/Helpers/ToolsHelpersTest.php b/tests/Traits/Helpers/ToolsHelpersTest.php
new file mode 100644
index 000000000..07533cbbc
--- /dev/null
+++ b/tests/Traits/Helpers/ToolsHelpersTest.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class ToolsHelpersTest extends TestCase
+{
+    public function test_can_get_toolbar_status(): void
+    {
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+        $this->assertTrue($this->basicTable->getToolsStatus());
+
+        $this->basicTable->setToolBarDisabled();
+
+        $this->assertFalse($this->basicTable->getToolBarStatus());
+        $this->assertTrue($this->basicTable->getToolsStatus());
+
+    }
+
+    public function test_can_get_tools_status(): void
+    {
+        $this->assertTrue($this->basicTable->getToolsStatus());
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+
+        $this->basicTable->setToolsDisabled();
+
+        $this->assertFalse($this->basicTable->getToolsStatus());
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+    }
+
+    public function test_can_get_tools_should_display(): void
+    {
+        $this->assertTrue($this->basicTable->getToolsStatus());
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+        $this->assertTrue($this->basicTable->shouldShowTools());
+        $this->assertTrue($this->basicTable->shouldShowToolBar());
+
+        $this->basicTable->setToolsDisabled();
+
+        $this->assertFalse($this->basicTable->getToolsStatus());
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+        $this->assertFalse($this->basicTable->shouldShowTools());
+        $this->assertFalse($this->basicTable->shouldShowToolBar());
+    }
+
+    public function test_can_get_toolbar_display(): void
+    {
+        $this->assertTrue($this->basicTable->getToolsStatus());
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+        $this->basicTable->setFiltersDisabled();
+        $this->basicTable->setSingleSortingDisabled();
+        $this->basicTable->setSearchDisabled();
+        $this->basicTable->setColumnSelectDisabled();
+        $this->basicTable->setPerPageVisibilityDisabled();
+        $this->basicTable->setSortingDisabled();
+        $this->basicTable->setSortingPillsDisabled();
+
+        $this->assertTrue($this->basicTable->getToolsStatus());
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+        $this->assertFalse($this->basicTable->shouldShowToolBar());
+
+    }
+
+    public function test_can_get_tools_display(): void
+    {
+        $this->assertTrue($this->basicTable->getToolsStatus());
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+        $this->basicTable->setSearchDisabled()
+            ->setColumnSelectDisabled()
+            ->setPerPageVisibilityDisabled();
+        $this->basicTable->setSorts(['id' => 'asc', 'name' => 'desc']);
+
+        $this->assertTrue($this->basicTable->shouldShowToolBar());
+        $this->assertTrue($this->basicTable->shouldShowTools());
+
+        $this->basicTable->setFiltersDisabled();
+
+        $this->assertFalse($this->basicTable->shouldShowToolBar());
+        $this->assertTrue($this->basicTable->shouldShowTools());
+
+        $this->basicTable->setSortingDisabled();
+
+        $this->assertFalse($this->basicTable->shouldShowToolBar());
+        $this->assertFalse($this->basicTable->shouldShowTools());
+
+        $this->basicTable->setFiltersEnabled();
+
+        $this->assertTrue($this->basicTable->shouldShowToolBar());
+        $this->assertTrue($this->basicTable->shouldShowTools());
+
+        $this->basicTable->clearSorts();
+
+        $this->assertTrue($this->basicTable->shouldShowToolBar());
+        $this->assertTrue($this->basicTable->shouldShowTools());
+
+        $this->basicTable->setFiltersDisabled();
+
+        $this->assertFalse($this->basicTable->shouldShowToolBar());
+        $this->assertFalse($this->basicTable->shouldShowTools());
+
+    }
+}

From 84eaf9b77e2dd648e325f5f56c8301f4c7415f27 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 26 Aug 2024 23:42:13 +0100
Subject: [PATCH 029/103] Use Computed Properties By Default (#1898)

---
 src/Traits/ComponentUtilities.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index 815cd216e..d065b25ed 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -45,7 +45,7 @@ trait ComponentUtilities
 
     protected array $extraWithAvgs = [];
 
-    protected bool $useComputedProperties = false;
+    protected bool $useComputedProperties = true;
 
     /**
      * Set any configuration options

From 0b0d9cb5e3a2a9713b56833b72550c2fe772ea72 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 27 Aug 2024 00:48:57 +0100
Subject: [PATCH 030/103] Fix has actions (#1901)

* Fix Action Repetitive Calling

* Fix validActionsCount

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/Helpers/ActionsHelpers.php | 22 ++++++++++++++--------
 src/Traits/WithActions.php            |  3 +++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Traits/Helpers/ActionsHelpers.php b/src/Traits/Helpers/ActionsHelpers.php
index 7e8e6e5fe..116ea60c9 100644
--- a/src/Traits/Helpers/ActionsHelpers.php
+++ b/src/Traits/Helpers/ActionsHelpers.php
@@ -29,18 +29,24 @@ public function getActionWrapperAttributes(): array
     #[Computed]
     public function hasActions(): bool
     {
-        return (new Collection($this->actions()))
-            ->filter(fn ($action) => $action instanceof Action)->count() > 0;
+        if (! isset($this->validActions)) {
+            $this->validActions = $this->getActions();
+        }
+
+        return $this->validActions->count() > 0;
     }
 
     #[Computed]
     public function getActions(): Collection
     {
-        return (new Collection($this->actions()))
-            ->filter(fn ($action) => $action instanceof Action)
-            ->each(function (Action $action, int $key) {
-                $action->setTheme($this->getTheme());
-            });
-
+        if (! isset($this->validActions)) {
+            $this->validActions = (new Collection($this->actions()))
+                ->filter(fn ($action) => $action instanceof Action)
+                ->each(function (Action $action, int $key) {
+                    $action->setTheme($this->getTheme());
+                });
+        }
+
+        return $this->validActions;
     }
 }
diff --git a/src/Traits/WithActions.php b/src/Traits/WithActions.php
index 1d78fa675..b9531e755 100644
--- a/src/Traits/WithActions.php
+++ b/src/Traits/WithActions.php
@@ -2,6 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
+use Illuminate\Support\Collection;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\ActionsConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\ActionsHelpers;
 
@@ -16,6 +17,8 @@ trait WithActions
 
     protected string $actionsPosition = 'right';
 
+    protected ?Collection $validActions;
+
     protected function actions(): array
     {
         return [];

From 0882827cef3312ad608c94b26ab9a868a7d845f3 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 27 Aug 2024 07:23:36 +0100
Subject: [PATCH 031/103] Add icon column (#1902)

* Initial Commit - Awaiting Docs & Tests

* Tweak to IconColumn label behaviour

* Adding IconColumn documentation

* Add Additional Tests - Replace Test Database

* Add Visuals Test for IconColumn

* Add Icon Columns to Other Column Types

* Undo FrontendAssetsTest Changes

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 database/{sqlite.database => database.sqlite} | Bin 45056 -> 49152 bytes
 docs/column-types/icon_column.md              |  87 ++++++++++++++
 docs/column-types/image_columns.md            |   2 +-
 docs/column-types/link_columns.md             |   2 +-
 .../column-types/livewire_component_column.md |   2 +-
 docs/column-types/sum_column.md               |   2 +-
 docs/column-types/view_component_column.md    |   2 +-
 docs/column-types/wire_link_column.md         |   2 +-
 docs/columns/other-column-types.md            |   3 +
 .../views/includes/columns/icon.blade.php     |   7 ++
 src/Views/Columns/IconColumn.php              |  43 +++++++
 .../Configuration/IconColumnConfiguration.php |  13 +++
 src/Views/Traits/Core/HasAttributes.php       |   2 +-
 .../Traits/Helpers/IconColumnHelpers.php      |  27 +++++
 tests/TestCase.php                            |   4 +-
 .../Visuals/Columns/IconColumnVisualsTest.php |  64 +++++++++++
 tests/Views/Columns/IconColumnTest.php        | 108 ++++++++++++++++++
 17 files changed, 361 insertions(+), 9 deletions(-)
 rename database/{sqlite.database => database.sqlite} (87%)
 create mode 100644 docs/column-types/icon_column.md
 create mode 100644 resources/views/includes/columns/icon.blade.php
 create mode 100644 src/Views/Columns/IconColumn.php
 create mode 100644 src/Views/Traits/Configuration/IconColumnConfiguration.php
 create mode 100644 src/Views/Traits/Helpers/IconColumnHelpers.php
 create mode 100644 tests/Traits/Visuals/Columns/IconColumnVisualsTest.php
 create mode 100644 tests/Views/Columns/IconColumnTest.php

diff --git a/database/sqlite.database b/database/database.sqlite
similarity index 87%
rename from database/sqlite.database
rename to database/database.sqlite
index 51e3c6632db04ef6c45a17f38916d86e009bb5ad..1a9e27435b4d4a1ffd860d2f3cb79b2bce625f63 100644
GIT binary patch
delta 1339
zcmcgrJ#5oJ81>n496JfuUxE~=a$TUU)Hd!9LnS0gQ@e^tonoA!3&u^at<^LMwkZ?|
zrL+>Ppv-JcT@Z={8$%~l6@=&p3lbw@V_@ViPNJrnSbEYY%kRDKeRqE6-5>PsF7qPZ
z-9=GU1Q&-3;EKK+n;z<-CLWig;Uh{29a3-)$`{P&r?4cv5oY<mNHBEBU48rXb+EF(
z8RlY%1bEJR)=B}n_X{hghqlUQ{nec803s<}Ng9f1B<C`UD0T3XI3n<py(;l`(L?LV
z5w)x#YPn2i4C8Le@lG=ppAzR4HJQs8;;=kSWJPNWN&L3u<TtE#18W@<Y0Xd;6rCsw
zmg||@wrgYCRm(#JTeG%Hj_n~cUn-QGmQQ_t8Rc!{n$7)H@CFIK;vlrzLK|S|VG%iJ
zz$HDsnADfWTgvhXIi;A)8QHXkKgyz_8Kc-s&FV^eLGu+Y-%(LlR7F>`lyXP($GOso
zG>9!anp$&5#idB~I6MG?)nDPsS|9(84&Z>VS3idbD*Jc+<eqJwO>Tc4GyVOb!IY8b
zk~)(df&MS7wybb+=N(pCR+VOi=NDF6R{2K4r@}g&a2+NIw>33-a2(BB*nTe>M59fp
z9Y<3=+y{67zrbp(yXy&z^>a)Dbo_K|^&l|}xZ2mmgxDkCE5gDP3jT$^;ZOJ-p5WFS
zuzK6vo8_2ZU_5w4ljowf!|+TDq&Dn)i4~YQpRycp%PJCb4i(8&Yp!4|a_>*JCyL)$
zs8jG8d=Fp29jIgLo3L_)6{t`Q48{TN+i_F!)bzM~ZCsuiQtOMMj%X=>WxaJ7j|Z^6
zXoiSnyi}E;K3-z#8Y&I|*&&S?Rh4CWEigzox_Lm(5c0dHaCZXFAO->EGQgTRp1_0V
NX)gM@$>tO+`v((qXKMfe

delta 524
zcmZo@U~YK8G(lRBpMima8;D_mbE1y1B0qy(xEC)_h>KH%fxn60fG?i+ERPKLDQ+dM
z^<0*mBAW#Trf_T);oQc=62QhLKKUHC+~g-52Aa)!tnA{VqKs|!C5cHnsRgMe#URY)
z9OUX4;;Inh=;Y(7pac|}+{b68RGeQ_qNI?SSCX2ZTBMMdU!ss#nv<iDlA4xSnp2{n
zZlFH-AfHTqVtT5QLRn%_az<j2j)GE7VsS})S!Qu2P;W|NNh(k%EwL=WD6=FrJ~=-p
zzX(||(E8-e)Z+Ne6u3n|^+`pksVQh;`Q>@3MW|wF`9-Oj>601x_0n_{Ae=mf?9@sP
zgaMigMX712MX7nosl`xpi<LB#fYxcEX@Q%Mss$_z)3W&tud@*A1^#{ftAHUqjeqhg
zeRW2b&6o7`6of$0!O9=Vz<-l}8~+^s3jRQ#5_|s1f$>e220*~Vtjfs6z#%QDD9y>p
s>6}<plAD-kWMpJuWUOmosB2)N3{nMD#|1X%G6Vlz{;!*P62ABY01(odHUIzs

diff --git a/docs/column-types/icon_column.md b/docs/column-types/icon_column.md
new file mode 100644
index 000000000..28c74458f
--- /dev/null
+++ b/docs/column-types/icon_column.md
@@ -0,0 +1,87 @@
+---
+title: Icon Columns (beta)
+weight: 10
+---
+
+Icon columns provide a way to display icons in your table without having to use `format()` or partial views.
+
+### setIcon
+setIcon requires a valid path to an SVG (Directly or via a Library), it receives the $row, and $value (if available) to help you customise which icon to use
+```php
+IconColumn::make('Icon', 'status')
+    ->setIcon(function ($row, $value) { 
+        if($value == 1) { 
+            return "heroicon-o-check-circle"; 
+        } 
+        else 
+        {
+            return "heroicon-o-x-circle"; 
+        } 
+    }),
+```
+
+### attributes
+Attributes receives the $row, and $value (if available) to help you customise which attributes to apply, you may pass both classes, and other SVG specific attributes.
+```php
+IconColumn::make('Icon', 'status')
+    ->setIcon(function ($row, $value) { if($value == 1) { return "heroicon-o-check-circle"; } else { return "heroicon-o-x-circle"; } })
+    ->attributes(function ($row, $value) { 
+        if($value == 1) { 
+            return [
+                'class' => 'w-6 h-6', 
+                'stroke' => '#008000'
+            ]; 
+        } 
+        else 
+        {
+            return [
+                'class' => 'w-3 h-3', 
+                'stroke' => '#FF0000'
+            ]; 
+        } 
+    }),
+```
+
+For example:
+### Example
+```php
+IconColumn::make('Icon', 'status')
+    ->setIcon(function ($row, $value) { if($value == 1) { return "heroicon-o-check-circle"; } else { return "heroicon-o-x-circle"; } })
+    ->attributes(function ($row, $value) { 
+        if($value == 3) { 
+            return [
+                'class' => 'w-3 h-3', 
+                'stroke' => '#008000'
+            ]; 
+        } 
+        else if($value == 2) { 
+            return [
+                'class' => 'w-3 h-3', 
+                'stroke' => '#0000FF'
+            ]; 
+        } 
+        else 
+        {
+            return [
+                'class' => 'w-3 h-3', 
+                'stroke' => '#FF0000'
+            ]; 
+        } 
+    }),
+```
+
+Please also see the following for other available methods:
+<ul>
+    <li>
+        <a href="https://rappasoft.com/docs/laravel-livewire-tables/v3/columns/available-methods">Available Methods</a>
+    </li>
+    <li>
+        <a href="https://rappasoft.com/docs/laravel-livewire-tables/v3/columns/column-selection">Column Selection</a>
+    </li>
+    <li>
+        <a href="https://rappasoft.com/docs/laravel-livewire-tables/v3/columns/secondary-header">Secondary Header</a>
+    </li>
+    <li>
+        <a href="https://rappasoft.com/docs/laravel-livewire-tables/v3/columns/footer">Footer</a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/docs/column-types/image_columns.md b/docs/column-types/image_columns.md
index 5e6868792..4225593b3 100644
--- a/docs/column-types/image_columns.md
+++ b/docs/column-types/image_columns.md
@@ -1,6 +1,6 @@
 ---
 title: Image Columns
-weight: 10
+weight: 11
 ---
 
 Image columns provide a way to display images in your table without having to use `format()` or partial views:
diff --git a/docs/column-types/link_columns.md b/docs/column-types/link_columns.md
index e3f3120a4..1e4aa7fa1 100644
--- a/docs/column-types/link_columns.md
+++ b/docs/column-types/link_columns.md
@@ -1,6 +1,6 @@
 ---
 title: Link Columns
-weight: 11
+weight: 12
 ---
 
 Link columns provide a way to display HTML links in your table without having to use `format()` or partial views:
diff --git a/docs/column-types/livewire_component_column.md b/docs/column-types/livewire_component_column.md
index b12ada72e..9b1851299 100644
--- a/docs/column-types/livewire_component_column.md
+++ b/docs/column-types/livewire_component_column.md
@@ -1,6 +1,6 @@
 ---
 title: Livewire Component (beta)
-weight: 12
+weight: 13
 ---
 
 Livewire Component Columns allow for the use of a Livewire Component as a Column.
diff --git a/docs/column-types/sum_column.md b/docs/column-types/sum_column.md
index d63aa8f47..b15288ef2 100644
--- a/docs/column-types/sum_column.md
+++ b/docs/column-types/sum_column.md
@@ -1,6 +1,6 @@
 ---
 title: Sum Columns (beta)
-weight: 13
+weight: 14
 ---
 
 Sum columns provide an easy way to display the "Sum" of a field on a relation.
diff --git a/docs/column-types/view_component_column.md b/docs/column-types/view_component_column.md
index 4b1b9a033..f3dd04276 100644
--- a/docs/column-types/view_component_column.md
+++ b/docs/column-types/view_component_column.md
@@ -1,6 +1,6 @@
 ---
 title: View Component Columns
-weight: 14
+weight: 15
 ---
 
 View Component columns let you specify a component name and attributes and provide attributes to the View Component.  This will render the View Component in it's entirety.
diff --git a/docs/column-types/wire_link_column.md b/docs/column-types/wire_link_column.md
index 9abf15aac..253544cd0 100644
--- a/docs/column-types/wire_link_column.md
+++ b/docs/column-types/wire_link_column.md
@@ -1,6 +1,6 @@
 ---
 title: Wire Link Column (beta)
-weight: 15
+weight: 16
 ---
 
 WireLink columns provide a way to display Wired Links in your table without having to use `format()` or partial views, with or without a Confirmation Message
diff --git a/docs/columns/other-column-types.md b/docs/columns/other-column-types.md
index c3a8bd154..f12adf6e7 100644
--- a/docs/columns/other-column-types.md
+++ b/docs/columns/other-column-types.md
@@ -28,6 +28,9 @@ weight: 4
     <li>
         <a href="https://rappasoft.com/docs/laravel-livewire-tables/v3/column-types/date_columns">Date Columns</a>
     </li>
+    <li>
+        [Icon Columns (Beta)](../column-types/icon_columns)
+    </li>
     <li>
         <a href="https://rappasoft.com/docs/laravel-livewire-tables/v3/column-types/image_columns">Image Columns</a>
     </li>
diff --git a/resources/views/includes/columns/icon.blade.php b/resources/views/includes/columns/icon.blade.php
new file mode 100644
index 000000000..0f8298c03
--- /dev/null
+++ b/resources/views/includes/columns/icon.blade.php
@@ -0,0 +1,7 @@
+<div class="livewire-tables-columns-icon">
+    @svg(
+        $icon,
+        $classes,
+        $attributes,
+    )
+</div>
\ No newline at end of file
diff --git a/src/Views/Columns/IconColumn.php b/src/Views/Columns/IconColumn.php
new file mode 100644
index 000000000..3d37dbc10
--- /dev/null
+++ b/src/Views/Columns/IconColumn.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Columns;
+
+use Illuminate\Database\Eloquent\Model;
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\IconColumnConfiguration;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\IconColumnHelpers;
+use Rappasoft\LaravelLivewireTables\Views\Traits\IsColumn;
+
+class IconColumn extends Column
+{
+    use IsColumn;
+    use IconColumnConfiguration,
+        IconColumnHelpers;
+
+    public ?\Closure $iconCallback;
+
+    protected string $view = 'livewire-tables::includes.columns.icon';
+
+    public function __construct(string $title, ?string $from = null)
+    {
+        parent::__construct($title, $from);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
+
+        $this->html();
+    }
+
+    public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
+    {
+        $attributeBag = $this->getAttributeBag($row);
+
+        return view($this->getView())
+            ->withIsTailwind($this->isTailwind())
+            ->withIsBootstrap($this->isBootstrap())
+            ->withIcon($this->getIcon($row))
+            ->withClasses($attributeBag['class'])
+            ->withAttributes(collect($attributeBag)->except('class')->toArray());
+    }
+}
diff --git a/src/Views/Traits/Configuration/IconColumnConfiguration.php b/src/Views/Traits/Configuration/IconColumnConfiguration.php
new file mode 100644
index 000000000..f52bc9e2e
--- /dev/null
+++ b/src/Views/Traits/Configuration/IconColumnConfiguration.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Configuration;
+
+trait IconColumnConfiguration
+{
+    public function setIcon(\Closure $callback): self
+    {
+        $this->iconCallback = $callback;
+
+        return $this;
+    }
+}
diff --git a/src/Views/Traits/Core/HasAttributes.php b/src/Views/Traits/Core/HasAttributes.php
index 76220d4bc..5ddd4653b 100644
--- a/src/Views/Traits/Core/HasAttributes.php
+++ b/src/Views/Traits/Core/HasAttributes.php
@@ -31,7 +31,7 @@ public function hasAttributesCallback(): bool
     // TODO: Test
     public function getAttributeBag(Model $row): ComponentAttributeBag
     {
-        return new ComponentAttributeBag($this->hasAttributesCallback() ? app()->call($this->getAttributesCallback(), ['row' => $row]) : []);
+        return new ComponentAttributeBag($this->hasAttributesCallback() ? app()->call($this->getAttributesCallback(), ['row' => $row, 'value' => $this->getValue($row)]) : []);
     }
 
     /**
diff --git a/src/Views/Traits/Helpers/IconColumnHelpers.php b/src/Views/Traits/Helpers/IconColumnHelpers.php
new file mode 100644
index 000000000..ceb8f9439
--- /dev/null
+++ b/src/Views/Traits/Helpers/IconColumnHelpers.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Helpers;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\View\ComponentAttributeBag;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\HasDefaultStringValue;
+
+trait IconColumnHelpers
+{
+    use HasDefaultStringValue;
+
+    public function getIcon(Model $row): string
+    {
+        return $this->hasIconCallback() ? app()->call($this->getIconCallback(), ['row' => $row, 'value' => $this->getValue($row) ?? '']) : ($this->getValue($row));
+    }
+
+    public function getIconCallback(): ?callable
+    {
+        return $this->iconCallback;
+    }
+
+    public function hasIconCallback(): bool
+    {
+        return isset($this->iconCallback);
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index d930575f7..0bf3aa3e2 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -193,10 +193,10 @@ public function getEnvironmentSetUp($app): void
         $app['config']->set('view.cache', false);
         $app['config']->set('view.compiled', realpath(storage_path('framework/views')).'/'.rand(0, 100));
 
-        if (file_exists(__DIR__.'/../database/sqlite.database')) {
+        if (file_exists(__DIR__.'/../database/database.sqlite')) {
             $app['config']->set('database.connections.sqlite', [
                 'driver' => 'sqlite',
-                'database' => __DIR__.'/../database/sqlite.database',
+                'database' => __DIR__.'/../database/database.sqlite',
                 'prefix' => '',
             ]);
         } else {
diff --git a/tests/Traits/Visuals/Columns/IconColumnVisualsTest.php b/tests/Traits/Visuals/Columns/IconColumnVisualsTest.php
new file mode 100644
index 000000000..68d3c80fb
--- /dev/null
+++ b/tests/Traits/Visuals/Columns/IconColumnVisualsTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals\Columns;
+
+use Exception;
+use Illuminate\View\ViewException;
+use Livewire\Livewire;
+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;
+
+final class IconColumnVisualsTest extends TestCase
+{
+    private $testErrors;
+
+    public function test_icon_column_renders_correctly(): void
+    {
+        Livewire::test(new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function columns(): array
+            {
+                return [
+                    \Rappasoft\LaravelLivewireTables\Views\Column::make('Name')->searchable(),
+                    \Rappasoft\LaravelLivewireTables\Views\Columns\IconColumn::make('Old Age', 'age')
+                        ->setIcon(function (\Rappasoft\LaravelLivewireTables\Tests\Models\Pet $row, int $value) {
+                            if ($value >= 5) {
+                                return 'heroicon-o-check-circle';
+                            } else {
+                                return 'heroicon-o-x-circle';
+                            }
+                        }),
+                ];
+            }
+
+            public function filters(): array
+            {
+                return [];
+            }
+        })
+            ->call('setSearch', 'Cartman')
+            ->assertSeeHtmlInOrder([
+                '<div class="livewire-tables-columns-icon">',
+                '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true" data-slot="icon">',
+                '<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>',
+                '</svg></div>',
+            ])
+            ->assertDontSeeHtml('<path stroke-linecap="round" stroke-linejoin="round" d="m9.75 9.75 4.5 4.5m0-4.5-4.5 4.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>')
+            ->call('setSearch', 'May')
+            ->assertDontSeeHtml('<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>')
+            ->assertSeeHtmlInOrder([
+                '<div class="livewire-tables-columns-icon">',
+                '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true" data-slot="icon">',
+                '<path stroke-linecap="round" stroke-linejoin="round" d="m9.75 9.75 4.5 4.5m0-4.5-4.5 4.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>',
+                '</svg></div>',
+            ]);
+
+    }
+}
diff --git a/tests/Views/Columns/IconColumnTest.php b/tests/Views/Columns/IconColumnTest.php
new file mode 100644
index 000000000..3ac423234
--- /dev/null
+++ b/tests/Views/Columns/IconColumnTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+
+//use Illuminate\Support\Facades\Exceptions;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+use Rappasoft\LaravelLivewireTables\Views\Columns\IconColumn;
+
+final class IconColumnTest extends TestCase
+{
+    public function test_can_set_the_column_title(): void
+    {
+        $column = IconColumn::make('Icon Column 1', 'favorite_color');
+
+        $this->assertSame('Icon Column 1', $column->getTitle());
+    }
+
+    public function test_can_get_the_column_view(): void
+    {
+        $column = IconColumn::make('Icon Column 1', 'favorite_color');
+
+        $this->assertSame('livewire-tables::includes.columns.icon', $column->getView());
+        $column->setView('test-icon-column');
+        $this->assertSame('test-icon-column', $column->getView());
+
+    }
+
+    public function test_can_infer_field_name_from_title_if_no_from(): void
+    {
+        $column = IconColumn::make('Icon Column 1');
+
+        $this->assertNull($column->getField());
+    }
+
+    public function test_can_setup_column_correctly(): void
+    {
+        $column = IconColumn::make('Icon Column 1')
+            ->setIcon(function ($row, $value) {
+                if ($value == 1) {
+                    return 'heroicon-o-check-circle';
+                } else {
+                    return 'heroicon-o-x-circle';
+                }
+            });
+
+        $this->assertNotEmpty($column);
+    }
+
+    public function test_icons_correctly_via_value(): void
+    {
+        $rows = $this->basicTable->getRows();
+        $column = IconColumn::make('Old Age', 'age')
+            ->setIcon(function (Pet $row, int $value) {
+                if ($value >= 5) {
+                    return 'heroicon-o-check-circle';
+                } else {
+                    return 'heroicon-o-x-circle';
+                }
+            });
+
+        $this->assertSame('heroicon-o-check-circle', $column->getIcon(Pet::where('age', '>', 5)->first()));
+        $this->assertSame('heroicon-o-x-circle', $column->getIcon(Pet::where('age', '<', 4)->first()));
+    }
+
+    public function test_icons_correctly_via_row(): void
+    {
+        $rows = $this->basicTable->getRows();
+        $column = IconColumn::make('Old Age', 'age')
+            ->setIcon(function (Pet $row) {
+                if ($row->age >= 7) {
+                    return 'old-icon';
+                } else {
+                    return 'young-icon';
+                }
+            });
+
+        $this->assertSame('old-icon', $column->getIcon(Pet::where('age', '>', 9)->first()));
+        $this->assertSame('young-icon', $column->getIcon(Pet::where('age', '<', 4)->first()));
+    }
+
+    public function test_renders_correctly(): void
+    {
+        $rows = $this->basicTable->getRows();
+        $row1 = $rows->first();
+        $column = IconColumn::make('Old Age', 'age')
+            ->setIcon(function (Pet $row, int $value) {
+                if ($value >= 5) {
+                    return 'heroicon-o-check-circle';
+                } else {
+                    return 'heroicon-o-x-circle';
+                }
+            });
+        $youngString = '<div class="livewire-tables-columns-icon"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true" data-slot="icon"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/></svg></div>';
+        $oldString = '<div class="livewire-tables-columns-icon"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true" data-slot="icon"><path stroke-linecap="round" stroke-linejoin="round" d="m9.75 9.75 4.5 4.5m0-4.5-4.5 4.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/></svg></div>';
+        $firstLine = str_replace('  ', ' ', str_replace(["\r", "\n"], '', $column->getContents(Pet::where('age', '<', 4)->first())));
+        $firstLine = str_replace('>  <', '><', $firstLine);
+        $firstLine = str_replace('> <', '><', $firstLine);
+
+        $this->assertSame($oldString, $firstLine);
+
+        $lastLine = str_replace('  ', ' ', str_replace(["\r", "\n"], '', $column->getContents(Pet::where('age', '>', 5)->first())));
+        $lastLine = str_replace('>  <', '><', $lastLine);
+        $lastLine = str_replace('> <', '><', $lastLine);
+
+        $this->assertSame($youngString, $lastLine);
+    }
+}

From 6ff95af65679e544b056465aafb796d63355d492 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 27 Aug 2024 07:36:19 +0100
Subject: [PATCH 032/103] Add Baseline - Convert phpstan.neon to tabs (#1903)

---
 phpstan-baseline.neon | 76 +++++++++++++++++++++++++++++++++++++++++++
 phpstan.neon          | 13 ++------
 2 files changed, 78 insertions(+), 11 deletions(-)
 create mode 100644 phpstan-baseline.neon

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 000000000..205fd1d59
--- /dev/null
+++ b/phpstan-baseline.neon
@@ -0,0 +1,76 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Offset '1' on array\\<string, non\\-empty\\-array\\<int\\<0, max\\>, mixed\\>\\> in empty\\(\\) does not exist\\.$#"
+			count: 1
+			path: src/DataTableComponent.php
+
+		-
+			message: "#^Offset '99' on array\\<string, non\\-empty\\-array\\<int\\<0, max\\>, mixed\\>\\> in isset\\(\\) does not exist\\.$#"
+			count: 1
+			path: src/DataTableComponent.php
+
+		-
+			message: "#^Offset '99' on non\\-empty\\-array\\<1\\|string, array\\<int\\<0, max\\>, mixed\\>\\> in isset\\(\\) does not exist\\.$#"
+			count: 1
+			path: src/DataTableComponent.php
+
+		-
+			message: "#^Property Illuminate\\\\Database\\\\Query\\\\Builder\\:\\:\\$joins \\(array\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: src/DataTableComponent.php
+
+		-
+			message: "#^Property Rappasoft\\\\LaravelLivewireTables\\\\DataTableComponent\\:\\:\\$model has no type specified\\.$#"
+			count: 1
+			path: src/DataTableComponent.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 1
+			path: src/Views/Action.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 1
+			path: src/Views/Column.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 1
+			path: src/Views/Filter.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of method Illuminate\\\\Support\\\\Collection\\<int,string\\>\\:\\:filter\\(\\) expects \\(callable\\(string, int\\)\\: bool\\)\\|null, Closure\\(mixed\\)\\: int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Views/Filters/MultiSelectDropdownFilter.php
+
+		-
+			message: "#^Unable to resolve the template type TMapWithKeysKey in call to method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:mapWithKeys\\(\\)$#"
+			count: 1
+			path: src/Views/Filters/MultiSelectDropdownFilter.php
+
+		-
+			message: "#^Unable to resolve the template type TMapWithKeysValue in call to method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:mapWithKeys\\(\\)$#"
+			count: 1
+			path: src/Views/Filters/MultiSelectDropdownFilter.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of method Illuminate\\\\Support\\\\Collection\\<int,string\\>\\:\\:filter\\(\\) expects \\(callable\\(string, int\\)\\: bool\\)\\|null, Closure\\(mixed\\)\\: int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Views/Filters/MultiSelectFilter.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of method Illuminate\\\\Support\\\\Collection\\<int,string\\>\\:\\:filter\\(\\) expects \\(callable\\(string, int\\)\\: bool\\)\\|null, Closure\\(mixed\\)\\: int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Views/Filters/NumberRangeFilter.php
+
+		-
+			message: "#^Unable to resolve the template type TMapWithKeysKey in call to method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:mapWithKeys\\(\\)$#"
+			count: 1
+			path: src/Views/Filters/SelectFilter.php
+
+		-
+			message: "#^Unable to resolve the template type TMapWithKeysValue in call to method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:mapWithKeys\\(\\)$#"
+			count: 1
+			path: src/Views/Filters/SelectFilter.php
diff --git a/phpstan.neon b/phpstan.neon
index eff01a782..494125a83 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,5 +1,6 @@
 includes:
     - vendor/larastan/larastan/extension.neon
+    - phpstan-baseline.neon
 
 parameters:
     paths:
@@ -14,14 +15,4 @@ parameters:
     reportUnmatchedIgnoredErrors: false
     ignoreErrors:
         - identifier: missingType.generics
-        - identifier: missingType.iterableValue
-        - '#Property Rappasoft\\LaravelLivewireTables\\DataTableComponent\:\:\$model has no type specified#'
-        - '#Unable to resolve the template type TMapWithKeysKey in call to method Illuminate\\Support\\Collection#'
-        - '#Unable to resolve the template type TMapWithKeysValue in call to method Illuminate\\Support\\Collection#'
-        - '#Access to an undefined property Rappasoft\\LaravelLivewireTables\\Views\\Column\:\:\$view#'
-        - "#Unsafe usage of new static#"
-        - '#on array\<string, non-empty-array\<int\<0, max\>, mixed\>\> in empty\(\) does not exist.#'
-        - '#on array<string, non-empty-array<int<0, max>, mixed>> in isset\(\) does not exist#'
-        - '#on non-empty-array<1\|string, array<int<0, max>, mixed>> in isset\(\) does not exist.#'
-        - '#\$callback of method Illuminate\\Support\\Collection<int,string>::filter\(\) expects \(callable\(string, int\): bool\)\|null, Closure\(mixed\): int<0, max> given.#'
-        - '#Property Illuminate\\Database\\Query\\Builder\:\:\$joins \(array\) on left side of \?\? is not nullable.#'
+        - identifier: missingType.iterableValue
\ No newline at end of file

From ce76b40d63c1c28ac5f3f5c87ce748134240736f Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 27 Aug 2024 07:43:58 +0100
Subject: [PATCH 033/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4958d0393..5adab2fbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.16] - 2024-08-27
+### New Features
+- Add icon column by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1902
+- Enable/Disable Tools/Toolbar by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1896
+
+### Bug Fixes
+- Fix has actions by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1901
+- Use Computed Properties By Default by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1898
+
+### Tweaks
+- PHPStan - Config File Update and Baseline by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1903
+
 ## [v3.4.15] - 2024-08-25
 ### New Features
 - BooleanColumn - Toggleable Callback by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1892

From 570abdc840eac03221069ebaee397feb56d4ee75 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 1 Sep 2024 13:39:39 +0100
Subject: [PATCH 034/103] Save filter selection to session (BETA) (#1910)

* Initial Commit

* Fix styling

* Initial Commit

* Fix styling

* Fix nullable return

* Add Initial Tests - Remove Non-Required Method

* Fix styling

* Swap methods

* Add default docs

* Remove errant note

* Adjust docs

* Adjust Docs for storeFiltersInSessionEnabled

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/filters/available-methods.md             | 24 +++++++++
 .../SessionStorageConfiguration.php           | 23 ++++++++
 src/Traits/HasAllTraits.php                   |  1 +
 src/Traits/Helpers/FilterHelpers.php          |  6 +++
 src/Traits/Helpers/SessionStorageHelpers.php  | 52 +++++++++++++++++++
 src/Traits/WithFilters.php                    |  2 +
 src/Traits/WithSessionStorage.php             | 16 ++++++
 .../Helpers/SessionStorageHelpersTest.php     | 27 ++++++++++
 8 files changed, 151 insertions(+)
 create mode 100644 src/Traits/Configuration/SessionStorageConfiguration.php
 create mode 100644 src/Traits/Helpers/SessionStorageHelpers.php
 create mode 100644 src/Traits/WithSessionStorage.php
 create mode 100644 tests/Traits/Helpers/SessionStorageHelpersTest.php

diff --git a/docs/filters/available-methods.md b/docs/filters/available-methods.md
index 5dd8c42f5..f8845dbaf 100644
--- a/docs/filters/available-methods.md
+++ b/docs/filters/available-methods.md
@@ -182,6 +182,30 @@ public function configure(): void
 }
 ```
 
+### storeFiltersInSessionEnabled
+
+Optional behaviour - stores filter values in the session (specific to table - based on the table name)
+
+#### Exercise Caution 
+If re-using the same Livewire Table Component multiple times in your site, with the same table name, this may cause clashes in filter values
+
+```php
+public function configure(): void
+{
+    $this->storeFiltersInSessionEnabled();
+}
+```
+### storeFiltersInSessionDisabled
+
+Default behaviour - does not store filters in the session
+
+```php
+public function configure(): void
+{
+    $this->storeFiltersInSessionDisabled();
+}
+```
+
 
 ----
 
diff --git a/src/Traits/Configuration/SessionStorageConfiguration.php b/src/Traits/Configuration/SessionStorageConfiguration.php
new file mode 100644
index 000000000..cc51d7107
--- /dev/null
+++ b/src/Traits/Configuration/SessionStorageConfiguration.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
+
+trait SessionStorageConfiguration
+{
+    protected function storeFiltersInSessionStatus(bool $status): self
+    {
+        $this->sessionStorageStatus['filters'] = $status;
+
+        return $this;
+    }
+
+    public function storeFiltersInSessionEnabled(): self
+    {
+        return $this->storeFiltersInSessionStatus(true);
+    }
+
+    public function storeFiltersInSessionDisabled(): self
+    {
+        return $this->storeFiltersInSessionStatus(false);
+    }
+}
diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index 567afccd3..7bef6fee8 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -27,6 +27,7 @@ trait HasAllTraits
         WithRefresh,
         WithReordering,
         WithSecondaryHeader,
+        WithSessionStorage,
         WithTableAttributes,
         WithTools;
 }
diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php
index 205322ccd..4a78b333b 100644
--- a/src/Traits/Helpers/FilterHelpers.php
+++ b/src/Traits/Helpers/FilterHelpers.php
@@ -18,6 +18,8 @@ trait FilterHelpers
      */
     public function mountFilterHelpers(): void
     {
+        $this->restoreFilterValues();
+
         foreach ($this->getFilters() as $filter) {
             if (! isset($this->appliedFilters[$filter->getKey()])) {
                 if ($filter->hasFilterDefaultValue()) {
@@ -145,6 +147,8 @@ public function setFilter(string $filterKey, string|array|null $value): void
             event(new FilterApplied($this->getTableName(), $filterKey, $value));
         }
         $this->dispatch('filter-was-set', tableName: $this->getTableName(), filterKey: $filterKey, value: $value);
+        $this->storeFilterValues();
+
     }
 
     public function selectAllFilterOptions(string $filterKey): void
@@ -173,6 +177,7 @@ public function setFilterDefaults(): void
                 $this->resetFilter($filter);
             }
         }
+
     }
 
     /**
@@ -252,6 +257,7 @@ public function resetFilter($filter): void
         $this->callHook('filterReset', ['filter' => $filter->getKey()]);
         $this->callTraitHook('filterReset', ['filter' => $filter->getKey()]);
         $this->setFilter($filter->getKey(), $filter->getDefaultValue());
+
     }
 
     public function getFilterLayout(): string
diff --git a/src/Traits/Helpers/SessionStorageHelpers.php b/src/Traits/Helpers/SessionStorageHelpers.php
new file mode 100644
index 000000000..ae8af24f1
--- /dev/null
+++ b/src/Traits/Helpers/SessionStorageHelpers.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
+
+trait SessionStorageHelpers
+{
+    protected function getSessionStorageStatus(string $name): bool
+    {
+        return $this->sessionStorageStatus[$name] ?? false;
+    }
+
+    public function shouldStoreFiltersInSession(): bool
+    {
+        return $this->getSessionStorageStatus('filters');
+    }
+
+    public function getFilterSessionKey(): string
+    {
+        return $this->getTableName().'-stored-filters';
+    }
+
+    public function storeFilterValues(): void
+    {
+        if ($this->shouldStoreFiltersInSession()) {
+            $this->clearStoredFilterValues();
+            session([$this->getFilterSessionKey() => $this->appliedFilters]);
+        }
+    }
+
+    public function restoreFilterValues(): void
+    {
+        if (empty($this->filterComponents) || empty($this->appliedFilters)) {
+            $this->filterComponents = $this->appliedFilters = $this->getStoredFilterValues();
+        }
+    }
+
+    public function getStoredFilterValues(): array
+    {
+        if ($this->shouldStoreFiltersInSession() && session()->has($this->getFilterSessionKey())) {
+            return session()->get($this->getFilterSessionKey());
+        }
+
+        return [];
+    }
+
+    public function clearStoredFilterValues(): void
+    {
+        if ($this->shouldStoreFiltersInSession() && session()->has($this->getFilterSessionKey())) {
+            session()->forget($this->getFilterSessionKey());
+        }
+    }
+}
diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
index 49c91da8c..9ec7e60aa 100644
--- a/src/Traits/WithFilters.php
+++ b/src/Traits/WithFilters.php
@@ -78,6 +78,7 @@ public function applyFilters(): Builder
                     }
                 }
             }
+            $this->storeFilterValues();
         }
 
         return $this->getBuilder();
@@ -110,5 +111,6 @@ public function updatedFilterComponents(string|array|null $value, string $filter
             $this->dispatch('filter-was-set', tableName: $this->getTableName(), filterKey: $filter->getKey(), value: $value);
 
         }
+
     }
 }
diff --git a/src/Traits/WithSessionStorage.php b/src/Traits/WithSessionStorage.php
new file mode 100644
index 000000000..b106886e3
--- /dev/null
+++ b/src/Traits/WithSessionStorage.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits;
+
+use Rappasoft\LaravelLivewireTables\Traits\Configuration\SessionStorageConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Helpers\SessionStorageHelpers;
+
+trait WithSessionStorage
+{
+    use SessionStorageConfiguration,
+        SessionStorageHelpers;
+
+    public array $sessionStorageStatus = [
+        'filters' => false,
+    ];
+}
diff --git a/tests/Traits/Helpers/SessionStorageHelpersTest.php b/tests/Traits/Helpers/SessionStorageHelpersTest.php
new file mode 100644
index 000000000..fe1852751
--- /dev/null
+++ b/tests/Traits/Helpers/SessionStorageHelpersTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class SessionStorageHelpersTest extends TestCase
+{
+    public function test_can_get_session_storage_status_for_filters(): void
+    {
+        $this->assertFalse($this->basicTable->shouldStoreFiltersInSession());
+
+        $this->basicTable->storeFiltersInSessionEnabled();
+
+        $this->assertTrue($this->basicTable->shouldStoreFiltersInSession());
+
+        $this->basicTable->storeFiltersInSessionDisabled();
+
+        $this->assertFalse($this->basicTable->shouldStoreFiltersInSession());
+
+    }
+
+    public function test_can_get_session_storage_status_filter_key(): void
+    {
+        $this->assertSame($this->basicTable->getTableName().'-stored-filters', $this->basicTable->getFilterSessionKey());
+    }
+}

From 1f076af0d2a1383583dc4567c4bfc3a76c5268b0 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 1 Sep 2024 17:18:22 +0100
Subject: [PATCH 035/103] Add hide table option (#1914)

* Initial Commit

* Fix styling

* Further adjustments

* Fix styling

* Improve Tests - Extend PetsTable

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/misc/hiding-the-table.md                 |  78 ++++++++++
 resources/js/laravel-livewire-tables.js       |  16 ++
 resources/js/laravel-livewire-tables.min.js   |   2 +-
 resources/views/datatable.blade.php           |   2 +-
 src/Traits/ComponentUtilities.php             |   8 +-
 .../TableAttributeConfiguration.php           |  15 ++
 src/Traits/Helpers/ComponentHelpers.php       |   2 +-
 src/Traits/Helpers/TableAttributeHelpers.php  |   6 +
 src/Traits/WithTableAttributes.php            |   3 +
 tests/Http/Livewire/PetsTable.php             |   1 +
 tests/Http/Livewire/PetsTableAttributes.php   | 139 +-----------------
 tests/Http/Livewire/PetsTableEvents.php       |  25 ++++
 .../Livewire/PetsTableLoadingPlaceholder.php  | 139 +-----------------
 tests/Http/Livewire/PetsTableNoFilters.php    |  15 +-
 tests/TestCase.php                            |  17 ++-
 tests/Traits/Visuals/ComponentVisualsTest.php |   6 +-
 tests/Traits/Visuals/HideableTableTest.php    |  69 +++++++++
 17 files changed, 250 insertions(+), 293 deletions(-)
 create mode 100644 docs/misc/hiding-the-table.md
 create mode 100644 tests/Http/Livewire/PetsTableEvents.php
 create mode 100644 tests/Traits/Visuals/HideableTableTest.php

diff --git a/docs/misc/hiding-the-table.md b/docs/misc/hiding-the-table.md
new file mode 100644
index 000000000..b607ff52b
--- /dev/null
+++ b/docs/misc/hiding-the-table.md
@@ -0,0 +1,78 @@
+---
+title: Hiding The Table (beta)
+weight: 8
+---
+
+You may wish to hide the table on load.  To do so, you should use the following in the mount method.  Note that this is in mount, not boot nor configure!
+
+```php
+    public function mount()
+    {
+        $this->setShouldBeHidden();
+    }
+```
+
+### Using Events To Display/Hide
+
+For example, you may have a "Sales" table that you wish to hide by default: 
+```php
+class SalesTable extends DataTableComponent
+{
+    public string $tableName = 'sales'; // Required to keep the call specific
+
+    public function mount()
+    {
+        $this->setShouldBeHidden(); // Defaults the table to be hidden, note that this is in MOUNT and not CONFIGURE
+    }
+
+    // Configure/Columns/Filters etc
+}
+```
+
+The Table allows for different approaches, out-of-the-box it supports the more efficient client-side listeners.
+
+However - should you wish to use Livewire listeners in your table component, for example if you wish to pass more detail into the Table then you can:
+
+```php
+    #[On('showTable.{tableName}')] 
+    public function showTable(): void
+    {
+        $this->setShouldBeDisplayed();
+    }
+
+    #[On('hideTable.{tableName}')] 
+    public function hideTable(): void
+    {
+        $this->setShouldBeHidden();
+    }
+```
+
+
+### Secondary Table
+Below are the two approaches.  Note that you can customise the Livewire "On" to pass additional details should you wish.
+
+#### Using Client Side Listeners
+```php
+    Column::make('Show')
+        ->label(
+            fn($row, Column $column) => "<button x-on:click=\"\$dispatch('show-table',{'tableName': 'sales' })\">Show Sales Table</button>"
+        )->html(),
+    Column::make('Hide')
+        ->label(
+            fn($row, Column $column) => "<button x-on:click=\"\$dispatch('hide-table',{'tableName': 'sales' })\">Hide Sales Table</button>"
+        )->html(),
+```
+
+
+#### Using Livewire "On" Style Listeners:
+```php
+    Column::make('Show')
+    ->label(
+        fn($row, Column $column) => "<button x-on:click=\"\$dispatch('showTable.sales')\">Show Sales Table</button>"
+    )->html(),
+    Column::make('Hide')
+    ->label(
+        fn($row, Column $column) => "<button x-on:click=\"\$dispatch('hideTable.sales')\">Hide Sales Table</button>"
+    )->html(),
+
+```
\ No newline at end of file
diff --git a/resources/js/laravel-livewire-tables.js b/resources/js/laravel-livewire-tables.js
index 306c3857d..2c214e492 100644
--- a/resources/js/laravel-livewire-tables.js
+++ b/resources/js/laravel-livewire-tables.js
@@ -3,6 +3,9 @@
 document.addEventListener('alpine:init', () => {
     
     Alpine.data('laravellivewiretable', (wire, showBulkActionsAlpine, tableID, primaryKeyName) => ({
+        shouldBeDisplayed: wire.entangle('shouldBeDisplayed'),
+        tableName: wire.entangle('tableName'),
+        dataTableFingerprint: wire.entangle('dataTableFingerprint'),
         listeners: [],
         childElementOpen: false,
         filtersOpen: wire.entangle('filterSlideDownDefaultVisible'),
@@ -207,6 +210,18 @@ document.addEventListener('alpine:init', () => {
             }
             this.selectedItems = [...new Set(tempSelectedItems)];
         },
+        showTable(eventTableName = '', eventTableFingerpint = '')
+        {
+            if ((eventTableName != '' && eventTableName === this.tableName) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) { 
+                this.shouldBeDisplayed = true; 
+            } 
+        },
+        hideTable(eventTableName = '', eventTableFingerpint = '')
+        {
+            if ((eventTableName != '' && eventTableName === this.tableName) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) { 
+                this.shouldBeDisplayed = false; 
+            } 
+        },
         destroy() {
             this.listeners.forEach((listener) => {
                 listener();
@@ -373,6 +388,7 @@ document.addEventListener('alpine:init', () => {
 
 
     Alpine.data('tableWrapper', (wire, showBulkActionsAlpine) => ({
+        shouldBeDisplayed: wire.entangle('shouldBeDisplayed'),
         listeners: [],
         childElementOpen: false,
         filtersOpen: wire.entangle('filterSlideDownDefaultVisible'),
diff --git a/resources/js/laravel-livewire-tables.min.js b/resources/js/laravel-livewire-tables.min.js
index 35cecdd4f..5ab2c9730 100644
--- a/resources/js/laravel-livewire-tables.min.js
+++ b/resources/js/laravel-livewire-tables.min.js
@@ -1 +1 @@
-document.addEventListener("alpine:init",()=>{Alpine.data("laravellivewiretable",(e,t,l,i)=>({listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.entangle("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=t.rowIndex,n=document.getElementById(l),o=a;e.offsetY>t.getBoundingClientRect().height/2?i.insertBefore(s,t.nextSibling):i.insertBefore(s,t),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.currentlyReorderingStatus?e.disableReordering():(this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),this.setupEvenOddClasses(),e.enableReordering()),this.$nextTick(()=>{this.setupEvenOddClasses()})},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let t=document.getElementById(l),s=[];for(let a=1,r;r=t.rows[a];a++)s.push({[i]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(l).getElementsByTagName("tbody")[0],t=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(t=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=t.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!t.includes(e)),t=[],i=[])}},toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("booleanFilter",(e,t,l,i)=>({switchOn:!1,value:e.entangle("filterComponents."+t).live,init(){this.switchOn=!1,void 0!==this.value&&(this.switchOn=Boolean(Number(this.value))),this.listeners.push(Livewire.on("filter-was-set",e=>{e.tableName==l&&e.filterKey==t&&(this.switchOn=e.value??i)}))}})),Alpine.data("numberRangeFilter",(e,t,l,i,s)=>({allFilters:e.entangle("filterComponents",!1),originalMin:0,originalMax:100,filterMin:0,filterMax:100,currentMin:0,currentMax:100,hasUpdate:!1,wireValues:e.entangle("filterComponents."+t,!1),defaultMin:i.minRange,defaultMax:i.maxRange,restrictUpdates:!1,initialiseStyles(){let e=document.getElementById(l);e.style.setProperty("--value-a",this.wireValues.min??this.filterMin),e.style.setProperty("--text-value-a",JSON.stringify(this.wireValues.min??this.filterMin)),e.style.setProperty("--value-b",this.wireValues.max??this.filterMax),e.style.setProperty("--text-value-b",JSON.stringify(this.wireValues.max??this.filterMax))},updateStyles(e,t){let i=document.getElementById(l);i.style.setProperty("--value-a",e),i.style.setProperty("--text-value-a",JSON.stringify(e)),i.style.setProperty("--value-b",t),i.style.setProperty("--text-value-b",JSON.stringify(t))},setupWire(){void 0!==this.wireValues?(this.filterMin=this.originalMin=void 0!==this.wireValues.min?this.wireValues.min:this.defaultMin,this.filterMax=this.originalMax=void 0!==this.wireValues.max?this.wireValues.max:this.defaultMax):(this.filterMin=this.originalMin=this.defaultMin,this.filterMax=this.originalMax=this.defaultMax),this.updateStyles(this.filterMin,this.filterMax)},allowUpdates(){this.updateWire()},updateWire(){let e=parseInt(this.filterMin),t=parseInt(this.filterMax);(e!=this.originalMin||t!=this.originalMax)&&(t<e&&(this.filterMin=t,this.filterMax=e),this.hasUpdate=!0,this.originalMin=e,this.originalMax=t),this.updateStyles(this.filterMin,this.filterMax)},updateWireable(){this.hasUpdate&&(this.hasUpdate=!1,this.wireValues={min:this.filterMin,max:this.filterMax},e.set("filterComponents."+t,this.wireValues))},init(){this.initialiseStyles(),this.setupWire(),this.$watch("allFilters",e=>this.setupWire())}})),Alpine.data("flatpickrFilter",(e,t,l,i,s)=>({wireValues:e.entangle("filterComponents."+t),flatpickrInstance:flatpickr(i,{mode:"range",altFormat:l.altFormat??"F j, Y",altInput:l.altInput??!1,allowInput:l.allowInput??!1,allowInvalidPreload:l.allowInvalidPreload??!0,ariaDateFormat:l.ariaDateFormat??"F j, Y",clickOpens:!0,dateFormat:l.dateFormat??"Y-m-d",defaultDate:l.defaultDate??null,defaultHour:l.defaultHour??12,defaultMinute:l.defaultMinute??0,enableTime:l.enableTime??!1,enableSeconds:l.enableSeconds??!1,hourIncrement:l.hourIncrement??1,locale:l.locale??"en",minDate:l.earliestDate??null,maxDate:l.latestDate??null,minuteIncrement:l.minuteIncrement??5,shorthandCurrentMonth:l.shorthandCurrentMonth??!1,time_24hr:l.time_24hr??!1,weekNumbers:l.weekNumbers??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(l,i,s){if(l.length>1){var a=i.split(" "),r={};window.childElementOpen=!1,window.filterPopoverOpen=!1,r={minDate:a[0],maxDate:void 0===a[2]?a[0]:a[2]},e.set("filterComponents."+t,r)}}}),changedValue:function(l){l.length<5&&(this.flatpickrInstance.setDate([]),e.set("filterComponents."+t,{}))},setupWire(){if(void 0!==this.wireValues){if(void 0!==this.wireValues.minDate&&void 0!==this.wireValues.maxDate){let e=[this.wireValues.minDate,this.wireValues.maxDate];this.flatpickrInstance.setDate(e)}else this.flatpickrInstance.setDate([])}else this.flatpickrInstance.setDate([])},init(){this.setupWire(),this.$watch("wireValues",e=>this.setupWire())}})),Alpine.data("tableWrapper",(e,t)=>({listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("reorderFunction",(e,t,l)=>({dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.get("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let l=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=l.rowIndex,n=document.getElementById(t),o=a;e.offsetY>l.getBoundingClientRect().height/2?i.insertBefore(s,l.nextSibling):i.insertBefore(s,l),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.currentlyReorderingStatus?e.disableReordering():(this.setupEvenOddClasses(),this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),e.enableReordering())},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let i=document.getElementById(t),s=[];for(let a=1,r;r=i.rows[a];a++)s.push({[l]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(t).getElementsByTagName("tbody")[0],l=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(l=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=l.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!l.includes(e)),l=[],i=[])}},init(){}}))});
\ No newline at end of file
+document.addEventListener("alpine:init",()=>{Alpine.data("laravellivewiretable",(e,t,l,i)=>({shouldBeDisplayed:e.entangle("shouldBeDisplayed"),tableName:e.entangle("tableName"),dataTableFingerprint:e.entangle("dataTableFingerprint"),listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.entangle("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=t.rowIndex,n=document.getElementById(l),o=a;e.offsetY>t.getBoundingClientRect().height/2?i.insertBefore(s,t.nextSibling):i.insertBefore(s,t),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.currentlyReorderingStatus?e.disableReordering():(this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),this.setupEvenOddClasses(),e.enableReordering()),this.$nextTick(()=>{this.setupEvenOddClasses()})},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let t=document.getElementById(l),s=[];for(let a=1,r;r=t.rows[a];a++)s.push({[i]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(l).getElementsByTagName("tbody")[0],t=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(t=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=t.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!t.includes(e)),t=[],i=[])}},toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},showTable(e="",t=""){(""!=e&&e===this.tableName||""!=eventTableFingerprint&&t===this.dataTableFingerprint)&&(this.shouldBeDisplayed=!0)},hideTable(e="",t=""){(""!=e&&e===this.tableName||""!=eventTableFingerprint&&t===this.dataTableFingerprint)&&(this.shouldBeDisplayed=!1)},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("booleanFilter",(e,t,l,i)=>({switchOn:!1,value:e.entangle("filterComponents."+t).live,init(){this.switchOn=!1,void 0!==this.value&&(this.switchOn=Boolean(Number(this.value))),this.listeners.push(Livewire.on("filter-was-set",e=>{e.tableName==l&&e.filterKey==t&&(this.switchOn=e.value??i)}))}})),Alpine.data("numberRangeFilter",(e,t,l,i,s)=>({allFilters:e.entangle("filterComponents",!1),originalMin:0,originalMax:100,filterMin:0,filterMax:100,currentMin:0,currentMax:100,hasUpdate:!1,wireValues:e.entangle("filterComponents."+t,!1),defaultMin:i.minRange,defaultMax:i.maxRange,restrictUpdates:!1,initialiseStyles(){let e=document.getElementById(l);e.style.setProperty("--value-a",this.wireValues.min??this.filterMin),e.style.setProperty("--text-value-a",JSON.stringify(this.wireValues.min??this.filterMin)),e.style.setProperty("--value-b",this.wireValues.max??this.filterMax),e.style.setProperty("--text-value-b",JSON.stringify(this.wireValues.max??this.filterMax))},updateStyles(e,t){let i=document.getElementById(l);i.style.setProperty("--value-a",e),i.style.setProperty("--text-value-a",JSON.stringify(e)),i.style.setProperty("--value-b",t),i.style.setProperty("--text-value-b",JSON.stringify(t))},setupWire(){void 0!==this.wireValues?(this.filterMin=this.originalMin=void 0!==this.wireValues.min?this.wireValues.min:this.defaultMin,this.filterMax=this.originalMax=void 0!==this.wireValues.max?this.wireValues.max:this.defaultMax):(this.filterMin=this.originalMin=this.defaultMin,this.filterMax=this.originalMax=this.defaultMax),this.updateStyles(this.filterMin,this.filterMax)},allowUpdates(){this.updateWire()},updateWire(){let e=parseInt(this.filterMin),t=parseInt(this.filterMax);(e!=this.originalMin||t!=this.originalMax)&&(t<e&&(this.filterMin=t,this.filterMax=e),this.hasUpdate=!0,this.originalMin=e,this.originalMax=t),this.updateStyles(this.filterMin,this.filterMax)},updateWireable(){this.hasUpdate&&(this.hasUpdate=!1,this.wireValues={min:this.filterMin,max:this.filterMax},e.set("filterComponents."+t,this.wireValues))},init(){this.initialiseStyles(),this.setupWire(),this.$watch("allFilters",e=>this.setupWire())}})),Alpine.data("flatpickrFilter",(e,t,l,i,s)=>({wireValues:e.entangle("filterComponents."+t),flatpickrInstance:flatpickr(i,{mode:"range",altFormat:l.altFormat??"F j, Y",altInput:l.altInput??!1,allowInput:l.allowInput??!1,allowInvalidPreload:l.allowInvalidPreload??!0,ariaDateFormat:l.ariaDateFormat??"F j, Y",clickOpens:!0,dateFormat:l.dateFormat??"Y-m-d",defaultDate:l.defaultDate??null,defaultHour:l.defaultHour??12,defaultMinute:l.defaultMinute??0,enableTime:l.enableTime??!1,enableSeconds:l.enableSeconds??!1,hourIncrement:l.hourIncrement??1,locale:l.locale??"en",minDate:l.earliestDate??null,maxDate:l.latestDate??null,minuteIncrement:l.minuteIncrement??5,shorthandCurrentMonth:l.shorthandCurrentMonth??!1,time_24hr:l.time_24hr??!1,weekNumbers:l.weekNumbers??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(l,i,s){if(l.length>1){var a=i.split(" "),r={};window.childElementOpen=!1,window.filterPopoverOpen=!1,r={minDate:a[0],maxDate:void 0===a[2]?a[0]:a[2]},e.set("filterComponents."+t,r)}}}),changedValue:function(l){l.length<5&&(this.flatpickrInstance.setDate([]),e.set("filterComponents."+t,{}))},setupWire(){if(void 0!==this.wireValues){if(void 0!==this.wireValues.minDate&&void 0!==this.wireValues.maxDate){let e=[this.wireValues.minDate,this.wireValues.maxDate];this.flatpickrInstance.setDate(e)}else this.flatpickrInstance.setDate([])}else this.flatpickrInstance.setDate([])},init(){this.setupWire(),this.$watch("wireValues",e=>this.setupWire())}})),Alpine.data("tableWrapper",(e,t)=>({shouldBeDisplayed:e.entangle("shouldBeDisplayed"),listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("reorderFunction",(e,t,l)=>({dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.get("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let l=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=l.rowIndex,n=document.getElementById(t),o=a;e.offsetY>l.getBoundingClientRect().height/2?i.insertBefore(s,l.nextSibling):i.insertBefore(s,l),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.currentlyReorderingStatus?e.disableReordering():(this.setupEvenOddClasses(),this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),e.enableReordering())},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let i=document.getElementById(t),s=[];for(let a=1,r;r=i.rows[a];a++)s.push({[l]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(t).getElementsByTagName("tbody")[0],l=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(l=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=l.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!l.includes(e)),l=[],i=[])}},init(){}}))});
\ No newline at end of file
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index 6cf84f2ce..d8105236a 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -6,7 +6,7 @@
 @php($isBootstrap4 = $this->isBootstrap4)
 @php($isBootstrap5 = $this->isBootstrap5)
 
-<div x-data="laravellivewiretable($wire, '{{ $this->showBulkActionsDropdownAlpine() }}', '{{ $tableId }}', '{{ $primaryKey }}')">
+<div x-data="laravellivewiretable($wire, '{{ $this->showBulkActionsDropdownAlpine() }}', '{{ $tableId }}', '{{ $primaryKey }}')" x-cloak x-show="shouldBeDisplayed"  x-on:show-table.window="showTable(event.detail.tableName ?? '', event.detail.tableFingerpint ?? '')" x-on:hide-table.window="hideTable(event.detail.tableName ?? '', event.detail.tableFingerpint ?? '')">
     <x-livewire-tables::wrapper :component="$this" :tableName="$tableName" :$primaryKey :$isTailwind :$isBootstrap :$isBootstrap4 :$isBootstrap5>
         @if($this->hasActions && !$this->showActionsInToolbar)
             <x-livewire-tables::includes.actions/>    
diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index d065b25ed..fc1b20153 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Str;
+use Livewire\Attributes\Locked;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\ComponentConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\ComponentHelpers;
@@ -27,7 +28,8 @@ trait ComponentUtilities
 
     protected string $tableName = 'table';
 
-    protected ?string $dataTableFingerprint;
+    #[Locked]
+    public ?string $dataTableFingerprint;
 
     protected bool $offlineIndicatorStatus = true;
 
@@ -61,6 +63,8 @@ public function mountComponentUtilities(): void
         if (is_null($this->theme)) {
             $this->setTheme();
         }
+        $this->generateDataTableFingerprint();
+
     }
 
     /**
@@ -81,7 +85,7 @@ public function bootedComponentUtilities(): void
 
         // Make sure a primary key is set
         if (! $this->hasPrimaryKey()) {
-            throw new DataTableConfigurationException('You must set a primary key using setPrimaryKey in the configure method.');
+            throw new DataTableConfigurationException('You must set a primary key using setPrimaryKey in the configure method, or configuring/configured lifecycle hooks');
         }
 
     }
diff --git a/src/Traits/Configuration/TableAttributeConfiguration.php b/src/Traits/Configuration/TableAttributeConfiguration.php
index 01cf7376d..c1bb681e9 100644
--- a/src/Traits/Configuration/TableAttributeConfiguration.php
+++ b/src/Traits/Configuration/TableAttributeConfiguration.php
@@ -118,4 +118,19 @@ public function setTableRowUrlTarget(\Closure $callback): self
 
         return $this;
     }
+
+    public function setShouldBeDisplayedStatus(bool $status): void
+    {
+        $this->shouldBeDisplayed = $status;
+    }
+
+    public function setShouldBeDisplayed(): void
+    {
+        $this->setShouldBeDisplayedStatus(true);
+    }
+
+    public function setShouldBeHidden(): void
+    {
+        $this->setShouldBeDisplayedStatus(false);
+    }
 }
diff --git a/src/Traits/Helpers/ComponentHelpers.php b/src/Traits/Helpers/ComponentHelpers.php
index 828df37a5..0480f39e4 100644
--- a/src/Traits/Helpers/ComponentHelpers.php
+++ b/src/Traits/Helpers/ComponentHelpers.php
@@ -9,7 +9,7 @@ trait ComponentHelpers
 {
     public function getDataTableFingerprint(): string
     {
-        return $this->dataTableFingerprint ?? $this->generateDataTableFingerprint();
+        return $this->dataTableFingerprint ?? ($this->dataTableFingerprint = $this->generateDataTableFingerprint());
     }
 
     public function setBuilder(Builder $builder): void
diff --git a/src/Traits/Helpers/TableAttributeHelpers.php b/src/Traits/Helpers/TableAttributeHelpers.php
index 842c20886..d5f57f03e 100644
--- a/src/Traits/Helpers/TableAttributeHelpers.php
+++ b/src/Traits/Helpers/TableAttributeHelpers.php
@@ -76,4 +76,10 @@ public function getTableRowUrlTarget(int|Model $row): ?string
     {
         return isset($this->trUrlTargetCallback) ? call_user_func($this->trUrlTargetCallback, $row) : null;
     }
+
+    #[Computed]
+    public function getShouldBeDisplayed(): bool
+    {
+        return $this->shouldBeDisplayed;
+    }
 }
diff --git a/src/Traits/WithTableAttributes.php b/src/Traits/WithTableAttributes.php
index 0ec1884c1..f87edea61 100644
--- a/src/Traits/WithTableAttributes.php
+++ b/src/Traits/WithTableAttributes.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
 use Closure;
+use Livewire\Attributes\On;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\TableAttributeConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\TableAttributeHelpers;
 
@@ -32,4 +33,6 @@ trait WithTableAttributes
     protected ?\Closure $trUrlCallback;
 
     protected ?\Closure $trUrlTargetCallback;
+
+    public bool $shouldBeDisplayed = true;
 }
diff --git a/tests/Http/Livewire/PetsTable.php b/tests/Http/Livewire/PetsTable.php
index 28cc1782c..59b52049d 100644
--- a/tests/Http/Livewire/PetsTable.php
+++ b/tests/Http/Livewire/PetsTable.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire;
 
 use Illuminate\Database\Eloquent\Builder;
+use Livewire\Attributes\On;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Http/Livewire/PetsTableAttributes.php b/tests/Http/Livewire/PetsTableAttributes.php
index 53f79646f..690faf813 100644
--- a/tests/Http/Livewire/PetsTableAttributes.php
+++ b/tests/Http/Livewire/PetsTableAttributes.php
@@ -2,26 +2,8 @@
 
 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;
-use Rappasoft\LaravelLivewireTables\Views\Column;
-use Rappasoft\LaravelLivewireTables\Views\Columns\ImageColumn;
-use Rappasoft\LaravelLivewireTables\Views\Columns\LinkColumn;
-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 PetsTableAttributes extends DataTableComponent
+class PetsTableAttributes extends PetsTable
 {
-    public $model = Pet::class;
-
     public function configure(): void
     {
         $this->setPrimaryKey('id')
@@ -49,123 +31,4 @@ public function configure(): void
             });
 
     }
-
-    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'),
-        ];
-    }
 }
diff --git a/tests/Http/Livewire/PetsTableEvents.php b/tests/Http/Livewire/PetsTableEvents.php
new file mode 100644
index 000000000..24c7163cf
--- /dev/null
+++ b/tests/Http/Livewire/PetsTableEvents.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire;
+
+use Livewire\Attributes\On;
+
+class PetsTableEvents extends PetsTable
+{
+    public function mount()
+    {
+        $this->setShouldBeHidden();
+    }
+
+    #[On('showTable')]
+    public function showTable(): void
+    {
+        $this->setShouldBeDisplayed();
+    }
+
+    #[On('hideTable')]
+    public function hideTable()
+    {
+        $this->setShouldBeHidden();
+    }
+}
diff --git a/tests/Http/Livewire/PetsTableLoadingPlaceholder.php b/tests/Http/Livewire/PetsTableLoadingPlaceholder.php
index c5096c496..26fd7c367 100644
--- a/tests/Http/Livewire/PetsTableLoadingPlaceholder.php
+++ b/tests/Http/Livewire/PetsTableLoadingPlaceholder.php
@@ -2,149 +2,12 @@
 
 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;
-use Rappasoft\LaravelLivewireTables\Views\Column;
-use Rappasoft\LaravelLivewireTables\Views\Columns\ImageColumn;
-use Rappasoft\LaravelLivewireTables\Views\Columns\LinkColumn;
-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 PetsTableLoadingPlaceholder extends DataTableComponent
+class PetsTableLoadingPlaceholder extends PetsTable
 {
-    public $model = Pet::class;
-
     public function configure(): void
     {
         $this->setPrimaryKey('id')
             ->setLoadingPlaceholderEnabled()
             ->setLoadingPlaceholderContent('TestLoadingPlaceholderContentTestTest');
     }
-
-    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'),
-        ];
-    }
 }
diff --git a/tests/Http/Livewire/PetsTableNoFilters.php b/tests/Http/Livewire/PetsTableNoFilters.php
index 20bc7a7b9..d209a6602 100644
--- a/tests/Http/Livewire/PetsTableNoFilters.php
+++ b/tests/Http/Livewire/PetsTableNoFilters.php
@@ -6,15 +6,8 @@
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 
-class PetsTableNoFilters extends DataTableComponent
+class PetsTableNoFilters extends PetsTable
 {
-    public $model = Pet::class;
-
-    public function configure(): void
-    {
-        $this->setPrimaryKey('id');
-    }
-
     public function columns(): array
     {
         return [
@@ -36,4 +29,10 @@ public function columns(): array
                 }),
         ];
     }
+
+    public function filters(): array
+    {
+        return [
+        ];
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 0bf3aa3e2..92cec4db2 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -9,7 +9,7 @@
 use Livewire\LivewireServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Rappasoft\LaravelLivewireTables\LaravelLivewireTablesServiceProvider;
-use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{BreedsTable,PetsTable,PetsTableUnpaginated,PetsTableWithOwner,SpeciesTable};
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{BreedsTable,PetsTable,PetsTableEvents,PetsTableUnpaginated,PetsTableWithOwner,SpeciesTable};
 use Rappasoft\LaravelLivewireTables\Tests\Http\TestComponent;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Owner;
@@ -107,6 +107,21 @@ protected function setupBasicTable()
         $this->basicTable->render();
     }
 
+    protected function setupEventsTable()
+    {
+        $view = view('livewire-tables::datatable');
+        $this->eventsTable = new PetsTableEvents;
+        $this->eventsTable->boot();
+        $this->eventsTable->bootedComponentUtilities();
+        $this->eventsTable->bootedWithData();
+        $this->eventsTable->bootedWithColumns();
+        $this->eventsTable->bootedWithColumnSelect();
+        $this->eventsTable->bootedWithSecondaryHeader();
+        $this->eventsTable->booted();
+        $this->eventsTable->renderingWithPagination($view, []);
+        $this->eventsTable->render();
+    }
+
     protected function setupBreedsTable()
     {
         $view = view('livewire-tables::datatable');
diff --git a/tests/Traits/Visuals/ComponentVisualsTest.php b/tests/Traits/Visuals/ComponentVisualsTest.php
index 62cd5cf6b..1b2df3adf 100644
--- a/tests/Traits/Visuals/ComponentVisualsTest.php
+++ b/tests/Traits/Visuals/ComponentVisualsTest.php
@@ -48,15 +48,15 @@ public function test_fails_when_table_has_no_pk(): void
             Livewire::test(NoPrimaryKeyTable::class);
         } catch (DataTableConfigurationException $DataTableConfigurationException) {
             $this->testErrors = true;
-            $this->assertSame('You must set a primary key using setPrimaryKey in the configure method.', substr($DataTableConfigurationException->getMessage(), 0, 71));
+            $this->assertSame('You must set a primary key using setPrimaryKey in the configure method, or configuring/configured lifecycle hooks', substr($DataTableConfigurationException->getMessage(), 0, 113));
         } catch (ViewException $ViewException) {
             $this->testErrors = true;
 
-            $this->assertSame('You must set a primary key using setPrimaryKey in the configure method.', substr($ViewException->getMessage(), 0, 71));
+            $this->assertSame('You must set a primary key using setPrimaryKey in the configure method, or configuring/configured lifecycle hooks', substr($ViewException->getMessage(), 0, 113));
 
         } catch (Exception $standardException) {
             $this->testErrors = true;
-            $this->assertSame('You must set a primary key using setPrimaryKey in the configure method.', substr($standardException->getMessage(), 0, 71));
+            $this->assertSame('You must set a primary key using setPrimaryKey in the configure method, or configuring/configured lifecycle hooks', substr($standardException->getMessage(), 0, 113));
         }
         if (! $this->testErrors) {
             $this->fail('Did Not Throw Error - Missing Primary Key');
diff --git a/tests/Traits/Visuals/HideableTableTest.php b/tests/Traits/Visuals/HideableTableTest.php
new file mode 100644
index 000000000..6af61ed75
--- /dev/null
+++ b/tests/Traits/Visuals/HideableTableTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+
+use Livewire\Livewire;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class HideableTableTest extends TestCase
+{
+    public function test_can_see_table_by_default(): void
+    {
+        $petsTable = (new class extends PetsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function bulkActions(): array
+            {
+                return ['exportBulk' => 'exportBulk'];
+            }
+
+            public function exportBulk($items)
+            {
+                return $items;
+            }
+        });
+        Livewire::test($petsTable)
+            ->assertSet('shouldBeDisplayed', true)
+            ->assertSee('Cartman');
+    }
+
+    public function test_can_see_table_if_shown(): void
+    {
+        $this->setupEventsTable();
+
+        Livewire::test($this->eventsTable)
+            ->assertSet('shouldBeDisplayed', false)
+            ->assertSee('Cartman')
+            ->call('setShouldBeDisplayed')
+            ->assertSet('shouldBeDisplayed', true)
+            ->assertSee('Cartman');
+
+    }
+
+    public function test_can_not_see_hidden_table(): void
+    {
+        $this->setupEventsTable();
+
+        Livewire::test($this->eventsTable)
+            ->assertSee('Cartman')
+            ->assertSet('shouldBeDisplayed', false)
+            ->assertSee('Cartman');
+    }
+
+    public function test_can_show_hidden_table(): void
+    {
+        $this->setupEventsTable();
+
+        Livewire::test($this->eventsTable)
+            ->assertSet('shouldBeDisplayed', false)
+            ->dispatch('showTable')
+            ->assertSet('shouldBeDisplayed', true)
+            ->assertSee('Cartman');
+
+    }
+}

From bf840293f1ae0132c6771d0d79d16b3b059efccc Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 1 Sep 2024 18:26:25 +0100
Subject: [PATCH 036/103] Add column select session methods (#1913)

* Initial Commit

* Fix styling

* Minor Tweaks

* Fix styling

* Fix Tests

* Add Tests for StoredColumnSelect

* Fix styling

* Add Missing Tests

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../ColumnSelectConfiguration.php             |  2 +-
 .../SessionStorageConfiguration.php           | 17 ++++
 src/Traits/Helpers/ColumnSelectHelpers.php    | 36 ++------
 src/Traits/Helpers/SessionStorageHelpers.php  | 44 ++++++++++
 src/Traits/WithColumnSelect.php               | 13 ++-
 src/Traits/WithSessionStorage.php             |  1 +
 .../ColumnSelectConfigurationTest.php         | 10 +--
 .../Helpers/ColumnSelectHelpersTest.php       | 15 +++-
 .../Helpers/SessionStorageHelpersTest.php     | 82 +++++++++++++++++++
 9 files changed, 177 insertions(+), 43 deletions(-)

diff --git a/src/Traits/Configuration/ColumnSelectConfiguration.php b/src/Traits/Configuration/ColumnSelectConfiguration.php
index baf47e693..1622149d2 100644
--- a/src/Traits/Configuration/ColumnSelectConfiguration.php
+++ b/src/Traits/Configuration/ColumnSelectConfiguration.php
@@ -29,7 +29,7 @@ public function setColumnSelectDisabled(): self
 
     public function setRememberColumnSelectionStatus(bool $status): self
     {
-        $this->rememberColumnSelectionStatus = $status;
+        $this->storeColumnSelectInSessionStatus($status);
 
         return $this;
     }
diff --git a/src/Traits/Configuration/SessionStorageConfiguration.php b/src/Traits/Configuration/SessionStorageConfiguration.php
index cc51d7107..33e8310ce 100644
--- a/src/Traits/Configuration/SessionStorageConfiguration.php
+++ b/src/Traits/Configuration/SessionStorageConfiguration.php
@@ -20,4 +20,21 @@ public function storeFiltersInSessionDisabled(): self
     {
         return $this->storeFiltersInSessionStatus(false);
     }
+
+    protected function storeColumnSelectInSessionStatus(bool $status): self
+    {
+        $this->sessionStorageStatus['columnselect'] = $status;
+
+        return $this;
+    }
+
+    public function storeColumnSelectInSessionEnabled(): self
+    {
+        return $this->storeColumnSelectInSessionStatus(true);
+    }
+
+    public function storeColumnSelectInSessionDisabled(): self
+    {
+        return $this->storeColumnSelectInSessionStatus(false);
+    }
 }
diff --git a/src/Traits/Helpers/ColumnSelectHelpers.php b/src/Traits/Helpers/ColumnSelectHelpers.php
index 9526856a2..961c62847 100644
--- a/src/Traits/Helpers/ColumnSelectHelpers.php
+++ b/src/Traits/Helpers/ColumnSelectHelpers.php
@@ -24,36 +24,11 @@ public function columnSelectIsDisabled(): bool
         return $this->getColumnSelectStatus() === false;
     }
 
-    public function getRememberColumnSelectionStatus(): bool
-    {
-        return $this->rememberColumnSelectionStatus;
-    }
-
-    public function rememberColumnSelectionIsEnabled(): bool
-    {
-        return $this->getRememberColumnSelectionStatus() === true;
-    }
-
-    public function rememberColumnSelectionIsDisabled(): bool
-    {
-        return $this->getRememberColumnSelectionStatus() === false;
-    }
-
     public function columnSelectIsEnabledForColumn(mixed $column): bool
     {
         return in_array($column instanceof Column ? $column->getSlug() : $column, $this->selectedColumns, true);
     }
 
-    protected function forgetColumnSelectSession(): void
-    {
-        session()->forget($this->getColumnSelectSessionKey());
-    }
-
-    protected function getColumnSelectSessionKey(): string
-    {
-        return $this->getDataTableFingerprint().'-columnSelectEnabled';
-    }
-
     public function getColumnSelectIsHiddenOnTablet(): bool
     {
         return $this->columnSelectHiddenOnTablet;
@@ -206,22 +181,23 @@ public function setupColumnSelect(): void
         $this->setupFirstColumnSelectRun();
 
         // If remember selection is off, then clear the session
-        if ($this->rememberColumnSelectionIsDisabled()) {
+        if (! $this->shouldStoreColumnSelectInSession()) {
             $this->forgetColumnSelectSession();
         }
 
         // Set to either the default set or what is stored in the session
-        $this->selectedColumns = (count($this->selectedColumns) > 1) ?
+        $selectedColumns = (count($this->selectedColumns) > 1) ?
             $this->selectedColumns :
             session()->get($this->getColumnSelectSessionKey(), $this->getDefaultVisibleColumns());
 
         // Check to see if there are any excluded that are already stored in the enabled and remove them
         foreach ($this->getColumns() as $column) {
-            if (! $column->isSelectable() && ! in_array($column->getSlug(), $this->selectedColumns, true)) {
-                $this->selectedColumns[] = $column->getSlug();
-                session([$this->getColumnSelectSessionKey() => $this->selectedColumns]);
+            if (! $column->isSelectable() && ! in_array($column->getSlug(), $selectedColumns, true)) {
+                $selectedColumns[] = $column->getSlug();
             }
         }
+        $this->selectedColumns = $selectedColumns;
+        // $this->storeColumnSelectValues();
     }
 
     protected function setupFirstColumnSelectRun(): void
diff --git a/src/Traits/Helpers/SessionStorageHelpers.php b/src/Traits/Helpers/SessionStorageHelpers.php
index ae8af24f1..67f4d5829 100644
--- a/src/Traits/Helpers/SessionStorageHelpers.php
+++ b/src/Traits/Helpers/SessionStorageHelpers.php
@@ -49,4 +49,48 @@ public function clearStoredFilterValues(): void
             session()->forget($this->getFilterSessionKey());
         }
     }
+
+    public function shouldStoreColumnSelectInSession(): bool
+    {
+        return $this->getSessionStorageStatus('columnselect');
+    }
+
+    public function getColumnSelectSessionKey(): string
+    {
+        return $this->getTableName().'-stored-columnselect';
+    }
+
+    public function storeColumnSelectValues(): void
+    {
+        if ($this->shouldStoreColumnSelectInSession()) {
+            $this->clearStoredColumnSelectValues();
+            session([$this->getColumnSelectSessionKey() => $this->selectedColumns]);
+        }
+    }
+
+    public function restoreColumnSelectValues(): void
+    {
+        $this->selectedColumns = $this->getStoredColumnSelectValues();
+    }
+
+    public function getStoredColumnSelectValues(): array
+    {
+        if ($this->shouldStoreColumnSelectInSession() && session()->has($this->getColumnSelectSessionKey())) {
+            return session()->get($this->getColumnSelectSessionKey());
+        }
+
+        return [];
+    }
+
+    public function clearStoredColumnSelectValues(): void
+    {
+        if ($this->shouldStoreColumnSelectInSession() && session()->has($this->getColumnSelectSessionKey())) {
+            session()->forget($this->getColumnSelectSessionKey());
+        }
+    }
+
+    protected function forgetColumnSelectSession(): void
+    {
+        session()->forget($this->getColumnSelectSessionKey());
+    }
 }
diff --git a/src/Traits/WithColumnSelect.php b/src/Traits/WithColumnSelect.php
index af1ebca61..704d1bea5 100644
--- a/src/Traits/WithColumnSelect.php
+++ b/src/Traits/WithColumnSelect.php
@@ -32,8 +32,6 @@ trait WithColumnSelect
 
     protected bool $columnSelectStatus = true;
 
-    protected bool $rememberColumnSelectionStatus = true;
-
     protected bool $columnSelectHiddenOnMobile = false;
 
     protected bool $columnSelectHiddenOnTablet = false;
@@ -51,13 +49,20 @@ protected function queryStringWithColumnSelect(): array
 
     public function bootedWithColumnSelect(): void
     {
+        $this->callHook('configuringColumnSelect');
+        $this->callTraitHook('configuringColumnSelect');
+
         $this->setupColumnSelect();
+
+        $this->callHook('configuredColumnSelect');
+        $this->callTraitHook('configuredColumnSelect');
+
     }
 
     public function updatedSelectedColumns(): void
     {
         // The query string isn't needed if it's the same as the default
-        session([$this->getColumnSelectSessionKey() => $this->selectedColumns]);
+        $this->storeColumnSelectValues();
         if ($this->getEventStatusColumnSelect()) {
             event(new ColumnsSelected($this->getTableName(), $this->getColumnSelectSessionKey(), $this->selectedColumns));
         }
@@ -67,7 +72,7 @@ public function renderingWithColumnSelect(\Illuminate\View\View $view, array $da
     {
         if (! $this->getComputedPropertiesStatus()) {
             $view->with([
-                'selectedVisibleColumns' => $this->getVisibleColumns(),
+                'selectedVisibleColumns' => $this->selectedVisibleColumns(),
             ]);
         }
     }
diff --git a/src/Traits/WithSessionStorage.php b/src/Traits/WithSessionStorage.php
index b106886e3..08cfbe5a7 100644
--- a/src/Traits/WithSessionStorage.php
+++ b/src/Traits/WithSessionStorage.php
@@ -11,6 +11,7 @@ trait WithSessionStorage
         SessionStorageHelpers;
 
     public array $sessionStorageStatus = [
+        'columnselect' => true,
         'filters' => false,
     ];
 }
diff --git a/tests/Traits/Configuration/ColumnSelectConfigurationTest.php b/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
index 2daf1e25a..ea79e5a21 100644
--- a/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
+++ b/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
@@ -41,23 +41,23 @@ public function test_can_set_column_select_status(): void
 
     public function test_can_set_remember_column_selection_status(): void
     {
-        $this->assertTrue($this->basicTable->getRememberColumnSelectionStatus());
+        $this->assertTrue($this->basicTable->shouldStoreColumnSelectInSession());
 
         $this->basicTable->setRememberColumnSelectionDisabled();
 
-        $this->assertFalse($this->basicTable->getRememberColumnSelectionStatus());
+        $this->assertFalse($this->basicTable->shouldStoreColumnSelectInSession());
 
         $this->basicTable->setRememberColumnSelectionEnabled();
 
-        $this->assertTrue($this->basicTable->getRememberColumnSelectionStatus());
+        $this->assertTrue($this->basicTable->shouldStoreColumnSelectInSession());
 
         $this->basicTable->setRememberColumnSelectionStatus(false);
 
-        $this->assertFalse($this->basicTable->getRememberColumnSelectionStatus());
+        $this->assertFalse($this->basicTable->shouldStoreColumnSelectInSession());
 
         $this->basicTable->setRememberColumnSelectionStatus(true);
 
-        $this->assertTrue($this->basicTable->getRememberColumnSelectionStatus());
+        $this->assertTrue($this->basicTable->shouldStoreColumnSelectInSession());
     }
 
     public function test_can_deselect_all_columns(): void
diff --git a/tests/Traits/Helpers/ColumnSelectHelpersTest.php b/tests/Traits/Helpers/ColumnSelectHelpersTest.php
index 71867823b..6c0d1fbf5 100644
--- a/tests/Traits/Helpers/ColumnSelectHelpersTest.php
+++ b/tests/Traits/Helpers/ColumnSelectHelpersTest.php
@@ -21,15 +21,24 @@ public function test_can_get_column_select_status(): void
 
     public function test_can_get_remember_column_selection_status(): void
     {
-        $this->assertTrue($this->basicTable->rememberColumnSelectionIsEnabled());
+        $this->assertTrue($this->basicTable->shouldStoreColumnSelectInSession());
 
         $this->basicTable->setRememberColumnSelectionDisabled();
 
-        $this->assertTrue($this->basicTable->rememberColumnSelectionIsDisabled());
+        $this->assertFalse($this->basicTable->shouldStoreColumnSelectInSession());
 
         $this->basicTable->setRememberColumnSelectionEnabled();
 
-        $this->assertTrue($this->basicTable->rememberColumnSelectionIsEnabled());
+        $this->assertTrue($this->basicTable->shouldStoreColumnSelectInSession());
+
+        $this->basicTable->storeColumnSelectInSessionDisabled();
+
+        $this->assertFalse($this->basicTable->shouldStoreColumnSelectInSession());
+
+        $this->basicTable->storeColumnSelectInSessionEnabled();
+
+        $this->assertTrue($this->basicTable->shouldStoreColumnSelectInSession());
+
     }
 
     public function test_can_set_column_select_hidden_on_mobile_status(): void
diff --git a/tests/Traits/Helpers/SessionStorageHelpersTest.php b/tests/Traits/Helpers/SessionStorageHelpersTest.php
index fe1852751..17362c503 100644
--- a/tests/Traits/Helpers/SessionStorageHelpersTest.php
+++ b/tests/Traits/Helpers/SessionStorageHelpersTest.php
@@ -24,4 +24,86 @@ public function test_can_get_session_storage_status_filter_key(): void
     {
         $this->assertSame($this->basicTable->getTableName().'-stored-filters', $this->basicTable->getFilterSessionKey());
     }
+
+    public function test_can_store_for_fikers(): void
+    {
+        $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->appliedFilters);
+        $this->assertSame(['breed' => ['1']], $this->basicTable->getStoredFilterValues());
+
+        $this->basicTable->setFilter('breed', ['22']);
+        $this->assertSame(['breed' => ['22']], $this->basicTable->appliedFilters);
+        $this->assertSame(['22'], $this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->assertSame(['breed' => ['22']], $this->basicTable->getStoredFilterValues());
+
+        $this->basicTable->restoreFilterValues();
+        $this->assertSame(['22'], $this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->assertSame(['breed' => ['22']], $this->basicTable->getStoredFilterValues());
+
+        $this->basicTable->clearStoredFilterValues();
+        $this->assertSame([], $this->basicTable->getStoredFilterValues());
+        $this->assertSame(['22'], $this->basicTable->getAppliedFilterWithValue('breed'));
+
+        $this->basicTable->setFilter('breed', ['33']);
+        $this->assertSame(['breed' => ['33']], $this->basicTable->getStoredFilterValues());
+        $this->assertSame(['33'], $this->basicTable->getAppliedFilterWithValue('breed'));
+
+        $this->basicTable->appliedFilters = $this->basicTable->filterComponents = ['breed' => ['44']];
+        $this->basicTable->storeFilterValues();
+        $this->assertSame(['44'], $this->basicTable->getAppliedFilterWithValue('breed'));
+
+        $this->basicTable->appliedFilters = $this->basicTable->filterComponents = [];
+        $this->assertNull($this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->assertSame([], $this->basicTable->appliedFilters);
+        $this->assertSame([], $this->basicTable->filterComponents);
+
+        $this->basicTable->restoreFilterValues();
+        $this->assertSame(['breed' => ['44']], $this->basicTable->appliedFilters);
+        $this->assertSame(['44'], $this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->assertSame(['breed' => ['44']], $this->basicTable->getStoredFilterValues());
+
+    }
+
+    public function test_can_get_session_storage_status_for_columnselect(): void
+    {
+        $this->assertTrue($this->basicTable->shouldStoreColumnSelectInSession());
+
+        $this->basicTable->storeColumnSelectInSessionDisabled();
+
+        $this->assertFalse($this->basicTable->shouldStoreColumnSelectInSession());
+
+        $this->basicTable->storeColumnSelectInSessionEnabled();
+
+        $this->assertTrue($this->basicTable->shouldStoreColumnSelectInSession());
+
+    }
+
+    public function test_can_get_session_storage_status_columnselect_key(): void
+    {
+        $this->assertSame($this->basicTable->getTableName().'-stored-columnselect', $this->basicTable->getColumnSelectSessionKey());
+    }
+
+    public function test_can_store_for_columnselect(): void
+    {
+        $this->assertTrue($this->basicTable->shouldStoreColumnSelectInSession());
+
+        $this->basicTable->selectedColumns = ['id', 'sort', 'name', 'age', 'breed', 'other', 'rowimg'];
+        $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'rowimg'], $this->basicTable->selectedColumns);
+        $this->basicTable->storeColumnSelectValues();
+        $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'rowimg'], $this->basicTable->getStoredColumnSelectValues());
+        $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'rowimg'], $this->basicTable->selectedColumns);
+        $this->basicTable->selectedColumns = ['rowimg'];
+        $this->assertSame(['rowimg'], $this->basicTable->selectedColumns);
+        $this->basicTable->restoreColumnSelectValues();
+        $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'rowimg'], $this->basicTable->getStoredColumnSelectValues());
+        $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'rowimg'], $this->basicTable->selectedColumns);
+        $this->basicTable->clearStoredColumnSelectValues();
+        $this->assertSame([], $this->basicTable->getStoredColumnSelectValues());
+        $this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'rowimg'], $this->basicTable->selectedColumns);
+    }
 }

From 2ebaf3bfb23804db5e8f150436630873b49c76b2 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 1 Sep 2024 18:43:07 +0100
Subject: [PATCH 037/103] Use Core HasTheme Methods (#1915)

* Centralise Theme Methods

* Fix styling

* Fix for broken tests

* Fix styling

* Remove persisted computed properties

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/ComponentUtilities.php             |  6 +--
 src/Traits/HasAllTraits.php                   |  3 ++
 src/Traits/Helpers/ComponentHelpers.php       | 38 -------------------
 .../Configuration/ColumnConfiguration.php     |  7 ----
 src/Views/Traits/Core/HasTheme.php            | 26 ++++++++++---
 src/Views/Traits/Helpers/ColumnHelpers.php    | 20 ----------
 src/Views/Traits/IsColumn.php                 |  5 +--
 .../Traits/Visuals/PaginationVisualsTest.php  | 16 ++++----
 8 files changed, 36 insertions(+), 85 deletions(-)

diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index fc1b20153..11625c8de 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -16,8 +16,6 @@ trait ComponentUtilities
 
     public array $table = [];
 
-    public ?string $theme = null;
-
     protected Builder $builder;
 
     protected $model;
@@ -60,8 +58,8 @@ abstract public function configure(): void;
     public function mountComponentUtilities(): void
     {
         // Sets the Theme - tailwind/bootstrap
-        if (is_null($this->theme)) {
-            $this->setTheme();
+        if (! isset($this->theme) || is_null($this->theme)) {
+            $this->setTheme(config('livewire-tables.theme', 'tailwind'));
         }
         $this->generateDataTableFingerprint();
 
diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index 7bef6fee8..8877bc69d 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -2,11 +2,14 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasTheme;
+
 trait HasAllTraits
 {
     // Note Specific Order Below!
     use WithTableHooks;
     use WithLoadingPlaceholder;
+    use HasTheme;
     use ComponentUtilities,
         WithActions,
         WithData,
diff --git a/src/Traits/Helpers/ComponentHelpers.php b/src/Traits/Helpers/ComponentHelpers.php
index 0480f39e4..b027be813 100644
--- a/src/Traits/Helpers/ComponentHelpers.php
+++ b/src/Traits/Helpers/ComponentHelpers.php
@@ -57,44 +57,6 @@ public function getModel()
         return $this->model;
     }
 
-    public function setTheme(): void
-    {
-        $theme = $this->getTheme();
-
-        if ($theme === 'bootstrap-4' || $theme === 'bootstrap-5') {
-            $this->setPaginationTheme('bootstrap');
-        }
-    }
-
-    public function getTheme(): string
-    {
-        return $this->theme ?? config('livewire-tables.theme', 'tailwind');
-    }
-
-    #[Computed]
-    public function isTailwind(): bool
-    {
-        return $this->getTheme() === 'tailwind';
-    }
-
-    #[Computed]
-    public function isBootstrap(): bool
-    {
-        return $this->getTheme() === 'bootstrap-4' || $this->getTheme() === 'bootstrap-5';
-    }
-
-    #[Computed]
-    public function isBootstrap4(): bool
-    {
-        return $this->getTheme() === 'bootstrap-4';
-    }
-
-    #[Computed]
-    public function isBootstrap5(): bool
-    {
-        return $this->getTheme() === 'bootstrap-5';
-    }
-
     /**
      * Get the translated empty message of the table
      */
diff --git a/src/Views/Traits/Configuration/ColumnConfiguration.php b/src/Views/Traits/Configuration/ColumnConfiguration.php
index 2b20f595c..c46b01663 100644
--- a/src/Views/Traits/Configuration/ColumnConfiguration.php
+++ b/src/Views/Traits/Configuration/ColumnConfiguration.php
@@ -84,13 +84,6 @@ public function setColumnLabelStatus(bool $status): void
         $this->displayColumnLabel = $status;
     }
 
-    public function setTheme(string $theme): self
-    {
-        $this->theme = $theme;
-
-        return $this;
-    }
-
     public function setHasTableRowUrl(bool $hasTableRowUrl): self
     {
         $this->hasTableRowUrl = $hasTableRowUrl;
diff --git a/src/Views/Traits/Core/HasTheme.php b/src/Views/Traits/Core/HasTheme.php
index 65ccfb885..5d229879a 100644
--- a/src/Views/Traits/Core/HasTheme.php
+++ b/src/Views/Traits/Core/HasTheme.php
@@ -2,34 +2,50 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views\Traits\Core;
 
+use Livewire\Attributes\{Computed,Locked};
+
 trait HasTheme
 {
-    protected string $theme = 'tailwind';
+    #[Locked]
+    public ?string $theme;
+
+    public function getTheme(): string
+    {
+        return $this->theme ?? ($this->theme = config('livewire-tables.theme', 'tailwind'));
+    }
 
     public function setTheme(string $theme): self
     {
         $this->theme = $theme;
 
+        if (($theme === 'bootstrap-4' || $theme === 'bootstrap-5') && method_exists($this, 'setPaginationTheme')) {
+            $this->setPaginationTheme('bootstrap');
+        }
+
         return $this;
     }
 
+    #[Computed]
     public function isTailwind(): bool
     {
-        return $this->theme != 'bootstrap-4' && $this->theme != 'bootstrap-5';
+        return ! $this->isBootstrap4() && ! $this->isBootstrap5();
     }
 
+    #[Computed]
     public function isBootstrap(): bool
     {
-        return $this->theme == 'bootstrap-4' || $this->theme == 'bootstrap-5';
+        return $this->isBootstrap4() || $this->isBootstrap5();
     }
 
+    #[Computed]
     public function isBootstrap4(): bool
     {
-        return $this->theme == 'bootstrap-4';
+        return $this->getTheme() === 'bootstrap-4';
     }
 
+    #[Computed]
     public function isBootstrap5(): bool
     {
-        return $this->theme == 'bootstrap-5';
+        return $this->getTheme() === 'bootstrap-5';
     }
 }
diff --git a/src/Views/Traits/Helpers/ColumnHelpers.php b/src/Views/Traits/Helpers/ColumnHelpers.php
index 1b016590c..da220287e 100644
--- a/src/Views/Traits/Helpers/ColumnHelpers.php
+++ b/src/Views/Traits/Helpers/ColumnHelpers.php
@@ -211,26 +211,6 @@ public function getHasTableRowUrl(): bool
         return $this->hasTableRowUrl;
     }
 
-    public function isTailwind(): bool
-    {
-        return $this->theme != 'bootstrap-4' && $this->theme != 'bootstrap-5';
-    }
-
-    public function isBootstrap(): bool
-    {
-        return $this->theme == 'bootstrap-4' || $this->theme == 'bootstrap-5';
-    }
-
-    public function isBootstrap4(): bool
-    {
-        return $this->theme == 'bootstrap-4';
-    }
-
-    public function isBootstrap5(): bool
-    {
-        return $this->theme == 'bootstrap-5';
-    }
-
     public function getIsReorderColumn(): bool
     {
         return $this->isReorderColumn;
diff --git a/src/Views/Traits/IsColumn.php b/src/Views/Traits/IsColumn.php
index 7ff25cf3f..42bbfb5b4 100644
--- a/src/Views/Traits/IsColumn.php
+++ b/src/Views/Traits/IsColumn.php
@@ -5,7 +5,7 @@
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\{HasVisibility, IsCollapsible, IsSearchable, IsSelectable, IsSortable};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\ColumnConfiguration;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasAttributes,HasFooter,HasSecondaryHeader,HasView};
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasAttributes,HasFooter,HasSecondaryHeader,HasTheme,HasView};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\{ColumnHelpers,RelationshipHelpers};
 
 trait IsColumn
@@ -20,6 +20,7 @@ trait IsColumn
         HasAttributes,
         HasFooter,
         HasSecondaryHeader,
+        HasTheme,
         HasView,
         HasVisibility;
 
@@ -57,7 +58,5 @@ trait IsColumn
 
     protected bool $hasTableRowUrl = false;
 
-    protected string $theme = 'tailwind';
-
     protected bool $isReorderColumn = false;
 }
diff --git a/tests/Traits/Visuals/PaginationVisualsTest.php b/tests/Traits/Visuals/PaginationVisualsTest.php
index 95d9f5e56..95cdfd062 100644
--- a/tests/Traits/Visuals/PaginationVisualsTest.php
+++ b/tests/Traits/Visuals/PaginationVisualsTest.php
@@ -184,7 +184,7 @@ public function test_detailed_pagination_is_not_displayed_simple_tw(): void
     public function test_detailed_pagination_is_displayed_standard_bs4(): void
     {
         Livewire::test(PetsTable::class)
-            ->set('theme', 'bootstrap-4')
+            ->call('setTheme', 'bootstrap-4')
             ->call('enableDetailedPagination', 'standard')
             ->assertSeeHtmlInOrder(['<div class="col-12 col-md-6 text-center text-md-right text-muted">',
                 '<span>Showing</span>',
@@ -197,7 +197,7 @@ public function test_detailed_pagination_is_displayed_standard_bs4(): void
     public function test_detailed_pagination_is_displayed_simple_bs4(): void
     {
         Livewire::test(PetsTable::class)
-            ->set('theme', 'bootstrap-4')
+            ->call('setTheme', 'bootstrap-4')
             ->call('enableDetailedPagination', 'simple')
             ->assertSeeHtmlInOrder(['<div class="col-12 col-md-6 overflow-auto">',
                 '<span>Showing</span>',
@@ -210,7 +210,7 @@ public function test_detailed_pagination_is_displayed_simple_bs4(): void
     public function test_detailed_pagination_is_not_displayed_standard_bs4(): void
     {
         Livewire::test(PetsTable::class)
-            ->set('theme', 'bootstrap-4')
+            ->call('setTheme', 'bootstrap-4')
             ->call('disableDetailedPagination', 'standard')
             ->assertDontSeeHtml('<span>Showing</span>')
             ->assertDontSeeHtml('<span>to</span>')
@@ -220,7 +220,7 @@ public function test_detailed_pagination_is_not_displayed_standard_bs4(): void
     public function test_detailed_pagination_is_not_displayed_simple_bs4(): void
     {
         Livewire::test(PetsTable::class)
-            ->set('theme', 'bootstrap-4')
+            ->call('setTheme', 'bootstrap-4')
             ->call('disableDetailedPagination', 'simple')
             ->assertDontSeeHtml('<span>Showing</span>')
             ->assertDontSeeHtml('<span>to</span>');
@@ -229,7 +229,7 @@ public function test_detailed_pagination_is_not_displayed_simple_bs4(): void
     public function test_detailed_pagination_is_displayed_standard_bs5(): void
     {
         Livewire::test(PetsTable::class)
-            ->set('theme', 'bootstrap-5')
+            ->call('setTheme', 'bootstrap-5')
             ->call('enableDetailedPagination', 'standard')
             ->assertSeeHtmlInOrder(['<div class="col-12 col-md-6 text-center text-md-end text-muted">',
                 '<span>Showing</span>',
@@ -242,7 +242,7 @@ public function test_detailed_pagination_is_displayed_standard_bs5(): void
     public function test_detailed_pagination_is_displayed_simple_bs5(): void
     {
         Livewire::test(PetsTable::class)
-            ->set('theme', 'bootstrap-5')
+            ->call('setTheme', 'bootstrap-5')
             ->call('enableDetailedPagination', 'simple')
             ->assertSeeHtmlInOrder(['<div class="col-12 col-md-6 text-center text-md-end text-muted">',
                 '<span>Showing</span>',
@@ -255,7 +255,7 @@ public function test_detailed_pagination_is_displayed_simple_bs5(): void
     public function test_detailed_pagination_is_not_displayed_standard_bs5(): void
     {
         Livewire::test(PetsTable::class)
-            ->set('theme', 'bootstrap-5')
+            ->call('setTheme', 'bootstrap-5')
             ->call('disableDetailedPagination', 'standard')
             ->assertDontSeeHtml('<span>Showing</span>')
             ->assertDontSeeHtml('<span>to</span>')
@@ -265,7 +265,7 @@ public function test_detailed_pagination_is_not_displayed_standard_bs5(): void
     public function test_detailed_pagination_is_not_displayed_simple_bs5(): void
     {
         Livewire::test(PetsTable::class)
-            ->set('theme', 'bootstrap-5')
+            ->call('setTheme', 'bootstrap-5')
             ->call('disableDetailedPagination', 'simple')
             ->assertDontSeeHtml('<span>Showing</span>')
             ->assertDontSeeHtml('<span>to</span>');

From 2322e8d5f2726ac77e3ec04a937425e0f501c0c4 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 1 Sep 2024 22:28:55 +0100
Subject: [PATCH 038/103] Use Core Attribute Bag (#1916)

* Initial Commit

* Fix styling

* Add Missing Test

* Fix styling

* Adjustments

* Fix styling

* Adjust Test

* Fix styling

* Fix Sorting Visual Test

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 resources/js/laravel-livewire-tables.js       | 47 ++++++++++++++-----
 resources/js/laravel-livewire-tables.min.js   |  2 +-
 resources/views/components/table.blade.php    |  1 +
 resources/views/datatable.blade.php           |  2 +-
 src/Traits/Helpers/ComponentHelpers.php       |  2 +-
 src/Traits/Helpers/TableAttributeHelpers.php  | 19 ++++++++
 .../Helpers/TableAttributeHelpersTest.php     | 29 ++++++++++++
 tests/Traits/Visuals/SortingVisualsTest.php   |  1 -
 8 files changed, 86 insertions(+), 17 deletions(-)
 create mode 100644 tests/Traits/Helpers/TableAttributeHelpersTest.php

diff --git a/resources/js/laravel-livewire-tables.js b/resources/js/laravel-livewire-tables.js
index 2c214e492..6177ea37f 100644
--- a/resources/js/laravel-livewire-tables.js
+++ b/resources/js/laravel-livewire-tables.js
@@ -2,7 +2,10 @@
 
 document.addEventListener('alpine:init', () => {
     
-    Alpine.data('laravellivewiretable', (wire, showBulkActionsAlpine, tableID, primaryKeyName) => ({
+    Alpine.data('laravellivewiretable', (wire) => ({
+        tableId: '',
+        showBulkActionsAlpine: false,
+        primaryKeyName: '',
         shouldBeDisplayed: wire.entangle('shouldBeDisplayed'),
         tableName: wire.entangle('tableName'),
         dataTableFingerprint: wire.entangle('dataTableFingerprint'),
@@ -70,7 +73,7 @@ document.addEventListener('alpine:init', () => {
             element.classList.remove("laravel-livewire-table-dragging");
             let originalPosition = element.rowIndex;
             let newPosition = target.rowIndex;
-            let table = document.getElementById(tableID);
+            let table = document.getElementById(this.tableId);
             let loopStart = originalPosition;
             if (event.offsetY > (target.getBoundingClientRect().height / 2)) {
                 parent.insertBefore(element, target.nextSibling);
@@ -126,17 +129,17 @@ document.addEventListener('alpine:init', () => {
  
         },
         updateOrderedItems() {
-            let table = document.getElementById(tableID);
+            let table = document.getElementById(this.tableId);
             let orderedRows = [];
             for (let i = 1, row; row = table.rows[i]; i++) {
-            orderedRows.push({ [primaryKeyName]: row.getAttribute('rowpk'), [this.defaultReorderColumn]: i });
+            orderedRows.push({ [this.primaryKeyName]: row.getAttribute('rowpk'), [this.defaultReorderColumn]: i });
             }
             wire.storeReorder(orderedRows);
         },
         setupEvenOddClasses() {
             if (this.evenNotInOdd.length === undefined || this.evenNotInOdd.length == 0 || this.oddNotInEven.length === undefined || this.oddNotInEven.length == 0)
             {
-                let tbody = document.getElementById(tableID).getElementsByTagName('tbody')[0];
+                let tbody = document.getElementById(this.tableId).getElementsByTagName('tbody')[0];
                 let evenRowClassArray = [];
                 let oddRowClassArray = [];
  
@@ -152,7 +155,7 @@ document.addEventListener('alpine:init', () => {
             }
         },
         toggleSelectAll() {
-            if (!showBulkActionsAlpine) {
+            if (!this.showBulkActionsAlpine) {
                 return;
             }
 
@@ -171,14 +174,14 @@ document.addEventListener('alpine:init', () => {
             }
         },
         setAllItemsSelected() {
-            if (!showBulkActionsAlpine) {
+            if (!this.showBulkActionsAlpine) {
                 return;
             }
             this.selectAllStatus = true;
             this.selectAllOnPage();
         },
         setAllSelected() {
-            if (!showBulkActionsAlpine) {
+            if (!this.showBulkActionsAlpine) {
                 return;
             }
             if (this.delaySelectAll)
@@ -192,14 +195,14 @@ document.addEventListener('alpine:init', () => {
             }
         },
         clearSelected() {
-            if (!showBulkActionsAlpine) {
+            if (!this.showBulkActionsAlpine) {
                 return;
             }
             this.selectAllStatus = false;
             wire.clearSelected();
         },
         selectAllOnPage() {
-            if (!showBulkActionsAlpine) {
+            if (!this.showBulkActionsAlpine) {
                 return;
             }
 
@@ -210,14 +213,32 @@ document.addEventListener('alpine:init', () => {
             }
             this.selectedItems = [...new Set(tempSelectedItems)];
         },
-        showTable(eventTableName = '', eventTableFingerpint = '')
+        setTableId(tableId)
         {
-            if ((eventTableName != '' && eventTableName === this.tableName) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) { 
+            this.tableId = tableId;
+        },
+        setAlpineBulkActions(showBulkActionsAlpine)
+        {
+            this.showBulkActionsAlpine = showBulkActionsAlpine;
+        },
+        setPrimaryKeyName(primaryKeyName)
+        {
+            this.primaryKeyName = primaryKeyName;
+        },
+        showTable(event)
+        {
+            let eventTableName = event.detail.tableName ?? '';
+            let eventTableFingerprint = event.detail.tableFingerpint ?? '';
+
+            if (((eventTableName ?? '') != '' && eventTableName === this.tableName) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) { 
                 this.shouldBeDisplayed = true; 
             } 
         },
-        hideTable(eventTableName = '', eventTableFingerpint = '')
+        hideTable(event)
         {
+            let eventTableName = event.detail.tableName ?? '';
+            let eventTableFingerprint = event.detail.tableFingerpint ?? '';
+
             if ((eventTableName != '' && eventTableName === this.tableName) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) { 
                 this.shouldBeDisplayed = false; 
             } 
diff --git a/resources/js/laravel-livewire-tables.min.js b/resources/js/laravel-livewire-tables.min.js
index 5ab2c9730..a4fb93695 100644
--- a/resources/js/laravel-livewire-tables.min.js
+++ b/resources/js/laravel-livewire-tables.min.js
@@ -1 +1 @@
-document.addEventListener("alpine:init",()=>{Alpine.data("laravellivewiretable",(e,t,l,i)=>({shouldBeDisplayed:e.entangle("shouldBeDisplayed"),tableName:e.entangle("tableName"),dataTableFingerprint:e.entangle("dataTableFingerprint"),listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.entangle("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=t.rowIndex,n=document.getElementById(l),o=a;e.offsetY>t.getBoundingClientRect().height/2?i.insertBefore(s,t.nextSibling):i.insertBefore(s,t),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.currentlyReorderingStatus?e.disableReordering():(this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),this.setupEvenOddClasses(),e.enableReordering()),this.$nextTick(()=>{this.setupEvenOddClasses()})},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let t=document.getElementById(l),s=[];for(let a=1,r;r=t.rows[a];a++)s.push({[i]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(l).getElementsByTagName("tbody")[0],t=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(t=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=t.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!t.includes(e)),t=[],i=[])}},toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},showTable(e="",t=""){(""!=e&&e===this.tableName||""!=eventTableFingerprint&&t===this.dataTableFingerprint)&&(this.shouldBeDisplayed=!0)},hideTable(e="",t=""){(""!=e&&e===this.tableName||""!=eventTableFingerprint&&t===this.dataTableFingerprint)&&(this.shouldBeDisplayed=!1)},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("booleanFilter",(e,t,l,i)=>({switchOn:!1,value:e.entangle("filterComponents."+t).live,init(){this.switchOn=!1,void 0!==this.value&&(this.switchOn=Boolean(Number(this.value))),this.listeners.push(Livewire.on("filter-was-set",e=>{e.tableName==l&&e.filterKey==t&&(this.switchOn=e.value??i)}))}})),Alpine.data("numberRangeFilter",(e,t,l,i,s)=>({allFilters:e.entangle("filterComponents",!1),originalMin:0,originalMax:100,filterMin:0,filterMax:100,currentMin:0,currentMax:100,hasUpdate:!1,wireValues:e.entangle("filterComponents."+t,!1),defaultMin:i.minRange,defaultMax:i.maxRange,restrictUpdates:!1,initialiseStyles(){let e=document.getElementById(l);e.style.setProperty("--value-a",this.wireValues.min??this.filterMin),e.style.setProperty("--text-value-a",JSON.stringify(this.wireValues.min??this.filterMin)),e.style.setProperty("--value-b",this.wireValues.max??this.filterMax),e.style.setProperty("--text-value-b",JSON.stringify(this.wireValues.max??this.filterMax))},updateStyles(e,t){let i=document.getElementById(l);i.style.setProperty("--value-a",e),i.style.setProperty("--text-value-a",JSON.stringify(e)),i.style.setProperty("--value-b",t),i.style.setProperty("--text-value-b",JSON.stringify(t))},setupWire(){void 0!==this.wireValues?(this.filterMin=this.originalMin=void 0!==this.wireValues.min?this.wireValues.min:this.defaultMin,this.filterMax=this.originalMax=void 0!==this.wireValues.max?this.wireValues.max:this.defaultMax):(this.filterMin=this.originalMin=this.defaultMin,this.filterMax=this.originalMax=this.defaultMax),this.updateStyles(this.filterMin,this.filterMax)},allowUpdates(){this.updateWire()},updateWire(){let e=parseInt(this.filterMin),t=parseInt(this.filterMax);(e!=this.originalMin||t!=this.originalMax)&&(t<e&&(this.filterMin=t,this.filterMax=e),this.hasUpdate=!0,this.originalMin=e,this.originalMax=t),this.updateStyles(this.filterMin,this.filterMax)},updateWireable(){this.hasUpdate&&(this.hasUpdate=!1,this.wireValues={min:this.filterMin,max:this.filterMax},e.set("filterComponents."+t,this.wireValues))},init(){this.initialiseStyles(),this.setupWire(),this.$watch("allFilters",e=>this.setupWire())}})),Alpine.data("flatpickrFilter",(e,t,l,i,s)=>({wireValues:e.entangle("filterComponents."+t),flatpickrInstance:flatpickr(i,{mode:"range",altFormat:l.altFormat??"F j, Y",altInput:l.altInput??!1,allowInput:l.allowInput??!1,allowInvalidPreload:l.allowInvalidPreload??!0,ariaDateFormat:l.ariaDateFormat??"F j, Y",clickOpens:!0,dateFormat:l.dateFormat??"Y-m-d",defaultDate:l.defaultDate??null,defaultHour:l.defaultHour??12,defaultMinute:l.defaultMinute??0,enableTime:l.enableTime??!1,enableSeconds:l.enableSeconds??!1,hourIncrement:l.hourIncrement??1,locale:l.locale??"en",minDate:l.earliestDate??null,maxDate:l.latestDate??null,minuteIncrement:l.minuteIncrement??5,shorthandCurrentMonth:l.shorthandCurrentMonth??!1,time_24hr:l.time_24hr??!1,weekNumbers:l.weekNumbers??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(l,i,s){if(l.length>1){var a=i.split(" "),r={};window.childElementOpen=!1,window.filterPopoverOpen=!1,r={minDate:a[0],maxDate:void 0===a[2]?a[0]:a[2]},e.set("filterComponents."+t,r)}}}),changedValue:function(l){l.length<5&&(this.flatpickrInstance.setDate([]),e.set("filterComponents."+t,{}))},setupWire(){if(void 0!==this.wireValues){if(void 0!==this.wireValues.minDate&&void 0!==this.wireValues.maxDate){let e=[this.wireValues.minDate,this.wireValues.maxDate];this.flatpickrInstance.setDate(e)}else this.flatpickrInstance.setDate([])}else this.flatpickrInstance.setDate([])},init(){this.setupWire(),this.$watch("wireValues",e=>this.setupWire())}})),Alpine.data("tableWrapper",(e,t)=>({shouldBeDisplayed:e.entangle("shouldBeDisplayed"),listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("reorderFunction",(e,t,l)=>({dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.get("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let l=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,r=l.rowIndex,n=document.getElementById(t),o=a;e.offsetY>l.getBoundingClientRect().height/2?i.insertBefore(s,l.nextSibling):i.insertBefore(s,l),r<a&&(o=r);let d="even";for(let h=1,g;g=n.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.currentlyReorderingStatus?e.disableReordering():(this.setupEvenOddClasses(),this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),e.enableReordering())},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let i=document.getElementById(t),s=[];for(let a=1,r;r=i.rows[a];a++)s.push({[l]:r.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(t).getElementsByTagName("tbody")[0],l=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(l=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=l.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!l.includes(e)),l=[],i=[])}},init(){}}))});
\ No newline at end of file
+document.addEventListener("alpine:init",()=>{Alpine.data("laravellivewiretable",e=>({tableId:"",showBulkActionsAlpine:!1,primaryKeyName:"",shouldBeDisplayed:e.entangle("shouldBeDisplayed"),tableName:e.entangle("tableName"),dataTableFingerprint:e.entangle("dataTableFingerprint"),listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.entangle("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr"),l=e.target.closest("tr").parentNode,i=document.getElementById(this.sourceID).closest("tr");i.classList.remove("laravel-livewire-table-dragging");let s=i.rowIndex,a=t.rowIndex,n=document.getElementById(this.tableId),r=s;e.offsetY>t.getBoundingClientRect().height/2?l.insertBefore(i,t.nextSibling):l.insertBefore(i,t),a<s&&(r=a);let o="even";for(let d=1,h;h=n.rows[d];d++)h.classList.contains("hidden")||h.classList.contains("md:hidden")||("even"===o?(h.classList.remove(...this.oddNotInEven),h.classList.add(...this.evenNotInOdd),o="odd"):(h.classList.remove(...this.evenNotInOdd),h.classList.add(...this.oddNotInEven),o="even"))},reorderToggle(){this.currentlyReorderingStatus?e.disableReordering():(this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),this.setupEvenOddClasses(),e.enableReordering()),this.$nextTick(()=>{this.setupEvenOddClasses()})},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let t=document.getElementById(this.tableId),l=[];for(let i=1,s;s=t.rows[i];i++)l.push({[this.primaryKeyName]:s.getAttribute("rowpk"),[this.defaultReorderColumn]:i});e.storeReorder(l)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(this.tableId).getElementsByTagName("tbody")[0],t=[],l=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(t=Array.from(e.rows[0].classList),l=Array.from(e.rows[1].classList),this.evenNotInOdd=t.filter(e=>!l.includes(e)),this.oddNotInEven=l.filter(e=>!t.includes(e)),t=[],l=[])}},toggleSelectAll(){this.showBulkActionsAlpine&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){this.showBulkActionsAlpine&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){this.showBulkActionsAlpine&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){this.showBulkActionsAlpine&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!this.showBulkActionsAlpine)return;let e=this.selectedItems,t=this.paginationCurrentItems.values();for(let l of t)e.push(l.toString());this.selectedItems=[...new Set(e)]},setTableId(e){this.tableId=e},setAlpineBulkActions(e){this.showBulkActionsAlpine=e},setPrimaryKeyName(e){this.primaryKeyName=e},showTable(e){let t=e.detail.tableName??"",l=e.detail.tableFingerpint??"";((t??"")!=""&&t===this.tableName||""!=l&&eventTableFingerpint===this.dataTableFingerprint)&&(this.shouldBeDisplayed=!0)},hideTable(e){let t=e.detail.tableName??"",l=e.detail.tableFingerpint??"";(""!=t&&t===this.tableName||""!=l&&eventTableFingerpint===this.dataTableFingerprint)&&(this.shouldBeDisplayed=!1)},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("booleanFilter",(e,t,l,i)=>({switchOn:!1,value:e.entangle("filterComponents."+t).live,init(){this.switchOn=!1,void 0!==this.value&&(this.switchOn=Boolean(Number(this.value))),this.listeners.push(Livewire.on("filter-was-set",e=>{e.tableName==l&&e.filterKey==t&&(this.switchOn=e.value??i)}))}})),Alpine.data("numberRangeFilter",(e,t,l,i,s)=>({allFilters:e.entangle("filterComponents",!1),originalMin:0,originalMax:100,filterMin:0,filterMax:100,currentMin:0,currentMax:100,hasUpdate:!1,wireValues:e.entangle("filterComponents."+t,!1),defaultMin:i.minRange,defaultMax:i.maxRange,restrictUpdates:!1,initialiseStyles(){let e=document.getElementById(l);e.style.setProperty("--value-a",this.wireValues.min??this.filterMin),e.style.setProperty("--text-value-a",JSON.stringify(this.wireValues.min??this.filterMin)),e.style.setProperty("--value-b",this.wireValues.max??this.filterMax),e.style.setProperty("--text-value-b",JSON.stringify(this.wireValues.max??this.filterMax))},updateStyles(e,t){let i=document.getElementById(l);i.style.setProperty("--value-a",e),i.style.setProperty("--text-value-a",JSON.stringify(e)),i.style.setProperty("--value-b",t),i.style.setProperty("--text-value-b",JSON.stringify(t))},setupWire(){void 0!==this.wireValues?(this.filterMin=this.originalMin=void 0!==this.wireValues.min?this.wireValues.min:this.defaultMin,this.filterMax=this.originalMax=void 0!==this.wireValues.max?this.wireValues.max:this.defaultMax):(this.filterMin=this.originalMin=this.defaultMin,this.filterMax=this.originalMax=this.defaultMax),this.updateStyles(this.filterMin,this.filterMax)},allowUpdates(){this.updateWire()},updateWire(){let e=parseInt(this.filterMin),t=parseInt(this.filterMax);(e!=this.originalMin||t!=this.originalMax)&&(t<e&&(this.filterMin=t,this.filterMax=e),this.hasUpdate=!0,this.originalMin=e,this.originalMax=t),this.updateStyles(this.filterMin,this.filterMax)},updateWireable(){this.hasUpdate&&(this.hasUpdate=!1,this.wireValues={min:this.filterMin,max:this.filterMax},e.set("filterComponents."+t,this.wireValues))},init(){this.initialiseStyles(),this.setupWire(),this.$watch("allFilters",e=>this.setupWire())}})),Alpine.data("flatpickrFilter",(e,t,l,i,s)=>({wireValues:e.entangle("filterComponents."+t),flatpickrInstance:flatpickr(i,{mode:"range",altFormat:l.altFormat??"F j, Y",altInput:l.altInput??!1,allowInput:l.allowInput??!1,allowInvalidPreload:l.allowInvalidPreload??!0,ariaDateFormat:l.ariaDateFormat??"F j, Y",clickOpens:!0,dateFormat:l.dateFormat??"Y-m-d",defaultDate:l.defaultDate??null,defaultHour:l.defaultHour??12,defaultMinute:l.defaultMinute??0,enableTime:l.enableTime??!1,enableSeconds:l.enableSeconds??!1,hourIncrement:l.hourIncrement??1,locale:l.locale??"en",minDate:l.earliestDate??null,maxDate:l.latestDate??null,minuteIncrement:l.minuteIncrement??5,shorthandCurrentMonth:l.shorthandCurrentMonth??!1,time_24hr:l.time_24hr??!1,weekNumbers:l.weekNumbers??!1,onOpen:function(){window.childElementOpen=!0},onChange:function(l,i,s){if(l.length>1){var a=i.split(" "),n={};window.childElementOpen=!1,window.filterPopoverOpen=!1,n={minDate:a[0],maxDate:void 0===a[2]?a[0]:a[2]},e.set("filterComponents."+t,n)}}}),changedValue:function(l){l.length<5&&(this.flatpickrInstance.setDate([]),e.set("filterComponents."+t,{}))},setupWire(){if(void 0!==this.wireValues){if(void 0!==this.wireValues.minDate&&void 0!==this.wireValues.maxDate){let e=[this.wireValues.minDate,this.wireValues.maxDate];this.flatpickrInstance.setDate(e)}else this.flatpickrInstance.setDate([])}else this.flatpickrInstance.setDate([])},init(){this.setupWire(),this.$watch("wireValues",e=>this.setupWire())}})),Alpine.data("tableWrapper",(e,t)=>({shouldBeDisplayed:e.entangle("shouldBeDisplayed"),listeners:[],childElementOpen:!1,filtersOpen:e.entangle("filterSlideDownDefaultVisible"),paginationCurrentCount:e.entangle("paginationCurrentCount"),paginationTotalItemCount:e.entangle("paginationTotalItemCount"),paginationCurrentItems:e.entangle("paginationCurrentItems"),selectedItems:e.entangle("selected"),selectAllStatus:e.entangle("selectAll"),delaySelectAll:e.entangle("delaySelectAll"),hideBulkActionsWhenEmpty:e.entangle("hideBulkActionsWhenEmpty"),toggleSelectAll(){t&&(this.paginationTotalItemCount===this.selectedItems.length?(this.clearSelected(),this.selectAllStatus=!1):this.delaySelectAll?this.setAllItemsSelected():this.setAllSelected())},setAllItemsSelected(){t&&(this.selectAllStatus=!0,this.selectAllOnPage())},setAllSelected(){t&&(this.delaySelectAll?(this.selectAllStatus=!0,this.selectAllOnPage()):e.setAllSelected())},clearSelected(){t&&(this.selectAllStatus=!1,e.clearSelected())},selectAllOnPage(){if(!t)return;let e=this.selectedItems,l=this.paginationCurrentItems.values();for(let i of l)e.push(i.toString());this.selectedItems=[...new Set(e)]},destroy(){this.listeners.forEach(e=>{e()})}})),Alpine.data("reorderFunction",(e,t,l)=>({dragging:!1,reorderEnabled:!1,sourceID:"",targetID:"",evenRowClasses:"",oddRowClasses:"",currentlyHighlightedElement:"",evenRowClassArray:{},oddRowClassArray:{},evenNotInOdd:{},oddNotInEven:{},orderedRows:[],defaultReorderColumn:e.get("defaultReorderColumn"),reorderStatus:e.get("reorderStatus"),currentlyReorderingStatus:e.entangle("currentlyReorderingStatus"),hideReorderColumnUnlessReorderingStatus:e.entangle("hideReorderColumnUnlessReorderingStatus"),reorderDisplayColumn:e.entangle("reorderDisplayColumn"),dragStart(e){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.sourceID=e.target.id,e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/plain",e.target.id),e.target.classList.add("laravel-livewire-tables-dragging")},dragOverEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let t=e.target.closest("tr");this.currentlyHighlightedElement=t,e.offsetY<t.getBoundingClientRect().height/2?(t.classList.add("laravel-livewire-tables-highlight-top"),t.classList.remove("laravel-livewire-tables-highlight-bottom")):(t.classList.remove("laravel-livewire-tables-highlight-top"),t.classList.add("laravel-livewire-tables-highlight-bottom"))},dragLeaveEvent(e){e.target.closest("tr").classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top")},dropEvent(e){"object"==typeof this.currentlyHighlightedElement&&this.currentlyHighlightedElement.classList.remove("laravel-livewire-tables-highlight-bottom","laravel-livewire-tables-highlight-top");let l=e.target.closest("tr"),i=e.target.closest("tr").parentNode,s=document.getElementById(this.sourceID).closest("tr");s.classList.remove("laravel-livewire-table-dragging");let a=s.rowIndex,n=l.rowIndex,r=document.getElementById(t),o=a;e.offsetY>l.getBoundingClientRect().height/2?i.insertBefore(s,l.nextSibling):i.insertBefore(s,l),n<a&&(o=n);let d="even";for(let h=1,g;g=r.rows[h];h++)g.classList.contains("hidden")||g.classList.contains("md:hidden")||("even"===d?(g.classList.remove(...this.oddNotInEven),g.classList.add(...this.evenNotInOdd),d="odd"):(g.classList.remove(...this.evenNotInOdd),g.classList.add(...this.oddNotInEven),d="even"))},reorderToggle(){this.$nextTick(()=>{this.setupEvenOddClasses()}),this.currentlyReorderingStatus?e.disableReordering():(this.setupEvenOddClasses(),this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!0),e.enableReordering())},cancelReorder(){this.hideReorderColumnUnlessReorderingStatus&&(this.reorderDisplayColumn=!1),e.disableReordering()},updateOrderedItems(){let i=document.getElementById(t),s=[];for(let a=1,n;n=i.rows[a];a++)s.push({[l]:n.getAttribute("rowpk"),[this.defaultReorderColumn]:a});e.storeReorder(s)},setupEvenOddClasses(){if(void 0===this.evenNotInOdd.length||0==this.evenNotInOdd.length||void 0===this.oddNotInEven.length||0==this.oddNotInEven.length){let e=document.getElementById(t).getElementsByTagName("tbody")[0],l=[],i=[];void 0!==e.rows[0]&&void 0!==e.rows[1]&&(l=Array.from(e.rows[0].classList),i=Array.from(e.rows[1].classList),this.evenNotInOdd=l.filter(e=>!i.includes(e)),this.oddNotInEven=i.filter(e=>!l.includes(e)),l=[],i=[])}},init(){}}))});
\ No newline at end of file
diff --git a/resources/views/components/table.blade.php b/resources/views/components/table.blade.php
index 0b92e6f39..4a8f14985 100644
--- a/resources/views/components/table.blade.php
+++ b/resources/views/components/table.blade.php
@@ -21,6 +21,7 @@
             {{ $attributes->merge($customAttributes['table'])
                 ->class(['min-w-full divide-y divide-gray-200 dark:divide-none' => $customAttributes['table']['default'] ?? true])
                 ->except('default') }}
+            
         >
             <thead wire:key="{{ $tableName }}-thead"
                 {{ $attributes->merge($customAttributes['thead'])
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index d8105236a..594272a70 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -6,7 +6,7 @@
 @php($isBootstrap4 = $this->isBootstrap4)
 @php($isBootstrap5 = $this->isBootstrap5)
 
-<div x-data="laravellivewiretable($wire, '{{ $this->showBulkActionsDropdownAlpine() }}', '{{ $tableId }}', '{{ $primaryKey }}')" x-cloak x-show="shouldBeDisplayed"  x-on:show-table.window="showTable(event.detail.tableName ?? '', event.detail.tableFingerpint ?? '')" x-on:hide-table.window="hideTable(event.detail.tableName ?? '', event.detail.tableFingerpint ?? '')">
+<div {{ $this->getTopLevelAttributes() }}>
     <x-livewire-tables::wrapper :component="$this" :tableName="$tableName" :$primaryKey :$isTailwind :$isBootstrap :$isBootstrap4 :$isBootstrap5>
         @if($this->hasActions && !$this->showActionsInToolbar)
             <x-livewire-tables::includes.actions/>    
diff --git a/src/Traits/Helpers/ComponentHelpers.php b/src/Traits/Helpers/ComponentHelpers.php
index b027be813..980d8d28e 100644
--- a/src/Traits/Helpers/ComponentHelpers.php
+++ b/src/Traits/Helpers/ComponentHelpers.php
@@ -94,7 +94,7 @@ public function getTableName(): string
     #[Computed]
     public function getTableId(): string
     {
-        return $this->getTableAttributes()['id'];
+        return $this->getTableAttributes()['id'] ?? 'table-'.$this->getTableName();
     }
 
     public function isTableNamed(string $name): bool
diff --git a/src/Traits/Helpers/TableAttributeHelpers.php b/src/Traits/Helpers/TableAttributeHelpers.php
index d5f57f03e..4d82a5393 100644
--- a/src/Traits/Helpers/TableAttributeHelpers.php
+++ b/src/Traits/Helpers/TableAttributeHelpers.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\View\ComponentAttributeBag;
 use Livewire\Attributes\Computed;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 
@@ -82,4 +83,22 @@ public function getShouldBeDisplayed(): bool
     {
         return $this->shouldBeDisplayed;
     }
+
+    public function getTopLevelAttributesArray(): array
+    {
+        return [
+            'x-data' => 'laravellivewiretable($wire)',
+            'x-init' => "setTableId('".$this->getTableAttributes()['id']."'); setAlpineBulkActions('".$this->showBulkActionsDropdownAlpine()."'); setPrimaryKeyName('".$this->getPrimaryKey()."');",
+            'x-cloak',
+            'x-show' => 'shouldBeDisplayed',
+            'x-on:show-table.window' => 'showTable(event)',
+            'x-on:hide-table.window' => 'hideTable(event)',
+        ];
+    }
+
+    #[Computed]
+    public function getTopLevelAttributes(): ComponentAttributeBag
+    {
+        return new ComponentAttributeBag($this->getTopLevelAttributesArray());
+    }
 }
diff --git a/tests/Traits/Helpers/TableAttributeHelpersTest.php b/tests/Traits/Helpers/TableAttributeHelpersTest.php
new file mode 100644
index 000000000..ec62d40c2
--- /dev/null
+++ b/tests/Traits/Helpers/TableAttributeHelpersTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class TableAttributeHelpersTest extends TestCase
+{
+    public function test_top_level_attributes_match(): void
+    {
+        $topLevelAttributesArray = $this->basicTable->getTopLevelAttributesArray();
+        $this->assertSame('shouldBeDisplayed', $topLevelAttributesArray['x-show']);
+        $this->assertSame('showTable(event)', $topLevelAttributesArray['x-on:show-table.window']);
+        $this->assertSame('hideTable(event)', $topLevelAttributesArray['x-on:hide-table.window']);
+        $this->assertSame('laravellivewiretable($wire)', $topLevelAttributesArray['x-data']);
+    }
+
+    public function test_top_level_attribute_bag_matches(): void
+    {
+        $topLevelAttributeBag = $this->basicTable->getTopLevelAttributes();
+
+        $topLevelAttributesArray = $topLevelAttributeBag->getAttributes();
+
+        $this->assertSame('shouldBeDisplayed', $topLevelAttributesArray['x-show']);
+        $this->assertSame('showTable(event)', $topLevelAttributesArray['x-on:show-table.window']);
+        $this->assertSame('hideTable(event)', $topLevelAttributesArray['x-on:hide-table.window']);
+        $this->assertSame('laravellivewiretable($wire)', $topLevelAttributesArray['x-data']);
+    }
+}
diff --git a/tests/Traits/Visuals/SortingVisualsTest.php b/tests/Traits/Visuals/SortingVisualsTest.php
index 4b2d44275..6419f2643 100644
--- a/tests/Traits/Visuals/SortingVisualsTest.php
+++ b/tests/Traits/Visuals/SortingVisualsTest.php
@@ -121,7 +121,6 @@ public function test_multiple_sorting_pill_shows_with_single_column_off(): void
     public function test_sorting_pill_shows_correct_name_and_direction(): void
     {
         Livewire::test(PetsTable::class)
-            ->assertDontSee('Key')
             ->call('sortBy', 'id')
             ->assertSee('Key')
             ->assertSee('0-9')

From a63fb4482feff2e2c68bac1f1bd616e01487fa40 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 1 Sep 2024 22:56:27 +0100
Subject: [PATCH 039/103] Fix ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5adab2fbc..8b412b286 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.17] - 2024-09-01
+### New Features
+- Add hide table option by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1914
+- Add column select session methods by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1913
+- Save filter selection to session (BETA) by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1910
+
+### Tweaks
+- Use Core Attribute Bag by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1916
+- Use Core HasTheme Methods by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1915
+
 ## [v3.4.16] - 2024-08-27
 ### New Features
 - Add icon column by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1902

From 2fd6014195a1beb6cdeacd91ea004a9f2bd92959 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 4 Sep 2024 01:14:08 +0100
Subject: [PATCH 040/103] Add Polish translation by @meavric (#1925)

* Add Polish translation by @meavric

* Update ChangeLog to reflect translation
---
 CHANGELOG.md           |  5 +++++
 CONTRIBUTORS.md        |  1 +
 resources/lang/pl.json | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 resources/lang/pl.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b412b286..b25610957 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## UNRELEASED
+
+### New Features
+- Added translation to Polish by @meavric in https://github.com/rappasoft/laravel-livewire-tables/pull/1925
+
 ## [v3.4.17] - 2024-09-01
 ### New Features
 - Add hide table option by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1914
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ffd644706..ad1b2a7cb 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -18,6 +18,7 @@
 | Indonesian (ID) | None |
 | Italian (IT) | Core Team |
 | Malay (MS) | [wanadri](https://github.com/wanadri) |
+| Polish (PL) | [meavric](https://github.com/meavric) |
 | Portugese (PT) | None |
 | Russian (RU) | None |
 | Spanish (ES) | [CristhoferMF](https://github.com/CristhoferMF) |
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
new file mode 100644
index 000000000..70e99e7f3
--- /dev/null
+++ b/resources/lang/pl.json
@@ -0,0 +1,33 @@
+{
+    "All": "Wszystko",
+    "All Columns": "Wszystkie kolumny",
+    "Applied Filters": "Użyte filtry",
+    "Applied Sorting": "Użyte sortowanie",
+    "Bulk Actions": "Akcje zbiorowe",
+    "Bulk Actions Confirm": "Czy zastosować ?",
+    "Clear": "Wyczyść",
+    "Columns": "Kolumny",
+    "Debugging Values": "Wartości debugowania",
+    "Deselect All": "Odznacz wszystko",
+    "Done Reordering": "Done Reordering",
+    "Filters": "Filtry",
+    "No": "Nie",
+    "No items found. Try to broaden your search.": "Brak rezultatów do wyświetlenia.",
+    "of": "z",
+    "Remove filter option": "Usuń opcję filtra",
+    "Remove sort option": "Usuń opcję sortowania",
+    "Reorder": "Zmień kolejność",
+    "results": "wyniki",
+    "row": "wiersz",
+    "rows": "wiersze",
+    "rows, do you want to select all": "czy chcesz zaznaczyć wszystkie wiersze",
+    "Search": "Szukaj",
+    "Select All": "Zaznacz wszystko",
+    "Select All On Page": "Zaznacz wszystko na stronie",
+    "Showing": "Pokazywanie",
+    "to": "do",
+    "Yes": "Tak",
+    "You are currently selecting all": "Aktualnie masz wszystko zaznaczone",
+    "You are not connected to the internet.": "Brak połączenia z internetem.",
+    "You have selected": "Masz wybrane"
+}
\ No newline at end of file

From 3a04d516c37c189da0dc70313037eedc752eb667 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 4 Sep 2024 01:19:57 +0100
Subject: [PATCH 041/103] Add Vertical Scrolling Example (#1926)

---
 docs/datatable/styling.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/datatable/styling.md b/docs/datatable/styling.md
index 612cf7a47..38055dbd9 100644
--- a/docs/datatable/styling.md
+++ b/docs/datatable/styling.md
@@ -386,3 +386,21 @@ public function configure(): void
   ]);
 }
 ```
+
+### Vertical Scrolling Example
+Should you wish to implement a table with a responsive height, and vertical scrolling for additional rows, a basic example is below that demonstrates the approach, noting that you will likely wish to adjust the break-points!
+
+```php
+public function configure(): void
+{
+
+    $this->setTableWrapperAttributes([
+        'class' => 'max-h-56 md:max-h-72 lg:max-h-96 overflow-y-scroll',
+        ]);
+    $this->setTheadAttributes([
+        'class' => 'sticky top-0 '
+    ]);
+}
+```
+
+Keep in mind that you must only call methods from configure() once to avoid overriding or conflicting results.
\ No newline at end of file

From 2a4b2d1eeb272799bf6d66f1df5cfeb0d221334a Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 4 Sep 2024 01:44:17 +0100
Subject: [PATCH 042/103] Adjusting contributing

---
 CHANGELOG.md    |  3 ++-
 CONTRIBUTING.md | 47 +++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58e40ae51..7dede0663 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,11 @@
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [v3.4.18] - 2024-09-04
-
 ### New Features
 - Added translation to Polish by @meavric in https://github.com/rappasoft/laravel-livewire-tables/pull/1925
 
+### Docs
+- Added example for Vertical Scrolling table by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1926
 
 ## [v3.4.17] - 2024-09-01
 ### New Features
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f4e9fea06..af96ac892 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,44 @@
 # Contributing
-Contributions are very welcome, please find below a summary of what is expected from contributions:
+This package is maintained by a core team, backed by a strong community effort, and contributions are extremely welcome! 
 
-- Follow the conventions for methods, adding to the relevant configuration/helper trait
-- Add properties to the "With" trait
+Please find below a brief summary of how to make a good contribution.  This helps to ensure a smooth review and merge of a PR.
+
+## Discussing A Feature
+Please do feel free to raise a Discussion topic, a Feature Request Issue, or reach out on the official Discord to discuss any ideas!
+
+## Starting A Contribution
+- Always create a fresh branch in your fork for every change.  This should be based on the "development" branch, as other branches may be outdated, or lack the change history.
+- Ensure that a PR contains a single feature/fix.  PRs with multiple features often end up with merge conflicts!
+- Avoid introducing a breaking change.  If your change makes a radical or substantial change, then the existing behaviour should be maintained as the default.  The core team tracks these, and as major versions are reached, may introduce new default behaviours.
+
+## Generic Information
+- Avoid adding any additional dependencies/requirements to the package unless discussed and approved by the core team.
 - Typehint both properties and return values
-- Add a comment to the method
-- Add tests for new methods
-- Add documentation for new methods
\ No newline at end of file
+- Add a comment to the method to explain what it does, this does not/should not be lengthy!
+
+## Views
+- Where amending/appending to Views/Blades, ensure that you cater for Tailwind, Bootstrap-4 and Bootstrap-5 to ensure continued support
+
+## Tests
+- Always add tests for new methods
+- Review existing tests if you make changes.
+- The project maintains a very high level of test coverage.  A PR that reduces this coverage is less likely to be readily accepted.
+
+## Documentation
+There is comprehensive documentation available for existing features.  Please add documentation for any new/amended methods, as otherwise this may result in delays, which may be significant! 
+
+## Conventions
+- Please follow the project conventions below:
+
+### Core Features
+A feature set typically exists in a "With" trait (For example - Rappasoft\LaravelLivewireTables\Traits\WithColumns.php)
+- The "WithColumns" contains any properties, and any key methods
+- Each feature set has a "Helper" and "Configuration" trait associated with it, for setting and getting properties, both server-side, and client-side.
+
+## Actions, Columns and Filters
+An Action/Column/Filter type exists in the "Views" section (For example Rappasoft\LaravelLivewireTables\Views\Columns\DateColumn.php)
+- Each Action/Column/Filter again has a "Helper" and "Configuration" trait associated with it, for setting and getting properties
+- Actions should extend Rappasoft\LaravelLivewireTables\Views\Action (or a class that extends this)
+- Columns should extend Rappasoft\LaravelLivewireTables\Views\Column (or a class that extends this)
+- Filters should extend Rappasoft\LaravelLivewireTables\Views\Filter (or a class that extends this)
+

From f1e041e36fbc57b98e01315addbff56ab2260a03 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 8 Sep 2024 22:57:22 +0100
Subject: [PATCH 043/103] Fix missing variable in workflow (#1933)

* Fix missing variable name

* Remove phpunit failOnWarning

* Tests

* PCOV Use Laravel 11
---
 .github/workflows/run-tests-pcov-pull.yml | 2 +-
 .github/workflows/run-tests-pull.yml      | 8 ++++----
 .github/workflows/run-tests.yml           | 6 +++---
 phpunit.xml.dist                          | 1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
index ef73e4b42..00cd4b1e5 100644
--- a/.github/workflows/run-tests-pcov-pull.yml
+++ b/.github/workflows/run-tests-pcov-pull.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.3]
-        laravel: [10]
+        laravel: [11]
         stability: [prefer-dist]
 
     name: PCOV - ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
index 38f635f9c..a0193d19e 100644
--- a/.github/workflows/run-tests-pull.yml
+++ b/.github/workflows/run-tests-pull.yml
@@ -21,7 +21,7 @@ jobs:
 
     name: PULL PHP-${{ matrix.php }} - Laravel-10
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
@@ -48,7 +48,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
-          tools: phpunit:latest
+          tools: phpunit:9.6
           ini-values: memory_limit=512M
           coverage: none
         env:
@@ -84,7 +84,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/paratest --no-coverage --processes=4
+        run: php ./vendor/bin/phpunit --no-coverage
 
 
   test-laravel11:
@@ -100,7 +100,7 @@ jobs:
 
     name: PULL PHP-${{ matrix.php }} - Laravel-11
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 9f6997a6c..f24fec995 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -22,7 +22,7 @@ jobs:
 
     name: PHP-${{ matrix.php }} - Laravel-10
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
@@ -49,7 +49,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
-          tools: phpunit:latest
+          tools: phpunit:9.6
           ini-values: memory_limit=512M
           coverage: none
         env:
@@ -101,7 +101,7 @@ jobs:
 
     name: PHP-${{ matrix.php }} - Laravel-11
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 5ff33415f..1e3747412 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,7 +5,6 @@
          colors="false"
          cacheResult="false" 
          executionOrder="random" 
-         failOnWarning="false" 
          failOnRisky="false" 
          failOnEmptyTestSuite="false" 
          beStrictAboutOutputDuringTests="true" >

From 5b326cc8fef0742da7ec7d9927cfd0f52b3e642c Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 8 Sep 2024 22:57:47 +0100
Subject: [PATCH 044/103] Fixes for ButtonGroupColumn, ImageColumn, LinkColumn
 - to not default as label if has a "from" property. (#1932)

* Initial Commit - Allowing Labels with "From" to be included in queries

* Fix styling

* Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default as label if has a "from" property.

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Views/Columns/ButtonGroupColumn.php | 4 +++-
 src/Views/Columns/ImageColumn.php       | 4 +++-
 src/Views/Columns/LinkColumn.php        | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Views/Columns/ButtonGroupColumn.php b/src/Views/Columns/ButtonGroupColumn.php
index 8e1264d93..973e9b977 100644
--- a/src/Views/Columns/ButtonGroupColumn.php
+++ b/src/Views/Columns/ButtonGroupColumn.php
@@ -20,7 +20,9 @@ public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);
 
-        $this->label(fn () => null);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
     }
 
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|\Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
diff --git a/src/Views/Columns/ImageColumn.php b/src/Views/Columns/ImageColumn.php
index f5d857324..a8bed5cc3 100644
--- a/src/Views/Columns/ImageColumn.php
+++ b/src/Views/Columns/ImageColumn.php
@@ -20,8 +20,10 @@ class ImageColumn extends Column
     public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
 
-        $this->label(fn () => null);
     }
 
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
diff --git a/src/Views/Columns/LinkColumn.php b/src/Views/Columns/LinkColumn.php
index 3302a1719..0edbc6436 100644
--- a/src/Views/Columns/LinkColumn.php
+++ b/src/Views/Columns/LinkColumn.php
@@ -22,7 +22,9 @@ public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);
 
-        $this->label(fn () => null);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
     }
 
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View

From 82e6e701daaeacf5755aa2527e8b4531364b4a8a Mon Sep 17 00:00:00 2001
From: Matthias Schmitt <126666060+matzeschmitt@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:58:09 +0200
Subject: [PATCH 045/103] Add button type to tailwind pagination blade template
 (#1928)

---
 resources/views/specific/tailwind/pagination.blade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/specific/tailwind/pagination.blade.php b/resources/views/specific/tailwind/pagination.blade.php
index 23911c6df..6d0e34c96 100644
--- a/resources/views/specific/tailwind/pagination.blade.php
+++ b/resources/views/specific/tailwind/pagination.blade.php
@@ -10,7 +10,7 @@
                             {!! __('pagination.previous') !!}
                         </span>
                     @else
-                        <button wire:click="previousPage('{{ $paginator->getPageName() }}')" wire:loading.attr="disabled" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600">
+                        <button type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" wire:loading.attr="disabled" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600">
                             {!! __('pagination.previous') !!}
                         </button>
                     @endif
@@ -18,7 +18,7 @@
 
                 <span>
                     @if ($paginator->hasMorePages())
-                        <button wire:click="nextPage('{{ $paginator->getPageName() }}')" wire:loading.attr="disabled" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600">
+                        <button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" wire:loading.attr="disabled" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600">
                             {!! __('pagination.next') !!}
                         </button>
                     @else
@@ -43,7 +43,7 @@
                                     </span>
                                 </span>
                             @else
-                                <button wire:click="previousPage('{{ $paginator->getPageName() }}')" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" rel="prev" class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('pagination.previous') }}">
+                                <button type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" rel="prev" class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('pagination.previous') }}">
                                     <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                                         <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
                                     </svg>
@@ -70,7 +70,7 @@
                                                     <span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-gray-100 border border-gray-300 cursor-default leading-5 dark:bg-gray-500 dark:text-white dark:border-gray-500">{{ $page }}</span>
                                                 </span>
                                             @else
-                                                <button wire:click="gotoPage({{ $page }}, '{{ $paginator->getPageName() }}')" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('Go to page :page', ['page' => $page]) }}">
+                                                <button type="button" wire:click="gotoPage({{ $page }}, '{{ $paginator->getPageName() }}')" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('Go to page :page', ['page' => $page]) }}">
                                                     {{ $page }}
                                                 </button>
                                             @endif
@@ -83,7 +83,7 @@
                         <span>
                             {{-- Next Page Link --}}
                             @if ($paginator->hasMorePages())
-                                <button wire:click="nextPage('{{ $paginator->getPageName() }}')" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" rel="next" class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('pagination.next') }}">
+                                <button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" rel="next" class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('pagination.next') }}">
                                     <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                                         <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
                                     </svg>

From d5bdd7b69d938f302401b7d3876af5ade0d388c3 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:02:18 +0100
Subject: [PATCH 046/103] v3.4.19 ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dede0663..d29975728 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.19] - 2024-09-08
+### Bug Fixes
+- Adjustment for Laravel 10 GH Workflows by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1933
+- Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default as label if has a "from" property. by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1932
+- Add button type to tailwind pagination blade template by @matzeschmitt in https://github.com/rappasoft/laravel-livewire-tables/pull/1928
+
 ## [v3.4.18] - 2024-09-04
 ### New Features
 - Added translation to Polish by @meavric in https://github.com/rappasoft/laravel-livewire-tables/pull/1925

From 6a63e9fab1eaf73aab11bede58083d0380464e43 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 10 Sep 2024 01:07:28 +0100
Subject: [PATCH 047/103] Revert tableName to be public (#1937)

---
 src/Traits/ComponentUtilities.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index 11625c8de..8cf7bad19 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -24,7 +24,8 @@ trait ComponentUtilities
 
     protected array $relationships = [];
 
-    protected string $tableName = 'table';
+    #[Locked]
+    public string $tableName = 'table';
 
     #[Locked]
     public ?string $dataTableFingerprint;

From 05e02212d16e82334e40ff78fae002d5b93c13c1 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 10 Sep 2024 01:14:00 +0100
Subject: [PATCH 048/103] v3.4.20 ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ca209ed9..e6ac79c87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.20] - 2024-09-10
+### Bug Fixes
+- Revert tableName to be public by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1937
+
 ## [v3.4.19] - 2024-09-08
 ### Bug Fixes
 - Adjustment for Laravel 10 GH Workflows by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1933

From 530b0bf1f2330abb7c5e19d8b1e0cfd1f029f035 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Thu, 12 Sep 2024 02:01:36 +0100
Subject: [PATCH 049/103] Migration to Core attribute management (#1943)

* Migration to Core attribute management

* Fix styling

* Fix missing type hint, update tests

* Fix styling

* Remove defaults from being output

* Fix styling

* Adjust defaults

* Adjust behaviour for Bulk Actions TH

* Add "styling" to Columns docs

* Docs Adjust, add missing test

* Fix styling

* Adjust workflows - use L11 for PHPStan, use PHPUnit for L10

* Add missing test for thSortIconAttributes

* Fix styling

* Add CustomAttributesTest

* Fix styling

* Add missing tests - correct attribute to respect defaults

* Fix styling

* Remove defined processes in workflows

* Add test for setShouldBeHidden and setShouldBeDisplayed

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .github/workflows/run-phpstan.yml             |   2 +-
 .github/workflows/run-tests-pcov-pull.yml     |   2 +-
 .github/workflows/run-tests-pull.yml          |   2 +-
 .github/workflows/run-tests.yml               |   4 +-
 docs/columns/available-methods.md             |   4 +
 docs/columns/styling.md                       | 292 ++++++++++++++++++
 docs/datatable/styling.md                     |  93 +++++-
 .../components/includes/actions.blade.php     |   2 +-
 .../components/includes/loading.blade.php     |   2 +-
 resources/views/components/table.blade.php    |  16 +-
 .../table/collapsed-columns.blade.php         |   2 +-
 resources/views/components/table/td.blade.php |   2 +-
 .../table/td/bulk-actions.blade.php           |   3 +-
 .../table/td/collapsed-columns.blade.php      |   8 +-
 .../views/components/table/td/plain.blade.php |   4 +-
 resources/views/components/table/th.blade.php |  88 +++---
 .../table/th/bulk-actions.blade.php           |   6 +-
 .../views/components/table/th/plain.blade.php |   4 +-
 .../components/table/th/reorder.blade.php     |  14 +-
 .../components/table/th/sort-icons.blade.php  |  32 ++
 resources/views/components/table/tr.blade.php |   2 +-
 .../views/components/table/tr/plain.blade.php |   4 +-
 .../components/tools/filter-label.blade.php   |  15 +-
 .../toolbar/items/bulk-actions.blade.php      |  10 +-
 .../toolbar/items/search-field.blade.php      |   9 +-
 resources/views/datatable.blade.php           |   2 +-
 .../views/includes/actions/button.blade.php   |   6 +-
 .../BulkActionsConfiguration.php              |  61 ----
 .../Configuration/SearchConfiguration.php     |   2 +-
 .../TableAttributeConfiguration.php           |  10 +
 src/Traits/Core/HasCustomAttributes.php       |  49 +++
 src/Traits/HasAllTraits.php                   |   2 +
 src/Traits/Helpers/BulkActionsHelpers.php     |  65 +---
 src/Traits/Helpers/ReorderingHelpers.php      |  12 +
 src/Traits/Helpers/SearchHelpers.php          |   2 +-
 src/Traits/Helpers/TableAttributeHelpers.php  |  46 ++-
 .../BulkActionStylingConfiguration.php        |  76 +++++
 src/Traits/Styling/HasBulkActionsStyling.php  |  28 ++
 .../Helpers/BulkActionStylingHelpers.php      |  96 ++++++
 src/Traits/WithBulkActions.php                |  20 +-
 src/Traits/WithTableAttributes.php            |   2 +
 src/Views/Traits/Columns/IsSortable.php       |  16 +
 src/Views/Traits/Core/HasLabelAttributes.php  |  41 +++
 src/Views/Traits/IsColumn.php                 |   3 +-
 src/Views/Traits/IsFilter.php                 |   3 +-
 .../BulkActionsConfigurationTest.php          | 116 +------
 .../BulkActionsStylingConfigurationTest.php   | 135 ++++++++
 .../ComponentConfigurationTest.php            |  31 +-
 .../Configuration/SearchConfigurationTest.php |   4 +-
 tests/Traits/Core/CustomAttributesTest.php    |  97 ++++++
 .../Traits/Helpers/BulkActionsHelpersTest.php |  20 --
 tests/Traits/Helpers/ColumnHelpersTest.php    |  18 ++
 .../Traits/Visuals/BulkActionsVisualsTest.php |  33 ++
 tests/Traits/Visuals/SortingVisualsTest.php   |  21 +-
 54 files changed, 1261 insertions(+), 378 deletions(-)
 create mode 100644 docs/columns/styling.md
 create mode 100644 resources/views/components/table/th/sort-icons.blade.php
 create mode 100644 src/Traits/Core/HasCustomAttributes.php
 create mode 100644 src/Traits/Styling/Configuration/BulkActionStylingConfiguration.php
 create mode 100644 src/Traits/Styling/HasBulkActionsStyling.php
 create mode 100644 src/Traits/Styling/Helpers/BulkActionStylingHelpers.php
 create mode 100644 src/Views/Traits/Core/HasLabelAttributes.php
 create mode 100644 tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php
 create mode 100644 tests/Traits/Core/CustomAttributesTest.php

diff --git a/.github/workflows/run-phpstan.yml b/.github/workflows/run-phpstan.yml
index c8163e5ac..c286d1e80 100644
--- a/.github/workflows/run-phpstan.yml
+++ b/.github/workflows/run-phpstan.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.3]
-        laravel: [10]
+        laravel: [11]
         stability: [prefer-dist]
 
     name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
index 00cd4b1e5..840cd8ee9 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/paratest --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml --processes=4
+        run: php ./vendor/bin/paratest --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
index a0193d19e..583d5d20f 100644
--- a/.github/workflows/run-tests-pull.yml
+++ b/.github/workflows/run-tests-pull.yml
@@ -163,4 +163,4 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/paratest --no-coverage --processes=4
+        run: php ./vendor/bin/paratest --no-coverage
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index f24fec995..bcb0d7031 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -85,7 +85,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/paratest --no-coverage --processes=4
+        run: php ./vendor/bin/phpunit --no-coverage
 
 
   test-laravel11:
@@ -164,4 +164,4 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/paratest --no-coverage --processes=4
+        run: php ./vendor/bin/paratest --no-coverage
diff --git a/docs/columns/available-methods.md b/docs/columns/available-methods.md
index 5c6eaa9b6..18f840b5d 100644
--- a/docs/columns/available-methods.md
+++ b/docs/columns/available-methods.md
@@ -302,3 +302,7 @@ Labels are visible by default, but should you wish to override a previous "hideC
 Column::make('Name')
     ->setColumnLabelStatusEnabled()
 ```
+
+## See Also
+[Column Styling](./styling)
+
diff --git a/docs/columns/styling.md b/docs/columns/styling.md
new file mode 100644
index 000000000..f7db2a4bd
--- /dev/null
+++ b/docs/columns/styling.md
@@ -0,0 +1,292 @@
+---
+title: Styling
+weight: 10
+---
+
+## Keeping Defaults
+To allow simpler customisation on a per-table basis, there are numerous methods available to over-ride the default CSS classes.
+Historically, this was provided by a simple toggleable "default" flag.  However - in many cases, the original "default" has been expanded to include:
+
+### Keep Default Colors And Default Styles
+- set default flag to true
+or
+- set default-colors flag to true
+- set default-styling flag to true
+
+### Keep Default Colors Only
+- set default flag to false
+- set default-colors flag to true
+- set default-styling flag to false
+
+### Keep Default Styling Only
+- set default flag to false
+- set default-colors flag to false
+- set default-styling flag to true
+
+## Styling The Column Label
+
+The Column itself provides the capability to style the Label shown in the "th" element.  You can set custom attributes to pass to the Column Label on a per-Column basis:
+
+For example:
+```php
+Column::make('Name')
+    ->setLabelAttributes(['class' => 'text-2xl'])
+```
+By default, this replaces the default classes on the label, if you would like to keep them, set the default/default-styling/default-colors flags to true as appropriate.
+
+## Styling Table Elements
+
+It is important to note that you can also customise the parent TH and TD elements, customising both classes and attributes for each Column's header (using setThAttributes) and each row of that Column (using setTdAttributes), these are available in the configure() method of the table.
+This allows you to customise attributes based on the value of the table as well!
+
+Below is a copy of the relevant sections from [datatable styling](../datatable/styling) to ensure visibility of the options.  More are documented on the main datatable styling page.
+
+## setThAttributes
+
+Set a list of attributes to override on the th elements.  
+
+```php
+public function configure(): void
+{
+  // Takes a callback that gives you the current column.
+  $this->setThAttributes(function(Column $column) {
+    if ($column->isField('name')) {
+      return [
+        'class' => 'bg-green-500',
+      ];
+    }
+
+    return [];
+  });
+}
+```
+
+### Keeping Default Colors and Default Styling
+```php
+public function configure(): void
+{
+  $this->setThAttributes(function(Column $column) {
+    if ($column->isField('name')) {
+      return [
+        'default' => true,
+        'class' => 'bg-green-500',
+      ];
+    }
+
+    return ['default' => true];
+  });
+}
+```
+
+### Keeping Default Styling Only For the "Name" Column
+```php
+public function configure(): void
+{
+  $this->setThAttributes(function(Column $column) {
+    if ($column->isField('name')) {
+      return [
+        'default' => false,
+        'default-styling' => true,
+        'class' => 'text-black bg-green-500 dark:text-white dark:bg-green-900',
+      ];
+    }
+
+    return ['default' => true];
+  });
+}
+```
+
+### Reorder Column
+Note: If you are using Reorder, then the th for Reorder can be [styled separately](../reordering/available-methods).  However this is now replaced with the following to ensure consistent behaviour.  The separate method will be supported until at least v3.6
+
+You can also use the "title" of the Column, which will be "reorder" for the "reorder" Column:
+```php
+public function configure(): void
+{
+  $this->setThAttributes(function(Column $column) {
+      if ($column->getTitle() == 'reorder')
+      {
+          return [
+              'class' => 'bg-green-500 dark:bg-green-800',
+              'default' => false,
+              'default-colors' => false,
+          ];
+  
+      }
+
+    return ['default' => true];
+  });
+}
+```
+
+### Bulk Actions Column
+Note: If you are using Bulk Actions, then the th for Bulk Actions can be [styled separately](../bulk-actions/customisations).  However this is now replaced with the following to ensure consistent behaviour.  The separate method will be supported until at least v3.6
+
+You can also use the "title" of the Column, which will be "bulkactions" for the "Bulk Actions" Column:
+```php
+public function configure(): void
+{
+  $this->setThAttributes(function(Column $column) {
+      if ($column->getTitle() == 'bulkactions')
+      {
+          return [
+              'class' => 'bg-yellow-500 dark:bg-yellow-800',
+              'default' => false,
+              'default-colors' => false,
+          ];
+  
+      }
+
+    return ['default' => true];
+  });
+}
+```
+
+## setThSortButtonAttributes
+
+Set a list of attributes to override on the th sort button elements
+
+```php
+public function configure(): void
+{
+  // Takes a callback that gives you the current column.
+  $this->setThSortButtonAttributes(function(Column $column) {
+    if ($column->isField('name')) {
+      return [
+        'class' => 'bg-green-500',
+      ];
+    }
+
+    return [];
+  });
+}
+```
+
+## setTrAttributes
+
+Set a list of attributes to override on the tr elements
+
+```php
+public function configure(): void
+{
+  // Takes a callback that gives you the current row and its index
+  $this->setTrAttributes(function($row, $index) {
+      if ($index % 2 === 0) {
+        return [
+          'class' => 'bg-gray-200',
+        ];
+      }
+
+      return [];
+  });
+}
+```
+
+By default, this replaces the default classes on the tr, if you would like to keep them, set the appropriate default flag (see above)
+
+```php
+public function configure(): void
+{
+  $this->setTrAttributes(function($row, $index) {
+      if ($index % 2 === 0) {
+        return [
+          'default' => true,
+          'class' => 'bg-gray-200',
+        ];
+      }
+
+      return ['default' => true];
+  });
+}
+```
+
+## setTdAttributes
+
+Set a list of attributes to override on the td elements.  For example, changing the background color between red/green based on whether the "total" field is over or under 1000.
+
+```php
+public function configure(): void
+{
+  // Takes a callback that gives you the current column, row, column index, and row index
+  $this->setTdAttributes(function(Column $column, $row, $columnIndex, $rowIndex) {
+    if ($column->isField('total') && $row->total < 1000) {
+      return [
+        'class' => 'bg-red-500 text-white',
+      ];
+    }
+    elseif ($column->isField('total') && $row->total >= 1000) {
+      return [
+        'class' => 'bg-green-500 text-white',
+      ];
+    }
+
+    return [];
+  });
+}
+```
+
+By default, this replaces the default classes on the td, if you would like to keep them, set the appropriate default flag (see above).
+
+```php
+public function configure(): void
+{
+  // Takes a callback that gives you the current column, row, column index, and row index
+  $this->setTdAttributes(function(Column $column, $row, $columnIndex, $rowIndex) {
+    if ($column->isField('total') && $row->total < 1000) {
+      return [
+        'default' => true,
+        'class' => 'bg-red-500 text-white',
+      ];
+    }
+
+    return ['default' => true];
+  });
+}
+
+```
+
+### Reorder Column
+Note: If you are using Reorder, then the td for Reorder can be [styled separately](../reordering/available-methods).  However this is now replaced with the following to ensure consistent behaviour.  The separate method will be supported until at least v3.6
+
+You can use the "title" of the Column, which will be "reorder" for the "reorder" Column:
+```php
+public function configure(): void
+{
+  $this->setTdAttributes(function(Column $column) {
+      if ($column->getTitle() == 'reorder')
+      {
+          return [
+              'class' => 'bg-green-500 dark:bg-green-800',
+              'default' => false,
+              'default-colors' => false,
+          ];
+  
+      }
+
+    return ['default' => true];
+  });
+}
+```
+
+### Bulk Actions Column
+Note: If you are using Bulk Actions, then the td for Bulk Actions can be [styled separately](../bulk-actions/customisations).  However this is now replaced with the following to ensure consistent behaviour.  The separate method will be supported until at least v3.6
+
+You can use the "title" of the Column, which will be "bulkactions" for the "Bulk Actions" Column:
+```php
+public function configure(): void
+{
+  $this->setTdAttributes(function(Column $column) {
+      if ($column->getTitle() == 'bulkactions')
+      {
+          return [
+              'class' => 'bg-yellow-500 dark:bg-yellow-800',
+              'default' => false,
+              'default-colors' => false,
+          ];
+  
+      }
+
+    return ['default' => true];
+  });
+}
+```
diff --git a/docs/datatable/styling.md b/docs/datatable/styling.md
index 38055dbd9..b460371bf 100644
--- a/docs/datatable/styling.md
+++ b/docs/datatable/styling.md
@@ -5,6 +5,27 @@ weight: 5
 
 The package offers significant opportunities to customise the look & feel of the core table, as well as other elements (which are documented in the relevant sections).
 
+## Keeping Defaults
+To allow simpler customisation on a per-table basis, there are numerous methods available to over-ride the default CSS classes.
+Historically, this was provided by a simple toggleable "default" flag.  However - in many cases, the original "default" has been expanded to include:
+
+### Keep Default Colors And Default Styles
+- set default flag to true
+or
+- set default-colors flag to true
+- set default-styling flag to true
+
+### Keep Default Colors Only
+- set default flag to false
+- set default-colors flag to true
+- set default-styling flag to false
+
+### Keep Default Styling Only
+- set default flag to false
+- set default-colors flag to false
+- set default-styling flag to true
+
+
 ## Attributes
 
 ### setComponentWrapperAttributes
@@ -129,9 +150,6 @@ public function configure(): void
 
 Set a list of attributes to override on the th elements.  
 
-Note: If you are using Bulk Actions, then the th for Bulk Actions is [styled separately](../bulk-actions/customisations).
-Note: If you are using Reorder, then the th for Reorder is [styled separately](../reordering/available-methods).
-
 ```php
 public function configure(): void
 {
@@ -148,8 +166,7 @@ public function configure(): void
 }
 ```
 
-By default, this replaces the default classes on the th, if you would like to keep them, set the default flag to true.
-
+#### Keeping Default Colors and Default Styling
 ```php
 public function configure(): void
 {
@@ -166,6 +183,72 @@ public function configure(): void
 }
 ```
 
+#### Keeping Default Styling Only For the "Name" Column
+```php
+public function configure(): void
+{
+  $this->setThAttributes(function(Column $column) {
+    if ($column->isField('name')) {
+      return [
+        'default' => false,
+        'default-styling' => true,
+        'class' => 'text-black bg-green-500 dark:text-white dark:bg-green-900',
+      ];
+    }
+
+    return ['default' => true];
+  });
+}
+```
+
+#### Reorder Column
+Note: If you are using Reorder, then the th for Reorder can be [styled separately](../reordering/available-methods).  However this is now replaced with the following to ensure consistent behaviour.  The separate method will be supported until at least v3.6
+
+You can also use the "title" of the Column, which will be "reorder" for the "reorder" Column:
+```php
+public function configure(): void
+{
+  $this->setThAttributes(function(Column $column) {
+      if ($column->getTitle() == 'reorder')
+      {
+          return [
+              'class' => 'bg-green-500 dark:bg-green-800',
+              'default' => false,
+              'default-colors' => false,
+          ];
+  
+      }
+
+    return ['default' => true];
+  });
+}
+```
+#### Bulk Actions Column
+Note: If you are using Bulk Actions, then the th for Bulk Actions can be [styled separately](../bulk-actions/customisations).  However this is now replaced with the following to ensure consistent behaviour.  The separate method will be supported until at least v3.6
+
+You can also use the "title" of the Column, which will be "bulkactions" for the "Bulk Actions" Column:
+```php
+public function configure(): void
+{
+  $this->setThAttributes(function(Column $column) {
+      if ($column->getTitle() == 'bulkactions')
+      {
+          return [
+              'class' => 'bg-yellow-500 dark:bg-yellow-800',
+              'default' => false,
+              'default-colors' => false,
+          ];
+  
+      }
+
+    return ['default' => true];
+  });
+}
+```
+
+
+
+
 ### setThSortButtonAttributes
 
 Set a list of attributes to override on the th sort button elements
diff --git a/resources/views/components/includes/actions.blade.php b/resources/views/components/includes/actions.blade.php
index 2c354e7ba..db8925279 100644
--- a/resources/views/components/includes/actions.blade.php
+++ b/resources/views/components/includes/actions.blade.php
@@ -9,7 +9,7 @@
             ->class(['justify-end' => $this->getActionsPosition == 'right'])
             ->class(['pl-2' => $this->showActionsInToolbar && $this->getActionsPosition == 'left'])
             ->class(['pr-2' => $this->showActionsInToolbar && $this->getActionsPosition == 'right'])
-            ->except(['default-styling','default-colors'])
+            ->except(['default','default-styling','default-colors'])
         }} >
     @foreach($this->getActions as $action)
         {{ $action->render() }}
diff --git a/resources/views/components/includes/loading.blade.php b/resources/views/components/includes/loading.blade.php
index b60d41016..c07d9cb19 100644
--- a/resources/views/components/includes/loading.blade.php
+++ b/resources/views/components/includes/loading.blade.php
@@ -24,7 +24,7 @@
                         $attributes->merge($customAttributes['loader-icon'])
                             ->class(['lds-hourglass' => $isTailwind && ($customAttributes['loader-icon']['default'] ?? true)])
                             ->class(['lds-hourglass' => $isBootstrap && ($customAttributes['loader-icon']['default'] ?? true)])
-                            ->except('default');
+                            ->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 4a8f14985..297548694 100644
--- a/resources/views/components/table.blade.php
+++ b/resources/views/components/table.blade.php
@@ -14,19 +14,19 @@
         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])
-            ->except('default') }}
+            ->except(['default','default-styling','default-colors']) }}
     >
         <table
             wire:key="{{ $tableName }}-table"
             {{ $attributes->merge($customAttributes['table'])
                 ->class(['min-w-full divide-y divide-gray-200 dark:divide-none' => $customAttributes['table']['default'] ?? true])
-                ->except('default') }}
+                ->except(['default','default-styling','default-colors']) }}
             
         >
             <thead wire:key="{{ $tableName }}-thead"
                 {{ $attributes->merge($customAttributes['thead'])
                     ->class(['bg-gray-50 dark:bg-gray-800' => $customAttributes['thead']['default'] ?? true])
-                    ->except('default') }}
+                    ->except(['default','default-styling','default-colors']) }}
             >
                 <tr>
                     {{ $thead }}
@@ -38,7 +38,7 @@
                 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])
-                        ->except('default') }}
+                        ->except(['default','default-styling','default-colors']) }}
             >
                 {{ $slot }}
             </tbody>
@@ -54,20 +54,20 @@
     <div wire:key="{{ $tableName }}-twrap"
         {{ $attributes->merge($customAttributes['wrapper'])
             ->class(['table-responsive' => $customAttributes['wrapper']['default'] ?? true])
-            ->except('default') }}
+            ->except(['default','default-styling','default-colors']) }}
     >
         <table
             wire:key="{{ $tableName }}-table"
             {{ $attributes->merge($customAttributes['table'])
                 ->class(['laravel-livewire-table table' => $customAttributes['table']['default'] ?? true])
-                ->except('default')
+                ->except(['default','default-styling','default-colors'])
             }}
         >
             <thead
                 wire:key="{{ $tableName }}-thead"
                 {{ $attributes->merge($customAttributes['thead'])
                     ->class(['' => $customAttributes['thead']['default'] ?? true])
-                    ->except('default') }}
+                    ->except(['default','default-styling','default-colors']) }}
             >
                 <tr>
                     {{ $thead }}
@@ -79,7 +79,7 @@
                 id="{{ $tableName }}-tbody"
                 {{ $attributes->merge($customAttributes['tbody'])
                         ->class(['' => $customAttributes['tbody']['default'] ?? true])
-                        ->except('default') }}
+                        ->except(['default','default-styling','default-colors']) }}
             >
                 {{ $slot }}
             </tbody>
diff --git a/resources/views/components/table/collapsed-columns.blade.php b/resources/views/components/table/collapsed-columns.blade.php
index ba21ee2ba..44bb45d9f 100644
--- a/resources/views/components/table/collapsed-columns.blade.php
+++ b/resources/views/components/table/collapsed-columns.blade.php
@@ -38,7 +38,7 @@
                 ->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))])
-                ->except(['default'])
+                ->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 926cd3ae2..0ba2f050d 100644
--- a/resources/views/components/table/td.blade.php
+++ b/resources/views/components/table/td.blade.php
@@ -22,7 +22,7 @@
                 ->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()])
-                ->except('default')
+                ->except(['default','default-styling','default-colors'])
         }}
     >
         {{ $slot }}
diff --git a/resources/views/components/table/td/bulk-actions.blade.php b/resources/views/components/table/td/bulk-actions.blade.php
index 341ad650c..918743395 100644
--- a/resources/views/components/table/td/bulk-actions.blade.php
+++ b/resources/views/components/table/td/bulk-actions.blade.php
@@ -24,8 +24,7 @@
                     $attributes->merge($bulkActionsTdCheckboxAttributes)->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') && ($bulkActionsTdCheckboxAttributes['default'] ?? true),
                         'form-check-input' => ($theme === 'bootstrap-5') && ($bulkActionsTdCheckboxAttributes['default'] ?? true),
-                        'except' => 'default',
-                    ])
+                    ])->except(['default','default-styling','default-colors'])
                 }}
             />
         </div>
diff --git a/resources/views/components/table/td/collapsed-columns.blade.php b/resources/views/components/table/td/collapsed-columns.blade.php
index 29cb50feb..166a62138 100644
--- a/resources/views/components/table/td/collapsed-columns.blade.php
+++ b/resources/views/components/table/td/collapsed-columns.blade.php
@@ -25,7 +25,7 @@
                                 'h-6 w-6' => $this->getCollapsingColumnButtonExpandAttributes['default-styling'] ?? true,
                                 'text-green-600' => $this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true,
                             ])
-                            ->except('default') 
+                            ->except(['default','default-styling','default-colors']) 
                         }}
                      />
                     <x-heroicon-o-minus-circle x-cloak x-show="open" 
@@ -35,7 +35,7 @@
                                 'h-6 w-6' => $this->getCollapsingColumnButtonCollapseAttributes['default-styling'] ?? true,
                                 'text-yellow-600' => $this->getCollapsingColumnButtonCollapseAttributes['default-colors'] ?? true,
                             ])
-                            ->except('default') 
+                            ->except(['default','default-styling','default-colors']) 
                         }}
                     />
                 </button>
@@ -63,7 +63,7 @@ class="border-0 bg-transparent p-0"
                             ->class([
                                 'laravel-livewire-tables-btn-lg text-success' => $this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true,
                             ])
-                            ->except('default') 
+                            ->except(['default','default-styling','default-colors']) 
                         }}
                     />
                     <x-heroicon-o-minus-circle x-cloak x-show="open" 
@@ -72,7 +72,7 @@ class="border-0 bg-transparent p-0"
                             ->class([
                                 'laravel-livewire-tables-btn-lg text-warning' => $this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true,
                             ])
-                            ->except('default') 
+                            ->except(['default','default-styling','default-colors']) 
                         }}
                     />
                 </button>
diff --git a/resources/views/components/table/td/plain.blade.php b/resources/views/components/table/td/plain.blade.php
index 54c9efc67..d2e9ffb6f 100644
--- a/resources/views/components/table/td/plain.blade.php
+++ b/resources/views/components/table/td/plain.blade.php
@@ -8,7 +8,7 @@
         ->class(['hidden' => $column && $column->shouldCollapseAlways()])
         ->class(['hidden md:table-cell' => $column && $column->shouldCollapseOnMobile()])
         ->class(['hidden lg:table-cell' => $column && $column->shouldCollapseOnTablet()])
-        ->except('default')
+        ->except(['default','default-styling','default-colors'])
     }} @if($hideUntilReorder) x-show="reorderDisplayColumn" @endif >
         {{ $slot }}
     </td>
@@ -19,7 +19,7 @@
         ->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()])
-        ->except('default')
+        ->except(['default','default-styling','default-colors'])
     }}>
         {{ $slot }}
     </td>
diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php
index 10436241f..b12366dc7 100644
--- a/resources/views/components/table/th.blade.php
+++ b/resources/views/components/table/th.blade.php
@@ -3,86 +3,86 @@
 
 @php
     $attributes = $attributes->merge(['wire:key' => $tableName . '-header-col-'.$column->getSlug()]);
-    $customAttributes = $this->getThAttributes($column);
-    $customSortButtonAttributes = $this->getThSortButtonAttributes($column);
+    $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 ;
 @endphp
 
 @if ($isTailwind)
     <th scope="col" {{
-        $attributes->merge($customAttributes)
-            ->class(['px-6 py-3 text-left text-xs font-medium whitespace-nowrap text-gray-500 uppercase tracking-wider dark:bg-gray-800 dark:text-gray-400' => $customAttributes['default'] ?? true])
+        $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')
+            ->except(['default', 'default-colors', 'default-styling'])
         }}
     >
         @if($column->getColumnLabelStatus())
             @unless ($this->sortingIsEnabled() && ($column->isSortable() || $column->getSortCallback()))
-                {{ $column->getTitle() }}
+                <span {{ $customLabelAttributes->except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }}</span>
             @else
-                <button
-                    wire:click="sortBy('{{ ($column->isSortable() ? $column->getColumnSelectName() : $column->getSlug()) }}')"
+                <button wire:click="sortBy('{{ $column->getColumnSortKey() }}')"
                     {{
                         $attributes->merge($customSortButtonAttributes)
-                            ->class(['flex items-center space-x-1 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider group focus:outline-none dark:text-gray-400' => $customSortButtonAttributes['default'] ?? true])
-                            ->except(['default', 'wire:key'])
+                            ->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 {{
-        $attributes->merge($customAttributes)
-            ->class(['text-left text-xs font-medium whitespace-nowrap text-gray-500 uppercase tracking-wider dark:bg-gray-800 dark:text-gray-400' => $customAttributes['default'] ?? true])
-            ->class(['hidden' => $column->shouldCollapseAlways()])
-            ->class(['hidden md:table-cell' => $column->shouldCollapseOnMobile()])
-            ->class(['hidden lg:table-cell' => $column->shouldCollapseOnTablet()])
-            ->except('default')
-        }}>{{ $column->getTitle() }}</span>
+                    <span {{ $customLabelAttributes->except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }}</span>
+                    <x-livewire-tables::table.th.sort-icons :$direction 
+                    {{
+                        $attributes->merge($customSortIconAttributes)
+                            ->except(['default', 'default-colors', 'default-styling', 'wire:key'])
+                    }}
+                    />
 
-                    <span class="relative flex items-center">
-                        @if ($direction === '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"/>
-                        @elseif ($direction === '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"/>
-                        @else
-                            <x-heroicon-o-chevron-up class="w-3 h-3 opacity-0 group-hover:opacity-100 transition-opacity duration-300" />
-                        @endif
-                    </span>
                 </button>
             @endunless
         @endif
     </th>
 @elseif ($isBootstrap)
     <th scope="col" {{
-        $attributes->merge($customAttributes)
-            ->class(['' => $customAttributes['default'] ?? true])
+        $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')
+            ->except(['default','default-styling','default-colors'])
         }}
     >
         @if($column->getColumnLabelStatus())
             @unless ($this->sortingIsEnabled() && ($column->isSortable() || $column->getSortCallback()))
-                {{ $column->getTitle() }}
+                <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->isSortable() ? $column->getColumnSelectName() : $column->getSlug()) }}')"
+                    wire:click="sortBy('{{ $column->getColumnSortKey() }}')"
+                    {{
+                        $attributes->merge($customSortButtonAttributes)
+                            ->class(['' => ($customSortButtonAttributes['default-styling'] ?? true || $customSortButtonAttributes['default'] ?? true)])
+                            ->except(['default', 'default-colors', 'default-styling', 'wire:key'])
+                    }}
                 >
-                    <span>{{ $column->getTitle() }}</span>
+                    <span {{ $customLabelAttributes->except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }}</span>
 
-                    <span class="relative d-flex align-items-center">
-                        @if ($direction === 'asc')
-                            <x-heroicon-o-chevron-up class="laravel-livewire-tables-btn-smaller ms-1 "  />
-                        @elseif ($direction === 'desc')
-                            <x-heroicon-o-chevron-down class="laravel-livewire-tables-btn-smaller ms-1"  />
-                        @else
-                            <x-heroicon-o-chevron-up-down class="laravel-livewire-tables-btn-smaller ms-1" />
-                        @endif
-                    </span>
+                    <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
diff --git a/resources/views/components/table/th/bulk-actions.blade.php b/resources/views/components/table/th/bulk-actions.blade.php
index b07a67f09..c5c6d3e6c 100644
--- a/resources/views/components/table/th/bulk-actions.blade.php
+++ b/resources/views/components/table/th/bulk-actions.blade.php
@@ -1,6 +1,7 @@
 @aware(['component', 'tableName'])
 @php
-    $customAttributes = $this->getBulkActionsThAttributes();
+    $customAttributes = $this->hasBulkActionsThAttributes ? $this->getBulkActionsThAttributes : $this->getAllThAttributes($this->getBulkActionsColumn())['customAttributes'];
+
     $bulkActionsThCheckboxAttributes = $this->getBulkActionsThCheckboxAttributes();
     $theme = $this->getTheme();
 @endphp
@@ -25,8 +26,7 @@
                     $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),
-                        'except' => 'default',
-                    ])
+                    ])->except(['default','default-styling','default-colors'])
                 }}
             />
         </div>
diff --git a/resources/views/components/table/th/plain.blade.php b/resources/views/components/table/th/plain.blade.php
index c8d36ad32..4f5837f34 100644
--- a/resources/views/components/table/th/plain.blade.php
+++ b/resources/views/components/table/th/plain.blade.php
@@ -4,8 +4,8 @@
 <th x-cloak {{ $attributes }} scope="col"
     {{ 
         $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'] ?? true),
-            'laravel-livewire-tables-reorderingMinimised' => ($isBootstrap) && ($customAttributes['default'] ?? true),
+            '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
diff --git a/resources/views/components/table/th/reorder.blade.php b/resources/views/components/table/th/reorder.blade.php
index b0dc73845..5ba02d959 100644
--- a/resources/views/components/table/th/reorder.blade.php
+++ b/resources/views/components/table/th/reorder.blade.php
@@ -1,10 +1,14 @@
 @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" {{ 
-        $attributes->merge($this->getReorderThAttributes())->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) && ($this->getReorderThAttributes['default'] ?? true),
-            'laravel-livewire-tables-reorderingMinimised' => ($isBootstrap) && ($this->getReorderThAttributes['default'] ?? true),
-        ])
+<x-livewire-tables::table.th.plain x-cloak x-show="currentlyReorderingStatus" wire:key="{{ $tableName }}-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)])
     }}
 >
     <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
new file mode 100644
index 000000000..b26b7d964
--- /dev/null
+++ b/resources/views/components/table/th/sort-icons.blade.php
@@ -0,0 +1,32 @@
+@props(['direction'])
+<span {{ $attributes->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
+            @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
+            @default
+                <x-heroicon-o-chevron-up class="w-3 h-3 opacity-0 group-hover:opacity-100 transition-opacity duration-300" />
+        @endswitch
+    @else
+        @switch($direction)
+            @case('asc')
+                <x-heroicon-o-chevron-up class="laravel-livewire-tables-btn-smaller ms-1 "  />
+                @break
+            @case('desc')
+                <x-heroicon-o-chevron-down class="laravel-livewire-tables-btn-smaller ms-1"  />
+            @break
+            @default
+                <x-heroicon-o-chevron-up-down class="laravel-livewire-tables-btn-smaller ms-1" />
+        @endswitch
+    @endif
+</span>
diff --git a/resources/views/components/table/tr.blade.php b/resources/views/components/table/tr.blade.php
index f043fbf8a..4a3f84ece 100644
--- a/resources/views/components/table/tr.blade.php
+++ b/resources/views/components/table/tr.blade.php
@@ -27,7 +27,7 @@
                 ->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))])
-                ->except(['default'])
+                ->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 5cd34cfef..d04879c87 100644
--- a/resources/views/components/table/tr/plain.blade.php
+++ b/resources/views/components/table/tr/plain.blade.php
@@ -6,7 +6,7 @@
             ->merge($customAttributes)
             ->class(['bg-white dark:bg-gray-700 dark:text-white' => $customAttributes['default'] ?? true])
             ->class(['laravel-livewire-tables-reorderingMinimised'])
-            ->except('default')
+            ->except(['default','default-styling','default-colors'])
         }}
     >
         {{ $slot }}
@@ -16,7 +16,7 @@
             ->merge($customAttributes)
             ->class(['' => $customAttributes['default'] ?? true])
             ->class(['laravel-livewire-tables-reorderingMinimised'])
-            ->except('default')
+            ->except(['default','default-styling','default-colors'])
         }}
     >
         {{ $slot }}
diff --git a/resources/views/components/tools/filter-label.blade.php b/resources/views/components/tools/filter-label.blade.php
index 6ac6196ae..6fc9022dc 100644
--- a/resources/views/components/tools/filter-label.blade.php
+++ b/resources/views/components/tools/filter-label.blade.php
@@ -2,20 +2,21 @@
 @props(['filter', 'filterLayout' => 'popover', 'tableName' => 'table', 'isTailwind' => false, 'isBootstrap' => false, 'isBootstrap4' => false, 'isBootstrap5' => false, 'for' => null])
 
 @php
-    $customLabelAttributes = $filter->getFilterLabelAttributes();
-@endphp
+    $filterLabelAttributes = $filter->getFilterLabelAttributes();
+    $customLabelAttributes = $filter->getLabelAttributes();
 
+@endphp
 @if($filter->hasCustomFilterLabel() && !$filter->hasCustomPosition())
     @include($filter->getCustomFilterLabel(),['filter' => $filter, 'filterLayout' => $filterLayout, 'tableName' => $tableName, 'isTailwind' => $isTailwind, 'isBootstrap' => $isBootstrap, 'isBootstrap4' => $isBootstrap4, 'isBootstrap5' => $isBootstrap5, 'customLabelAttributes' => $customLabelAttributes])
 @elseif(!$filter->hasCustomPosition())
     <label for="{{ $for ?? $tableName.'-filter-'.$filter->getKey() }}"
 
         {{
-            $attributes->merge($customLabelAttributes)
-                ->class(['block text-sm font-medium leading-5 text-gray-700 dark:text-white' => $isTailwind && ($customLabelAttributes['default'] ?? true)])
-                ->class(['d-block' => $isBootstrap && $filterLayout == 'slide-down' && ($customLabelAttributes['default'] ?? true)])
-                ->class(['mb-2' => $isBootstrap && $filterLayout == 'popover' && ($customLabelAttributes['default'] ?? true)])
-                ->except('default')
+            $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)])
+                ->except(['default', 'default-colors', 'default-styling'])
         }}
 
     >
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 faabdf825..a4282ce56 100644
--- a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
+++ b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
@@ -21,7 +21,7 @@
                     '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') 
+                ->except(['default','default-styling','default-colors']) 
             }}
             type="button"
             id="{{ $tableName }}-bulkActionsDropdown" 
@@ -60,7 +60,7 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
                             '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') 
+                        ->except(['default','default-styling','default-colors']) 
                     }}
                 >
                     <div class="py-1" role="menu" aria-orientation="vertical">
@@ -79,7 +79,7 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
                                         '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') 
+                                    ->except(['default','default-styling','default-colors']) 
                                 }}
                             >
                                 <span>{{ $title }}</span>
@@ -96,7 +96,7 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
                         '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') 
+                    ->except(['default','default-styling','default-colors']) 
                 }}
                 aria-labelledby="{{ $tableName }}-bulkActionsDropdown"
             >
@@ -113,7 +113,7 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
                                 ->class([
                                     'dropdown-item' => $this->isBootstrap && $this->getBulkActionsMenuItemAttributes['default-styling'] ?? true,
                                 ])
-                                ->except('default') 
+                                ->except(['default','default-styling','default-colors']) 
                         }}
                     >
                         {{ $title }}
diff --git a/resources/views/components/tools/toolbar/items/search-field.blade.php b/resources/views/components/tools/toolbar/items/search-field.blade.php
index 48c791e1e..755cbab29 100644
--- a/resources/views/components/tools/toolbar/items/search-field.blade.php
+++ b/resources/views/components/tools/toolbar/items/search-field.blade.php
@@ -12,11 +12,14 @@
             {{ 
                 $attributes->merge($this->getSearchFieldAttributes())
                 ->class([
-                    'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 dark:bg-gray-700 dark:text-white dark:border-gray-600 rounded-none rounded-l-md focus:ring-0 focus:border-gray-300' => $this->isTailwind && $this->hasSearch() && $this->getSearchFieldAttributes()['default'] ?? true,
-                    'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 dark:bg-gray-700 dark:text-white dark:border-gray-600 rounded-md focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50' => $this->isTailwind && !$this->hasSearch() && $this->getSearchFieldAttributes()['default'] ?? true,
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 rounded-none rounded-l-md focus:ring-0 focus:border-gray-300' => $this->isTailwind && $this->hasSearch() && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-styling'] ?? true),
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 rounded-md focus:ring focus:ring-opacity-50' => $this->isTailwind && !$this->hasSearch()  && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-styling'] ?? true),
+                    'border-gray-300 dark:bg-gray-700 dark:text-white dark:border-gray-600 focus:border-gray-300' => $this->isTailwind && $this->hasSearch()  && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-colors'] ?? true),
+                    'border-gray-300 dark:bg-gray-700 dark:text-white dark:border-gray-600 focus:border-indigo-300 focus:ring-indigo-200' => $this->isTailwind && !$this->hasSearch()  && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-colors'] ?? true),
+
                     'form-control' => $this->isBootstrap && $this->getSearchFieldAttributes()['default'] ?? true,
                 ])
-                ->except('default') 
+                ->except(['default','default-styling','default-colors']) 
             }}
 
         />
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index 594272a70..f534f7f49 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -39,7 +39,7 @@
             
             <x-slot name="thead">
                 @if($this->getCurrentlyReorderingStatus)
-                    <x-livewire-tables::table.th.reorder x-cloak x-show="currentlyReorderingStatus" />
+                    <x-livewire-tables::table.th.reorder x-cloak x-show="currentlyReorderingStatus"  />
                 @endif
                 @if($this->showBulkActionsSections)
                     <x-livewire-tables::table.th.bulk-actions :displayMinimisedOnReorder="true" />
diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php
index 84fe37120..cbd20ba96 100644
--- a/resources/views/includes/actions/button.blade.php
+++ b/resources/views/includes/actions/button.blade.php
@@ -3,7 +3,7 @@
             ->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])
-            ->except(['default-styling', 'default-colors'])
+            ->except(['default','default-styling','default-colors'])
         }} 
            @if($action->hasWireAction())
             {{ $action->getWireAction() }}="{{ $action->getWireActionParams() }}"
@@ -18,14 +18,14 @@
             <i {{ $action->getIconAttributes()
                     ->class(["ms-1 ". $action->getIcon() => $isBootstrap])
                     ->class(["ml-1 ". $action->getIcon() => $isTailwind])
-                    ->except('default-styling')
+                    ->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])
-                    ->except('default-styling')
+                    ->except(['default','default-styling','default-colors'])
                 }}
             ></i>
             <span>{{ $action->getLabel() }}</span>
diff --git a/src/Traits/Configuration/BulkActionsConfiguration.php b/src/Traits/Configuration/BulkActionsConfiguration.php
index 790cdaf53..b0c7e9ab3 100644
--- a/src/Traits/Configuration/BulkActionsConfiguration.php
+++ b/src/Traits/Configuration/BulkActionsConfiguration.php
@@ -111,46 +111,6 @@ public function setBulkActionDefaultConfirmationMessage(string $defaultConfirmat
         return $this;
     }
 
-    /**
-     * Used to set attributes for the <th> for Bulk Actions
-     */
-    public function setBulkActionsThAttributes(array $bulkActionsThAttributes): self
-    {
-        $this->bulkActionsThAttributes = [...$this->bulkActionsThAttributes, ...$bulkActionsThAttributes];
-
-        return $this;
-    }
-
-    /**
-     * Used to set attributes for the Bulk Actions Checkbox in the <th>
-     */
-    public function setBulkActionsThCheckboxAttributes(array $bulkActionsThCheckboxAttributes): self
-    {
-        $this->bulkActionsThCheckboxAttributes = [...$this->bulkActionsThCheckboxAttributes, ...$bulkActionsThCheckboxAttributes];
-
-        return $this;
-    }
-
-    /**
-     * Used to set attributes for the Bulk Actions TD in the Row
-     */
-    public function setBulkActionsTdAttributes(array $bulkActionsTdAttributes): self
-    {
-        $this->bulkActionsTdAttributes = [...$this->bulkActionsTdAttributes, ...$bulkActionsTdAttributes];
-
-        return $this;
-    }
-
-    /**
-     * Used to set attributes for the Bulk Actions Checkbox in the Row
-     */
-    public function setBulkActionsTdCheckboxAttributes(array $bulkActionsTdCheckboxAttributes): self
-    {
-        $this->bulkActionsTdCheckboxAttributes = [...$this->bulkActionsTdCheckboxAttributes, ...$bulkActionsTdCheckboxAttributes];
-
-        return $this;
-    }
-
     public function setShouldAlwaysHideBulkActionsDropdownOption(bool $status = false): self
     {
         $this->alwaysHideBulkActionsDropdownOption = $status;
@@ -214,27 +174,6 @@ public function setClearSelectedOnFilterDisabled(): self
         return $this;
     }
 
-    public function setBulkActionsButtonAttributes(array $bulkActionsButtonAttributes): self
-    {
-        $this->bulkActionsButtonAttributes = [...$this->bulkActionsButtonAttributes, ...$bulkActionsButtonAttributes];
-
-        return $this;
-    }
-
-    public function setBulkActionsMenuAttributes(array $bulkActionsMenuAttributes): self
-    {
-        $this->bulkActionsMenuAttributes = [...$this->bulkActionsMenuAttributes, ...$bulkActionsMenuAttributes];
-
-        return $this;
-    }
-
-    public function setBulkActionsMenuItemAttributes(array $bulkActionsMenuItemAttributes): self
-    {
-        $this->bulkActionsMenuItemAttributes = [...$this->bulkActionsMenuItemAttributes, ...$bulkActionsMenuItemAttributes];
-
-        return $this;
-    }
-
     public function setDelaySelectAllStatus(bool $status): self
     {
         $this->delaySelectAll = $status;
diff --git a/src/Traits/Configuration/SearchConfiguration.php b/src/Traits/Configuration/SearchConfiguration.php
index a5e06634a..c746ef609 100644
--- a/src/Traits/Configuration/SearchConfiguration.php
+++ b/src/Traits/Configuration/SearchConfiguration.php
@@ -156,7 +156,7 @@ public function setSearchPlaceholder(string $placeholder): self
 
     public function setSearchFieldAttributes(array $attributes = []): self
     {
-        $this->searchFieldAttributes = $attributes;
+        $this->setCustomAttributes('searchFieldAttributes', $attributes);
 
         return $this;
     }
diff --git a/src/Traits/Configuration/TableAttributeConfiguration.php b/src/Traits/Configuration/TableAttributeConfiguration.php
index c1bb681e9..2053d50d7 100644
--- a/src/Traits/Configuration/TableAttributeConfiguration.php
+++ b/src/Traits/Configuration/TableAttributeConfiguration.php
@@ -85,6 +85,16 @@ public function setThSortButtonAttributes(\Closure $callback): self
         return $this;
     }
 
+    /**
+     * Set a list of attributes to override on the th sort icon elements
+     */
+    public function setThSortIconAttributes(\Closure $callback): self
+    {
+        $this->thSortIconAttributesCallback = $callback;
+
+        return $this;
+    }
+
     /**
      * Set a list of attributes to override on the td elements
      */
diff --git a/src/Traits/Core/HasCustomAttributes.php b/src/Traits/Core/HasCustomAttributes.php
new file mode 100644
index 000000000..99afeb4c4
--- /dev/null
+++ b/src/Traits/Core/HasCustomAttributes.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core;
+
+use Illuminate\View\ComponentAttributeBag;
+
+trait HasCustomAttributes
+{
+    public function hasCustomAttributes(string $propertyName): bool
+    {
+        return property_exists($this, $propertyName) && isset($this->{$propertyName});
+    }
+
+    public function getCustomAttributes(string $propertyName, bool $default = false, bool $classicMode = true): array
+    {
+        if ($classicMode) {
+            if ($this->hasCustomAttributes($propertyName)) {
+                $vals = array_merge(['default' => $default, 'default-colors' => $default, 'default-styling' => $default], $this->{$propertyName});
+                ksort($vals);
+
+                return $vals;
+            }
+
+            return ['default' => $default, 'default-colors' => $default, 'default-styling' => $default];
+        } else {
+            if ($this->hasCustomAttributes($propertyName)) {
+                $vals = array_merge(['default-colors' => $default, 'default-styling' => $default], $this->{$propertyName});
+                ksort($vals);
+
+                return $vals;
+            }
+
+            return ['default-colors' => $default, 'default-styling' => $default];
+
+        }
+    }
+
+    public function getCustomAttributesBag(string $propertyName): ComponentAttributeBag
+    {
+        return new ComponentAttributeBag($this->getCustomAttributes($propertyName));
+    }
+
+    public function setCustomAttributes(string $propertyName, array $customAttributes): self
+    {
+        $this->{$propertyName} = $customAttributes;
+
+        return $this;
+    }
+}
diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index 8877bc69d..70ddd3eb5 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -2,6 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
+use Rappasoft\LaravelLivewireTables\Traits\Core\HasCustomAttributes;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasTheme;
 
 trait HasAllTraits
@@ -18,6 +19,7 @@ trait HasAllTraits
         WithSearch,
         WithPagination;
     use WithBulkActions,
+        HasCustomAttributes,
         WithCollapsingColumns,
         WithColumnSelect,
         WithConfigurableAreas,
diff --git a/src/Traits/Helpers/BulkActionsHelpers.php b/src/Traits/Helpers/BulkActionsHelpers.php
index efe9e69a4..d07e9fdc6 100644
--- a/src/Traits/Helpers/BulkActionsHelpers.php
+++ b/src/Traits/Helpers/BulkActionsHelpers.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
 
 use Livewire\Attributes\Computed;
+use Rappasoft\LaravelLivewireTables\Views\Column;
 
 trait BulkActionsHelpers
 {
@@ -183,46 +184,6 @@ public function getBulkActionDefaultConfirmationMessage(): string
         return isset($this->bulkActionConfirmDefaultMessage) ? $this->bulkActionConfirmDefaultMessage : __('Bulk Actions Confirm');
     }
 
-    /**
-     * Used to get attributes for the <th> for Bulk Actions
-     *
-     * @return array<mixed>
-     */
-    public function getBulkActionsThAttributes(): array
-    {
-        return $this->bulkActionsThAttributes ?? ['default' => true];
-    }
-
-    /**
-     * Used to get attributes for the Checkbox for Bulk Actions TH
-     *
-     * @return array<mixed>
-     */
-    public function getBulkActionsThCheckboxAttributes(): array
-    {
-        return $this->bulkActionsThCheckboxAttributes ?? ['default' => true];
-    }
-
-    /**
-     * Used to get attributes for the Bulk Actions TD
-     *
-     * @return array<mixed>
-     */
-    public function getBulkActionsTdAttributes(): array
-    {
-        return $this->bulkActionsTdAttributes ?? ['default' => true];
-    }
-
-    /**
-     * Used to get attributes for the Bulk Actions TD
-     *
-     * @return array<mixed>
-     */
-    public function getBulkActionsTdCheckboxAttributes(): array
-    {
-        return $this->bulkActionsTdCheckboxAttributes ?? ['default' => true];
-    }
-
     #[Computed]
     public function shouldAlwaysHideBulkActionsDropdownOption(): bool
     {
@@ -239,25 +200,6 @@ public function getClearSelectedOnFilter(): bool
         return $this->clearSelectedOnFilter ?? true;
     }
 
-    #[Computed]
-    public function getBulkActionsButtonAttributes(): array
-    {
-        return array_merge(['default-colors' => true, 'default-styling' => true], $this->bulkActionsButtonAttributes);
-
-    }
-
-    #[Computed]
-    public function getBulkActionsMenuAttributes(): array
-    {
-        return array_merge(['default-colors' => true, 'default-styling' => true], $this->bulkActionsMenuAttributes);
-    }
-
-    #[Computed]
-    public function getBulkActionsMenuItemAttributes(): array
-    {
-        return array_merge(['default-colors' => true, 'default-styling' => true], $this->bulkActionsMenuItemAttributes);
-    }
-
     public function getSelectedRows(): array
     {
         if ($this->getDelaySelectAllStatus() && $this->selectAllIsEnabled()) {
@@ -271,4 +213,9 @@ public function getDelaySelectAllStatus(): bool
     {
         return $this->delaySelectAll ?? false;
     }
+
+    public function getBulkActionsColumn(): Column
+    {
+        return Column::make('bulkactions')->label(fn () => null);
+    }
 }
diff --git a/src/Traits/Helpers/ReorderingHelpers.php b/src/Traits/Helpers/ReorderingHelpers.php
index 3dc694b0a..c6ad8bd9a 100644
--- a/src/Traits/Helpers/ReorderingHelpers.php
+++ b/src/Traits/Helpers/ReorderingHelpers.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
 
 use Livewire\Attributes\Computed;
+use Rappasoft\LaravelLivewireTables\Views\Column;
 
 trait ReorderingHelpers
 {
@@ -102,4 +103,15 @@ public function getReorderThAttributes(): array
     {
         return $this->reorderThAttributes ?? ['default' => true];
     }
+
+    #[Computed]
+    public function hasReorderThAttributes(): bool
+    {
+        return $this->getReorderThAttributes() != ['default' => true];
+    }
+
+    public function getReorderColumn(): Column
+    {
+        return Column::make('reorder')->label(fn () => null);
+    }
 }
diff --git a/src/Traits/Helpers/SearchHelpers.php b/src/Traits/Helpers/SearchHelpers.php
index 4cde87290..1547414a2 100644
--- a/src/Traits/Helpers/SearchHelpers.php
+++ b/src/Traits/Helpers/SearchHelpers.php
@@ -137,7 +137,7 @@ public function hasSearchPlaceholder(): bool
 
     public function getSearchFieldAttributes(): array
     {
-        return count($this->searchFieldAttributes) ? $this->searchFieldAttributes : ['default' => true];
+        return $this->getCustomAttributes('searchFieldAttributes');
     }
 
     public function shouldTrimSearchString(): bool
diff --git a/src/Traits/Helpers/TableAttributeHelpers.php b/src/Traits/Helpers/TableAttributeHelpers.php
index 4d82a5393..5c8125fa9 100644
--- a/src/Traits/Helpers/TableAttributeHelpers.php
+++ b/src/Traits/Helpers/TableAttributeHelpers.php
@@ -39,16 +39,58 @@ public function getTbodyAttributes(): array
         return count($this->tbodyAttributes) ? $this->tbodyAttributes : ['default' => true];
     }
 
+    /**
+     * Used in resources/views/components/table/th.blade.php
+     */
     #[Computed]
     public function getThAttributes(Column $column): array
     {
-        return isset($this->thAttributesCallback) ? call_user_func($this->thAttributesCallback, $column) : ['default' => true];
+
+        if (isset($this->thAttributesCallback)) {
+            return array_merge(['default' => false, 'default-colors' => false, 'default-styling' => false], call_user_func($this->thAttributesCallback, $column));
+        }
+
+        return ['default' => true, 'default-colors' => true, 'default-styling' => true];
     }
 
+    /**
+     * Used in resources/views/components/table/th.blade.php
+     */
     #[Computed]
     public function getThSortButtonAttributes(Column $column): array
     {
-        return isset($this->thSortButtonAttributesCallback) ? call_user_func($this->thSortButtonAttributesCallback, $column) : ['default' => true];
+        if (isset($this->thSortButtonAttributesCallback)) {
+            return array_merge(['default' => false, 'default-colors' => false, 'default-styling' => false], call_user_func($this->thSortButtonAttributesCallback, $column));
+        }
+
+        return ['default' => true, 'default-colors' => true, 'default-styling' => true];
+    }
+
+    /**
+     * Used in resources/views/components/table/th.blade.php
+     */
+    #[Computed]
+    public function getThSortIconAttributes(Column $column): array
+    {
+        if (isset($this->thSortIconAttributesCallback)) {
+            return array_merge(['default' => false, 'default-colors' => false, 'default-styling' => false], call_user_func($this->thSortIconAttributesCallback, $column));
+        }
+
+        return ['default' => true, 'default-colors' => true, 'default-styling' => true];
+    }
+
+    /**
+     * Used in resources/views/components/table/th.blade.php
+     */
+    #[Computed]
+    public function getAllThAttributes(Column $column): array
+    {
+        return [
+            'customAttributes' => $this->getThAttributes($column),
+            'labelAttributes' => $column->getLabelAttributesBag(),
+            'sortButtonAttributes' => $this->getThSortButtonAttributes($column),
+            'sortIconAttributes' => $this->getThSortIconAttributes($column),
+        ];
     }
 
     #[Computed]
diff --git a/src/Traits/Styling/Configuration/BulkActionStylingConfiguration.php b/src/Traits/Styling/Configuration/BulkActionStylingConfiguration.php
new file mode 100644
index 000000000..9c61f9eba
--- /dev/null
+++ b/src/Traits/Styling/Configuration/BulkActionStylingConfiguration.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
+
+trait BulkActionStylingConfiguration
+{
+    /**
+     * Used to set attributes for the Bulk Actions Menu Button
+     */
+    public function setBulkActionsButtonAttributes(array $bulkActionsButtonAttributes): self
+    {
+        $this->setCustomAttributes('bulkActionsButtonAttributes', $bulkActionsButtonAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the Bulk Actions Menu
+     */
+    public function setBulkActionsMenuAttributes(array $bulkActionsMenuAttributes): self
+    {
+        $this->setCustomAttributes('bulkActionsMenuAttributes', $bulkActionsMenuAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the Bulk Actions Menu Items
+     */
+    public function setBulkActionsMenuItemAttributes(array $bulkActionsMenuItemAttributes): self
+    {
+        $this->setCustomAttributes('bulkActionsMenuItemAttributes', $bulkActionsMenuItemAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the Bulk Actions TD in the Row
+     */
+    public function setBulkActionsTdAttributes(array $bulkActionsTdAttributes): self
+    {
+        $this->setCustomAttributes('bulkActionsTdAttributes', $bulkActionsTdAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the Bulk Actions Checkbox in the Row
+     */
+    public function setBulkActionsTdCheckboxAttributes(array $bulkActionsTdCheckboxAttributes): self
+    {
+        $this->setCustomAttributes('bulkActionsTdCheckboxAttributes', $bulkActionsTdCheckboxAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the <th> for Bulk Actions
+     */
+    public function setBulkActionsThAttributes(array $bulkActionsThAttributes): self
+    {
+        $this->setCustomAttributes('bulkActionsThAttributes', $bulkActionsThAttributes);
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the Bulk Actions Checkbox in the <th>
+     */
+    public function setBulkActionsThCheckboxAttributes(array $bulkActionsThCheckboxAttributes): self
+    {
+        $this->setCustomAttributes('bulkActionsThCheckboxAttributes', $bulkActionsThCheckboxAttributes);
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Styling/HasBulkActionsStyling.php b/src/Traits/Styling/HasBulkActionsStyling.php
new file mode 100644
index 000000000..c1f1b1aca
--- /dev/null
+++ b/src/Traits/Styling/HasBulkActionsStyling.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling;
+
+use Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration\BulkActionStylingConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers\BulkActionStylingHelpers;
+
+trait HasBulkActionsStyling
+{
+    use BulkActionStylingConfiguration,
+        BulkActionStylingHelpers;
+
+    protected array $bulkActionsCheckboxAttributes = [];
+
+    protected array $bulkActionsThAttributes = ['default' => true];
+
+    protected array $bulkActionsThCheckboxAttributes = ['default' => true];
+
+    protected array $bulkActionsTdAttributes = ['default' => true];
+
+    protected array $bulkActionsTdCheckboxAttributes = ['default' => true];
+
+    protected array $bulkActionsButtonAttributes = ['default-colors' => true, 'default-styling' => true];
+
+    protected array $bulkActionsMenuAttributes = ['default-colors' => true, 'default-styling' => true];
+
+    protected array $bulkActionsMenuItemAttributes = ['default-colors' => true, 'default-styling' => true];
+}
diff --git a/src/Traits/Styling/Helpers/BulkActionStylingHelpers.php b/src/Traits/Styling/Helpers/BulkActionStylingHelpers.php
new file mode 100644
index 000000000..6c100c345
--- /dev/null
+++ b/src/Traits/Styling/Helpers/BulkActionStylingHelpers.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers;
+
+use Livewire\Attributes\Computed;
+
+trait BulkActionStylingHelpers
+{
+    /**
+     * Used to get attributes for the Bulk Actions Button
+     *
+     * @return array<mixed>
+     */
+    #[Computed]
+    public function getBulkActionsButtonAttributes(): array
+    {
+        return $this->getCustomAttributes('bulkActionsButtonAttributes', true);
+
+    }
+
+    /**
+     * Used to get attributes for the Bulk Actions Menu (Dropdown)
+     *
+     * @return array<mixed>
+     */
+    #[Computed]
+    public function getBulkActionsMenuAttributes(): array
+    {
+        return $this->getCustomAttributes('bulkActionsMenuAttributes', true, false);
+
+    }
+
+    /**
+     * Used to get attributes for the items in the Bulk Actions Menu (Dropdown)
+     *
+     * @return array<mixed>
+     */
+    #[Computed]
+    public function getBulkActionsMenuItemAttributes(): array
+    {
+        return $this->getCustomAttributes('bulkActionsMenuItemAttributes', true, false);
+
+    }
+
+    /**
+     * Used to get attributes for the <th> for Bulk Actions
+     *
+     * @return array<mixed>
+     */
+    #[Computed]
+    public function getBulkActionsThAttributes(): array
+    {
+        return $this->getCustomAttributes('bulkActionsThAttributes');
+
+    }
+
+    /**
+     * Used to check if the Bulk Actions TH has any attributes (supports historic approach)
+     */
+    #[Computed]
+    public function hasBulkActionsThAttributes(): bool
+    {
+        return $this->getBulkActionsThAttributes() != ['default' => true, 'default-colors' => false, 'default-styling' => false];
+    }
+
+    /**
+     * Used to get attributes for the Checkbox for Bulk Actions TH
+     *
+     * @return array<mixed>
+     */
+    public function getBulkActionsThCheckboxAttributes(): array
+    {
+        return $this->getCustomAttributes('bulkActionsThCheckboxAttributes');
+    }
+
+    /**
+     * Used to get attributes for the Bulk Actions TD
+     *
+     * @return array<mixed>
+     */
+    public function getBulkActionsTdAttributes(): array
+    {
+        return $this->getCustomAttributes('bulkActionsTdAttributes');
+    }
+
+    /**
+     * Used to get attributes for the Bulk Actions TD
+     *
+     * @return array<mixed>
+     */
+    public function getBulkActionsTdCheckboxAttributes(): array
+    {
+        return $this->getCustomAttributes('bulkActionsTdCheckboxAttributes');
+
+    }
+}
diff --git a/src/Traits/WithBulkActions.php b/src/Traits/WithBulkActions.php
index c36b87bb4..17c4fdcea 100644
--- a/src/Traits/WithBulkActions.php
+++ b/src/Traits/WithBulkActions.php
@@ -4,11 +4,13 @@
 
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\BulkActionsConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\BulkActionsHelpers;
+use Rappasoft\LaravelLivewireTables\Traits\Styling\HasBulkActionsStyling;
 
 trait WithBulkActions
 {
     use BulkActionsConfiguration,
-        BulkActionsHelpers;
+        BulkActionsHelpers,
+        HasBulkActionsStyling;
 
     public bool $bulkActionsStatus = true;
 
@@ -27,28 +29,12 @@ trait WithBulkActions
 
     public ?string $bulkActionConfirmDefaultMessage;
 
-    protected array $bulkActionsCheckboxAttributes = [];
-
-    protected array $bulkActionsThAttributes = ['default' => true];
-
-    protected array $bulkActionsThCheckboxAttributes = ['default' => true];
-
-    protected array $bulkActionsTdAttributes = ['default' => true];
-
-    protected array $bulkActionsTdCheckboxAttributes = ['default' => true];
-
     protected bool $alwaysHideBulkActionsDropdownOption = false;
 
     protected bool $clearSelectedOnSearch = true;
 
     protected bool $clearSelectedOnFilter = true;
 
-    protected array $bulkActionsButtonAttributes = ['default-colors' => true, 'default-styling' => true];
-
-    protected array $bulkActionsMenuAttributes = ['default-colors' => true, 'default-styling' => true];
-
-    protected array $bulkActionsMenuItemAttributes = ['default-colors' => true, 'default-styling' => true];
-
     // Entangled in JS
     public bool $delaySelectAll = false;
 
diff --git a/src/Traits/WithTableAttributes.php b/src/Traits/WithTableAttributes.php
index f87edea61..a0ce12c44 100644
--- a/src/Traits/WithTableAttributes.php
+++ b/src/Traits/WithTableAttributes.php
@@ -26,6 +26,8 @@ trait WithTableAttributes
 
     protected ?\Closure $thSortButtonAttributesCallback;
 
+    protected ?\Closure $thSortIconAttributesCallback;
+
     protected ?\Closure $trAttributesCallback;
 
     protected ?\Closure $tdAttributesCallback;
diff --git a/src/Views/Traits/Columns/IsSortable.php b/src/Views/Traits/Columns/IsSortable.php
index b627ac334..5af058650 100644
--- a/src/Views/Traits/Columns/IsSortable.php
+++ b/src/Views/Traits/Columns/IsSortable.php
@@ -42,11 +42,19 @@ public function setSortingPillDirections(string $asc, string $desc): self
         return $this;
     }
 
+    /**
+     * Used internally
+     * Used in resources/views/components/table/th.blade.php
+     */
     public function getSortCallback(): ?callable
     {
         return $this->sortCallback;
     }
 
+    /**
+     * Used internally
+     * Used in resources/views/components/table/th.blade.php
+     */
     public function isSortable(): bool
     {
         return $this->hasField() && $this->sortable === true;
@@ -102,4 +110,12 @@ public function getSortingPillDirection(DataTableComponent $component, string $d
 
         return $direction === 'asc' ? $component->getDefaultSortingLabelAsc() : $component->getDefaultSortingLabelDesc();
     }
+
+    /**
+     * Used in resources/views/components/table/th.blade.php
+     */
+    public function getColumnSortKey(): string
+    {
+        return $this->isSortable() ? $this->getColumnSelectName() : $this->getSlug();
+    }
 }
diff --git a/src/Views/Traits/Core/HasLabelAttributes.php b/src/Views/Traits/Core/HasLabelAttributes.php
new file mode 100644
index 000000000..ba1ec4f9b
--- /dev/null
+++ b/src/Views/Traits/Core/HasLabelAttributes.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Core;
+
+use Illuminate\View\ComponentAttributeBag;
+use Rappasoft\LaravelLivewireTables\Traits\Core\HasCustomAttributes;
+
+trait HasLabelAttributes
+{
+    use HasCustomAttributes;
+
+    protected ?array $labelAttributesArray;
+
+    public function hasLabelAttributes(): bool
+    {
+        return $this->hasCustomAttributes('labelAttributesArray');
+    }
+
+    /**
+     * Used in resources/views/components/table/th.blade.php
+     */
+    public function getLabelAttributes(): array
+    {
+        return $this->getCustomAttributes('labelAttributesArray');
+    }
+
+    public function getLabelAttributesBag(): ComponentAttributeBag
+    {
+        return new ComponentAttributeBag($this->getLabelAttributes());
+    }
+
+    /**
+     * Set a list of attributes to override on the th label
+     */
+    public function setLabelAttributes(array $labelAttributes): self
+    {
+        $this->setCustomAttributes('labelAttributesArray', $labelAttributes);
+
+        return $this;
+    }
+}
diff --git a/src/Views/Traits/IsColumn.php b/src/Views/Traits/IsColumn.php
index 42bbfb5b4..4dc6e4eef 100644
--- a/src/Views/Traits/IsColumn.php
+++ b/src/Views/Traits/IsColumn.php
@@ -5,7 +5,7 @@
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\{HasVisibility, IsCollapsible, IsSearchable, IsSelectable, IsSortable};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\ColumnConfiguration;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasAttributes,HasFooter,HasSecondaryHeader,HasTheme,HasView};
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasAttributes,HasFooter,HasLabelAttributes,HasSecondaryHeader,HasTheme,HasView};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\{ColumnHelpers,RelationshipHelpers};
 
 trait IsColumn
@@ -19,6 +19,7 @@ trait IsColumn
         IsSortable,
         HasAttributes,
         HasFooter,
+        HasLabelAttributes,
         HasSecondaryHeader,
         HasTheme,
         HasView,
diff --git a/src/Views/Traits/IsFilter.php b/src/Views/Traits/IsFilter.php
index 13af1e3af..9896e8bd3 100644
--- a/src/Views/Traits/IsFilter.php
+++ b/src/Views/Traits/IsFilter.php
@@ -3,7 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Traits;
 
 use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\FilterConfiguration;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig,HasView};
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig,HasLabelAttributes,HasView};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasCustomPosition,HasVisibility};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\FilterHelpers;
 
@@ -13,6 +13,7 @@ trait IsFilter
         FilterHelpers,
         HasConfig,
         HasCustomPosition,
+        HasLabelAttributes,
         HasVisibility,
         HasView;
 
diff --git a/tests/Traits/Configuration/BulkActionsConfigurationTest.php b/tests/Traits/Configuration/BulkActionsConfigurationTest.php
index af9773618..de113419f 100644
--- a/tests/Traits/Configuration/BulkActionsConfigurationTest.php
+++ b/tests/Traits/Configuration/BulkActionsConfigurationTest.php
@@ -2,10 +2,25 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
 final class BulkActionsConfigurationTest extends TestCase
 {
+    public static function attributeStatusProvider(): array
+    {
+        return [
+            [false, false, false],
+            [true, false, false],
+            [true, true, false],
+            [true, true, true],
+            [true, false, true],
+            [false, true, false],
+            [false, true, true],
+            [false, false, true],
+        ];
+    }
+
     public function test_variables_are_correct_types(): void
     {
         $this->assertIsBool($this->basicTable->bulkActionsStatus);
@@ -142,107 +157,6 @@ public function test_can_set_bulk_action_default_confirmation_message(): void
 
     }
 
-    public function test_can_set_bulk_actions_td_attributes(): void
-    {
-        $this->assertSame(['default' => true], $this->basicTable->getBulkActionsTdAttributes());
-
-        $this->basicTable->setBulkActionsTdAttributes(['class' => 'bg-blue-500']);
-
-        $this->assertSame(['default' => true, 'class' => 'bg-blue-500'], $this->basicTable->getBulkActionsTdAttributes());
-
-        $this->basicTable->setBulkActionsTdAttributes(['class' => 'bg-blue-500', 'default' => false]);
-
-        $this->assertSame(['default' => false, 'class' => 'bg-blue-500'], $this->basicTable->getBulkActionsTdAttributes());
-    }
-
-    public function test_can_set_bulk_actions_td_checkbox_attributes(): void
-    {
-        $this->assertSame(['default' => true], $this->basicTable->getBulkActionsTdCheckboxAttributes());
-
-        $this->basicTable->setBulkActionsTdCheckboxAttributes(['class' => 'bg-gray-500']);
-
-        $this->assertSame(['default' => true, 'class' => 'bg-gray-500'], $this->basicTable->getBulkActionsTdCheckboxAttributes());
-
-        $this->basicTable->setBulkActionsTdCheckboxAttributes(['class' => 'bg-gray-500', 'default' => false]);
-
-        $this->assertSame(['default' => false, 'class' => 'bg-gray-500'], $this->basicTable->getBulkActionsTdCheckboxAttributes());
-    }
-
-    public function test_can_set_bulk_actions_th_attributes(): void
-    {
-        $this->assertSame(['default' => true], $this->basicTable->getBulkActionsThAttributes());
-
-        $this->basicTable->setBulkActionsThAttributes(['class' => 'bg-red-500']);
-
-        $this->assertSame(['default' => true, 'class' => 'bg-red-500'], $this->basicTable->getBulkActionsThAttributes());
-
-        $this->basicTable->setBulkActionsThAttributes(['class' => 'bg-red-500', 'default' => false]);
-
-        $this->assertSame(['default' => false, 'class' => 'bg-red-500'], $this->basicTable->getBulkActionsThAttributes());
-    }
-
-    public function test_can_set_bulk_actions_th_checkbox_attributes(): void
-    {
-        $this->assertSame(['default' => true], $this->basicTable->getBulkActionsThCheckboxAttributes());
-
-        $this->basicTable->setBulkActionsThCheckboxAttributes(['class' => 'bg-green-500']);
-
-        $this->assertSame(['default' => true, 'class' => 'bg-green-500'], $this->basicTable->getBulkActionsThCheckboxAttributes());
-
-        $this->basicTable->setBulkActionsThCheckboxAttributes(['class' => 'bg-green-500', 'default' => false]);
-
-        $this->assertSame(['default' => false, 'class' => 'bg-green-500'], $this->basicTable->getBulkActionsThCheckboxAttributes());
-    }
-
-    public function test_can_set_bulk_actions_button_attributes(): void
-    {
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsButtonAttributes());
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes());
-
-        $this->basicTable->setBulkActionsButtonAttributes(['default-colors' => false, 'class' => 'bg-green-500']);
-
-        $this->assertSame(['default-colors' => false, 'default-styling' => true, 'class' => 'bg-green-500'], $this->basicTable->getBulkActionsButtonAttributes());
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes());
-
-        $this->basicTable->setBulkActionsButtonAttributes(['class' => 'bg-green-500', 'default-colors' => false]);
-
-        $this->assertSame(['default-colors' => false, 'default-styling' => true, 'class' => 'bg-green-500'], $this->basicTable->getBulkActionsButtonAttributes());
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes());
-    }
-
-    public function test_can_set_bulk_actions_menu_attributes(): void
-    {
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes());
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsButtonAttributes());
-
-        $this->basicTable->setBulkActionsMenuAttributes(['class' => 'bg-blue-500']);
-
-        $this->assertSame(['default-colors' => true, 'default-styling' => true, 'class' => 'bg-blue-500'], $this->basicTable->getBulkActionsMenuAttributes());
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsButtonAttributes());
-
-        $this->basicTable->setBulkActionsMenuAttributes(['class' => 'bg-blue-500', 'default-colors' => false]);
-
-        $this->assertSame(['default-colors' => false, 'default-styling' => true, 'class' => 'bg-blue-500'], $this->basicTable->getBulkActionsMenuAttributes());
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsButtonAttributes());
-    }
-
-    public function test_can_set_bulk_actions_menu_item_attributes(): void
-    {
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes());
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuItemAttributes());
-
-        $this->basicTable->setBulkActionsMenuItemAttributes(['class' => 'bg-red-500']);
-
-        $this->assertSame(['default-colors' => true, 'default-styling' => true, 'class' => 'bg-red-500'], $this->basicTable->getBulkActionsMenuItemAttributes());
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes());
-
-        $this->basicTable->setBulkActionsMenuItemAttributes(['class' => 'bg-amber-500', 'default-colors' => false]);
-
-        $this->assertSame(['default-colors' => false, 'default-styling' => true, 'class' => 'bg-amber-500'], $this->basicTable->getBulkActionsMenuItemAttributes());
-        $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes());
-
-    }
-
     public function test_can_set_bulk_actions_delay_select_all_status(): void
     {
         $this->assertFalse($this->basicTable->getDelaySelectAllStatus());
diff --git a/tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php b/tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php
new file mode 100644
index 000000000..e93674466
--- /dev/null
+++ b/tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+
+use Illuminate\View\ComponentAttributeBag;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class BulkActionsStylingConfigurationTest extends TestCase
+{
+    public static function providesAttributeDataSet(): array
+    {
+        return [
+            'fff' => [false, false, false, 'bg-blue-500', 'bg-red-300'],
+            'tff' => [true, false, false, 'bg-red-500', 'bg-yellow-300'],
+            'ttf' => [true, true, false, 'bg-green-500', 'bg-gray-300'],
+            'ttt' => [true, true, true, 'bg-yellow-500', 'bg-green-300'],
+            'tft' => [true, false, true, 'bg-red-500', 'bg-blue-300'],
+            'ftf' => [false, true, false, 'bg-green-500', 'bg-amber-300'],
+            'ftt' => [false, true, true, 'bg-gray-500', 'bg-blue-300'],
+            'fff' => [false, false, true, 'bg-blue-500', 'bg-yellow-300'],
+        ];
+    }
+
+    public static function providesBulkActionMethodsToTest(): array
+    {
+        return [
+            'BulkActionsButtonAttributes',
+            'BulkActionsMenuAttributes',
+            'BulkActionsMenuItemAttributes',
+            'BulkActionsThAttributes',
+            'BulkActionsThCheckboxAttributes',
+            'BulkActionsTdAttributes',
+            'BulkActionsTdCheckboxAttributes',
+        ];
+    }
+
+    public static function mergesMethodsWithAttributes(array $methodsToTest, array $dataSetItems): array
+    {
+        $allItems = [];
+
+        foreach ($methodsToTest as $methodToTest) {
+            $lcFirst = lcfirst($methodToTest);
+            $getMethod = 'get'.$methodToTest;
+            $setMethod = 'set'.$methodToTest;
+            $lower = strtolower($methodToTest);
+
+            foreach ($dataSetItems as $index => $dataSetItem) {
+                $allItems[$lower.'_'.$index] = [$setMethod, $getMethod, $lcFirst, $dataSetItem[0], $dataSetItem[1],  $dataSetItem[2],  $dataSetItem[3],  $dataSetItem[4]];
+            }
+        }
+
+        return $allItems;
+    }
+
+    public static function bulkActionAttributesProvider(): array
+    {
+        $dataSetItems = self::providesAttributeDataSet();
+        $methodsToTest = self::providesBulkActionMethodsToTest();
+
+        return self::mergesMethodsWithAttributes($methodsToTest, $dataSetItems);
+
+    }
+
+    #[DataProvider('bulkActionAttributesProvider')]
+    public function test_can_set_bulk_actions_attributes_via_provider(string $setMethod, string $getMethod, string $propertyName, bool $default, bool $defaultColors, bool $defaultStyling, string $class1, string $class2): void
+    {
+        $this->basicTable->{$setMethod}([
+            'default' => $default,
+            'default-colors' => $defaultColors,
+            'class' => $class1,
+            'default-styling' => $defaultStyling,
+        ]);
+
+        $this->assertSame([
+            'class' => $class1,
+            'default' => $default,
+            'default-colors' => $defaultColors,
+            'default-styling' => $defaultStyling,
+        ], $this->basicTable->{$getMethod}());
+
+        $this->basicTable->{$setMethod}([
+            'default' => $default,
+            'class' => $class2,
+            'default-colors' => ! $defaultColors,
+            'default-styling' => $defaultStyling,
+        ]);
+
+        $this->assertSame([
+            'class' => $class2,
+            'default' => $default,
+            'default-colors' => ! $defaultColors,
+            'default-styling' => $defaultStyling,
+        ], $this->basicTable->{$getMethod}());
+    }
+
+    #[DataProvider('bulkActionAttributesProvider')]
+    public function test_can_get_bulk_actions_attributes_bag_via_provider(string $setMethod, string $getMethod, string $propertyName, bool $default, bool $defaultColors, bool $defaultStyling, string $class1, string $class2): void
+    {
+        $data = [
+            'class' => $class1,
+            'default' => $default,
+            'default-colors' => $defaultColors,
+            'default-styling' => $defaultStyling,
+        ];
+
+        $this->basicTable->{$setMethod}($data);
+
+        $this->assertSame($data, $this->basicTable->{$getMethod}());
+
+        $attributeBag = new ComponentAttributeBag($data);
+
+        $this->assertSame($attributeBag->getAttributes(), $this->basicTable->getCustomAttributesBag($propertyName)->getAttributes());
+    }
+
+    public function test_bulk_actions_td_attributes_returns_default_true_if_not_set(): void
+    {
+        $this->assertSame(['default' => true, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getBulkActionsTdAttributes());
+    }
+
+    public function test_bulk_actions_td_checkbox_attributes_returns_default_true_if_not_set(): void
+    {
+        $this->assertSame(['default' => true, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getBulkActionsTdCheckboxAttributes());
+    }
+
+    public function test_bulk_actions_th_attributes_returns_default_true_if_not_set(): void
+    {
+        $this->assertSame(['default' => true, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getBulkActionsThAttributes());
+    }
+
+    public function test_bulk_actions_th_checkbox_attributes_returns_default_true_if_not_set(): void
+    {
+        $this->assertSame(['default' => true, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getBulkActionsThCheckboxAttributes());
+    }
+}
diff --git a/tests/Traits/Configuration/ComponentConfigurationTest.php b/tests/Traits/Configuration/ComponentConfigurationTest.php
index 3892083a5..d853d09c1 100644
--- a/tests/Traits/Configuration/ComponentConfigurationTest.php
+++ b/tests/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, 'this' => 'that']);
-        $this->assertSame($this->basicTable->getThAttributes($this->basicTable->columns()[1]), ['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']);
     }
 
     public function test_can_set_th_sort_button_attributes(): void
@@ -87,8 +87,22 @@ public function test_can_set_th_sort_button_attributes(): void
             return ['default' => true, 'here' => 'there'];
         });
 
-        $this->assertSame($this->basicTable->getThSortButtonAttributes($this->basicTable->columns()[0]), ['default' => false, 'this' => 'that']);
-        $this->assertSame($this->basicTable->getThSortButtonAttributes($this->basicTable->columns()[1]), ['default' => true, 'here' => 'there']);
+        $this->assertSame($this->basicTable->getThSortButtonAttributes($this->basicTable->columns()[0]), ['default' => false, 'default-colors' => false, 'default-styling' => false,  'this' => 'that']);
+        $this->assertSame($this->basicTable->getThSortButtonAttributes($this->basicTable->columns()[1]), ['default' => true, 'default-colors' => false, 'default-styling' => false, 'here' => 'there']);
+    }
+
+    public function test_can_set_th_sort_icon_attributes(): void
+    {
+        $this->basicTable->setThSortIconAttributes(function (Column $column) {
+            if ($column->isField('id')) {
+                return ['default' => false, 'this' => 'that'];
+            }
+
+            return ['default' => true, 'here' => 'there'];
+        });
+
+        $this->assertSame($this->basicTable->getThSortIconAttributes($this->basicTable->columns()[0]), ['default' => false, 'default-colors' => false, 'default-styling' => false,  'this' => 'that']);
+        $this->assertSame($this->basicTable->getThSortIconAttributes($this->basicTable->columns()[1]), ['default' => true, 'default-colors' => false, 'default-styling' => false, 'here' => 'there']);
     }
 
     public function test_can_set_tr_attributes(): void
@@ -441,4 +455,13 @@ public function test_can_set_collapsing_column_button_expand_attributes(): void
         $this->assertSame(['default-styling' => true, 'default-colors' => true], $this->basicTable->getCollapsingColumnButtonCollapseAttributes());
 
     }
+
+    public function test_can_get_set_should_be_displayed(): void
+    {
+        $this->assertTrue($this->basicTable->getShouldBeDisplayed());
+        $this->basicTable->setShouldBeHidden();
+        $this->assertFalse($this->basicTable->getShouldBeDisplayed());
+        $this->basicTable->setShouldBeDisplayed();
+        $this->assertTrue($this->basicTable->getShouldBeDisplayed());
+    }
 }
diff --git a/tests/Traits/Configuration/SearchConfigurationTest.php b/tests/Traits/Configuration/SearchConfigurationTest.php
index b89461e15..caeaf19e5 100644
--- a/tests/Traits/Configuration/SearchConfigurationTest.php
+++ b/tests/Traits/Configuration/SearchConfigurationTest.php
@@ -180,11 +180,11 @@ public function test_can_set_search_placeholder(): void
 
     public function test_can_set_search_field_attributes(): void
     {
-        $this->assertSame(['default' => true], $this->basicTable->getSearchFieldAttributes());
+        $this->assertSame(['default' => false, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getSearchFieldAttributes());
 
         $this->basicTable->setSearchFieldAttributes(['class' => 'bg-blue', 'style' => 'font-size: 3em;']);
 
-        $this->assertSame(['class' => 'bg-blue', 'style' => 'font-size: 3em;'], $this->basicTable->getSearchFieldAttributes());
+        $this->assertSame(['class' => 'bg-blue', 'default' => false, 'default-colors' => false, 'default-styling' => false, 'style' => 'font-size: 3em;'], $this->basicTable->getSearchFieldAttributes());
 
     }
 }
diff --git a/tests/Traits/Core/CustomAttributesTest.php b/tests/Traits/Core/CustomAttributesTest.php
new file mode 100644
index 000000000..cfe3478eb
--- /dev/null
+++ b/tests/Traits/Core/CustomAttributesTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Core;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class CustomAttributesTest extends TestCase
+{
+    public function test_can_get_custom_attribute_defaults_false_standard_mode(): void
+    {
+        $mock = new class extends PetsTable
+        {
+            public ?array $testAttributesArray;
+
+            public function configure(): void
+            {
+                $this->setDataTableFingerprint('test');
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame([
+            'default' => false,
+            'default-colors' => false,
+            'default-styling' => false,
+        ], $mock->getCustomAttributes('testAttributesArray', false, true));
+    }
+
+    public function test_can_get_custom_attribute_defaults_false_classic_mode(): void
+    {
+        $mock = new class extends PetsTable
+        {
+            public ?array $testAttributesArray;
+
+            public function configure(): void
+            {
+                $this->setDataTableFingerprint('test');
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame([
+            'default-colors' => false,
+            'default-styling' => false,
+        ], $mock->getCustomAttributes('testAttributesArray', false, false));
+    }
+
+    public function test_can_get_custom_attribute_defaults_true_standard_mode(): void
+    {
+        $mock = new class extends PetsTable
+        {
+            public ?array $testAttributesArray;
+
+            public function configure(): void
+            {
+                $this->setDataTableFingerprint('test');
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame([
+            'default' => true,
+            'default-colors' => true,
+            'default-styling' => true,
+        ], $mock->getCustomAttributes('testAttributesArray', true, true));
+    }
+
+    public function test_can_get_custom_attribute_defaults_true_classic_mode(): void
+    {
+        $mock = new class extends PetsTable
+        {
+            public ?array $testAttributesArray;
+
+            public function configure(): void
+            {
+                $this->setDataTableFingerprint('test');
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame([
+            'default-colors' => true,
+            'default-styling' => true,
+        ], $mock->getCustomAttributes('testAttributesArray', true, false));
+    }
+}
diff --git a/tests/Traits/Helpers/BulkActionsHelpersTest.php b/tests/Traits/Helpers/BulkActionsHelpersTest.php
index 5506fcb4b..78283a5d9 100644
--- a/tests/Traits/Helpers/BulkActionsHelpersTest.php
+++ b/tests/Traits/Helpers/BulkActionsHelpersTest.php
@@ -188,26 +188,6 @@ public function test_can_get_bulk_action_default_confirmation_message(): void
         $this->assertSame('Are you sure?', $this->basicTable->getBulkActionDefaultConfirmationMessage());
     }
 
-    public function test_bulk_actions_td_attributes_returns_default_true_if_not_set(): void
-    {
-        $this->assertSame(['default' => true], $this->basicTable->getBulkActionsTdAttributes());
-    }
-
-    public function test_bulk_actions_td_checkbox_attributes_returns_default_true_if_not_set(): void
-    {
-        $this->assertSame(['default' => true], $this->basicTable->getBulkActionsTdCheckboxAttributes());
-    }
-
-    public function test_bulk_actions_th_attributes_returns_default_true_if_not_set(): void
-    {
-        $this->assertSame(['default' => true], $this->basicTable->getBulkActionsThAttributes());
-    }
-
-    public function test_bulk_actions_th_checkbox_attributes_returns_default_true_if_not_set(): void
-    {
-        $this->assertSame(['default' => true], $this->basicTable->getBulkActionsThCheckboxAttributes());
-    }
-
     public function test_select_clears_by_default(): void
     {
         $this->basicTable->setSelected([1, 2, 3, 4, 5]);
diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Traits/Helpers/ColumnHelpersTest.php
index a135ac86c..a295b721e 100644
--- a/tests/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Traits/Helpers/ColumnHelpersTest.php
@@ -342,4 +342,22 @@ public function test_can_check_if_column_label_should_be_shown(): void
         $this->assertTrue($column3->getColumnLabelStatus());
         $this->assertFalse($column2->getColumnLabelStatus());
     }
+
+    public function test_can_check_if_column_label_has_attributes(): void
+    {
+        $column = Column::make('ID', 'id');
+
+        $this->assertFalse($column->hasLabelAttributes());
+
+        $column->setLabelAttributes(['class' => 'text-xl']);
+
+        $this->assertTrue($column->hasLabelAttributes());
+
+        $this->assertSame(['class' => 'text-xl', 'default' => false, 'default-colors' => false, 'default-styling' => false], $column->getLabelAttributes());
+
+        $column->setLabelAttributes(['class' => 'text-xl', 'default' => true]);
+
+        $this->assertSame(['class' => 'text-xl', 'default' => true, 'default-colors' => false, 'default-styling' => false], $column->getLabelAttributes());
+
+    }
 }
diff --git a/tests/Traits/Visuals/BulkActionsVisualsTest.php b/tests/Traits/Visuals/BulkActionsVisualsTest.php
index 91f73c177..1e61b1940 100644
--- a/tests/Traits/Visuals/BulkActionsVisualsTest.php
+++ b/tests/Traits/Visuals/BulkActionsVisualsTest.php
@@ -189,4 +189,37 @@ public function exportBulk($items)
             }
         })->assertDontSee('Bulk Actions');
     }
+
+    public function test_bulk_dropdown_can_have_customised_classes(): 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="bg-yellow-500 dark:bg-yellow-800"',
+                'wire:key="table-thead-bulk-actions"',
+            ]);
+    }
 }
diff --git a/tests/Traits/Visuals/SortingVisualsTest.php b/tests/Traits/Visuals/SortingVisualsTest.php
index 6419f2643..c74999eb0 100644
--- a/tests/Traits/Visuals/SortingVisualsTest.php
+++ b/tests/Traits/Visuals/SortingVisualsTest.php
@@ -35,7 +35,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 text-gray-500 uppercase tracking-wider group focus:outline-none dark:text-gray-400"',
+                '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"',
             ]);
     }
 
@@ -45,8 +45,25 @@ public function test_th_headers_are_not_buttons_with_sorting_disabled(): void
             ->call('setSortingDisabled')
             ->assertDontSeeHtml('<button
                 wire:click="sortBy(\'id\')"
-                class="flex items-center space-x-1 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider group focus:outline-none dark:text-gray-400"
+                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"
             >');
+
+    }
+
+    public function test_th_headers_are_not_buttons_until_sorting_enabled(): void
+    {
+        Livewire::test(PetsTable::class)
+            ->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"
+            >')
+            ->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"',
+            ]);
+
     }
 
     public function test_th_headers_are_not_buttons_unless_the_column_is_sortable(): void

From a76ae7b1ca2429cae55d476a0e61fa6658d33a35 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 18 Sep 2024 01:41:09 +0100
Subject: [PATCH 050/103] Update docs - add Action setLabelAttributes method
 (#1952)

---
 docs/filters/available-methods.md               | 17 +++++++++++++++++
 docs/misc/actions.md                            | 16 ++++++++++++++++
 .../views/includes/actions/button.blade.php     |  6 +++---
 src/Views/Action.php                            |  3 ++-
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/docs/filters/available-methods.md b/docs/filters/available-methods.md
index f8845dbaf..359d2aba9 100644
--- a/docs/filters/available-methods.md
+++ b/docs/filters/available-methods.md
@@ -387,6 +387,8 @@ Example label blade:
 ```
 
 ### setFilterLabelAttributes
+
+#### Old Method (Still Supported)
 Set custom attributes for a Filter Label.  At present it is recommended to only use this for "class" and "style" attributes to avoid conflicts.
 
 By default, this replaces the default classes on the Filter Label wrapper, if you would like to keep them, set the default flag to true.
@@ -401,6 +403,21 @@ TextFilter::make('Name')
     ),
 ```
 
+#### New Method (Recommended)
+Set custom attributes for a Filter Label.  At present it is recommended to only use this for "class" and "style" attributes to avoid conflicts.
+
+By default, this replaces the default classes on the Filter Label wrapper, if you would like to keep them, set the default flag to true.
+
+```php
+TextFilter::make('Name')
+    ->setLabelAttributes(
+        [
+            'class' => 'text-xl', 
+            'default' => 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/docs/misc/actions.md b/docs/misc/actions.md
index 1030183d5..089b71139 100644
--- a/docs/misc/actions.md
+++ b/docs/misc/actions.md
@@ -92,6 +92,21 @@ public function actions(): array
 
 ## Button Available Methods
 
+### setLabelAttributes
+Set custom attributes for an Action Label.  At present it is recommended to only use this for "class" and "style" attributes to avoid conflicts.
+
+By default, this replaces the default classes on the Action Label, if you would like to keep them, set the default flag to true.
+
+```php
+Action::make('Dashboard')
+    ->setRoute('dashboard')
+    ->wireNavigate()
+    ->setLabelAttributes([
+        'class' => 'text-xl', 
+        'default' => true,
+    ]),
+```
+
 ### setActionAttributes
 
 setActionAttributes is used to pass any attributes that you wish to implement on the "button" element for the action button.  By default it will merge with the default classes. 
@@ -252,6 +267,7 @@ public function actions(): array
 }
 ```
 
+
 ## Extending
 
 You can extend the Base Action class which can be a useful timesaver, when you wish to re-use the same look/feel of an Action, but wish to set a different route (for example).
diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php
index cbd20ba96..71eaa50b8 100644
--- a/resources/views/includes/actions/button.blade.php
+++ b/resources/views/includes/actions/button.blade.php
@@ -14,7 +14,7 @@
         >
 
         @if($action->hasIcon() && $action->getIconRight())
-            <span>{{ $action->getLabel() }}</span>
+            <span {{ $action->getLabelAttributesBag() }}>{{ $action->getLabel() }}</span>
             <i {{ $action->getIconAttributes()
                     ->class(["ms-1 ". $action->getIcon() => $isBootstrap])
                     ->class(["ml-1 ". $action->getIcon() => $isTailwind])
@@ -28,8 +28,8 @@
                     ->except(['default','default-styling','default-colors'])
                 }}
             ></i>
-            <span>{{ $action->getLabel() }}</span>
+            <span {{ $action->getLabelAttributesBag() }}>{{ $action->getLabel() }}</span>
         @else
-            <span>{{ $action->getLabel() }}</span>
+            <span {{ $action->getLabelAttributesBag() }}>{{ $action->getLabel() }}</span>
         @endif
 </a>
\ No newline at end of file
diff --git a/src/Views/Action.php b/src/Views/Action.php
index 3c6570328..ee3d4640e 100644
--- a/src/Views/Action.php
+++ b/src/Views/Action.php
@@ -6,13 +6,14 @@
 use Illuminate\View\ComponentAttributeBag;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Actions\{HasActionAttributes, HasRoute};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\HasVisibility;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasIcon, HasLabel, HasTheme, HasView, HasWireActions};
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasIcon, HasLabel, HasLabelAttributes, HasTheme, HasView, HasWireActions};
 
 class Action extends Component
 {
     use HasActionAttributes;
     use HasIcon;
     use HasLabel;
+    use HasLabelAttributes;
     use HasRoute;
     use HasTheme;
     use HasView;

From 07e8dbce115e48413ccab2e2d6a7b8842225006b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 18 Sep 2024 01:52:26 +0100
Subject: [PATCH 051/103] Reset Page on "Per Page" changing (#1953)

---
 src/Traits/WithPagination.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Traits/WithPagination.php b/src/Traits/WithPagination.php
index 571c2b76c..c8c56a3c9 100644
--- a/src/Traits/WithPagination.php
+++ b/src/Traits/WithPagination.php
@@ -74,6 +74,8 @@ public function updatedPerPage(int|string $value): void
             session()->put($this->getPerPagePaginationSessionKey(), $this->getPerPageAccepted()[0] ?? 10);
         }
         $this->setPerPage($value);
+        $this->resetPage($this->getComputedPageName());
+
     }
 
     protected function queryStringWithPagination(): array

From 256b12d5fe90794537df1c83aec31946c0555be8 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 20 Sep 2024 08:45:15 +0100
Subject: [PATCH 052/103] Localisation - Avoid Conflicts With Other Packages
 (#1955)

* Merging Localisation Tweaks

* Fix styling

* Tweak localisations

* Fix styling

* Tweaks to sorting pill direction label

* Fix styling

* Fixes for Sorting Pill Labels

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .github/workflows/run-phpstan.yml             |  1 +
 .github/workflows/run-tests-pcov-pull.yml     |  3 -
 .github/workflows/run-tests-pull.yml          |  1 -
 docs/filters/available-methods.md             |  2 +-
 resources/lang/ar.json                        | 59 ++++++++---------
 resources/lang/ca.json                        | 59 ++++++++---------
 resources/lang/da.json                        | 59 ++++++++---------
 resources/lang/de.json                        | 59 ++++++++---------
 resources/lang/en.json                        | 65 ++++++++++---------
 resources/lang/es.json                        | 61 ++++++++---------
 resources/lang/fr.json                        | 59 ++++++++---------
 resources/lang/id.json                        | 59 ++++++++---------
 resources/lang/it.json                        | 59 ++++++++---------
 resources/lang/ms.json                        | 59 ++++++++---------
 resources/lang/nl.json                        | 63 +++++++++---------
 resources/lang/pl.json                        | 63 +++++++++---------
 resources/lang/pt.json                        | 60 ++++++++---------
 resources/lang/pt_BR.json                     | 60 +++++++++--------
 resources/lang/ru.json                        | 59 ++++++++---------
 resources/lang/th.json                        | 60 +++++++++--------
 resources/lang/tk.json                        | 59 ++++++++---------
 resources/lang/tr.json                        | 59 ++++++++---------
 resources/lang/tw.json                        | 61 ++++++++---------
 resources/lang/uk.json                        | 63 +++++++++---------
 .../views/components/pagination.blade.php     | 48 +++++++-------
 .../table/tr/bulk-actions.blade.php           | 32 ++++-----
 .../components/tools/filter-pills.blade.php   | 10 +--
 .../tools/filters/boolean.blade.php           |  2 +-
 .../tools/filters/multi-select.blade.php      |  4 +-
 .../components/tools/sorting-pills.blade.php  | 24 +++----
 .../toolbar/items/bulk-actions.blade.php      |  2 +-
 .../toolbar/items/column-select.blade.php     | 12 ++--
 .../toolbar/items/filter-button.blade.php     |  2 +-
 .../toolbar/items/filter-popover.blade.php    |  4 +-
 .../items/pagination-dropdown.blade.php       |  2 +-
 .../toolbar/items/reorder-buttons.blade.php   |  6 +-
 resources/views/includes/debug.blade.php      |  2 +-
 resources/views/includes/offline.blade.php    |  4 +-
 src/Traits/Helpers/BulkActionsHelpers.php     |  2 +-
 src/Traits/Helpers/SearchHelpers.php          |  2 +-
 src/Traits/Helpers/SortingHelpers.php         |  2 +
 src/Views/Filters/DateRangeFilter.php         |  2 +-
 src/Views/Filters/NumberRangeFilter.php       |  2 +-
 src/Views/Traits/Columns/IsSortable.php       | 32 +++++++--
 .../Configuration/SearchConfigurationTest.php |  2 +-
 .../Traits/Helpers/ColumnHelpersTest.php      | 10 +++
 46 files changed, 743 insertions(+), 677 deletions(-)

diff --git a/.github/workflows/run-phpstan.yml b/.github/workflows/run-phpstan.yml
index c286d1e80..3701660df 100644
--- a/.github/workflows/run-phpstan.yml
+++ b/.github/workflows/run-phpstan.yml
@@ -11,6 +11,7 @@ on:
       - '*/*'       # matches every branch containing a single '/'
       - '**'        # matches every branch
       - '!master'
+      - '!development'
 
 jobs:
   test:
diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
index 840cd8ee9..fffe0618f 100644
--- a/.github/workflows/run-tests-pcov-pull.yml
+++ b/.github/workflows/run-tests-pcov-pull.yml
@@ -3,12 +3,9 @@ name: run-tests-pcov-pull
 on:
   push:
     branches:
-      - 'develop'
       - 'development'
-      - 'master'
   pull_request:
     branches:
-      - 'develop'
       - 'development'
       - 'master'
 
diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
index 583d5d20f..80c625554 100644
--- a/.github/workflows/run-tests-pull.yml
+++ b/.github/workflows/run-tests-pull.yml
@@ -3,7 +3,6 @@ name: run-tests-pull
 on:
   pull_request:
     branches:
-      - 'develop'
       - 'development'
       - 'master'
 
diff --git a/docs/filters/available-methods.md b/docs/filters/available-methods.md
index 359d2aba9..7d284321b 100644
--- a/docs/filters/available-methods.md
+++ b/docs/filters/available-methods.md
@@ -339,7 +339,7 @@ Example blade:
         type="button"
         class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
     >
-        <span class="sr-only">@lang('Remove filter option')</span>
+        <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
         <svg class="h-2 w-2" stroke="currentColor" fill="none" viewBox="0 0 8 8">
             <path stroke-linecap="round" stroke-width="1.5" d="M1 1l6 6m0-6L1 7" />
         </svg>
diff --git a/resources/lang/ar.json b/resources/lang/ar.json
index bb39d9ab5..e255b7976 100644
--- a/resources/lang/ar.json
+++ b/resources/lang/ar.json
@@ -1,31 +1,32 @@
 {
-    "All": "الجميع",
-    "All Columns": "كافة الأعمدة",
-    "Applied Filters": "المرشحات التطبيقية",
-    "Applied Sorting": "الفرز التطبيقي",
-    "Bulk Actions": "إجراءات جملة",
-    "Clear": "واضح",
-    "Columns": "الأعمدة",
-    "Debugging Values": "قيم التصحيح",
-    "Deselect All": "الغاء تحديد الكل",
-    "Done Reordering": "تمت إعادة الترتيب",
-    "Filters": "المرشحات",
-    "No": "لا",
-    "No items found. Try to broaden your search.": "لم يتم العثور على العناصر. حاول توسيع نطاق البحث.",
-    "of": "ل",
-    "Remove filter option": "إزالة خيار التصفية",
-    "Remove sort option": "إزالة خيار الفرز",
-    "Reorder": "إعادة ترتيب",
-    "results": "نتائج",
-    "row": "صف",
-    "rows": "صفوف",
-    "rows, do you want to select all": "الصفوف ، هل تريد تحديد الكل",
-    "Search": "يبحث",
-    "Select All": "اختر الكل",
-    "Showing": "عرض",
-    "to": "ل",
-    "Yes": "نعم",
-    "You are currently selecting all": "أنت الآن تختار الكل",
-    "You are not connected to the internet.": "أنت غير متصل بالإنترنت.",
-    "You have selected": "قمت بتحديدها"
+    "livewire-tables::All": "الجميع",
+    "livewire-tables::All Columns": "كافة الأعمدة",
+    "livewire-tables::Applied Filters": "المرشحات التطبيقية",
+    "livewire-tables::Applied Sorting": "الفرز التطبيقي",
+    "livewire-tables::Bulk Actions": "إجراءات جملة",
+    "livewire-tables::Clear": "واضح",
+    "livewire-tables::Columns": "الأعمدة",
+    "livewire-tables::Debugging Values": "قيم التصحيح",
+    "livewire-tables::Deselect All": "الغاء تحديد الكل",
+    "livewire-tables::Done Reordering": "تمت إعادة الترتيب",
+    "livewire-tables::Filters": "المرشحات",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "لا",
+    "livewire-tables::No items found. Try to broaden your search.": "لم يتم العثور على العناصر. حاول توسيع نطاق البحث.",
+    "livewire-tables::of": "ل",
+    "livewire-tables::Remove filter option": "إزالة خيار التصفية",
+    "livewire-tables::Remove sort option": "إزالة خيار الفرز",
+    "livewire-tables::Reorder": "إعادة ترتيب",
+    "livewire-tables::results": "نتائج",
+    "livewire-tables::row": "صف",
+    "livewire-tables::rows": "صفوف",
+    "livewire-tables::rows, do you want to select all": "الصفوف ، هل تريد تحديد الكل",
+    "livewire-tables::Search": "يبحث",
+    "livewire-tables::Select All": "اختر الكل",
+    "livewire-tables::Showing": "عرض",
+    "livewire-tables::to": "ل",
+    "livewire-tables::Yes": "نعم",
+    "livewire-tables::You are currently selecting all": "أنت الآن تختار الكل",
+    "livewire-tables::You are not connected to the internet.": "أنت غير متصل بالإنترنت.",
+    "livewire-tables::You have selected": "قمت بتحديدها"
 }
\ No newline at end of file
diff --git a/resources/lang/ca.json b/resources/lang/ca.json
index 7e8eb6691..9187914fe 100644
--- a/resources/lang/ca.json
+++ b/resources/lang/ca.json
@@ -1,31 +1,32 @@
 {
-    "All": "Tot",
-    "All Columns": "Totes les columnes",
-    "Applied Filters": "Filtres Aplicats",
-    "Applied Sorting": "Ordenació Aplicada",
-    "Bulk Actions": "Accions Massives",
-    "Clear": "Esborra",
-    "Columns": "Columnes",
-    "Debugging Values": "Valors de depuració",
-    "Deselect All": "Deselecciona tot",
-    "Done Reordering": "Reordenació finalitzada",
-    "Filters": "Filtres",
-    "No": "No",
-    "No items found. Try to broaden your search.": "No s'han trobat elements. Intenti ampliar la cerca.",
-    "of": "de",
-    "Remove filter option": "Elimina opció de filtre",
-    "Remove sort option": "Elimina opció d'ordenació",
-    "Reorder": "Reordena",
-    "results": "resultats",
-    "row": "fila",
-    "rows": "files",
-    "rows, do you want to select all": "files, vol seleccionar totes",
-    "to": "a",
-    "Search": "Cerca",
-    "Select All": "Selecciona tot",
-    "Showing": "Mostrant",
-    "Yes": "Sí",
-    "You are currently selecting all": "Actualment està seleccionant tot",
-    "You are not connected to the internet.": "No està conectat a Internet.",
-    "You have selected": "Ha seleccionat"
+    "livewire-tables::All": "Tot",
+    "livewire-tables::All Columns": "Totes les columnes",
+    "livewire-tables::Applied Filters": "Filtres Aplicats",
+    "livewire-tables::Applied Sorting": "Ordenació Aplicada",
+    "livewire-tables::Bulk Actions": "Accions Massives",
+    "livewire-tables::Clear": "Esborra",
+    "livewire-tables::Columns": "Columnes",
+    "livewire-tables::Debugging Values": "Valors de depuració",
+    "livewire-tables::Deselect All": "Deselecciona tot",
+    "livewire-tables::Done Reordering": "Reordenació finalitzada",
+    "livewire-tables::Filters": "Filtres",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "No",
+    "livewire-tables::No items found. Try to broaden your search.": "No s'han trobat elements. Intenti ampliar la cerca.",
+    "livewire-tables::of": "de",
+    "livewire-tables::Remove filter option": "Elimina opció de filtre",
+    "livewire-tables::Remove sort option": "Elimina opció d'ordenació",
+    "livewire-tables::Reorder": "Reordena",
+    "livewire-tables::results": "resultats",
+    "livewire-tables::row": "fila",
+    "livewire-tables::rows": "files",
+    "livewire-tables::rows, do you want to select all": "files, vol seleccionar totes",
+    "livewire-tables::to": "a",
+    "livewire-tables::Search": "Cerca",
+    "livewire-tables::Select All": "Selecciona tot",
+    "livewire-tables::Showing": "Mostrant",
+    "livewire-tables::Yes": "Sí",
+    "livewire-tables::You are currently selecting all": "Actualment està seleccionant tot",
+    "livewire-tables::You are not connected to the internet.": "No està conectat a Internet.",
+    "livewire-tables::You have selected": "Ha seleccionat"
 }
\ No newline at end of file
diff --git a/resources/lang/da.json b/resources/lang/da.json
index e90e13ce2..9167043ff 100644
--- a/resources/lang/da.json
+++ b/resources/lang/da.json
@@ -1,31 +1,32 @@
 {
-    "All": "Alle",
-    "All Columns": "Alle kolonner",
-    "Applied Filters": "Anvendte filtre",
-    "Applied Sorting": "Anvendt sortering",
-    "Bulk Actions": "Massehandlinger",
-    "Clear": "Ryd",
-    "Columns": "Kolonner",
-    "Debugging Values": "Debugging-værdier",
-    "Deselect All": "Fravælg alle",
-    "Done Reordering": "Færdig med omorganisering",
-    "Filters": "Filtre",
-    "No": "Nej",
-    "No items found. Try to broaden your search.": "Ingen elementer fundet. Prøv at udvide din søgning.",
-    "of": "af",
-    "Remove filter option": "Fjern filtermulighed",
-    "Remove sort option": "Fjern sorteringsmulighed",
-    "Reorder": "Omorganisér",
-    "results": "resultater",
-    "row": "række",
-    "rows": "rækker",
-    "rows, do you want to select all": "rækker, vil du vælge alle",
-    "Search": "Søg",
-    "Select All": "Vælg alle",
-    "Showing": "Viser",
-    "to": "til",
-    "Yes": "Ja",
-    "You are currently selecting all": "Du vælger i øjeblikket alle",
-    "You are not connected to the internet.": "Du er ikke forbundet til internettet.",
-    "You have selected": "Du har valgt"
+    "livewire-tables::All": "Alle",
+    "livewire-tables::All Columns": "Alle kolonner",
+    "livewire-tables::Applied Filters": "Anvendte filtre",
+    "livewire-tables::Applied Sorting": "Anvendt sortering",
+    "livewire-tables::Bulk Actions": "Massehandlinger",
+    "livewire-tables::Clear": "Ryd",
+    "livewire-tables::Columns": "Kolonner",
+    "livewire-tables::Debugging Values": "Debugging-værdier",
+    "livewire-tables::Deselect All": "Fravælg alle",
+    "livewire-tables::Done Reordering": "Færdig med omorganisering",
+    "livewire-tables::Filters": "Filtre",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Nej",
+    "livewire-tables::No items found. Try to broaden your search.": "Ingen elementer fundet. Prøv at udvide din søgning.",
+    "livewire-tables::of": "af",
+    "livewire-tables::Remove filter option": "Fjern filtermulighed",
+    "livewire-tables::Remove sort option": "Fjern sorteringsmulighed",
+    "livewire-tables::Reorder": "Omorganisér",
+    "livewire-tables::results": "resultater",
+    "livewire-tables::row": "række",
+    "livewire-tables::rows": "rækker",
+    "livewire-tables::rows, do you want to select all": "rækker, vil du vælge alle",
+    "livewire-tables::Search": "Søg",
+    "livewire-tables::Select All": "Vælg alle",
+    "livewire-tables::Showing": "Viser",
+    "livewire-tables::to": "til",
+    "livewire-tables::Yes": "Ja",
+    "livewire-tables::You are currently selecting all": "Du vælger i øjeblikket alle",
+    "livewire-tables::You are not connected to the internet.": "Du er ikke forbundet til internettet.",
+    "livewire-tables::You have selected": "Du har valgt"
 }
diff --git a/resources/lang/de.json b/resources/lang/de.json
index cc49b1b2a..4855e7697 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -1,31 +1,32 @@
 {
-    "All": "Alle",
-    "All Columns": "Alle Spalten",
-    "Applied Filters": "Angewendete Filter",
-    "Applied Sorting": "Angewendete Sortierung",
-    "Bulk Actions": "Aktionen",
-    "Clear": "Zurücksetzen",
-    "Columns": "Spalten",
-    "Debugging Values": "Werte debuggen",
-    "Deselect All": "Alle abwählen",
-    "Done Reordering": "Sortieren abgeschlossen",
-    "Filters": "Filter",
-    "No": "Nein",
-    "No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern.",
-    "of": "von",
-    "Remove filter option": "Entferne Filterauswahl",
-    "Remove sort option": "Entferne Sortierauswahl",
-    "Reorder": "erneut Sortieren",
-    "results": "Ergebnisse",
-    "row": "Zeile",
-    "rows": "Zeilen",
-    "rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
-    "Search": "Suche",
-    "Select All": "Alle auswählen",
-    "Showing": "Anzeigen",
-    "to": "nach",
-    "Yes": "Ja",
-    "You are currently selecting all": "Es sind schon alle ausgewählt",
-    "You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.",
-    "You have selected": "Es sind ausgewählt"
+    "livewire-tables::All": "Alle",
+    "livewire-tables::All Columns": "Alle Spalten",
+    "livewire-tables::Applied Filters": "Angewendete Filter",
+    "livewire-tables::Applied Sorting": "Angewendete Sortierung",
+    "livewire-tables::Bulk Actions": "Aktionen",
+    "livewire-tables::Clear": "Zurücksetzen",
+    "livewire-tables::Columns": "Spalten",
+    "livewire-tables::Debugging Values": "Werte debuggen",
+    "livewire-tables::Deselect All": "Alle abwählen",
+    "livewire-tables::Done Reordering": "Sortieren abgeschlossen",
+    "livewire-tables::Filters": "Filter",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Nein",
+    "livewire-tables::No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern.",
+    "livewire-tables::of": "von",
+    "livewire-tables::Remove filter option": "Entferne Filterauswahl",
+    "livewire-tables::Remove sort option": "Entferne Sortierauswahl",
+    "livewire-tables::Reorder": "erneut Sortieren",
+    "livewire-tables::results": "Ergebnisse",
+    "livewire-tables::row": "Zeile",
+    "livewire-tables::rows": "Zeilen",
+    "livewire-tables::rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
+    "livewire-tables::Search": "Suche",
+    "livewire-tables::Select All": "Alle auswählen",
+    "livewire-tables::Showing": "Anzeigen",
+    "livewire-tables::to": "nach",
+    "livewire-tables::Yes": "Ja",
+    "livewire-tables::You are currently selecting all": "Es sind schon alle ausgewählt",
+    "livewire-tables::You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.",
+    "livewire-tables::You have selected": "Es sind ausgewählt"
 }
\ No newline at end of file
diff --git a/resources/lang/en.json b/resources/lang/en.json
index 87b34925e..8d657001b 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -1,33 +1,36 @@
 {
-    "All": "All",
-    "All Columns": "All Columns",
-    "Applied Filters": "Applied Filters",
-    "Applied Sorting": "Applied Sorting",
-    "Bulk Actions": "Bulk Actions",
-    "Bulk Actions Confirm": "Are you sure?",
-    "Clear": "Clear",
-    "Columns": "Columns",
-    "Debugging Values": "Debugging Values",
-    "Deselect All": "Deselect All",
-    "Done Reordering": "Done Reordering",
-    "Filters": "Filters",
-    "No": "No",
-    "No items found. Try to broaden your search.": "No items found. Try to broaden your search.",
-    "of": "of",
-    "Remove filter option": "Remove filter option",
-    "Remove sort option": "Remove sort option",
-    "Reorder": "Reorder",
-    "results": "results",
-    "row": "row",
-    "rows": "rows",
-    "rows, do you want to select all": "rows, do you want to select all",
-    "Search": "Search",
-    "Select All": "Select All",
-    "Select All On Page": "Select All On Page",
-    "Showing": "Showing",
-    "to": "to",
-    "Yes": "Yes",
-    "You are currently selecting all": "You are currently selecting all",
-    "You are not connected to the internet.": "You are not connected to the internet.",
-    "You have selected": "You have selected"
+    "livewire-tables::All": "All",
+    "livewire-tables::All Columns": "All Columns",
+    "livewire-tables::Applied Filters": "Applied Filters",
+    "livewire-tables::Applied Sorting": "Applied Sorting",
+    "livewire-tables::Bulk Actions": "Bulk Actions",
+    "livewire-tables::Bulk Actions Confirm": "Are you sure?",
+    "livewire-tables::Clear": "Clear",
+    "livewire-tables::Columns": "Columns",
+    "livewire-tables::Debugging Values": "Debugging Values",
+    "livewire-tables::Deselect All": "Deselect All",
+    "livewire-tables::Done Reordering": "Done Reordering",
+    "livewire-tables::Filters": "Filters",
+    "livewire-tables::max": "Max",
+    "livewire-tables::min": "Min",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "No",
+    "livewire-tables::No items found. Try to broaden your search.": "No items found. Try to broaden your search.",
+    "livewire-tables::of": "of",
+    "livewire-tables::Remove filter option": "Remove filter option",
+    "livewire-tables::Remove sort option": "Remove sort option",
+    "livewire-tables::Reorder": "Reorder",
+    "livewire-tables::results": "results",
+    "livewire-tables::row": "row",
+    "livewire-tables::rows": "rows",
+    "livewire-tables::rows, do you want to select all": "rows, do you want to select all",
+    "livewire-tables::Search": "Search",
+    "livewire-tables::Select All": "Select All",
+    "livewire-tables::Select All On Page": "Select All On Page",
+    "livewire-tables::Showing": "Showing",
+    "livewire-tables::to": "to",
+    "livewire-tables::Yes": "Yes",
+    "livewire-tables::You are currently selecting all": "You are currently selecting all",
+    "livewire-tables::You are not connected to the internet.": "You are not connected to the internet.",
+    "livewire-tables::You have selected": "You have selected"
 }
diff --git a/resources/lang/es.json b/resources/lang/es.json
index a337cb094..264a26dcb 100644
--- a/resources/lang/es.json
+++ b/resources/lang/es.json
@@ -1,32 +1,33 @@
 {
-    "All": "Todo",
-    "All Columns": "Todas las columnas",
-    "Applied Filters": "Filtros Aplicados",
-    "Applied Sorting": "Ordenamiento Aplicado",
-    "Bulk Actions": "Acciones Masivas",
-    "Clear": "Borrar",
-    "Columns": "Columnas",
-    "Debugging Values": "Valores de depuración",
-    "Deselect All": "Deseleccionar todo",
-    "Done Reordering": "Reordenación finalizada",
-    "Filters": "Filtros",
-    "No": "No",
-    "No items found. Try to broaden your search.": "No se encontraron elementos. Intente ampliar la búsqueda.",
-    "of": "de",
-    "Remove filter option": "Remover opción de filtro",
-    "Remove sort option": "Remover opción de ordenamineto",
-    "Reorder": "Reordenar",
-    "results": "resultados",
-    "row": "fila",
-    "rows": "filas",
-    "rows, do you want to select all": "filas, desea seleccionar todas",
-    "Search": "Buscar",
-    "Select All": "Seleccionar todo",
-    "Select All On Page": "Seleccionar todo en la página",
-    "Showing": "Mostrando",
-    "to": "a",
-    "Yes": "Sí",
-    "You are currently selecting all": "Actualmente está seleccionando todo",
-    "You are not connected to the internet.": "No está conectado a Internet.",
-    "You have selected": "Ha seleccionado"
+    "livewire-tables::All": "Todo",
+    "livewire-tables::All Columns": "Todas las columnas",
+    "livewire-tables::Applied Filters": "Filtros Aplicados",
+    "livewire-tables::Applied Sorting": "Ordenamiento Aplicado",
+    "livewire-tables::Bulk Actions": "Acciones Masivas",
+    "livewire-tables::Clear": "Borrar",
+    "livewire-tables::Columns": "Columnas",
+    "livewire-tables::Debugging Values": "Valores de depuración",
+    "livewire-tables::Deselect All": "Deseleccionar todo",
+    "livewire-tables::Done Reordering": "Reordenación finalizada",
+    "livewire-tables::Filters": "Filtros",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "No",
+    "livewire-tables::No items found. Try to broaden your search.": "No se encontraron elementos. Intente ampliar la búsqueda.",
+    "livewire-tables::of": "de",
+    "livewire-tables::Remove filter option": "Remover opción de filtro",
+    "livewire-tables::Remove sort option": "Remover opción de ordenamineto",
+    "livewire-tables::Reorder": "Reordenar",
+    "livewire-tables::results": "resultados",
+    "livewire-tables::row": "fila",
+    "livewire-tables::rows": "filas",
+    "livewire-tables::rows, do you want to select all": "filas, desea seleccionar todas",
+    "livewire-tables::Search": "Buscar",
+    "livewire-tables::Select All": "Seleccionar todo",
+    "livewire-tables::Select All On Page": "Seleccionar todo en la página",
+    "livewire-tables::Showing": "Mostrando",
+    "livewire-tables::to": "a",
+    "livewire-tables::Yes": "Sí",
+    "livewire-tables::You are currently selecting all": "Actualmente está seleccionando todo",
+    "livewire-tables::You are not connected to the internet.": "No está conectado a Internet.",
+    "livewire-tables::You have selected": "Ha seleccionado"
 }
\ No newline at end of file
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index b6f21093b..4cd16768e 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -1,31 +1,32 @@
 {
-    "All": "Tous",
-    "All Columns": "Toutes les colonnes",
-    "Applied Filters": "Filtres appliqués",
-    "Applied Sorting": "Tris appliqués",
-    "Bulk Actions": "Actions en masse",
-    "Clear": "Effacer",
-    "Columns": "Colonnes",
-    "Debugging Values": "Valeurs de débogage",
-    "Deselect All": "Tout désélectionner ",
-    "Done Reordering": "Réordonnancement terminé",
-    "Filters": "Filtres",
-    "No": "Non",
-    "No items found. Try to broaden your search.": "Aucun élément trouvé. Essayez d'élargir votre recherche.",
-    "of": "sur",
-    "Remove filter option": "Supprimer l'option de filtrage",
-    "Remove sort option": "Supprimer l'option de tri",
-    "Reorder": "Réordonner",
-    "results": "résultats",
-    "row": "ligne",
-    "rows": "lignes",
-    "rows, do you want to select all": "lignes, voulez-vous tout sélectionner ?",
-    "Search": "Rechercher",
-    "Select All": "Tout sélectionner",
-    "Showing": "Montrant",
-    "to": "à",
-    "Yes": "Oui",
-    "You are currently selecting all": "Vous êtes en train de sélectionner ",
-    "You are not connected to the internet.": "Vous n'êtes pas connecté à l'Internet.",
-    "You have selected": "Vous avez sélectionné"
+    "livewire-tables::All": "Tous",
+    "livewire-tables::All Columns": "Toutes les colonnes",
+    "livewire-tables::Applied Filters": "Filtres appliqués",
+    "livewire-tables::Applied Sorting": "Tris appliqués",
+    "livewire-tables::Bulk Actions": "Actions en masse",
+    "livewire-tables::Clear": "Effacer",
+    "livewire-tables::Columns": "Colonnes",
+    "livewire-tables::Debugging Values": "Valeurs de débogage",
+    "livewire-tables::Deselect All": "Tout désélectionner ",
+    "livewire-tables::Done Reordering": "Réordonnancement terminé",
+    "livewire-tables::Filters": "Filtres",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Non",
+    "livewire-tables::No items found. Try to broaden your search.": "Aucun élément trouvé. Essayez d'élargir votre recherche.",
+    "livewire-tables::of": "sur",
+    "livewire-tables::Remove filter option": "Supprimer l'option de filtrage",
+    "livewire-tables::Remove sort option": "Supprimer l'option de tri",
+    "livewire-tables::Reorder": "Réordonner",
+    "livewire-tables::results": "résultats",
+    "livewire-tables::row": "ligne",
+    "livewire-tables::rows": "lignes",
+    "livewire-tables::rows, do you want to select all": "lignes, voulez-vous tout sélectionner ?",
+    "livewire-tables::Search": "Rechercher",
+    "livewire-tables::Select All": "Tout sélectionner",
+    "livewire-tables::Showing": "Montrant",
+    "livewire-tables::to": "à",
+    "livewire-tables::Yes": "Oui",
+    "livewire-tables::You are currently selecting all": "Vous êtes en train de sélectionner ",
+    "livewire-tables::You are not connected to the internet.": "Vous n'êtes pas connecté à l'Internet.",
+    "livewire-tables::You have selected": "Vous avez sélectionné"
 }
\ No newline at end of file
diff --git a/resources/lang/id.json b/resources/lang/id.json
index 3ba72de81..64dfdb26d 100644
--- a/resources/lang/id.json
+++ b/resources/lang/id.json
@@ -1,31 +1,32 @@
 {
-    "All": "Semua",
-    "All Columns": "Semua Kolom",
-    "Applied Filters": "Filter Diterapkan",
-    "Applied Sorting": "Penyortiran Diterapkan",
-    "Bulk Actions": "Aksi",
-    "Clear": "Bersihkan",
-    "Columns": "Kolom",
-    "Debugging Values": "Nilai Debug",
-    "Deselect All": "Batalkan Semua Pilihan",
-    "Done Reordering": "Selesai Mengurutkan Ulang",
-    "Filters": "Filter",
-    "No": "Tidak",
-    "No items found. Try to broaden your search.": "Tidak ada data yang ditemukan. Cobalah untuk memperluas pencarian Anda.",
-    "of": "dari",
-    "Remove filter option": "Hapus opsi filter",
-    "Remove sort option": "Hapus opsi pengurutan",
-    "Reorder": "Urutkan ulang",
-    "results": "hasil",
-    "row": "baris",
-    "rows": "baris",
-    "rows, do you want to select all": "baris, apakah Anda ingin memilih semua?",
-    "Search": "Cari",
-    "Select All": "Pilih Semua",
-    "Showing": "Menampilkan",
-    "to": "ke",
-    "Yes": "Ya",
-    "You are currently selecting all": "Anda sedang memilih semua",
-    "You are not connected to the internet.": "Anda sedang tidak terhubung ke internet.",
-    "You have selected": "Anda telah memilih"
+    "livewire-tables::All": "Semua",
+    "livewire-tables::All Columns": "Semua Kolom",
+    "livewire-tables::Applied Filters": "Filter Diterapkan",
+    "livewire-tables::Applied Sorting": "Penyortiran Diterapkan",
+    "livewire-tables::Bulk Actions": "Aksi",
+    "livewire-tables::Clear": "Bersihkan",
+    "livewire-tables::Columns": "Kolom",
+    "livewire-tables::Debugging Values": "Nilai Debug",
+    "livewire-tables::Deselect All": "Batalkan Semua Pilihan",
+    "livewire-tables::Done Reordering": "Selesai Mengurutkan Ulang",
+    "livewire-tables::Filters": "Filter",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Tidak",
+    "livewire-tables::No items found. Try to broaden your search.": "Tidak ada data yang ditemukan. Cobalah untuk memperluas pencarian Anda.",
+    "livewire-tables::of": "dari",
+    "livewire-tables::Remove filter option": "Hapus opsi filter",
+    "livewire-tables::Remove sort option": "Hapus opsi pengurutan",
+    "livewire-tables::Reorder": "Urutkan ulang",
+    "livewire-tables::results": "hasil",
+    "livewire-tables::row": "baris",
+    "livewire-tables::rows": "baris",
+    "livewire-tables::rows, do you want to select all": "baris, apakah Anda ingin memilih semua?",
+    "livewire-tables::Search": "Cari",
+    "livewire-tables::Select All": "Pilih Semua",
+    "livewire-tables::Showing": "Menampilkan",
+    "livewire-tables::to": "ke",
+    "livewire-tables::Yes": "Ya",
+    "livewire-tables::You are currently selecting all": "Anda sedang memilih semua",
+    "livewire-tables::You are not connected to the internet.": "Anda sedang tidak terhubung ke internet.",
+    "livewire-tables::You have selected": "Anda telah memilih"
 }
\ No newline at end of file
diff --git a/resources/lang/it.json b/resources/lang/it.json
index 4cb15d436..4c798b43e 100644
--- a/resources/lang/it.json
+++ b/resources/lang/it.json
@@ -1,31 +1,32 @@
 {
-    "All": "Tutti",
-    "All Columns": "Tutte le colonne",
-    "Applied Filters": "Filtri Applicati",
-    "Applied Sorting": "Ordinamento Applicato",
-    "Bulk Actions": "Azioni di Gruppo",
-    "Clear": "Pulisci",
-    "Columns": "Colonne",
-    "Debugging Values": "Valori di debug",
-    "Deselect All": "Deseleziona tutto",
-    "Done Reordering": "Ordinamento Terminato",
-    "Filters": "Filtri",
-    "No": "No",
-    "No items found. Try to broaden your search.": "Nessun risultato trovato. Prova ad ampliare la tua ricerca.",
-    "of": "di",
-    "Remove filter option": "Rimuovi filtro",
-    "Remove sort option": "Rimuovi ordinamento",
-    "Reorder": "Riordina",
-    "results": "risultati",
-    "row": "righe",
-    "rows": "righe",
-    "rows, do you want to select all": "righe, vuoi selezionarle tutte",
-    "Search": "Cerca",
-    "Select All": "Seleziona Tutto",
-    "Showing": "Visualizzati",
-    "to": "a",
-    "Yes": "SÌ",
-    "You are currently selecting all": "Stai selezionando tutto",
-    "You are not connected to the internet.": "Non sei connesso a internet",
-    "You have selected": "Hai selezionato"
+    "livewire-tables::All": "Tutti",
+    "livewire-tables::All Columns": "Tutte le colonne",
+    "livewire-tables::Applied Filters": "Filtri Applicati",
+    "livewire-tables::Applied Sorting": "Ordinamento Applicato",
+    "livewire-tables::Bulk Actions": "Azioni di Gruppo",
+    "livewire-tables::Clear": "Pulisci",
+    "livewire-tables::Columns": "Colonne",
+    "livewire-tables::Debugging Values": "Valori di debug",
+    "livewire-tables::Deselect All": "Deseleziona tutto",
+    "livewire-tables::Done Reordering": "Ordinamento Terminato",
+    "livewire-tables::Filters": "Filtri",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "No",
+    "livewire-tables::No items found. Try to broaden your search.": "Nessun risultato trovato. Prova ad ampliare la tua ricerca.",
+    "livewire-tables::of": "di",
+    "livewire-tables::Remove filter option": "Rimuovi filtro",
+    "livewire-tables::Remove sort option": "Rimuovi ordinamento",
+    "livewire-tables::Reorder": "Riordina",
+    "livewire-tables::results": "risultati",
+    "livewire-tables::row": "righe",
+    "livewire-tables::rows": "righe",
+    "livewire-tables::rows, do you want to select all": "righe, vuoi selezionarle tutte",
+    "livewire-tables::Search": "Cerca",
+    "livewire-tables::Select All": "Seleziona Tutto",
+    "livewire-tables::Showing": "Visualizzati",
+    "livewire-tables::to": "a",
+    "livewire-tables::Yes": "SÌ",
+    "livewire-tables::You are currently selecting all": "Stai selezionando tutto",
+    "livewire-tables::You are not connected to the internet.": "Non sei connesso a internet",
+    "livewire-tables::You have selected": "Hai selezionato"
 }
\ No newline at end of file
diff --git a/resources/lang/ms.json b/resources/lang/ms.json
index ff04ae499..1127c2983 100644
--- a/resources/lang/ms.json
+++ b/resources/lang/ms.json
@@ -1,31 +1,32 @@
 {
-    "All": "Semua",
-    "All Columns": "Semua Lajur",
-    "Applied Filters": "Tapisan Digunakan",
-    "Applied Sorting": "Susunan Digunakan",
-    "Bulk Actions": "Tindakan Pukal",
-    "Clear": "Kosongkan",
-    "Columns": "Kolum",
-    "Debugging Values": "Menyahpepijat Nilai",
-    "Deselect All": "Nyahpilih semua",
-    "Done Reordering": "Selesai Menyusun Semula",
-    "Filters": "Tapisan",
-    "No": "Tidak",
-    "No items found. Try to broaden your search.": "Tiada data ditemui. Sila perluaskan carian anda",
-    "of": "daripada",
-    "Remove filter option": "Keluarkan pilihan tapisan",
-    "Remove sort option": "Keluarkan pilihan sususan",
-    "Reorder": "menyusun semula",
-    "results": "keputusan",
-    "row": "barisan",
-    "rows": "barisan",
-    "rows, do you want to select all": "barisan, adakah anda mahu pilih semua?",
-    "Search": "Carian",
-    "Select All": "Pilih Semua",
-    "Showing": "Menunjukkan",
-    "to": "ke",
-    "Yes": "ya",
-    "You are currently selecting all": "Anda sedang memilih semua",
-    "You are not connected to the internet.": "Anda tidak disambungkan ke internet.",
-    "You have selected": "Anda telah memilih"
+    "livewire-tables::All": "Semua",
+    "livewire-tables::All Columns": "Semua Lajur",
+    "livewire-tables::Applied Filters": "Tapisan Digunakan",
+    "livewire-tables::Applied Sorting": "Susunan Digunakan",
+    "livewire-tables::Bulk Actions": "Tindakan Pukal",
+    "livewire-tables::Clear": "Kosongkan",
+    "livewire-tables::Columns": "Kolum",
+    "livewire-tables::Debugging Values": "Menyahpepijat Nilai",
+    "livewire-tables::Deselect All": "Nyahpilih semua",
+    "livewire-tables::Done Reordering": "Selesai Menyusun Semula",
+    "livewire-tables::Filters": "Tapisan",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Tidak",
+    "livewire-tables::No items found. Try to broaden your search.": "Tiada data ditemui. Sila perluaskan carian anda",
+    "livewire-tables::of": "daripada",
+    "livewire-tables::Remove filter option": "Keluarkan pilihan tapisan",
+    "livewire-tables::Remove sort option": "Keluarkan pilihan sususan",
+    "livewire-tables::Reorder": "menyusun semula",
+    "livewire-tables::results": "keputusan",
+    "livewire-tables::row": "barisan",
+    "livewire-tables::rows": "barisan",
+    "livewire-tables::rows, do you want to select all": "barisan, adakah anda mahu pilih semua?",
+    "livewire-tables::Search": "Carian",
+    "livewire-tables::Select All": "Pilih Semua",
+    "livewire-tables::Showing": "Menunjukkan",
+    "livewire-tables::to": "ke",
+    "livewire-tables::Yes": "ya",
+    "livewire-tables::You are currently selecting all": "Anda sedang memilih semua",
+    "livewire-tables::You are not connected to the internet.": "Anda tidak disambungkan ke internet.",
+    "livewire-tables::You have selected": "Anda telah memilih"
 }
\ No newline at end of file
diff --git a/resources/lang/nl.json b/resources/lang/nl.json
index e2f681d4d..7ffad019f 100644
--- a/resources/lang/nl.json
+++ b/resources/lang/nl.json
@@ -1,33 +1,34 @@
 {
-    "All": "Alle",
-    "All Columns": "Alle kolommen",
-    "Applied Filters": "Toegepaste filters",
-    "Applied Sorting": "Toegepaste sortering",
-    "Bulk Actions": "Bulkacties",
-    "Bulk Actions Confirm": "Weet u het zeker?",
-    "Clear": "Wissen",
-    "Columns": "Kolommen",
-    "Debugging Values": "Debugging waarden",
-    "Deselect All": "Alles deselecteren",
-    "Done Reordering": "Hersortering voltooid",
-    "Filters": "Filters",
-    "No": "Nee",
-    "No items found. Try to broaden your search.": "Er zijn geen items gevonden. Probeer uw zoekopdracht te verfijnen.",
-    "of": "van",
-    "Remove filter option": "Filteroptie verwijderen",
-    "Remove sort option": "Sorteeroptie verwijderen",
-    "Reorder": "Hersorteren",
-    "results": "resultaten",
-    "row": "rij",
-    "rows": "rijen",
-    "rows, do you want to select all": "rijen, wilt u alles selecteren",
-    "Search": "Zoeken",
-    "Select All": "Alles selecteren",
-    "Showing": "Toont",
-    "to": "tot",
-    "Yes": "Ja",
-    "You are currently selecting all": "Huidig heeft u alles geselecteerd",
-    "You are not connected to the internet.": "U bent niet verbonden met het internet.",
-    "You have selected": "U selecteerde",
-    "Select All On Page": "Alles op deze pagina selecteren"
+    "livewire-tables::All": "Alle",
+    "livewire-tables::All Columns": "Alle kolommen",
+    "livewire-tables::Applied Filters": "Toegepaste filters",
+    "livewire-tables::Applied Sorting": "Toegepaste sortering",
+    "livewire-tables::Bulk Actions": "Bulkacties",
+    "livewire-tables::Bulk Actions Confirm": "Weet u het zeker?",
+    "livewire-tables::Clear": "Wissen",
+    "livewire-tables::Columns": "Kolommen",
+    "livewire-tables::Debugging Values": "Debugging waarden",
+    "livewire-tables::Deselect All": "Alles deselecteren",
+    "livewire-tables::Done Reordering": "Hersortering voltooid",
+    "livewire-tables::Filters": "Filters",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Nee",
+    "livewire-tables::No items found. Try to broaden your search.": "Er zijn geen items gevonden. Probeer uw zoekopdracht te verfijnen.",
+    "livewire-tables::of": "van",
+    "livewire-tables::Remove filter option": "Filteroptie verwijderen",
+    "livewire-tables::Remove sort option": "Sorteeroptie verwijderen",
+    "livewire-tables::Reorder": "Hersorteren",
+    "livewire-tables::results": "resultaten",
+    "livewire-tables::row": "rij",
+    "livewire-tables::rows": "rijen",
+    "livewire-tables::rows, do you want to select all": "rijen, wilt u alles selecteren",
+    "livewire-tables::Search": "Zoeken",
+    "livewire-tables::Select All": "Alles selecteren",
+    "livewire-tables::Showing": "Toont",
+    "livewire-tables::to": "tot",
+    "livewire-tables::Yes": "Ja",
+    "livewire-tables::You are currently selecting all": "Huidig heeft u alles geselecteerd",
+    "livewire-tables::You are not connected to the internet.": "U bent niet verbonden met het internet.",
+    "livewire-tables::You have selected": "U selecteerde",
+    "livewire-tables::Select All On Page": "Alles op deze pagina selecteren"
 }
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
index 70e99e7f3..a8e8c3b5a 100644
--- a/resources/lang/pl.json
+++ b/resources/lang/pl.json
@@ -1,33 +1,34 @@
 {
-    "All": "Wszystko",
-    "All Columns": "Wszystkie kolumny",
-    "Applied Filters": "Użyte filtry",
-    "Applied Sorting": "Użyte sortowanie",
-    "Bulk Actions": "Akcje zbiorowe",
-    "Bulk Actions Confirm": "Czy zastosować ?",
-    "Clear": "Wyczyść",
-    "Columns": "Kolumny",
-    "Debugging Values": "Wartości debugowania",
-    "Deselect All": "Odznacz wszystko",
-    "Done Reordering": "Done Reordering",
-    "Filters": "Filtry",
-    "No": "Nie",
-    "No items found. Try to broaden your search.": "Brak rezultatów do wyświetlenia.",
-    "of": "z",
-    "Remove filter option": "Usuń opcję filtra",
-    "Remove sort option": "Usuń opcję sortowania",
-    "Reorder": "Zmień kolejność",
-    "results": "wyniki",
-    "row": "wiersz",
-    "rows": "wiersze",
-    "rows, do you want to select all": "czy chcesz zaznaczyć wszystkie wiersze",
-    "Search": "Szukaj",
-    "Select All": "Zaznacz wszystko",
-    "Select All On Page": "Zaznacz wszystko na stronie",
-    "Showing": "Pokazywanie",
-    "to": "do",
-    "Yes": "Tak",
-    "You are currently selecting all": "Aktualnie masz wszystko zaznaczone",
-    "You are not connected to the internet.": "Brak połączenia z internetem.",
-    "You have selected": "Masz wybrane"
+    "livewire-tables::All": "Wszystko",
+    "livewire-tables::All Columns": "Wszystkie kolumny",
+    "livewire-tables::Applied Filters": "Użyte filtry",
+    "livewire-tables::Applied Sorting": "Użyte sortowanie",
+    "livewire-tables::Bulk Actions": "Akcje zbiorowe",
+    "livewire-tables::Bulk Actions Confirm": "Czy zastosować ?",
+    "livewire-tables::Clear": "Wyczyść",
+    "livewire-tables::Columns": "Kolumny",
+    "livewire-tables::Debugging Values": "Wartości debugowania",
+    "livewire-tables::Deselect All": "Odznacz wszystko",
+    "livewire-tables::Done Reordering": "Done Reordering",
+    "livewire-tables::Filters": "Filtry",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Nie",
+    "livewire-tables::No items found. Try to broaden your search.": "Brak rezultatów do wyświetlenia.",
+    "livewire-tables::of": "z",
+    "livewire-tables::Remove filter option": "Usuń opcję filtra",
+    "livewire-tables::Remove sort option": "Usuń opcję sortowania",
+    "livewire-tables::Reorder": "Zmień kolejność",
+    "livewire-tables::results": "wyniki",
+    "livewire-tables::row": "wiersz",
+    "livewire-tables::rows": "wiersze",
+    "livewire-tables::rows, do you want to select all": "czy chcesz zaznaczyć wszystkie wiersze",
+    "livewire-tables::Search": "Szukaj",
+    "livewire-tables::Select All": "Zaznacz wszystko",
+    "livewire-tables::Select All On Page": "Zaznacz wszystko na stronie",
+    "livewire-tables::Showing": "Pokazywanie",
+    "livewire-tables::to": "do",
+    "livewire-tables::Yes": "Tak",
+    "livewire-tables::You are currently selecting all": "Aktualnie masz wszystko zaznaczone",
+    "livewire-tables::You are not connected to the internet.": "Brak połączenia z internetem.",
+    "livewire-tables::You have selected": "Masz wybrane"
 }
\ No newline at end of file
diff --git a/resources/lang/pt.json b/resources/lang/pt.json
index fd12aafbf..204e0dd76 100644
--- a/resources/lang/pt.json
+++ b/resources/lang/pt.json
@@ -1,31 +1,33 @@
 {
-    "All": "Tudo",
-    "All Columns": "Todas as colunas",
-    "Applied Filters": "Filtros Aplicados",
-    "Applied Sorting": "Ordenação Aplicada",
-    "Bulk Actions": "Ações Massivas",
-    "Clear": "Limpar",
-    "Columns": "Colunas",
-    "Debugging Values": "Valores de depuração",
-    "Deselect All": "Desmarcar Tudo",
-    "Done Reordering": "Ordeanação finalizada",
-    "Filters": "Filtros",
-    "No": "Não",
-    "No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
-    "of": "de",
-    "Remove filter option": "Remover opção de filtro",
-    "Remove sort option": "Remover opção de ordenação",
-    "Reorder": "Reordenar",
-    "results": "resultados",
-    "row": "linha",
-    "rows": "linhas",
-    "rows, do you want to select all": "linhas, pretende selecionar tudo",
-    "Search": "Pesquisar",
-    "Select All": "Seleccionar Tudo",
-    "Showing": "A mostrar",
-    "to": "a",
-    "Yes": "Sim",
-    "You are currently selecting all": "Atualmente está a selecionar tudo",
-    "You are not connected to the internet.": "Não está ligado à internet.",
-    "You have selected": "Selecionou"
+    "livewire-tables::All": "Tudo",
+    "livewire-tables::All Columns": "Todas as colunas",
+    "livewire-tables::Applied Filters": "Filtros Aplicados",
+    "livewire-tables::Applied Sorting": "Ordenação Aplicada",
+    "livewire-tables::Bulk Actions": "Ações Massivas",
+    "livewire-tables::Clear": "Limpar",
+    "livewire-tables::Columns": "Colunas",
+    "livewire-tables::Debugging Values": "Valores de depuração",
+    "livewire-tables::Deselect All": "Desmarcar Tudo",
+    "livewire-tables::Done Reordering": "Ordeanação finalizada",
+    "livewire-tables::Filters": "Filtros",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Não",
+    "livewire-tables::No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
+    "livewire-tables::of": "de",
+    "livewire-tables::Remove filter option": "Remover opção de filtro",
+    "livewire-tables::Remove sort option": "Remover opção de ordenação",
+    "livewire-tables::Reorder": "Reordenar",
+    "livewire-tables::results": "resultados",
+    "livewire-tables::row": "linha",
+    "livewire-tables::rows": "linhas",
+    "livewire-tables::rows, do you want to select all": "linhas, pretende selecionar tudo",
+    "livewire-tables::Search": "Pesquisar",
+    "livewire-tables::Select All": "Seleccionar Tudo",
+    "livewire-tables::Select All On Page": "Selecione tudo na página",
+    "livewire-tables::Showing": "A mostrar",
+    "livewire-tables::to": "a",
+    "livewire-tables::Yes": "Sim",
+    "livewire-tables::You are currently selecting all": "Atualmente está a selecionar tudo",
+    "livewire-tables::You are not connected to the internet.": "Não está ligado à internet.",
+    "livewire-tables::You have selected": "Selecionou"
 }
\ No newline at end of file
diff --git a/resources/lang/pt_BR.json b/resources/lang/pt_BR.json
index 9bf168d13..e906cea37 100644
--- a/resources/lang/pt_BR.json
+++ b/resources/lang/pt_BR.json
@@ -1,30 +1,34 @@
 {
-    "All": "Tudo",
-    "Applied Filters": "Filtros aplicados",
-    "Applied Sorting": "Ordenação aplicada",
-    "Bulk Actions": "Ações em massa",
-    "Clear": "Limpar",
-    "Columns": "Colunas",
-    "Debugging Values": "Valores de depuração",
-    "Deselect All": "Desmarcar Tudo",
-    "Done Reordering": "Ordenação finalizada",
-    "Filters": "Filtros",
-    "No": "Não",
-    "No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
-    "of": "de",
-    "Reorder": "Reordenar",
-    "results": "resultados",
-    "Remove filter option": "Remover opção de filtro",
-    "Remove sort option": "Remover opção de ordenação",
-    "row": "linha",
-    "rows": "linhas",
-    "rows, do you want to select all": "linhas, você deseja selecionar tudo?",
-    "Search": "Pesquisar",
-    "Select All": "Selecionar tudo",
-    "Showing": "Exibindo",
-    "to": "a",
-    "Yes": "Sim",
-    "You are currently selecting all": "Você selecionou tudo",
-    "You are not connected to the internet.": "Você não está conectado na internet.",
-    "You have selected": "Você selecionou"
+    "livewire-tables::All": "Tudo",
+    "livewire-tables::All Columns": "Todas as colunas",
+    "livewire-tables::Applied Filters": "Filtros aplicados",
+    "livewire-tables::Applied Sorting": "Ordenação aplicada",
+    "livewire-tables::Bulk Actions": "Ações em massa",
+    "livewire-tables::Bulk Actions Confirm": "Tem certeza",
+    "livewire-tables::Clear": "Limpar",
+    "livewire-tables::Columns": "Colunas",
+    "livewire-tables::Debugging Values": "Valores de depuração",
+    "livewire-tables::Deselect All": "Desmarcar Tudo",
+    "livewire-tables::Done Reordering": "Ordenação finalizada",
+    "livewire-tables::Filters": "Filtros",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Não",
+    "livewire-tables::No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
+    "livewire-tables::of": "de",
+    "livewire-tables::Reorder": "Reordenar",
+    "livewire-tables::results": "resultados",
+    "livewire-tables::Remove filter option": "Remover opção de filtro",
+    "livewire-tables::Remove sort option": "Remover opção de ordenação",
+    "livewire-tables::row": "linha",
+    "livewire-tables::rows": "linhas",
+    "livewire-tables::rows, do you want to select all": "linhas, você deseja selecionar tudo?",
+    "livewire-tables::Search": "Pesquisar",
+    "livewire-tables::Select All": "Selecionar tudo",
+    "livewire-tables::Select All On Page": "Selecione tudo na página",
+    "livewire-tables::Showing": "Exibindo",
+    "livewire-tables::to": "a",
+    "livewire-tables::Yes": "Sim",
+    "livewire-tables::You are currently selecting all": "Você selecionou tudo",
+    "livewire-tables::You are not connected to the internet.": "Você não está conectado na internet.",
+    "livewire-tables::You have selected": "Você selecionou"
 }
\ No newline at end of file
diff --git a/resources/lang/ru.json b/resources/lang/ru.json
index 7eb99d1f9..15460181c 100644
--- a/resources/lang/ru.json
+++ b/resources/lang/ru.json
@@ -1,31 +1,32 @@
 {
-    "All": "Все",
-    "All Columns": "Все столбцы",
-    "Applied Filters": "Примененные фильтры",
-    "Applied Sorting": "Примененная сортировка",
-    "Bulk Actions": "Массовые действия",
-    "Clear": "Очистить",
-    "Columns": "Столбцы",
-    "Debugging Values": "Отладочные значения",
-    "Deselect All": "Снять выделение",
-    "Done Reordering": "Сортировка выполнена",
-    "Filters": "Фильтры",
-    "No": "Нет",
-    "No items found. Try to broaden your search.": "Ничего не найдено. Попробуйте расширить поиск.",
-    "of": "из",
-    "Remove filter option": "Удалить фильтр",
-    "Remove sort option": "Удалить параметр сортировки",
-    "Reorder": "Переупорядочить",
-    "results": "результатов",
-    "row": "ряды",
-    "rows": "ряды",
-    "rows, do you want to select all": "ряды, вы хотите выбрать все",
-    "Search": "Поиск",
-    "Select All": "Выбрать все",
-    "Showing": "Показано с",
-    "to": "к",
-    "Yes": "Да",
-    "You are currently selecting all": "Вы выбираете все",
-    "You are not connected to the internet.": "Вы не подключены к Интернету",
-    "You have selected": "Вы выбрали"
+    "livewire-tables::All": "Все",
+    "livewire-tables::All Columns": "Все столбцы",
+    "livewire-tables::Applied Filters": "Примененные фильтры",
+    "livewire-tables::Applied Sorting": "Примененная сортировка",
+    "livewire-tables::Bulk Actions": "Массовые действия",
+    "livewire-tables::Clear": "Очистить",
+    "livewire-tables::Columns": "Столбцы",
+    "livewire-tables::Debugging Values": "Отладочные значения",
+    "livewire-tables::Deselect All": "Снять выделение",
+    "livewire-tables::Done Reordering": "Сортировка выполнена",
+    "livewire-tables::Filters": "Фильтры",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Нет",
+    "livewire-tables::No items found. Try to broaden your search.": "Ничего не найдено. Попробуйте расширить поиск.",
+    "livewire-tables::of": "из",
+    "livewire-tables::Remove filter option": "Удалить фильтр",
+    "livewire-tables::Remove sort option": "Удалить параметр сортировки",
+    "livewire-tables::Reorder": "Переупорядочить",
+    "livewire-tables::results": "результатов",
+    "livewire-tables::row": "ряды",
+    "livewire-tables::rows": "ряды",
+    "livewire-tables::rows, do you want to select all": "ряды, вы хотите выбрать все",
+    "livewire-tables::Search": "Поиск",
+    "livewire-tables::Select All": "Выбрать все",
+    "livewire-tables::Showing": "Показано с",
+    "livewire-tables::to": "к",
+    "livewire-tables::Yes": "Да",
+    "livewire-tables::You are currently selecting all": "Вы выбираете все",
+    "livewire-tables::You are not connected to the internet.": "Вы не подключены к Интернету",
+    "livewire-tables::You have selected": "Вы выбрали"
 }
\ No newline at end of file
diff --git a/resources/lang/th.json b/resources/lang/th.json
index 34904172c..56bc17f36 100644
--- a/resources/lang/th.json
+++ b/resources/lang/th.json
@@ -1,30 +1,34 @@
 {
-    "All": "ทั้งหมด",
-    "Applied Filters": "กรองข้อมูลตาม",
-    "Applied Sorting": "เรียงลำดับตาม",
-    "Bulk Actions": "เลือกการกระทำ",
-    "Clear": "ล้างทั้งหมด",
-    "Columns": "เลือกคอลัมน์",
-    "Debugging Values": "ค่าการดีบัก",
-    "Deselect All": "ไม่เลือกทั้งหมด",
-    "Done Reordering": "จัดลำดับแล้ว",
-    "Filters": "ตัวกรอง",
-    "No": "เลขที่",
-    "No items found. Try to broaden your search.": "ไม่พบรายการที่ค้นหา",
-    "of": "จาก",
-    "Remove filter option": "เอาตัวกรองออก",
-    "Remove sort option": "เอาการเรียงลำดับออก",
-    "Reorder": "จัดลำดับ",
-    "results": "รายการ",
-    "row": "รายการ",
-    "rows": "รายการ",
-    "rows, do you want to select all": "รายการ, คุณต้องการเลือกทั้งหมด",
-    "Search": "ค้นหา...",
-    "Select All": "เลือกทั้งหมด",
-    "Showing": "แสดง",
-    "to": "-",
-    "Yes": "ใช่",
-    "You are currently selecting all": "ขณะนี้คุณได้เลือกทุกรายการ",
-    "You are not connected to the internet.": "ขณะนี้คุณไม่ได้เชื่อมต่อกับอินเทอร์เน็ต",
-    "You have selected": "คุณเลือก"
+    "livewire-tables::All": "ทั้งหมด",
+    "livewire-tables::All Columns": "คอลัมน์ทั้งหมด",
+    "livewire-tables::Applied Filters": "กรองข้อมูลตาม",
+    "livewire-tables::Applied Sorting": "เรียงลำดับตาม",
+    "livewire-tables::Bulk Actions": "เลือกการกระทำ",
+    "livewire-tables::Bulk Actions Confirm": "คุณแน่ใจ?",
+    "livewire-tables::Clear": "ล้างทั้งหมด",
+    "livewire-tables::Columns": "เลือกคอลัมน์",
+    "livewire-tables::Debugging Values": "ค่าการดีบัก",
+    "livewire-tables::Deselect All": "ไม่เลือกทั้งหมด",
+    "livewire-tables::Done Reordering": "จัดลำดับแล้ว",
+    "livewire-tables::Filters": "ตัวกรอง",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "เลขที่",
+    "livewire-tables::No items found. Try to broaden your search.": "ไม่พบรายการที่ค้นหา",
+    "livewire-tables::of": "จาก",
+    "livewire-tables::Remove filter option": "เอาตัวกรองออก",
+    "livewire-tables::Remove sort option": "เอาการเรียงลำดับออก",
+    "livewire-tables::Reorder": "จัดลำดับ",
+    "livewire-tables::results": "รายการ",
+    "livewire-tables::row": "รายการ",
+    "livewire-tables::rows": "รายการ",
+    "livewire-tables::rows, do you want to select all": "รายการ, คุณต้องการเลือกทั้งหมด",
+    "livewire-tables::Search": "ค้นหา...",
+    "livewire-tables::Select All": "เลือกทั้งหมด",
+    "livewire-tables::Select All On Page": "เลือกทั้งหมดบนหน้า",
+    "livewire-tables::Showing": "แสดง",
+    "livewire-tables::to": "-",
+    "livewire-tables::Yes": "ใช่",
+    "livewire-tables::You are currently selecting all": "ขณะนี้คุณได้เลือกทุกรายการ",
+    "livewire-tables::You are not connected to the internet.": "ขณะนี้คุณไม่ได้เชื่อมต่อกับอินเทอร์เน็ต",
+    "livewire-tables::You have selected": "คุณเลือก"
 }
\ No newline at end of file
diff --git a/resources/lang/tk.json b/resources/lang/tk.json
index 78bb1460b..5c22ba779 100644
--- a/resources/lang/tk.json
+++ b/resources/lang/tk.json
@@ -1,31 +1,32 @@
 {
-    "All": "Hemmesi",
-    "All Columns": "Colhli sütünler",
-    "Applied Filters": "Ulanylýan Süzgüçler",
-    "Applied Sorting": "Ulanylýan Tertipleşdirme",
-    "Bulk Actions": "Köpçülikleýin Hereketler",
-    "Clear": "Arassala",
-    "Columns": "Sütünler",
-    "Debugging Values": "Gymmatlyklary düzetmek",
-    "Deselect All": "Hemmesini Aýyr",
-    "Done Reordering": "Täzeden Tertiplendi",
-    "Filters": "Süzgüçler",
-    "No": "Hayir",
-    "No items found. Try to broaden your search.": "Hiç zat tapylmady. Gözlegiňizi giňeltmäge synanyşyň.",
-    "of": "aralygy",
-    "Remove filter option": "Süzgüç görnüşini aýyryň",
-    "Remove sort option": "Tertiplemek görnüşini aýyryň",
-    "Reorder": "Tertibe salmak",
-    "results": "netijeler",
-    "row": "hatarlar",
-    "rows": "hatarlar",
-    "rows, do you want to select all": "hatarlar, hemmesini saýlamak isleýärsiňizmi?",
-    "Search": "Gözlemek",
-    "Select All": "Hepsini seç",
-    "Showing": "Görkezmek",
-    "to": "-",
-    "Yes": "Evet",
-    "You are currently selecting all": "Häzirki wagtda hemmesini saýlap alýarsyňyz",
-    "You are not connected to the internet.": "Siz internete birikmediksiňiz.",
-    "You have selected": "Saýladyňyz"
+    "livewire-tables::All": "Hemmesi",
+    "livewire-tables::All Columns": "Colhli sütünler",
+    "livewire-tables::Applied Filters": "Ulanylýan Süzgüçler",
+    "livewire-tables::Applied Sorting": "Ulanylýan Tertipleşdirme",
+    "livewire-tables::Bulk Actions": "Köpçülikleýin Hereketler",
+    "livewire-tables::Clear": "Arassala",
+    "livewire-tables::Columns": "Sütünler",
+    "livewire-tables::Debugging Values": "Gymmatlyklary düzetmek",
+    "livewire-tables::Deselect All": "Hemmesini Aýyr",
+    "livewire-tables::Done Reordering": "Täzeden Tertiplendi",
+    "livewire-tables::Filters": "Süzgüçler",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Hayir",
+    "livewire-tables::No items found. Try to broaden your search.": "Hiç zat tapylmady. Gözlegiňizi giňeltmäge synanyşyň.",
+    "livewire-tables::of": "aralygy",
+    "livewire-tables::Remove filter option": "Süzgüç görnüşini aýyryň",
+    "livewire-tables::Remove sort option": "Tertiplemek görnüşini aýyryň",
+    "livewire-tables::Reorder": "Tertibe salmak",
+    "livewire-tables::results": "netijeler",
+    "livewire-tables::row": "hatarlar",
+    "livewire-tables::rows": "hatarlar",
+    "livewire-tables::rows, do you want to select all": "hatarlar, hemmesini saýlamak isleýärsiňizmi?",
+    "livewire-tables::Search": "Gözlemek",
+    "livewire-tables::Select All": "Hepsini seç",
+    "livewire-tables::Showing": "Görkezmek",
+    "livewire-tables::to": "-",
+    "livewire-tables::Yes": "Evet",
+    "livewire-tables::You are currently selecting all": "Häzirki wagtda hemmesini saýlap alýarsyňyz",
+    "livewire-tables::You are not connected to the internet.": "Siz internete birikmediksiňiz.",
+    "livewire-tables::You have selected": "Saýladyňyz"
 }
\ No newline at end of file
diff --git a/resources/lang/tr.json b/resources/lang/tr.json
index a6c5c01f1..9b0dd4dff 100644
--- a/resources/lang/tr.json
+++ b/resources/lang/tr.json
@@ -1,31 +1,32 @@
 {
-    "All": "Tümü",
-    "All Columns": "Tüm Sütunlar",
-    "Applied Filters": "Aktif Filtreler",
-    "Applied Sorting": "Aktif Sıralamalar",
-    "Bulk Actions": "Toplu İşlemler",
-    "Clear": "Kaldır",
-    "Columns": "Kolonlar",
-    "Debugging Values": "Debug Değerleri",
-    "Deselect All": "Seçimleri kaldır",
-    "Done Reordering": "Sıralamayı Tamamla",
-    "Filters": "Filtreler",
-    "No": "HAYIR",
-    "No items found. Try to broaden your search.": "Kayıt bulunamadı.",
-    "of": " ",
-    "Remove filter option": "Filtre seçeneğini kaldır",
-    "Remove sort option": "Sıralama seçeneğini kaldır",
-    "Reorder": "Yeniden Sırala",
-    "results": "toplam sonuç",
-    "row": "satır",
-    "rows": "satır",
-    "rows, do you want to select all": "satır seçtiniz. Hepsini seçmek ister misiniz?",
-    "Search": "Ara",
-    "Select All": "Hepsini seç",
-    "Showing": "Gösterilen",
-    "to": " - ",
-    "Yes": "Evet",
-    "You are currently selecting all": "Hepsini seçtiniz.",
-    "You are not connected to the internet.": "İnternet bağlantınız kesildi.",
-    "You have selected": "Siz seçildiniz"
+    "livewire-tables::All": "Tümü",
+    "livewire-tables::All Columns": "Tüm Sütunlar",
+    "livewire-tables::Applied Filters": "Aktif Filtreler",
+    "livewire-tables::Applied Sorting": "Aktif Sıralamalar",
+    "livewire-tables::Bulk Actions": "Toplu İşlemler",
+    "livewire-tables::Clear": "Kaldır",
+    "livewire-tables::Columns": "Kolonlar",
+    "livewire-tables::Debugging Values": "Debug Değerleri",
+    "livewire-tables::Deselect All": "Seçimleri kaldır",
+    "livewire-tables::Done Reordering": "Sıralamayı Tamamla",
+    "livewire-tables::Filters": "Filtreler",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "HAYIR",
+    "livewire-tables::No items found. Try to broaden your search.": "Kayıt bulunamadı.",
+    "livewire-tables::of": " ",
+    "livewire-tables::Remove filter option": "Filtre seçeneğini kaldır",
+    "livewire-tables::Remove sort option": "Sıralama seçeneğini kaldır",
+    "livewire-tables::Reorder": "Yeniden Sırala",
+    "livewire-tables::results": "toplam sonuç",
+    "livewire-tables::row": "satır",
+    "livewire-tables::rows": "satır",
+    "livewire-tables::rows, do you want to select all": "satır seçtiniz. Hepsini seçmek ister misiniz?",
+    "livewire-tables::Search": "Ara",
+    "livewire-tables::Select All": "Hepsini seç",
+    "livewire-tables::Showing": "Gösterilen",
+    "livewire-tables::to": " - ",
+    "livewire-tables::Yes": "Evet",
+    "livewire-tables::You are currently selecting all": "Hepsini seçtiniz.",
+    "livewire-tables::You are not connected to the internet.": "İnternet bağlantınız kesildi.",
+    "livewire-tables::You have selected": "Siz seçildiniz"
 }
\ No newline at end of file
diff --git a/resources/lang/tw.json b/resources/lang/tw.json
index 6599bfdb7..990244a50 100644
--- a/resources/lang/tw.json
+++ b/resources/lang/tw.json
@@ -1,31 +1,34 @@
 {
-    "All": "全部",
-    "All Columns": "所有專欄",
-    "Applied Filters": "已套用的過濾規則",
-    "Applied Sorting": "已套用的搜尋規則",
-    "Bulk Actions": "批次操作",
-    "Clear": "清除",
-    "Columns": "欄位",
-    "Debugging Values": "調試值",
-    "Deselect All": "取消選擇",
-    "Done Reordering": "排序完成",
-    "Filters": "過濾規則",
-    "No": "不",
-    "No items found. Try to broaden your search.": "無資料呈現。請嘗試擴大搜尋範圍。",
-    "of": "筆資料，共",
-    "Reorder": "重新排序",
-    "Remove filter option": "移除過濾規則",
-    "Remove sort option": "移除排序規則",
-    "results": "筆資料",
-    "row": "筆資料",
-    "rows": "筆資料",
-    "rows, do you want to select all": "筆資料，您是否要全選",
-    "Search": "搜尋",
-    "Select All": "搜尋全部",
-    "Showing": "顯示",
-    "to": "至",
-    "Yes": "是的",
-    "You are currently selecting all": "您目前已選擇全部資料",
-    "You are not connected to the internet.": "目前為離線模式",
-    "You have selected": "您已選擇"
+    "livewire-tables::All": "全部",
+    "livewire-tables::All Columns": "所有專欄",
+    "livewire-tables::Applied Filters": "已套用的過濾規則",
+    "livewire-tables::Applied Sorting": "已套用的搜尋規則",
+    "livewire-tables::Bulk Actions": "批次操作",
+    "livewire-tables::Bulk Actions Confirm": "你確定嗎",
+    "livewire-tables::Clear": "清除",
+    "livewire-tables::Columns": "欄位",
+    "livewire-tables::Debugging Values": "調試值",
+    "livewire-tables::Deselect All": "取消選擇",
+    "livewire-tables::Done Reordering": "排序完成",
+    "livewire-tables::Filters": "過濾規則",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "不",
+    "livewire-tables::No items found. Try to broaden your search.": "無資料呈現。請嘗試擴大搜尋範圍。",
+    "livewire-tables::of": "筆資料，共",
+    "livewire-tables::Reorder": "重新排序",
+    "livewire-tables::Remove filter option": "移除過濾規則",
+    "livewire-tables::Remove sort option": "移除排序規則",
+    "livewire-tables::results": "筆資料",
+    "livewire-tables::row": "筆資料",
+    "livewire-tables::rows": "筆資料",
+    "livewire-tables::rows, do you want to select all": "筆資料，您是否要全選",
+    "livewire-tables::Search": "搜尋",
+    "livewire-tables::Select All": "搜尋全部",
+    "livewire-tables::Select All On Page": "选择页面上的所有内容",
+    "livewire-tables::Showing": "顯示",
+    "livewire-tables::to": "至",
+    "livewire-tables::Yes": "是的",
+    "livewire-tables::You are currently selecting all": "您目前已選擇全部資料",
+    "livewire-tables::You are not connected to the internet.": "目前為離線模式",
+    "livewire-tables::You have selected": "您已選擇"
 }
\ No newline at end of file
diff --git a/resources/lang/uk.json b/resources/lang/uk.json
index 778560124..4d662de72 100644
--- a/resources/lang/uk.json
+++ b/resources/lang/uk.json
@@ -1,32 +1,35 @@
 {
-    "All": "Всі",
-    "All Columns": "Усі стовпці",
-    "Applied Filters": "Застосовані фільтри",
-    "Applied Sorting": "Застосовані сортування",
-    "Bulk Actions": "Масові дії",
-    "Clear": "Очистити",
-    "Columns": "Колонки",
-    "Debugging Values": "Значення налагодження",
-    "Deselect All": "Зняти вибір із усіх",
-    "Done Reordering": "Сортування виконанно",
-    "Filters": "Фільтри",
-    "No": "Немає",
-    "No items found. Try to broaden your search.": "Немає елементів. Спробуйте розширити пошук.",
-    "of": "від",
-    "Remove filter option": "Видалити опцію фільтра",
-    "Remove sort option": "Видалити параметр сортування",
-    "Reorder": "Змінити порядок",
-    "results": "результатів",
-    "row": "рядки",
-    "rows": "рядки",
-    "rows, do you want to select all": "рядків, ви хочете вибрати всі",
-    "Search": "Пошук",
-    "Select All": "Вибрати все",
-    "Showing": "Показано",
-    "to": "до",
-    "Unselect All": "Прибрати вибір усіх",
-    "Yes": "Так",
-    "You are currently selecting all": "Наразі ви вибираєте всі",
-    "You are not connected to the internet.": "Ви не підключені до Інтернету.",
-    "You have selected": "Ви вибрали"
+    "livewire-tables::All": "Всі",
+    "livewire-tables::All Columns": "Усі стовпці",
+    "livewire-tables::Applied Filters": "Застосовані фільтри",
+    "livewire-tables::Applied Sorting": "Застосовані сортування",
+    "livewire-tables::Bulk Actions": "Масові дії",
+    "livewire-tables::Bulk Actions Confirm": "Vy vpevneni?",
+    "livewire-tables::Clear": "Очистити",
+    "livewire-tables::Columns": "Колонки",
+    "livewire-tables::Debugging Values": "Значення налагодження",
+    "livewire-tables::Deselect All": "Зняти вибір із усіх",
+    "livewire-tables::Done Reordering": "Сортування виконанно",
+    "livewire-tables::Filters": "Фільтри",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Немає",
+    "livewire-tables::No items found. Try to broaden your search.": "Немає елементів. Спробуйте розширити пошук.",
+    "livewire-tables::of": "від",
+    "livewire-tables::Remove filter option": "Видалити опцію фільтра",
+    "livewire-tables::Remove sort option": "Видалити параметр сортування",
+    "livewire-tables::Reorder": "Змінити порядок",
+    "livewire-tables::results": "результатів",
+    "livewire-tables::row": "рядки",
+    "livewire-tables::rows": "рядки",
+    "livewire-tables::rows, do you want to select all": "рядків, ви хочете вибрати всі",
+    "livewire-tables::Search": "Пошук",
+    "livewire-tables::Select All": "Вибрати все",
+    "livewire-tables::Select All On Page": "Виберіть «Усі на сторінці",
+    "livewire-tables::Showing": "Показано",
+    "livewire-tables::to": "до",
+    "livewire-tables::Unselect All": "Прибрати вибір усіх",
+    "livewire-tables::Yes": "Так",
+    "livewire-tables::You are currently selecting all": "Наразі ви вибираєте всі",
+    "livewire-tables::You are not connected to the internet.": "Ви не підключені до Інтернету.",
+    "livewire-tables::You have selected": "Ви вибрали"
 }
\ No newline at end of file
diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php
index 846da2e06..b69ca77ff 100644
--- a/resources/views/components/pagination.blade.php
+++ b/resources/views/components/pagination.blade.php
@@ -12,30 +12,30 @@
                     @if ($this->paginationIsEnabled() && $this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
                         <p class="paged-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
                             @if($this->showPaginationDetails())
-                                <span>@lang('Showing')</span>
+                                <span>@lang('livewire-tables::Showing')</span>
                                 <span class="font-medium">{{ $this->getRows->firstItem() }}</span>
-                                <span>@lang('to')</span>
+                                <span>@lang('livewire-tables::to')</span>
                                 <span class="font-medium">{{ $this->getRows->lastItem() }}</span>
-                                <span>@lang('of')</span>
+                                <span>@lang('livewire-tables::of')</span>
                                 <span class="font-medium"><span x-text="paginationTotalItemCount"></span></span>
-                                <span>@lang('results')</span>
+                                <span>@lang('livewire-tables::results')</span>
                             @endif
                         </p>
                     @elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('simple'))
                         <p class="paged-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
                             @if($this->showPaginationDetails())
-                                <span>@lang('Showing')</span>
+                                <span>@lang('livewire-tables::Showing')</span>
                                 <span class="font-medium">{{ $this->getRows->firstItem() }}</span>
-                                <span>@lang('to')</span>
+                                <span>@lang('livewire-tables::to')</span>
                                 <span class="font-medium">{{ $this->getRows->lastItem() }}</span>
                             @endif
                         </p>
                     @elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('cursor'))
                     @else
                         <p class="total-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
-                            @lang('Showing')
+                            @lang('livewire-tables::Showing')
                             <span class="font-medium">{{ $this->getRows->count() }}</span>
-                            @lang('results')
+                            @lang('livewire-tables::results')
                         </p>
                     @endif
                 </div>
@@ -57,13 +57,13 @@
 
                     <div class="col-12 col-md-6 text-center text-md-right text-muted">
                         @if($this->showPaginationDetails())
-                            <span>@lang('Showing')</span>
+                            <span>@lang('livewire-tables::Showing')</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
-                            <span>@lang('to')</span>
+                            <span>@lang('livewire-tables::to')</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
-                            <span>@lang('of')</span>
+                            <span>@lang('livewire-tables::of')</span>
                             <strong><span x-text="paginationTotalItemCount"></span></strong>
-                            <span>@lang('results')</span>
+                            <span>@lang('livewire-tables::results')</span>
                         @endif
                     </div>
                 </div>
@@ -75,9 +75,9 @@
 
                     <div class="col-12 col-md-6 text-center text-md-right text-muted">
                         @if($this->showPaginationDetails())
-                            <span>@lang('Showing')</span>
+                            <span>@lang('livewire-tables::Showing')</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
-                            <span>@lang('to')</span>
+                            <span>@lang('livewire-tables::to')</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
                         @endif
                     </div>
@@ -91,9 +91,9 @@
             @else
                 <div class="row mt-3">
                     <div class="col-12 text-muted">
-                        @lang('Showing')
+                        @lang('livewire-tables::Showing')
                         <strong>{{ $this->getRows->count() }}</strong>
-                        @lang('results')
+                        @lang('livewire-tables::results')
                     </div>
                 </div>
             @endif
@@ -109,13 +109,13 @@
                     </div>
                     <div class="col-12 col-md-6 text-center text-md-end text-muted">
                         @if($this->showPaginationDetails())
-                            <span>@lang('Showing')</span>
+                            <span>@lang('livewire-tables::Showing')</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
-                            <span>@lang('to')</span>
+                            <span>@lang('livewire-tables::to')</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
-                            <span>@lang('of')</span>
+                            <span>@lang('livewire-tables::of')</span>
                             <strong><span x-text="paginationTotalItemCount"></span></strong>
-                            <span>@lang('results')</span>
+                            <span>@lang('livewire-tables::results')</span>
                         @endif
                     </div>
                 </div>
@@ -126,9 +126,9 @@
                     </div>
                     <div class="col-12 col-md-6 text-center text-md-end text-muted">
                         @if($this->showPaginationDetails())
-                            <span>@lang('Showing')</span>
+                            <span>@lang('livewire-tables::Showing')</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
-                            <span>@lang('to')</span>
+                            <span>@lang('livewire-tables::to')</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
                         @endif
                     </div>
@@ -142,9 +142,9 @@
             @else
                 <div class="row mt-3">
                     <div class="col-12 text-muted">
-                        @lang('Showing')
+                        @lang('livewire-tables::Showing')
                         <strong>{{ $this->getRows->count() }}</strong>
-                        @lang('results')
+                        @lang('livewire-tables::results')
                     </div>
                 </div>
             @endif
diff --git a/resources/views/components/table/tr/bulk-actions.blade.php b/resources/views/components/table/tr/bulk-actions.blade.php
index 73201debf..f9946b2b9 100644
--- a/resources/views/components/table/tr/bulk-actions.blade.php
+++ b/resources/views/components/table/tr/bulk-actions.blade.php
@@ -17,9 +17,9 @@ class="bg-indigo-50 dark:bg-gray-900 dark:text-white"
                 <template x-if="selectedItems.length == paginationTotalItemCount || selectAllStatus">
                     <div wire:key="{{ $tableName }}-all-selected">
                         <span>
-                            @lang('You are currently selecting all')
+                            @lang('livewire-tables::You are currently selecting all')
                             @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
-                            @lang('rows').
+                            @lang('livewire-tables::rows').
                         </span>
 
                         <button
@@ -28,7 +28,7 @@ class="bg-indigo-50 dark:bg-gray-900 dark:text-white"
                             type="button"
                             class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium focus:outline-none focus:text-gray-800 focus:underline transition duration-150 ease-in-out dark:text-white dark:hover:text-gray-400"
                         >
-                            @lang('Deselect All')
+                            @lang('livewire-tables::Deselect All')
                         </button>
                     </div>
                 </template>
@@ -36,9 +36,9 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                 <template x-if="selectedItems.length !== paginationTotalItemCount && !selectAllStatus">
                     <div wire:key="{{ $tableName }}-some-selected">
                         <span>
-                            @lang('You have selected')
+                            @lang('livewire-tables::You have selected')
                             <strong><span x-text="selectedItems.length"></span></strong>
-                            @lang('rows, do you want to select all')
+                            @lang('livewire-tables::rows, do you want to select all')
                             @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
                         </span>
 
@@ -48,7 +48,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                             type="button"
                             class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium focus:outline-none focus:text-gray-800 focus:underline transition duration-150 ease-in-out dark:text-white dark:hover:text-gray-400"
                         >
-                            @lang('Select All On Page')
+                            @lang('livewire-tables::Select All On Page')
                         </button>&nbsp;
 
                         <button
@@ -57,7 +57,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                             type="button"
                             class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium focus:outline-none focus:text-gray-800 focus:underline transition duration-150 ease-in-out dark:text-white dark:hover:text-gray-400"
                         >
-                            @lang('Select All')
+                            @lang('livewire-tables::Select All')
                         </button>
 
                         <button
@@ -66,7 +66,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                             type="button"
                             class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium focus:outline-none focus:text-gray-800 focus:underline transition duration-150 ease-in-out dark:text-white dark:hover:text-gray-400"
                         >
-                            @lang('Deselect All')
+                            @lang('livewire-tables::Deselect All')
                         </button>
                     </div>
                 </template>
@@ -81,9 +81,9 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                 <template x-if="selectedItems.length == paginationTotalItemCount || selectAllStatus">
                     <div wire:key="{{ $tableName }}-all-selected">
                         <span>
-                            @lang('You are currently selecting all')
+                            @lang('livewire-tables::You are currently selecting all')
                             @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
-                            @lang('rows').
+                            @lang('livewire-tables::rows').
                         </span>
 
                         <button
@@ -92,7 +92,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                             type="button"
                             class="btn btn-primary btn-sm"
                         >
-                            @lang('Deselect All')
+                            @lang('livewire-tables::Deselect All')
                         </button>
                     </div>
                 </template>
@@ -100,9 +100,9 @@ class="btn btn-primary btn-sm"
                 <template x-if="selectedItems.length !== paginationTotalItemCount && !selectAllStatus">
                     <div wire:key="{{ $tableName }}-some-selected">
                         <span>
-                            @lang('You have selected')
+                            @lang('livewire-tables::You have selected')
                             <strong><span x-text="selectedItems.length"></span></strong>
-                            @lang('rows, do you want to select all')
+                            @lang('livewire-tables::rows, do you want to select all')
                             @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
                         </span>
 
@@ -112,7 +112,7 @@ class="btn btn-primary btn-sm"
                             type="button"
                             class="btn btn-primary btn-sm"
                         >
-                            @lang('Select All On Page')
+                            @lang('livewire-tables::Select All On Page')
                         </button>&nbsp;
 
                         <button
@@ -121,7 +121,7 @@ class="btn btn-primary btn-sm"
                             type="button"
                             class="btn btn-primary btn-sm"
                         >
-                            @lang('Select All')
+                            @lang('livewire-tables::Select All')
                         </button>
 
                         <button
@@ -130,7 +130,7 @@ class="btn btn-primary btn-sm"
                             type="button"
                             class="btn btn-primary btn-sm"
                         >
-                            @lang('Deselect All')
+                            @lang('livewire-tables::Deselect All')
                         </button>
                     </div>
                 </template>
diff --git a/resources/views/components/tools/filter-pills.blade.php b/resources/views/components/tools/filter-pills.blade.php
index 3644decaa..69a1366e7 100644
--- a/resources/views/components/tools/filter-pills.blade.php
+++ b/resources/views/components/tools/filter-pills.blade.php
@@ -10,7 +10,7 @@
                 'text-gray-700 dark:text-white' => $isTailwind,
                 '' =>  $isBootstrap,
             ])>
-                @lang('Applied Filters'):
+                @lang('livewire-tables::Applied Filters'):
             </small>
 
             @foreach($this->getAppliedFiltersWithValues() as $filterSelectName => $value)
@@ -48,7 +48,7 @@
                                 type="button"
                                 class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
                             >
-                                <span class="sr-only">@lang('Remove filter option')</span>
+                                <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
                                 <x-heroicon-m-x-mark class="h-2 w-2" />
                             </button>
                         @else
@@ -63,7 +63,7 @@ class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justif
                                     'sr-only' => $isBootstrap4,
                                     'visually-hidden' => $isBootstrap5,
                                 ])>
-                                    @lang('Remove filter option')
+                                    @lang('livewire-tables::Remove filter option')
                                 </span>
                                 <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-tiny"  />
                             </a>
@@ -78,7 +78,7 @@ class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justif
                     class="focus:outline-none active:outline-none"
                 >
                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900">
-                        @lang('Clear')
+                        @lang('livewire-tables::Clear')
                     </span>
                 </button>
             @else
@@ -90,7 +90,7 @@ class="focus:outline-none active:outline-none"
                         'badge rounded-pill bg-light text-dark text-decoration-none' => $isBootstrap5,
                     ])
                 >
-                    @lang('Clear')
+                    @lang('livewire-tables::Clear')
                 </a>
             @endif
         </div>
diff --git a/resources/views/components/tools/filters/boolean.blade.php b/resources/views/components/tools/filters/boolean.blade.php
index cfffe3a1f..aeb2aa2a8 100644
--- a/resources/views/components/tools/filters/boolean.blade.php
+++ b/resources/views/components/tools/filters/boolean.blade.php
@@ -21,7 +21,7 @@ class="relative inline-flex h-6 py-0.5 ml-4 focus:outline-none rounded-full w-10
             type="button"
             class="flex-shrink-0 ml-1 h-6 w-6 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
         >
-            <span class="sr-only">@lang('Remove filter option')</span>
+            <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
             <x-heroicon-m-x-mark class="h-6 w-6" />
         </button>
     </template>
diff --git a/resources/views/components/tools/filters/multi-select.blade.php b/resources/views/components/tools/filters/multi-select.blade.php
index 884a84441..e09772b19 100644
--- a/resources/views/components/tools/filters/multi-select.blade.php
+++ b/resources/views/components/tools/filters/multi-select.blade.php
@@ -15,7 +15,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
                 @if ($filter->getFirstOption() != "")
                     {{ $filter->getFirstOption() }}
                 @else
-                    @lang('All')
+                    @lang('livewire-tables::All')
                 @endif
                 </label>
             </div>
@@ -42,7 +42,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
                 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">@lang('All')</label>
+            <label class="form-check-label" for="{{ $tableName }}-filter-{{ $filter->getKey() }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif-select-all">@lang('livewire-tables::All')</label>
         </div>
 
         @foreach($filter->getOptions() as $key => $value)
diff --git a/resources/views/components/tools/sorting-pills.blade.php b/resources/views/components/tools/sorting-pills.blade.php
index a57a6a97d..b633cf1d8 100644
--- a/resources/views/components/tools/sorting-pills.blade.php
+++ b/resources/views/components/tools/sorting-pills.blade.php
@@ -4,7 +4,7 @@
     <div>
         @if ($this->sortingPillsAreEnabled() && $this->hasSorts())
             <div class="mb-4 px-4 md:p-0" x-cloak x-show="!currentlyReorderingStatus">
-                <small class="text-gray-700 dark:text-white">@lang('Applied Sorting'):</small>
+                <small class="text-gray-700 dark:text-white">@lang('livewire-tables::Applied Sorting'):</small>
 
                 @foreach($this->getSorts() as $columnSelectName => $direction)
                     @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName))
@@ -17,14 +17,14 @@
                         wire:key="{{ $tableName }}-sorting-pill-{{ $columnSelectName }}"
                         class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 bg-indigo-100 text-indigo-800 capitalize dark:bg-indigo-200 dark:text-indigo-900"
                     >
-                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirection($this, $direction) }}
+                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirectionLabel($direction, $this->getDefaultSortingLabelAsc, $this->getDefaultSortingLabelDesc) }}
 
                         <button
                             wire:click="clearSort('{{ $columnSelectName }}')"
                             type="button"
                             class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
                         >
-                            <span class="sr-only">@lang('Remove sort option')</span>
+                            <span class="sr-only">@lang('livewire-tables::Remove sort option')</span>
                             <x-heroicon-m-x-mark class="h-3 w-3" />
                         </button>
                     </span>
@@ -35,7 +35,7 @@ class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justif
                     class="focus:outline-none active:outline-none"
                 >
                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900">
-                        @lang('Clear')
+                        @lang('livewire-tables::Clear')
                     </span>
                 </button>
             </div>
@@ -45,7 +45,7 @@ class="focus:outline-none active:outline-none"
     <div>
         @if ($this->sortingPillsAreEnabled() && $this->hasSorts())
             <div class="mb-3" x-cloak x-show="!currentlyReorderingStatus">
-                <small>@lang('Applied Sorting'):</small>
+                <small>@lang('livewire-tables::Applied Sorting'):</small>
 
                 @foreach($this->getSorts() as $columnSelectName => $direction)
                     @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName))
@@ -58,14 +58,14 @@ class="focus:outline-none active:outline-none"
                         wire:key="{{ $tableName . '-sorting-pill-' . $columnSelectName }}"
                         class="badge badge-pill badge-info d-inline-flex align-items-center"
                     >
-                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirection($this, $direction) }}
+                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirectionLabel($direction, $this->getDefaultSortingLabelAsc, $this->getDefaultSortingLabelDesc) }}
 
                         <a
                             href="#"
                             wire:click="clearSort('{{ $columnSelectName }}')"
                             class="text-white ml-2"
                         >
-                            <span class="sr-only">@lang('Remove sort option')</span>
+                            <span class="sr-only">@lang('livewire-tables::Remove sort option')</span>
                             <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-smaller" />
                         </a>
                     </span>
@@ -76,7 +76,7 @@ class="text-white ml-2"
                     wire:click.prevent="clearSorts"
                     class="badge badge-pill badge-light"
                 >
-                    @lang('Clear')
+                    @lang('livewire-tables::Clear')
                 </a>
             </div>
         @endif
@@ -85,7 +85,7 @@ class="badge badge-pill badge-light"
     <div>
         @if ($this->sortingPillsAreEnabled() && $this->hasSorts())
             <div class="mb-3" x-cloak x-show="!currentlyReorderingStatus">
-                <small>@lang('Applied Sorting'):</small>
+                <small>@lang('livewire-tables::Applied Sorting'):</small>
 
                 @foreach($this->getSorts() as $columnSelectName => $direction)
                     @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName))
@@ -98,14 +98,14 @@ class="badge badge-pill badge-light"
                         wire:key="{{ $tableName }}-sorting-pill-{{ $columnSelectName }}"
                         class="badge rounded-pill bg-info d-inline-flex align-items-center"
                     >
-                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirection($this, $direction) }}
+                        {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirectionLabel($direction, $this->getDefaultSortingLabelAsc, $this->getDefaultSortingLabelDesc) }}
 
                         <a
                             href="#"
                             wire:click="clearSort('{{ $columnSelectName }}')"
                             class="text-white ms-2"
                         >
-                            <span class="visually-hidden">@lang('Remove sort option')</span>
+                            <span class="visually-hidden">@lang('livewire-tables::Remove sort option')</span>
                             <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-smaller" />
                         </a>
                     </span>
@@ -116,7 +116,7 @@ class="text-white ms-2"
                     wire:click.prevent="clearSorts"
                     class="badge rounded-pill bg-light text-dark text-decoration-none"
                 >
-                    @lang('Clear')
+                    @lang('livewire-tables::Clear')
                 </a>
             </div>
         @endif
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 a4282ce56..3be95e799 100644
--- a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
+++ b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
@@ -34,7 +34,7 @@
                         @endif
             aria-haspopup="true" aria-expanded="false">
 
-            @lang('Bulk Actions')
+            @lang('livewire-tables::Bulk Actions')
             @if($this->isTailwind)
                 <x-heroicon-m-chevron-down class="-mr-1 ml-2 h-5 w-5" />
             @endif
diff --git a/resources/views/components/tools/toolbar/items/column-select.blade.php b/resources/views/components/tools/toolbar/items/column-select.blade.php
index f6a954514..24033daee 100644
--- a/resources/views/components/tools/toolbar/items/column-select.blade.php
+++ b/resources/views/components/tools/toolbar/items/column-select.blade.php
@@ -18,7 +18,7 @@ class="inline-flex justify-center px-4 py-2 w-full text-sm font-medium text-gray
                     x-bind:aria-expanded="open"
                     aria-expanded="true"
                 >
-                    @lang('Columns')
+                    @lang('livewire-tables::Columns')
 
                     <x-heroicon-m-chevron-down class="-mr-1 ml-2 h-5 w-5" />
                 </button>
@@ -51,7 +51,7 @@ class="text-indigo-600 transition duration-150 ease-in-out border-gray-300 round
                                 @checked($component->getSelectableSelectedColumns()->count() == $component->getSelectableColumns()->count())
                                 @if($component->getSelectableSelectedColumns()->count() == $component->getSelectableColumns()->count())  wire:click="deselectAllColumns" @else wire:click="selectAllColumns" @endif
                             >
-                            <span class="ml-2">{{ __('All Columns') }}</span>
+                            <span class="ml-2">@lang('livewire-tables::All Columns')</span>
                         </label>
                     </div>
 
@@ -104,7 +104,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
             type="button" id="{{ $tableName }}-columnSelect" aria-haspopup="true"
             x-bind:aria-expanded="open"
         >
-            @lang('Columns')
+            @lang('livewire-tables::Columns')
         </button>
 
         <div
@@ -124,7 +124,9 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
                             @if($component->getSelectableSelectedColumns()->count() == $component->getSelectableColumns()->count()) checked wire:click="deselectAllColumns" @else unchecked wire:click="selectAllColumns" @endif
                         />
 
-                        <span class="ml-2">{{ __('All Columns') }}</span>
+                        <span class="ml-2">@lang('livewire-tables::All Columns')</span>
+                        
+
                     </label>
                 </div>
             @elseif($isBootstrap5)
@@ -137,7 +139,7 @@ class="form-check-input"
                     />
 
                     <label wire:loading.attr="disabled" class="form-check-label">
-                        {{ __('All Columns') }}
+                        @lang('livewire-tables::All Columns')
                     </label>
                 </div>
             @endif
diff --git a/resources/views/components/tools/toolbar/items/filter-button.blade.php b/resources/views/components/tools/toolbar/items/filter-button.blade.php
index 64b5ba0de..f3488639e 100644
--- a/resources/views/components/tools/toolbar/items/filter-button.blade.php
+++ b/resources/views/components/tools/toolbar/items/filter-button.blade.php
@@ -33,7 +33,7 @@
                 @endif
                 @if ($this->isFilterLayoutSlideDown()) x-on:click="filtersOpen = !filtersOpen" @endif
             >
-                @lang('Filters')
+                @lang('livewire-tables::Filters')
 
                 @if ($count = $this->getFilterBadgeCount())
                     <span @class([
diff --git a/resources/views/components/tools/toolbar/items/filter-popover.blade.php b/resources/views/components/tools/toolbar/items/filter-popover.blade.php
index 3ef892130..0ff205d97 100644
--- a/resources/views/components/tools/toolbar/items/filter-popover.blade.php
+++ b/resources/views/components/tools/toolbar/items/filter-popover.blade.php
@@ -36,7 +36,7 @@
                     'dropdown-item text-center' => $this->isBootstrap5,
                 ])
             >
-                @lang('Clear')
+                @lang('livewire-tables::Clear')
             </button>
         @endif
     </ul>
@@ -74,7 +74,7 @@ class="block px-4 py-2 text-sm text-gray-700 space-y-1"
                     type="button"
                     class="w-full inline-flex items-center justify-center px-3 py-2 border border-gray-300 shadow-sm text-sm leading-4 font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:border-gray-600 dark:text-white dark:hover:border-gray-500 dark:hover:bg-gray-600"
                 >
-                    @lang('Clear')
+                    @lang('livewire-tables::Clear')
                 </button>
             </div>
         @endif
diff --git a/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php b/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php
index da39ef3d5..5a2ae1845 100644
--- a/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php
+++ b/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php
@@ -21,7 +21,7 @@
                 value="{{ $item }}"
                 wire:key="{{ $tableName }}-per-page-{{ $item }}"
             >
-                {{ $item === -1 ? __('All') : $item }}
+                {{ $item === -1 ? __('livewire-tables::All') : $item }}
             </option>
         @endforeach
     </select>
diff --git a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
index c0dc417f8..061b2ea8c 100644
--- a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
+++ b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
@@ -14,11 +14,11 @@
         ])
     >
         <span x-cloak x-show="currentlyReorderingStatus">
-            @lang('Cancel')
+            @lang('livewire-tables::Cancel')
         </span>
 
         <span x-cloak x-show="!currentlyReorderingStatus">
-            @lang('Reorder')
+            @lang('livewire-tables::Reorder')
         </span>
 
     </button>
@@ -33,7 +33,7 @@
             ])
         >
             <span>
-                @lang('Save')
+                @lang('livewire-tables::Save')
             </span>
         </button>
     </div>
diff --git a/resources/views/includes/debug.blade.php b/resources/views/includes/debug.blade.php
index fa3803f84..d737f6941 100644
--- a/resources/views/includes/debug.blade.php
+++ b/resources/views/includes/debug.blade.php
@@ -1,6 +1,6 @@
 <div>
     @if ($this->debugIsEnabled())
-        <p><strong>@lang('Debugging Values'):</strong></p>
+        <p><strong>@lang('livewire-tables::Debugging Values'):</strong></p>
 
         @if (! app()->runningInConsole())
             <div class="mb-4">@dump((new \Rappasoft\LaravelLivewireTables\DataTransferObjects\DebuggableData($this))->toArray())</div>
diff --git a/resources/views/includes/offline.blade.php b/resources/views/includes/offline.blade.php
index ae59b9e70..ae5dc5f37 100644
--- a/resources/views/includes/offline.blade.php
+++ b/resources/views/includes/offline.blade.php
@@ -9,7 +9,7 @@
                     </div>
                     <div class="ml-3">
                         <h3 class="text-sm font-medium text-red-800 dark:text-white">
-                            @lang('You are not connected to the internet.')
+                            @lang('livewire-tables::You are not connected to the internet.')
                         </h3>
                     </div>
                 </div>
@@ -19,7 +19,7 @@
         <div wire:offline.class.remove="d-none" class="d-none">
             <div class="alert alert-danger d-flex align-items-center">
                 <x-heroicon-s-x-circle class="laravel-livewire-tables-btn-md" />
-                <span class="d-inline-block ml-2">@lang('You are not connected to the internet.')</span>
+                <span class="d-inline-block ml-2">@lang('livewire-tables::You are not connected to the internet.')</span>
             </div>
         </div>
     @endif
diff --git a/src/Traits/Helpers/BulkActionsHelpers.php b/src/Traits/Helpers/BulkActionsHelpers.php
index d07e9fdc6..95c116900 100644
--- a/src/Traits/Helpers/BulkActionsHelpers.php
+++ b/src/Traits/Helpers/BulkActionsHelpers.php
@@ -181,7 +181,7 @@ public function getBulkActionConfirmMessage(string $bulkAction): string
 
     public function getBulkActionDefaultConfirmationMessage(): string
     {
-        return isset($this->bulkActionConfirmDefaultMessage) ? $this->bulkActionConfirmDefaultMessage : __('Bulk Actions Confirm');
+        return isset($this->bulkActionConfirmDefaultMessage) ? $this->bulkActionConfirmDefaultMessage : __('livewire-tables::Bulk Actions Confirm');
     }
 
     #[Computed]
diff --git a/src/Traits/Helpers/SearchHelpers.php b/src/Traits/Helpers/SearchHelpers.php
index 1547414a2..4d4a540a4 100644
--- a/src/Traits/Helpers/SearchHelpers.php
+++ b/src/Traits/Helpers/SearchHelpers.php
@@ -127,7 +127,7 @@ public function getSearchPlaceholder(): string
             return $this->searchPlaceholder;
         }
 
-        return __('Search');
+        return __('livewire-tables::Search');
     }
 
     public function hasSearchPlaceholder(): bool
diff --git a/src/Traits/Helpers/SortingHelpers.php b/src/Traits/Helpers/SortingHelpers.php
index a0043d41e..e3628e0c3 100644
--- a/src/Traits/Helpers/SortingHelpers.php
+++ b/src/Traits/Helpers/SortingHelpers.php
@@ -151,11 +151,13 @@ public function sortingPillsAreDisabled(): bool
         return $this->getSortingPillsStatus() === false;
     }
 
+    #[Computed]
     public function getDefaultSortingLabelAsc(): string
     {
         return $this->defaultSortingLabelAsc;
     }
 
+    #[Computed]
     public function getDefaultSortingLabelDesc(): string
     {
         return $this->defaultSortingLabelDesc;
diff --git a/src/Views/Filters/DateRangeFilter.php b/src/Views/Filters/DateRangeFilter.php
index 40cfba046..3c0d0a95e 100644
--- a/src/Views/Filters/DateRangeFilter.php
+++ b/src/Views/Filters/DateRangeFilter.php
@@ -189,7 +189,7 @@ public function getFilterPillValue($value): array|string|bool|null
 
             if (($minDate instanceof Carbon) && $maxDate instanceof Carbon) {
                 return $this->outputTranslatedDate($minDate)
-                        .' '.__('to').' '.
+                        .' '.__('livewire-tables::to').' '.
                         $this->outputTranslatedDate($maxDate);
             }
         }
diff --git a/src/Views/Filters/NumberRangeFilter.php b/src/Views/Filters/NumberRangeFilter.php
index 9eac63a7b..a32a83667 100644
--- a/src/Views/Filters/NumberRangeFilter.php
+++ b/src/Views/Filters/NumberRangeFilter.php
@@ -89,7 +89,7 @@ public function getDefaultValue(): array|string
     public function getFilterPillValue($values): array|string|bool|null
     {
         if ($this->validate($values)) {
-            return __('Min:').$values['min'].', '.__('Max:').$values['max'];
+            return __('livewire-tables::min').':'.$values['min'].', '.__('livewire-tables::max').':'.$values['max'];
         }
 
         return '';
diff --git a/src/Views/Traits/Columns/IsSortable.php b/src/Views/Traits/Columns/IsSortable.php
index 5af058650..b53c729d8 100644
--- a/src/Views/Traits/Columns/IsSortable.php
+++ b/src/Views/Traits/Columns/IsSortable.php
@@ -89,28 +89,50 @@ public function hasCustomSortingPillDirections(): bool
         return $this->sortingPillDirectionAsc !== null && $this->sortingPillDirectionDesc !== null;
     }
 
-    public function getCustomSortingPillDirections(string $direction): string
+    public function getCustomSortingPillDirections(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string
     {
         if ($direction === 'asc') {
-            return $this->sortingPillDirectionAsc;
+            return $this->sortingPillDirectionAsc ?? $defaultLabelAsc;
         }
 
         if ($direction === 'desc') {
-            return $this->sortingPillDirectionDesc;
+            return $this->sortingPillDirectionDesc ?? $defaultLabelDesc;
         }
 
-        return __('N/A');
+        return __('livewire-tables::not_applicable');
+    }
+
+    public function getCustomSortingPillDirectionsLabel(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string
+    {
+        if ($direction === 'asc') {
+            return $this->sortingPillDirectionAsc ?? $defaultLabelAsc;
+        }
+
+        if ($direction === 'desc') {
+            return $this->sortingPillDirectionDesc ?? $defaultLabelDesc;
+        }
+
+        return __('livewire-tables::not_applicable');
     }
 
     public function getSortingPillDirection(DataTableComponent $component, string $direction): string
     {
         if ($this->hasCustomSortingPillDirections()) {
-            return $this->getCustomSortingPillDirections($direction);
+            return $this->getCustomSortingPillDirections($direction, $component->getDefaultSortingLabelAsc(), $component->getDefaultSortingLabelDesc());
         }
 
         return $direction === 'asc' ? $component->getDefaultSortingLabelAsc() : $component->getDefaultSortingLabelDesc();
     }
 
+    public function getSortingPillDirectionLabel(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string
+    {
+        if ($this->hasCustomSortingPillDirections()) {
+            return $this->getCustomSortingPillDirectionsLabel($direction, $defaultLabelAsc, $defaultLabelDesc);
+        }
+
+        return $direction === 'asc' ? $defaultLabelAsc : $defaultLabelDesc;
+    }
+
     /**
      * Used in resources/views/components/table/th.blade.php
      */
diff --git a/tests/Traits/Configuration/SearchConfigurationTest.php b/tests/Traits/Configuration/SearchConfigurationTest.php
index caeaf19e5..0f0815faa 100644
--- a/tests/Traits/Configuration/SearchConfigurationTest.php
+++ b/tests/Traits/Configuration/SearchConfigurationTest.php
@@ -170,7 +170,7 @@ public function test_cant_set_search_throttle_with_other_search_modifiers(): voi
 
     public function test_can_set_search_placeholder(): void
     {
-        $this->assertSame(__('Search'), $this->basicTable->getSearchPlaceholder());
+        $this->assertSame(__('livewire-tables::Search'), $this->basicTable->getSearchPlaceholder());
 
         $this->basicTable->setSearchPlaceholder('Anthony');
 
diff --git a/tests/Views/Traits/Helpers/ColumnHelpersTest.php b/tests/Views/Traits/Helpers/ColumnHelpersTest.php
index f48a83d90..d5119f088 100644
--- a/tests/Views/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Views/Traits/Helpers/ColumnHelpersTest.php
@@ -108,6 +108,16 @@ public function test_can_set_custom_sorting_pill_title(): void
         $this->assertSame('New Title', $column->getCustomSortingPillTitle());
     }
 
+    public function test_can_get_standard_sorting_pill_directions(): void
+    {
+        $column = Column::make('My Title');
+
+        $this->assertFalse($column->hasCustomSortingPillDirections());
+
+        $this->assertSame($this->basicTable->getDefaultSortingLabelAsc(), $column->getCustomSortingPillDirections('asc'));
+        $this->assertSame($this->basicTable->getDefaultSortingLabelDesc(), $column->getCustomSortingPillDirections('desc'));
+    }
+
     public function test_can_set_custom_sorting_pill_directions(): void
     {
         $column = Column::make('My Title');

From bb005d00542a1f889bbd48a5ced88d001db86011 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 21 Sep 2024 21:52:30 +0100
Subject: [PATCH 053/103] Add filterComponents into queryString (#1957)

---
 src/Traits/WithFilters.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
index 9ec7e60aa..3c2ff58c5 100644
--- a/src/Traits/WithFilters.php
+++ b/src/Traits/WithFilters.php
@@ -52,6 +52,7 @@ protected function queryStringWithFilters(): array
         if ($this->queryStringIsEnabled() && $this->filtersAreEnabled()) {
             return [
                 'appliedFilters' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-filters'],
+                'filterComponents' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-filters'],
             ];
         }
 

From 1dfaca122f6681ecf7d8108de16854a3fe055fd9 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 22 Sep 2024 00:51:45 +0100
Subject: [PATCH 054/103] Fix syntax for DateColumn outputFormat in docs
 (#1960)

---
 docs/column-types/date_columns.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/column-types/date_columns.md b/docs/column-types/date_columns.md
index 3e2e6ca0a..17ffa581b 100644
--- a/docs/column-types/date_columns.md
+++ b/docs/column-types/date_columns.md
@@ -8,7 +8,7 @@ Date columns provide an easy way to display dates in a given format, without hav
 You may pass either a DateTime object, in which you can define an "outputFormat"
 ```php
 DateColumn::make('Updated At', 'updated_at')
-    ->outputFormat('Y-m-d H:i:s),
+    ->outputFormat('Y-m-d H:i:s'),
 ```
 
 Or you may pass a string, in which case you can define an "inputFormat" in addition to the outputFormat:

From a6c150a775c65528a2530e5c4278dca18e5e5a8d Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 22 Sep 2024 05:47:36 +0100
Subject: [PATCH 055/103] Fix Filter Pills Icon - Tailwind (#1961)

---
 resources/views/components/tools/filter-pills.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/tools/filter-pills.blade.php b/resources/views/components/tools/filter-pills.blade.php
index 69a1366e7..004f82272 100644
--- a/resources/views/components/tools/filter-pills.blade.php
+++ b/resources/views/components/tools/filter-pills.blade.php
@@ -49,7 +49,7 @@
                                 class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
                             >
                                 <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
-                                <x-heroicon-m-x-mark class="h-2 w-2" />
+                                <x-heroicon-m-x-mark class="h-full" />
                             </button>
                         @else
                             <a

From 1760c3c979d07d547309a715faef0ec6150033f4 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 22 Sep 2024 05:54:29 +0100
Subject: [PATCH 056/103] Add original translation strings - for use in
 published views (#1959)

---
 resources/lang/ar.json    | 32 +++++++++++++++++++++++++++++++-
 resources/lang/ca.json    | 32 +++++++++++++++++++++++++++++++-
 resources/lang/da.json    | 32 +++++++++++++++++++++++++++++++-
 resources/lang/de.json    | 32 +++++++++++++++++++++++++++++++-
 resources/lang/en.json    | 36 +++++++++++++++++++++++++++++++++++-
 resources/lang/es.json    | 33 ++++++++++++++++++++++++++++++++-
 resources/lang/fr.json    | 32 +++++++++++++++++++++++++++++++-
 resources/lang/id.json    | 33 ++++++++++++++++++++++++++++++++-
 resources/lang/it.json    | 33 ++++++++++++++++++++++++++++++++-
 resources/lang/ms.json    | 32 +++++++++++++++++++++++++++++++-
 resources/lang/nl.json    | 34 +++++++++++++++++++++++++++++++++-
 resources/lang/pl.json    | 34 +++++++++++++++++++++++++++++++++-
 resources/lang/pt.json    | 33 ++++++++++++++++++++++++++++++++-
 resources/lang/pt_BR.json | 34 +++++++++++++++++++++++++++++++++-
 resources/lang/ru.json    | 32 +++++++++++++++++++++++++++++++-
 resources/lang/th.json    | 34 +++++++++++++++++++++++++++++++++-
 resources/lang/tk.json    | 32 +++++++++++++++++++++++++++++++-
 resources/lang/tr.json    | 32 +++++++++++++++++++++++++++++++-
 resources/lang/tw.json    | 34 +++++++++++++++++++++++++++++++++-
 resources/lang/uk.json    | 35 ++++++++++++++++++++++++++++++++++-
 20 files changed, 641 insertions(+), 20 deletions(-)

diff --git a/resources/lang/ar.json b/resources/lang/ar.json
index e255b7976..8ed603244 100644
--- a/resources/lang/ar.json
+++ b/resources/lang/ar.json
@@ -28,5 +28,35 @@
     "livewire-tables::Yes": "نعم",
     "livewire-tables::You are currently selecting all": "أنت الآن تختار الكل",
     "livewire-tables::You are not connected to the internet.": "أنت غير متصل بالإنترنت.",
-    "livewire-tables::You have selected": "قمت بتحديدها"
+    "livewire-tables::You have selected": "قمت بتحديدها",
+    "All": "الجميع",
+    "All Columns": "كافة الأعمدة",
+    "Applied Filters": "المرشحات التطبيقية",
+    "Applied Sorting": "الفرز التطبيقي",
+    "Bulk Actions": "إجراءات جملة",
+    "Clear": "واضح",
+    "Columns": "الأعمدة",
+    "Debugging Values": "قيم التصحيح",
+    "Deselect All": "الغاء تحديد الكل",
+    "Done Reordering": "تمت إعادة الترتيب",
+    "Filters": "المرشحات",
+    "not_applicable": "N/A",
+    "No": "لا",
+    "No items found. Try to broaden your search.": "لم يتم العثور على العناصر. حاول توسيع نطاق البحث.",
+    "of": "ل",
+    "Remove filter option": "إزالة خيار التصفية",
+    "Remove sort option": "إزالة خيار الفرز",
+    "Reorder": "إعادة ترتيب",
+    "results": "نتائج",
+    "row": "صف",
+    "rows": "صفوف",
+    "rows, do you want to select all": "الصفوف ، هل تريد تحديد الكل",
+    "Search": "يبحث",
+    "Select All": "اختر الكل",
+    "Showing": "عرض",
+    "to": "ل",
+    "Yes": "نعم",
+    "You are currently selecting all": "أنت الآن تختار الكل",
+    "You are not connected to the internet.": "أنت غير متصل بالإنترنت.",
+    "You have selected": "قمت بتحديدها"
 }
\ No newline at end of file
diff --git a/resources/lang/ca.json b/resources/lang/ca.json
index 9187914fe..532ff38b3 100644
--- a/resources/lang/ca.json
+++ b/resources/lang/ca.json
@@ -28,5 +28,35 @@
     "livewire-tables::Yes": "Sí",
     "livewire-tables::You are currently selecting all": "Actualment està seleccionant tot",
     "livewire-tables::You are not connected to the internet.": "No està conectat a Internet.",
-    "livewire-tables::You have selected": "Ha seleccionat"
+    "livewire-tables::You have selected": "Ha seleccionat",
+    "All": "Tot",
+    "All Columns": "Totes les columnes",
+    "Applied Filters": "Filtres Aplicats",
+    "Applied Sorting": "Ordenació Aplicada",
+    "Bulk Actions": "Accions Massives",
+    "Clear": "Esborra",
+    "Columns": "Columnes",
+    "Debugging Values": "Valors de depuració",
+    "Deselect All": "Deselecciona tot",
+    "Done Reordering": "Reordenació finalitzada",
+    "Filters": "Filtres",
+    "not_applicable": "N/A",
+    "No": "No",
+    "No items found. Try to broaden your search.": "No s'han trobat elements. Intenti ampliar la cerca.",
+    "of": "de",
+    "Remove filter option": "Elimina opció de filtre",
+    "Remove sort option": "Elimina opció d'ordenació",
+    "Reorder": "Reordena",
+    "results": "resultats",
+    "row": "fila",
+    "rows": "files",
+    "rows, do you want to select all": "files, vol seleccionar totes",
+    "to": "a",
+    "Search": "Cerca",
+    "Select All": "Selecciona tot",
+    "Showing": "Mostrant",
+    "Yes": "Sí",
+    "You are currently selecting all": "Actualment està seleccionant tot",
+    "You are not connected to the internet.": "No està conectat a Internet.",
+    "You have selected": "Ha seleccionat"
 }
\ No newline at end of file
diff --git a/resources/lang/da.json b/resources/lang/da.json
index 9167043ff..0ce769f43 100644
--- a/resources/lang/da.json
+++ b/resources/lang/da.json
@@ -28,5 +28,35 @@
     "livewire-tables::Yes": "Ja",
     "livewire-tables::You are currently selecting all": "Du vælger i øjeblikket alle",
     "livewire-tables::You are not connected to the internet.": "Du er ikke forbundet til internettet.",
-    "livewire-tables::You have selected": "Du har valgt"
+    "livewire-tables::You have selected": "Du har valgt",
+    "All": "Alle",
+    "All Columns": "Alle kolonner",
+    "Applied Filters": "Anvendte filtre",
+    "Applied Sorting": "Anvendt sortering",
+    "Bulk Actions": "Massehandlinger",
+    "Clear": "Ryd",
+    "Columns": "Kolonner",
+    "Debugging Values": "Debugging-værdier",
+    "Deselect All": "Fravælg alle",
+    "Done Reordering": "Færdig med omorganisering",
+    "Filters": "Filtre",
+    "not_applicable": "N/A",
+    "No": "Nej",
+    "No items found. Try to broaden your search.": "Ingen elementer fundet. Prøv at udvide din søgning.",
+    "of": "af",
+    "Remove filter option": "Fjern filtermulighed",
+    "Remove sort option": "Fjern sorteringsmulighed",
+    "Reorder": "Omorganisér",
+    "results": "resultater",
+    "row": "række",
+    "rows": "rækker",
+    "rows, do you want to select all": "rækker, vil du vælge alle",
+    "Search": "Søg",
+    "Select All": "Vælg alle",
+    "Showing": "Viser",
+    "to": "til",
+    "Yes": "Ja",
+    "You are currently selecting all": "Du vælger i øjeblikket alle",
+    "You are not connected to the internet.": "Du er ikke forbundet til internettet.",
+    "You have selected": "Du har valgt"
 }
diff --git a/resources/lang/de.json b/resources/lang/de.json
index 4855e7697..2ddfa94cc 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -28,5 +28,35 @@
     "livewire-tables::Yes": "Ja",
     "livewire-tables::You are currently selecting all": "Es sind schon alle ausgewählt",
     "livewire-tables::You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.",
-    "livewire-tables::You have selected": "Es sind ausgewählt"
+    "livewire-tables::You have selected": "Es sind ausgewählt",
+    "All": "Alle",
+    "All Columns": "Alle Spalten",
+    "Applied Filters": "Angewendete Filter",
+    "Applied Sorting": "Angewendete Sortierung",
+    "Bulk Actions": "Aktionen",
+    "Clear": "Zurücksetzen",
+    "Columns": "Spalten",
+    "Debugging Values": "Werte debuggen",
+    "Deselect All": "Alle abwählen",
+    "Done Reordering": "Sortieren abgeschlossen",
+    "Filters": "Filter",
+    "not_applicable": "N/A",
+    "No": "Nein",
+    "No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern.",
+    "of": "von",
+    "Remove filter option": "Entferne Filterauswahl",
+    "Remove sort option": "Entferne Sortierauswahl",
+    "Reorder": "erneut Sortieren",
+    "results": "Ergebnisse",
+    "row": "Zeile",
+    "rows": "Zeilen",
+    "rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
+    "Search": "Suche",
+    "Select All": "Alle auswählen",
+    "Showing": "Anzeigen",
+    "to": "nach",
+    "Yes": "Ja",
+    "You are currently selecting all": "Es sind schon alle ausgewählt",
+    "You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.",
+    "You have selected": "Es sind ausgewählt"
 }
\ No newline at end of file
diff --git a/resources/lang/en.json b/resources/lang/en.json
index 8d657001b..dcf30f145 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -32,5 +32,39 @@
     "livewire-tables::Yes": "Yes",
     "livewire-tables::You are currently selecting all": "You are currently selecting all",
     "livewire-tables::You are not connected to the internet.": "You are not connected to the internet.",
-    "livewire-tables::You have selected": "You have selected"
+    "livewire-tables::You have selected": "You have selected",
+    "All": "All",
+    "All Columns": "All Columns",
+    "Applied Filters": "Applied Filters",
+    "Applied Sorting": "Applied Sorting",
+    "Bulk Actions": "Bulk Actions",
+    "Bulk Actions Confirm": "Are you sure?",
+    "Clear": "Clear",
+    "Columns": "Columns",
+    "Debugging Values": "Debugging Values",
+    "Deselect All": "Deselect All",
+    "Done Reordering": "Done Reordering",
+    "Filters": "Filters",
+    "max": "Max",
+    "min": "Min",
+    "not_applicable": "N/A",
+    "No": "No",
+    "No items found. Try to broaden your search.": "No items found. Try to broaden your search.",
+    "of": "of",
+    "Remove filter option": "Remove filter option",
+    "Remove sort option": "Remove sort option",
+    "Reorder": "Reorder",
+    "results": "results",
+    "row": "row",
+    "rows": "rows",
+    "rows, do you want to select all": "rows, do you want to select all",
+    "Search": "Search",
+    "Select All": "Select All",
+    "Select All On Page": "Select All On Page",
+    "Showing": "Showing",
+    "to": "to",
+    "Yes": "Yes",
+    "You are currently selecting all": "You are currently selecting all",
+    "You are not connected to the internet.": "You are not connected to the internet.",
+    "You have selected": "You have selected"
 }
diff --git a/resources/lang/es.json b/resources/lang/es.json
index 264a26dcb..b03b2e25f 100644
--- a/resources/lang/es.json
+++ b/resources/lang/es.json
@@ -29,5 +29,36 @@
     "livewire-tables::Yes": "Sí",
     "livewire-tables::You are currently selecting all": "Actualmente está seleccionando todo",
     "livewire-tables::You are not connected to the internet.": "No está conectado a Internet.",
-    "livewire-tables::You have selected": "Ha seleccionado"
+    "livewire-tables::You have selected": "Ha seleccionado",
+    "All": "Todo",
+    "All Columns": "Todas las columnas",
+    "Applied Filters": "Filtros Aplicados",
+    "Applied Sorting": "Ordenamiento Aplicado",
+    "Bulk Actions": "Acciones Masivas",
+    "Clear": "Borrar",
+    "Columns": "Columnas",
+    "Debugging Values": "Valores de depuración",
+    "Deselect All": "Deseleccionar todo",
+    "Done Reordering": "Reordenación finalizada",
+    "Filters": "Filtros",
+    "not_applicable": "N/A",
+    "No": "No",
+    "No items found. Try to broaden your search.": "No se encontraron elementos. Intente ampliar la búsqueda.",
+    "of": "de",
+    "Remove filter option": "Remover opción de filtro",
+    "Remove sort option": "Remover opción de ordenamineto",
+    "Reorder": "Reordenar",
+    "results": "resultados",
+    "row": "fila",
+    "rows": "filas",
+    "rows, do you want to select all": "filas, desea seleccionar todas",
+    "Search": "Buscar",
+    "Select All": "Seleccionar todo",
+    "Select All On Page": "Seleccionar todo en la página",
+    "Showing": "Mostrando",
+    "to": "a",
+    "Yes": "Sí",
+    "You are currently selecting all": "Actualmente está seleccionando todo",
+    "You are not connected to the internet.": "No está conectado a Internet.",
+    "You have selected": "Ha seleccionado"
 }
\ No newline at end of file
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 4cd16768e..89323dc4a 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -28,5 +28,35 @@
     "livewire-tables::Yes": "Oui",
     "livewire-tables::You are currently selecting all": "Vous êtes en train de sélectionner ",
     "livewire-tables::You are not connected to the internet.": "Vous n'êtes pas connecté à l'Internet.",
-    "livewire-tables::You have selected": "Vous avez sélectionné"
+    "livewire-tables::You have selected": "Vous avez sélectionné",
+    "All": "Tous",
+    "All Columns": "Toutes les colonnes",
+    "Applied Filters": "Filtres appliqués",
+    "Applied Sorting": "Tris appliqués",
+    "Bulk Actions": "Actions en masse",
+    "Clear": "Effacer",
+    "Columns": "Colonnes",
+    "Debugging Values": "Valeurs de débogage",
+    "Deselect All": "Tout désélectionner ",
+    "Done Reordering": "Réordonnancement terminé",
+    "Filters": "Filtres",
+    "not_applicable": "N/A",
+    "No": "Non",
+    "No items found. Try to broaden your search.": "Aucun élément trouvé. Essayez d'élargir votre recherche.",
+    "of": "sur",
+    "Remove filter option": "Supprimer l'option de filtrage",
+    "Remove sort option": "Supprimer l'option de tri",
+    "Reorder": "Réordonner",
+    "results": "résultats",
+    "row": "ligne",
+    "rows": "lignes",
+    "rows, do you want to select all": "lignes, voulez-vous tout sélectionner ?",
+    "Search": "Rechercher",
+    "Select All": "Tout sélectionner",
+    "Showing": "Montrant",
+    "to": "à",
+    "Yes": "Oui",
+    "You are currently selecting all": "Vous êtes en train de sélectionner ",
+    "You are not connected to the internet.": "Vous n'êtes pas connecté à l'Internet.",
+    "You have selected": "Vous avez sélectionné"
 }
\ No newline at end of file
diff --git a/resources/lang/id.json b/resources/lang/id.json
index 64dfdb26d..06a9f38cf 100644
--- a/resources/lang/id.json
+++ b/resources/lang/id.json
@@ -28,5 +28,36 @@
     "livewire-tables::Yes": "Ya",
     "livewire-tables::You are currently selecting all": "Anda sedang memilih semua",
     "livewire-tables::You are not connected to the internet.": "Anda sedang tidak terhubung ke internet.",
-    "livewire-tables::You have selected": "Anda telah memilih"
+    "livewire-tables::You have selected": "Anda telah memilih",
+    "All": "Semua",
+    "All Columns": "Semua Kolom",
+    "Applied Filters": "Filter Diterapkan",
+    "Applied Sorting": "Penyortiran Diterapkan",
+    "Bulk Actions": "Aksi",
+    "Clear": "Bersihkan",
+    "Columns": "Kolom",
+    "Debugging Values": "Nilai Debug",
+    "Deselect All": "Batalkan Semua Pilihan",
+    "Done Reordering": "Selesai Mengurutkan Ulang",
+    "Filters": "Filter",
+    "not_applicable": "N/A",
+    "No": "Tidak",
+    "No items found. Try to broaden your search.": "Tidak ada data yang ditemukan. Cobalah untuk memperluas pencarian Anda.",
+    "of": "dari",
+    "Remove filter option": "Hapus opsi filter",
+    "Remove sort option": "Hapus opsi pengurutan",
+    "Reorder": "Urutkan ulang",
+    "results": "hasil",
+    "row": "baris",
+    "rows": "baris",
+    "rows, do you want to select all": "baris, apakah Anda ingin memilih semua?",
+    "Search": "Cari",
+    "Select All": "Pilih Semua",
+    "Showing": "Menampilkan",
+    "to": "ke",
+    "Yes": "Ya",
+    "You are currently selecting all": "Anda sedang memilih semua",
+    "You are not connected to the internet.": "Anda sedang tidak terhubung ke internet.",
+    "You have selected": "Anda telah memilih"
+
 }
\ No newline at end of file
diff --git a/resources/lang/it.json b/resources/lang/it.json
index 4c798b43e..a1c50fb21 100644
--- a/resources/lang/it.json
+++ b/resources/lang/it.json
@@ -28,5 +28,36 @@
     "livewire-tables::Yes": "SÌ",
     "livewire-tables::You are currently selecting all": "Stai selezionando tutto",
     "livewire-tables::You are not connected to the internet.": "Non sei connesso a internet",
-    "livewire-tables::You have selected": "Hai selezionato"
+    "livewire-tables::You have selected": "Hai selezionato",
+    "All": "Tutti",
+    "All Columns": "Tutte le colonne",
+    "Applied Filters": "Filtri Applicati",
+    "Applied Sorting": "Ordinamento Applicato",
+    "Bulk Actions": "Azioni di Gruppo",
+    "Clear": "Pulisci",
+    "Columns": "Colonne",
+    "Debugging Values": "Valori di debug",
+    "Deselect All": "Deseleziona tutto",
+    "Done Reordering": "Ordinamento Terminato",
+    "Filters": "Filtri",
+    "not_applicable": "N/A",
+    "No": "No",
+    "No items found. Try to broaden your search.": "Nessun risultato trovato. Prova ad ampliare la tua ricerca.",
+    "of": "di",
+    "Remove filter option": "Rimuovi filtro",
+    "Remove sort option": "Rimuovi ordinamento",
+    "Reorder": "Riordina",
+    "results": "risultati",
+    "row": "righe",
+    "rows": "righe",
+    "rows, do you want to select all": "righe, vuoi selezionarle tutte",
+    "Search": "Cerca",
+    "Select All": "Seleziona Tutto",
+    "Showing": "Visualizzati",
+    "to": "a",
+    "Yes": "SÌ",
+    "You are currently selecting all": "Stai selezionando tutto",
+    "You are not connected to the internet.": "Non sei connesso a internet",
+    "You have selected": "Hai selezionato"
+
 }
\ No newline at end of file
diff --git a/resources/lang/ms.json b/resources/lang/ms.json
index 1127c2983..e7e725fa7 100644
--- a/resources/lang/ms.json
+++ b/resources/lang/ms.json
@@ -28,5 +28,35 @@
     "livewire-tables::Yes": "ya",
     "livewire-tables::You are currently selecting all": "Anda sedang memilih semua",
     "livewire-tables::You are not connected to the internet.": "Anda tidak disambungkan ke internet.",
-    "livewire-tables::You have selected": "Anda telah memilih"
+    "livewire-tables::You have selected": "Anda telah memilih",
+    "All": "Semua",
+    "All Columns": "Semua Lajur",
+    "Applied Filters": "Tapisan Digunakan",
+    "Applied Sorting": "Susunan Digunakan",
+    "Bulk Actions": "Tindakan Pukal",
+    "Clear": "Kosongkan",
+    "Columns": "Kolum",
+    "Debugging Values": "Menyahpepijat Nilai",
+    "Deselect All": "Nyahpilih semua",
+    "Done Reordering": "Selesai Menyusun Semula",
+    "Filters": "Tapisan",
+    "not_applicable": "N/A",
+    "No": "Tidak",
+    "No items found. Try to broaden your search.": "Tiada data ditemui. Sila perluaskan carian anda",
+    "of": "daripada",
+    "Remove filter option": "Keluarkan pilihan tapisan",
+    "Remove sort option": "Keluarkan pilihan sususan",
+    "Reorder": "menyusun semula",
+    "results": "keputusan",
+    "row": "barisan",
+    "rows": "barisan",
+    "rows, do you want to select all": "barisan, adakah anda mahu pilih semua?",
+    "Search": "Carian",
+    "Select All": "Pilih Semua",
+    "Showing": "Menunjukkan",
+    "to": "ke",
+    "Yes": "ya",
+    "You are currently selecting all": "Anda sedang memilih semua",
+    "You are not connected to the internet.": "Anda tidak disambungkan ke internet.",
+    "You have selected": "Anda telah memilih"
 }
\ No newline at end of file
diff --git a/resources/lang/nl.json b/resources/lang/nl.json
index 7ffad019f..a6223018c 100644
--- a/resources/lang/nl.json
+++ b/resources/lang/nl.json
@@ -30,5 +30,37 @@
     "livewire-tables::You are currently selecting all": "Huidig heeft u alles geselecteerd",
     "livewire-tables::You are not connected to the internet.": "U bent niet verbonden met het internet.",
     "livewire-tables::You have selected": "U selecteerde",
-    "livewire-tables::Select All On Page": "Alles op deze pagina selecteren"
+    "livewire-tables::Select All On Page": "Alles op deze pagina selecteren",
+    "All": "Alle",
+    "All Columns": "Alle kolommen",
+    "Applied Filters": "Toegepaste filters",
+    "Applied Sorting": "Toegepaste sortering",
+    "Bulk Actions": "Bulkacties",
+    "Bulk Actions Confirm": "Weet u het zeker?",
+    "Clear": "Wissen",
+    "Columns": "Kolommen",
+    "Debugging Values": "Debugging waarden",
+    "Deselect All": "Alles deselecteren",
+    "Done Reordering": "Hersortering voltooid",
+    "Filters": "Filters",
+    "not_applicable": "N/A",
+    "No": "Nee",
+    "No items found. Try to broaden your search.": "Er zijn geen items gevonden. Probeer uw zoekopdracht te verfijnen.",
+    "of": "van",
+    "Remove filter option": "Filteroptie verwijderen",
+    "Remove sort option": "Sorteeroptie verwijderen",
+    "Reorder": "Hersorteren",
+    "results": "resultaten",
+    "row": "rij",
+    "rows": "rijen",
+    "rows, do you want to select all": "rijen, wilt u alles selecteren",
+    "Search": "Zoeken",
+    "Select All": "Alles selecteren",
+    "Showing": "Toont",
+    "to": "tot",
+    "Yes": "Ja",
+    "You are currently selecting all": "Huidig heeft u alles geselecteerd",
+    "You are not connected to the internet.": "U bent niet verbonden met het internet.",
+    "You have selected": "U selecteerde",
+    "Select All On Page": "Alles op deze pagina selecteren"
 }
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
index a8e8c3b5a..12469dc82 100644
--- a/resources/lang/pl.json
+++ b/resources/lang/pl.json
@@ -30,5 +30,37 @@
     "livewire-tables::Yes": "Tak",
     "livewire-tables::You are currently selecting all": "Aktualnie masz wszystko zaznaczone",
     "livewire-tables::You are not connected to the internet.": "Brak połączenia z internetem.",
-    "livewire-tables::You have selected": "Masz wybrane"
+    "livewire-tables::You have selected": "Masz wybrane",
+    "All": "Wszystko",
+    "All Columns": "Wszystkie kolumny",
+    "Applied Filters": "Użyte filtry",
+    "Applied Sorting": "Użyte sortowanie",
+    "Bulk Actions": "Akcje zbiorowe",
+    "Bulk Actions Confirm": "Czy zastosować ?",
+    "Clear": "Wyczyść",
+    "Columns": "Kolumny",
+    "Debugging Values": "Wartości debugowania",
+    "Deselect All": "Odznacz wszystko",
+    "Done Reordering": "Done Reordering",
+    "Filters": "Filtry",
+    "not_applicable": "N/A",
+    "No": "Nie",
+    "No items found. Try to broaden your search.": "Brak rezultatów do wyświetlenia.",
+    "of": "z",
+    "Remove filter option": "Usuń opcję filtra",
+    "Remove sort option": "Usuń opcję sortowania",
+    "Reorder": "Zmień kolejność",
+    "results": "wyniki",
+    "row": "wiersz",
+    "rows": "wiersze",
+    "rows, do you want to select all": "czy chcesz zaznaczyć wszystkie wiersze",
+    "Search": "Szukaj",
+    "Select All": "Zaznacz wszystko",
+    "Select All On Page": "Zaznacz wszystko na stronie",
+    "Showing": "Pokazywanie",
+    "to": "do",
+    "Yes": "Tak",
+    "You are currently selecting all": "Aktualnie masz wszystko zaznaczone",
+    "You are not connected to the internet.": "Brak połączenia z internetem.",
+    "You have selected": "Masz wybrane"
 }
\ No newline at end of file
diff --git a/resources/lang/pt.json b/resources/lang/pt.json
index 204e0dd76..f38578da1 100644
--- a/resources/lang/pt.json
+++ b/resources/lang/pt.json
@@ -29,5 +29,36 @@
     "livewire-tables::Yes": "Sim",
     "livewire-tables::You are currently selecting all": "Atualmente está a selecionar tudo",
     "livewire-tables::You are not connected to the internet.": "Não está ligado à internet.",
-    "livewire-tables::You have selected": "Selecionou"
+    "livewire-tables::You have selected": "Selecionou",
+    "All": "Tudo",
+    "All Columns": "Todas as colunas",
+    "Applied Filters": "Filtros Aplicados",
+    "Applied Sorting": "Ordenação Aplicada",
+    "Bulk Actions": "Ações Massivas",
+    "Clear": "Limpar",
+    "Columns": "Colunas",
+    "Debugging Values": "Valores de depuração",
+    "Deselect All": "Desmarcar Tudo",
+    "Done Reordering": "Ordeanação finalizada",
+    "Filters": "Filtros",
+    "not_applicable": "N/A",
+    "No": "Não",
+    "No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
+    "of": "de",
+    "Remove filter option": "Remover opção de filtro",
+    "Remove sort option": "Remover opção de ordenação",
+    "Reorder": "Reordenar",
+    "results": "resultados",
+    "row": "linha",
+    "rows": "linhas",
+    "rows, do you want to select all": "linhas, pretende selecionar tudo",
+    "Search": "Pesquisar",
+    "Select All": "Seleccionar Tudo",
+    "Select All On Page": "Selecione tudo na página",
+    "Showing": "A mostrar",
+    "to": "a",
+    "Yes": "Sim",
+    "You are currently selecting all": "Atualmente está a selecionar tudo",
+    "You are not connected to the internet.": "Não está ligado à internet.",
+    "You have selected": "Selecionou"
 }
\ No newline at end of file
diff --git a/resources/lang/pt_BR.json b/resources/lang/pt_BR.json
index e906cea37..09a0e2906 100644
--- a/resources/lang/pt_BR.json
+++ b/resources/lang/pt_BR.json
@@ -30,5 +30,37 @@
     "livewire-tables::Yes": "Sim",
     "livewire-tables::You are currently selecting all": "Você selecionou tudo",
     "livewire-tables::You are not connected to the internet.": "Você não está conectado na internet.",
-    "livewire-tables::You have selected": "Você selecionou"
+    "livewire-tables::You have selected": "Você selecionou",
+    "All": "Tudo",
+    "All Columns": "Todas as colunas",
+    "Applied Filters": "Filtros aplicados",
+    "Applied Sorting": "Ordenação aplicada",
+    "Bulk Actions": "Ações em massa",
+    "Bulk Actions Confirm": "Tem certeza",
+    "Clear": "Limpar",
+    "Columns": "Colunas",
+    "Debugging Values": "Valores de depuração",
+    "Deselect All": "Desmarcar Tudo",
+    "Done Reordering": "Ordenação finalizada",
+    "Filters": "Filtros",
+    "not_applicable": "N/A",
+    "No": "Não",
+    "No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
+    "of": "de",
+    "Reorder": "Reordenar",
+    "results": "resultados",
+    "Remove filter option": "Remover opção de filtro",
+    "Remove sort option": "Remover opção de ordenação",
+    "row": "linha",
+    "rows": "linhas",
+    "rows, do you want to select all": "linhas, você deseja selecionar tudo?",
+    "Search": "Pesquisar",
+    "Select All": "Selecionar tudo",
+    "Select All On Page": "Selecione tudo na página",
+    "Showing": "Exibindo",
+    "to": "a",
+    "Yes": "Sim",
+    "You are currently selecting all": "Você selecionou tudo",
+    "You are not connected to the internet.": "Você não está conectado na internet.",
+    "You have selected": "Você selecionou"
 }
\ No newline at end of file
diff --git a/resources/lang/ru.json b/resources/lang/ru.json
index 15460181c..53b9fbf1b 100644
--- a/resources/lang/ru.json
+++ b/resources/lang/ru.json
@@ -28,5 +28,35 @@
     "livewire-tables::Yes": "Да",
     "livewire-tables::You are currently selecting all": "Вы выбираете все",
     "livewire-tables::You are not connected to the internet.": "Вы не подключены к Интернету",
-    "livewire-tables::You have selected": "Вы выбрали"
+    "livewire-tables::You have selected": "Вы выбрали",
+    "All": "Все",
+    "All Columns": "Все столбцы",
+    "Applied Filters": "Примененные фильтры",
+    "Applied Sorting": "Примененная сортировка",
+    "Bulk Actions": "Массовые действия",
+    "Clear": "Очистить",
+    "Columns": "Столбцы",
+    "Debugging Values": "Отладочные значения",
+    "Deselect All": "Снять выделение",
+    "Done Reordering": "Сортировка выполнена",
+    "Filters": "Фильтры",
+    "not_applicable": "N/A",
+    "No": "Нет",
+    "No items found. Try to broaden your search.": "Ничего не найдено. Попробуйте расширить поиск.",
+    "of": "из",
+    "Remove filter option": "Удалить фильтр",
+    "Remove sort option": "Удалить параметр сортировки",
+    "Reorder": "Переупорядочить",
+    "results": "результатов",
+    "row": "ряды",
+    "rows": "ряды",
+    "rows, do you want to select all": "ряды, вы хотите выбрать все",
+    "Search": "Поиск",
+    "Select All": "Выбрать все",
+    "Showing": "Показано с",
+    "to": "к",
+    "Yes": "Да",
+    "You are currently selecting all": "Вы выбираете все",
+    "You are not connected to the internet.": "Вы не подключены к Интернету",
+    "You have selected": "Вы выбрали"
 }
\ No newline at end of file
diff --git a/resources/lang/th.json b/resources/lang/th.json
index 56bc17f36..35c21b7fd 100644
--- a/resources/lang/th.json
+++ b/resources/lang/th.json
@@ -30,5 +30,37 @@
     "livewire-tables::Yes": "ใช่",
     "livewire-tables::You are currently selecting all": "ขณะนี้คุณได้เลือกทุกรายการ",
     "livewire-tables::You are not connected to the internet.": "ขณะนี้คุณไม่ได้เชื่อมต่อกับอินเทอร์เน็ต",
-    "livewire-tables::You have selected": "คุณเลือก"
+    "livewire-tables::You have selected": "คุณเลือก",
+    "All": "ทั้งหมด",
+    "All Columns": "คอลัมน์ทั้งหมด",
+    "Applied Filters": "กรองข้อมูลตาม",
+    "Applied Sorting": "เรียงลำดับตาม",
+    "Bulk Actions": "เลือกการกระทำ",
+    "Bulk Actions Confirm": "คุณแน่ใจ?",
+    "Clear": "ล้างทั้งหมด",
+    "Columns": "เลือกคอลัมน์",
+    "Debugging Values": "ค่าการดีบัก",
+    "Deselect All": "ไม่เลือกทั้งหมด",
+    "Done Reordering": "จัดลำดับแล้ว",
+    "Filters": "ตัวกรอง",
+    "not_applicable": "N/A",
+    "No": "เลขที่",
+    "No items found. Try to broaden your search.": "ไม่พบรายการที่ค้นหา",
+    "of": "จาก",
+    "Remove filter option": "เอาตัวกรองออก",
+    "Remove sort option": "เอาการเรียงลำดับออก",
+    "Reorder": "จัดลำดับ",
+    "results": "รายการ",
+    "row": "รายการ",
+    "rows": "รายการ",
+    "rows, do you want to select all": "รายการ, คุณต้องการเลือกทั้งหมด",
+    "Search": "ค้นหา...",
+    "Select All": "เลือกทั้งหมด",
+    "Select All On Page": "เลือกทั้งหมดบนหน้า",
+    "Showing": "แสดง",
+    "to": "-",
+    "Yes": "ใช่",
+    "You are currently selecting all": "ขณะนี้คุณได้เลือกทุกรายการ",
+    "You are not connected to the internet.": "ขณะนี้คุณไม่ได้เชื่อมต่อกับอินเทอร์เน็ต",
+    "You have selected": "คุณเลือก"
 }
\ No newline at end of file
diff --git a/resources/lang/tk.json b/resources/lang/tk.json
index 5c22ba779..2099d845f 100644
--- a/resources/lang/tk.json
+++ b/resources/lang/tk.json
@@ -28,5 +28,35 @@
     "livewire-tables::Yes": "Evet",
     "livewire-tables::You are currently selecting all": "Häzirki wagtda hemmesini saýlap alýarsyňyz",
     "livewire-tables::You are not connected to the internet.": "Siz internete birikmediksiňiz.",
-    "livewire-tables::You have selected": "Saýladyňyz"
+    "livewire-tables::You have selected": "Saýladyňyz",
+    "All": "Hemmesi",
+    "All Columns": "Colhli sütünler",
+    "Applied Filters": "Ulanylýan Süzgüçler",
+    "Applied Sorting": "Ulanylýan Tertipleşdirme",
+    "Bulk Actions": "Köpçülikleýin Hereketler",
+    "Clear": "Arassala",
+    "Columns": "Sütünler",
+    "Debugging Values": "Gymmatlyklary düzetmek",
+    "Deselect All": "Hemmesini Aýyr",
+    "Done Reordering": "Täzeden Tertiplendi",
+    "Filters": "Süzgüçler",
+    "not_applicable": "N/A",
+    "No": "Hayir",
+    "No items found. Try to broaden your search.": "Hiç zat tapylmady. Gözlegiňizi giňeltmäge synanyşyň.",
+    "of": "aralygy",
+    "Remove filter option": "Süzgüç görnüşini aýyryň",
+    "Remove sort option": "Tertiplemek görnüşini aýyryň",
+    "Reorder": "Tertibe salmak",
+    "results": "netijeler",
+    "row": "hatarlar",
+    "rows": "hatarlar",
+    "rows, do you want to select all": "hatarlar, hemmesini saýlamak isleýärsiňizmi?",
+    "Search": "Gözlemek",
+    "Select All": "Hepsini seç",
+    "Showing": "Görkezmek",
+    "to": "-",
+    "Yes": "Evet",
+    "You are currently selecting all": "Häzirki wagtda hemmesini saýlap alýarsyňyz",
+    "You are not connected to the internet.": "Siz internete birikmediksiňiz.",
+    "You have selected": "Saýladyňyz"
 }
\ No newline at end of file
diff --git a/resources/lang/tr.json b/resources/lang/tr.json
index 9b0dd4dff..f1218ae2b 100644
--- a/resources/lang/tr.json
+++ b/resources/lang/tr.json
@@ -28,5 +28,35 @@
     "livewire-tables::Yes": "Evet",
     "livewire-tables::You are currently selecting all": "Hepsini seçtiniz.",
     "livewire-tables::You are not connected to the internet.": "İnternet bağlantınız kesildi.",
-    "livewire-tables::You have selected": "Siz seçildiniz"
+    "livewire-tables::You have selected": "Siz seçildiniz",
+    "All": "Tümü",
+    "All Columns": "Tüm Sütunlar",
+    "Applied Filters": "Aktif Filtreler",
+    "Applied Sorting": "Aktif Sıralamalar",
+    "Bulk Actions": "Toplu İşlemler",
+    "Clear": "Kaldır",
+    "Columns": "Kolonlar",
+    "Debugging Values": "Debug Değerleri",
+    "Deselect All": "Seçimleri kaldır",
+    "Done Reordering": "Sıralamayı Tamamla",
+    "Filters": "Filtreler",
+    "not_applicable": "N/A",
+    "No": "HAYIR",
+    "No items found. Try to broaden your search.": "Kayıt bulunamadı.",
+    "of": " ",
+    "Remove filter option": "Filtre seçeneğini kaldır",
+    "Remove sort option": "Sıralama seçeneğini kaldır",
+    "Reorder": "Yeniden Sırala",
+    "results": "toplam sonuç",
+    "row": "satır",
+    "rows": "satır",
+    "rows, do you want to select all": "satır seçtiniz. Hepsini seçmek ister misiniz?",
+    "Search": "Ara",
+    "Select All": "Hepsini seç",
+    "Showing": "Gösterilen",
+    "to": " - ",
+    "Yes": "Evet",
+    "You are currently selecting all": "Hepsini seçtiniz.",
+    "You are not connected to the internet.": "İnternet bağlantınız kesildi.",
+    "You have selected": "Siz seçildiniz"
 }
\ No newline at end of file
diff --git a/resources/lang/tw.json b/resources/lang/tw.json
index 990244a50..b675a47c7 100644
--- a/resources/lang/tw.json
+++ b/resources/lang/tw.json
@@ -30,5 +30,37 @@
     "livewire-tables::Yes": "是的",
     "livewire-tables::You are currently selecting all": "您目前已選擇全部資料",
     "livewire-tables::You are not connected to the internet.": "目前為離線模式",
-    "livewire-tables::You have selected": "您已選擇"
+    "livewire-tables::You have selected": "您已選擇",
+    "All": "全部",
+    "All Columns": "所有專欄",
+    "Applied Filters": "已套用的過濾規則",
+    "Applied Sorting": "已套用的搜尋規則",
+    "Bulk Actions": "批次操作",
+    "Bulk Actions Confirm": "你確定嗎",
+    "Clear": "清除",
+    "Columns": "欄位",
+    "Debugging Values": "調試值",
+    "Deselect All": "取消選擇",
+    "Done Reordering": "排序完成",
+    "Filters": "過濾規則",
+    "not_applicable": "N/A",
+    "No": "不",
+    "No items found. Try to broaden your search.": "無資料呈現。請嘗試擴大搜尋範圍。",
+    "of": "筆資料，共",
+    "Reorder": "重新排序",
+    "Remove filter option": "移除過濾規則",
+    "Remove sort option": "移除排序規則",
+    "results": "筆資料",
+    "row": "筆資料",
+    "rows": "筆資料",
+    "rows, do you want to select all": "筆資料，您是否要全選",
+    "Search": "搜尋",
+    "Select All": "搜尋全部",
+    "Select All On Page": "选择页面上的所有内容",
+    "Showing": "顯示",
+    "to": "至",
+    "Yes": "是的",
+    "You are currently selecting all": "您目前已選擇全部資料",
+    "You are not connected to the internet.": "目前為離線模式",
+    "You have selected": "您已選擇"
 }
\ No newline at end of file
diff --git a/resources/lang/uk.json b/resources/lang/uk.json
index 4d662de72..540684056 100644
--- a/resources/lang/uk.json
+++ b/resources/lang/uk.json
@@ -31,5 +31,38 @@
     "livewire-tables::Yes": "Так",
     "livewire-tables::You are currently selecting all": "Наразі ви вибираєте всі",
     "livewire-tables::You are not connected to the internet.": "Ви не підключені до Інтернету.",
-    "livewire-tables::You have selected": "Ви вибрали"
+    "livewire-tables::You have selected": "Ви вибрали",
+    "All": "Всі",
+    "All Columns": "Усі стовпці",
+    "Applied Filters": "Застосовані фільтри",
+    "Applied Sorting": "Застосовані сортування",
+    "Bulk Actions": "Масові дії",
+    "Bulk Actions Confirm": "Vy vpevneni?",
+    "Clear": "Очистити",
+    "Columns": "Колонки",
+    "Debugging Values": "Значення налагодження",
+    "Deselect All": "Зняти вибір із усіх",
+    "Done Reordering": "Сортування виконанно",
+    "Filters": "Фільтри",
+    "not_applicable": "N/A",
+    "No": "Немає",
+    "No items found. Try to broaden your search.": "Немає елементів. Спробуйте розширити пошук.",
+    "of": "від",
+    "Remove filter option": "Видалити опцію фільтра",
+    "Remove sort option": "Видалити параметр сортування",
+    "Reorder": "Змінити порядок",
+    "results": "результатів",
+    "row": "рядки",
+    "rows": "рядки",
+    "rows, do you want to select all": "рядків, ви хочете вибрати всі",
+    "Search": "Пошук",
+    "Select All": "Вибрати все",
+    "Select All On Page": "Виберіть «Усі на сторінці",
+    "Showing": "Показано",
+    "to": "до",
+    "Unselect All": "Прибрати вибір усіх",
+    "Yes": "Так",
+    "You are currently selecting all": "Наразі ви вибираєте всі",
+    "You are not connected to the internet.": "Ви не підключені до Інтернету.",
+    "You have selected": "Ви вибрали"
 }
\ No newline at end of file

From 1817b9fb8054c98a0c6d8806373140f006e09a56 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 22 Sep 2024 07:29:25 +0100
Subject: [PATCH 057/103] Fix for Search Field Attribute Defaults (#1962)

* Fix for Search Field Attribute Defaults

* SearchFieldAttributes -> Defaults To False
---
 src/Traits/Configuration/SearchConfiguration.php       | 2 +-
 src/Traits/Helpers/SearchHelpers.php                   | 2 +-
 tests/Traits/Configuration/SearchConfigurationTest.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Traits/Configuration/SearchConfiguration.php b/src/Traits/Configuration/SearchConfiguration.php
index c746ef609..77590071f 100644
--- a/src/Traits/Configuration/SearchConfiguration.php
+++ b/src/Traits/Configuration/SearchConfiguration.php
@@ -156,7 +156,7 @@ public function setSearchPlaceholder(string $placeholder): self
 
     public function setSearchFieldAttributes(array $attributes = []): self
     {
-        $this->setCustomAttributes('searchFieldAttributes', $attributes);
+        $this->setCustomAttributes('searchFieldAttributes', array_merge(['default' => false, 'default-colors' => false, 'default-styling' => false], $attributes));
 
         return $this;
     }
diff --git a/src/Traits/Helpers/SearchHelpers.php b/src/Traits/Helpers/SearchHelpers.php
index 4d4a540a4..059c17d32 100644
--- a/src/Traits/Helpers/SearchHelpers.php
+++ b/src/Traits/Helpers/SearchHelpers.php
@@ -137,7 +137,7 @@ public function hasSearchPlaceholder(): bool
 
     public function getSearchFieldAttributes(): array
     {
-        return $this->getCustomAttributes('searchFieldAttributes');
+        return $this->getCustomAttributes('searchFieldAttributes', true);
     }
 
     public function shouldTrimSearchString(): bool
diff --git a/tests/Traits/Configuration/SearchConfigurationTest.php b/tests/Traits/Configuration/SearchConfigurationTest.php
index 0f0815faa..ad47d954b 100644
--- a/tests/Traits/Configuration/SearchConfigurationTest.php
+++ b/tests/Traits/Configuration/SearchConfigurationTest.php
@@ -180,7 +180,7 @@ public function test_can_set_search_placeholder(): void
 
     public function test_can_set_search_field_attributes(): void
     {
-        $this->assertSame(['default' => false, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getSearchFieldAttributes());
+        $this->assertSame(['default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getSearchFieldAttributes());
 
         $this->basicTable->setSearchFieldAttributes(['class' => 'bg-blue', 'style' => 'font-size: 3em;']);
 

From 3f7898ff8dbb2e71a517b29990814301b3f0d167 Mon Sep 17 00:00:00 2001
From: Paoulo Riveros <khwadj@gmail.com>
Date: Tue, 24 Sep 2024 20:50:50 +0200
Subject: [PATCH 058/103] Change the type of LaravelLivewireTablesEvent::$user
 from Illuminate\Foundation\Auth\User to
 Illuminate\Contracts\Auth\Authenticatable (#1963)

---
 src/Events/LaravelLivewireTablesEvent.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Events/LaravelLivewireTablesEvent.php b/src/Events/LaravelLivewireTablesEvent.php
index 38ef5550a..89026ead2 100644
--- a/src/Events/LaravelLivewireTablesEvent.php
+++ b/src/Events/LaravelLivewireTablesEvent.php
@@ -2,7 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Events;
 
-use Illuminate\Foundation\Auth\User;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -16,7 +16,7 @@ class LaravelLivewireTablesEvent
 
     public string|array|null $value;
 
-    public ?User $user;
+    public ?Authenticatable $user;
 
     public function setKeyForEvent(string $key): self
     {

From 74a0cc8d951b76039c274b0ad49b28b0d935b26a Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:51:00 +0100
Subject: [PATCH 059/103] Remove persist from getFilterGenericData (#1966)

---
 src/Traits/Helpers/FilterHelpers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php
index 4a78b333b..056500190 100644
--- a/src/Traits/Helpers/FilterHelpers.php
+++ b/src/Traits/Helpers/FilterHelpers.php
@@ -330,7 +330,7 @@ public function hasFilterGenericData(): bool
         return ! empty($this->filterGenericData);
     }
 
-    #[Computed(persist: true)]
+    #[Computed]
     public function getFilterGenericData(): array
     {
         if (! $this->hasFilterGenericData()) {

From d19dba0bb3e8e3bf1808b57c24ace079bddba77e Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:57:55 +0100
Subject: [PATCH 060/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6ac79c87..d724f6945 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.21] - 2024-09-24
+### Bug Fixes
+- Remove persist from getFilterGenericData by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1966
+- In LaravelLivewireTablesEvent, change the type to Illuminate\Contracts\Auth\Authenticatable by @khwadj in https://github.com/rappasoft/laravel-livewire-tables/pull/1963
+- Fix for Search Field Attribute Defaults by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1962
+- Fix Filter Pills Icon - Tailwind by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1961
+- Add filterComponents into queryString to ensure they're maintained by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1957
+- Reset Current Page on "Per Page" changing by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1953
+
+### New Features
+- Add setLabelAttributes method to Action, and update Docs for Filter by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1952
+
+### Tweaks
+- Migration to Core attribute management by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1943
+- Localisation - Avoid Conflicts With Other Packages by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1955
+
+### Docs
+- Fix syntax for DateColumn outputFormat in docs by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1960
+
+
 ## [v3.4.20] - 2024-09-10
 ### Bug Fixes
 - Revert tableName to be public by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1937

From 5f6e5d641cfb8143a5c57e70e50ed36c220b9d12 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:30:36 +0100
Subject: [PATCH 061/103] Update Pint Workflow (#1967)

* Update Pint Workflow

* Update ChangeLog

* Test Styling Workflow

* Fix styling

* Test Workflow

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .github/workflows/pint.yml | 4 ++--
 CHANGELOG.md               | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pint.yml b/.github/workflows/pint.yml
index 230a58799..356103132 100644
--- a/.github/workflows/pint.yml
+++ b/.github/workflows/pint.yml
@@ -24,9 +24,9 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@2.2.0
+        uses: aglipanci/laravel-pint-action@latest
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Fix styling
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d724f6945..3e2d71935 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 ### Tweaks
 - Migration to Core attribute management by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1943
 - Localisation - Avoid Conflicts With Other Packages by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1955
+- GitHub Workflow Tweak for Styling Fixes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1967
 
 ### Docs
 - Fix syntax for DateColumn outputFormat in docs by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1960

From e222c1e46a5abe65cd70f95d7580cdcb213c6624 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:35:11 +0100
Subject: [PATCH 062/103] Update Discord Releases Workflow (#1968)

---
 .github/workflows/discord-releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/discord-releases.yml b/.github/workflows/discord-releases.yml
index 84ea5b888..fb008bc21 100644
--- a/.github/workflows/discord-releases.yml
+++ b/.github/workflows/discord-releases.yml
@@ -9,7 +9,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Package Releases
-        uses: SethCohen/github-releases-to-discord@v1.13.1
+        uses: SethCohen/github-releases-to-discord@latest
         with:
           webhook_url: ${{ secrets.WEBHOOK_DISCORD_RELEASE_URL }}
           color: "2105893"

From 5c47e61b9c7055b6bf97cfeb99521899753498ef Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:37:18 +0100
Subject: [PATCH 063/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e2d71935..4edbb623a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Migration to Core attribute management by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1943
 - Localisation - Avoid Conflicts With Other Packages by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1955
 - GitHub Workflow Tweak for Styling Fixes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1967
+- GitHub Workflow Tweak for Discord - Updates by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1968
 
 ### Docs
 - Fix syntax for DateColumn outputFormat in docs by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1960

From 2d7f7053a49240e30f535f24585197165631824d Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 25 Sep 2024 06:35:25 +0100
Subject: [PATCH 064/103] Fix Loading Placeholder Bug - Breaking Table (#1969)

* FixLoadingPlaceholderBug

* Adjust tests for new Loading blade
---
 resources/views/components/includes/loading.blade.php  | 8 ++++----
 resources/views/components/table/tr.blade.php          | 4 ++--
 tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/views/components/includes/loading.blade.php b/resources/views/components/includes/loading.blade.php
index c07d9cb19..f22096321 100644
--- a/resources/views/components/includes/loading.blade.php
+++ b/resources/views/components/includes/loading.blade.php
@@ -9,15 +9,15 @@
     @include($this->getLoadingPlaceHolderBlade(), ['colCount' => $colCount])
 @else
 
-    <tr wire:key="{{ $tableName }}-loader" class="hidden d-none"
+    <tr wire:key="{{ $tableName }}-loader"
     {{
         $attributes->merge($customAttributes['loader-wrapper'])
-            ->class(['w-full text-center h-screen place-items-center align-middle' => $isTailwind && ($customAttributes['loader-wrapper']['default'] ?? true)])
-            ->class(['w-100 text-center h-100 align-items-center' => $isBootstrap && ($customAttributes['loader-wrapper']['default'] ?? true)]);
+            ->class(['hidden w-full text-center h-screen place-items-center align-middle' => $isTailwind && ($customAttributes['loader-wrapper']['default'] ?? true)])
+            ->class(['d-none w-100 text-center h-100 align-items-center' => $isBootstrap && ($customAttributes['loader-wrapper']['default'] ?? true)]);
     }}
     wire:loading.class.remove="hidden d-none"
     >
-        <td colspan="{{ $colCount }}">
+        <td colspan="{{ $colCount }}" wire:key="{{ $tableName }}-loader-column" >
             <div class="h-min self-center align-middle text-center">
                 <div class="lds-hourglass"
                 {{
diff --git a/resources/views/components/table/tr.blade.php b/resources/views/components/table/tr.blade.php
index 4a3f84ece..40ccde560 100644
--- a/resources/views/components/table/tr.blade.php
+++ b/resources/views/components/table/tr.blade.php
@@ -12,9 +12,9 @@
     x-on:dragover.prevent.throttle.500ms="currentlyReorderingStatus && dragOverEvent(event)"
     x-on:dragleave.prevent.throttle.500ms="currentlyReorderingStatus && dragLeaveEvent(event)"
     @if($this->hasDisplayLoadingPlaceholder()) 
-    wire:loading.remove
+        wire:loading.class.add="hidden d-none"
     @else
-    wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
+        wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
     @endif
     id="{{ $tableName }}-row-{{ $row->{$primaryKey} }}"
     :draggable="currentlyReorderingStatus"
diff --git a/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php b/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php
index 0f64aa5bf..5d93e3432 100644
--- a/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php
+++ b/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php
@@ -12,7 +12,7 @@ public function test_can_see_placeholder_section(): void
     {
         Livewire::test(PetsTableLoadingPlaceholder::class)
             ->call('setPerPageAccepted', [1, 5, 10])
-            ->assertSeeHtml('tr wire:key="table-loader" class="hidden d-none"')
+            ->assertSeeHtml('tr wire:key="table-loader')
             ->call('setPerPage', 5);
     }
 
@@ -21,7 +21,7 @@ public function test_can_see_placeholder_custom_text(): void
         Livewire::test(PetsTableLoadingPlaceholder::class)
             ->call('setPerPageAccepted', [1, 5, 10])
             ->assertSeeHtmlInOrder([
-                '<tr wire:key="table-loader" class="hidden d-none"',
+                '<tr wire:key="table-loader"',
                 '<td colspan="',
                 '<div class="h-min self-center align-middle text-center"',
                 '<div class="lds-hourglass"',

From 71717f92e0420f7365a54ad19f931ad5e2c60f09 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 25 Sep 2024 06:36:14 +0100
Subject: [PATCH 065/103] v3.4.22 ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f8fe64b6..1683a3f17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.4.22] - 2024-09-25
+### Bug Fixes
+- Fix Loading Placeholder Bug - Breaking Table by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1969
+
 ## [v3.4.21] - 2024-09-25
 ### Bug Fixes
 - Remove persist from getFilterGenericData by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1966

From 9a8436f5fbd7fb85cc56346fdf09ea945457c94b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 27 Sep 2024 05:14:05 +0100
Subject: [PATCH 066/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1683a3f17..6f9c6c307 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## [v3.4.22] - 2024-09-25
+## [v3.4.22] - 2024-09-27
 ### Bug Fixes
 - Fix Loading Placeholder Bug - Breaking Table by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1969
 

From 905b43cf3dcdea9f5cc76bef1e0c4322bddf1e17 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 29 Sep 2024 01:40:24 +0100
Subject: [PATCH 067/103] Add comment on getTitle (#1976)

---
 docs/columns/styling.md   | 10 ++++++++++
 docs/datatable/styling.md | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/docs/columns/styling.md b/docs/columns/styling.md
index f7db2a4bd..7862c9566 100644
--- a/docs/columns/styling.md
+++ b/docs/columns/styling.md
@@ -45,6 +45,11 @@ Below is a copy of the relevant sections from [datatable styling](../datatable/s
 
 Set a list of attributes to override on the th elements.  
 
+If your Column does not have a field (e.g. a label column), then you may use the following, which will utilise the first parameter in Column::make()
+```php
+  $column->getTitle()
+```
+
 ```php
 public function configure(): void
 {
@@ -204,6 +209,11 @@ public function configure(): void
 
 Set a list of attributes to override on the td elements.  For example, changing the background color between red/green based on whether the "total" field is over or under 1000.
 
+If your Column does not have a field (e.g. a label column), then you may use the following, which will utilise the first parameter in Column::make()
+```php
+  $column->getTitle()
+```
+
 ```php
 public function configure(): void
 {
diff --git a/docs/datatable/styling.md b/docs/datatable/styling.md
index b460371bf..9353ad00e 100644
--- a/docs/datatable/styling.md
+++ b/docs/datatable/styling.md
@@ -150,6 +150,11 @@ public function configure(): void
 
 Set a list of attributes to override on the th elements.  
 
+If your Column does not have a field (e.g. a label column), then you may use the following, which will utilise the first parameter in Column::make()
+```php
+  $column->getTitle()
+```
+
 ```php
 public function configure(): void
 {
@@ -311,6 +316,11 @@ public function configure(): void
 
 Set a list of attributes to override on the td elements
 
+If your Column does not have a field (e.g. a label column), then you may use the following, which will utilise the first parameter in Column::make()
+```php
+  $column->getTitle()
+```
+
 ```php
 public function configure(): void
 {

From fd13aa92b97fcc30906d49eecca13be2105f51ba Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 29 Sep 2024 02:06:14 +0100
Subject: [PATCH 068/103] Add before-wrapper and after-wrapper configurable
 areas (#1977)

---
 docs/datatable/configurable-areas.md |  2 ++
 resources/views/datatable.blade.php  | 36 ++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/docs/datatable/configurable-areas.md b/docs/datatable/configurable-areas.md
index bb9d78a5b..4661be63b 100644
--- a/docs/datatable/configurable-areas.md
+++ b/docs/datatable/configurable-areas.md
@@ -26,6 +26,7 @@ You can use the `setConfigurableAreas` method to set multiple areas that you wan
 public function configure(): void
 {
   $this->setConfigurableAreas([
+    'before-wrapper' => 'path.to.my.view',
     'before-tools' => 'path.to.my.view',
     'toolbar-left-start' => 'path.to.my.view',
     'toolbar-left-end' => 'path.to.my.view',
@@ -35,6 +36,7 @@ public function configure(): void
     'after-toolbar' => 'path.to.my.view',
     'before-pagination' => 'path.to.my.view',
     'after-pagination' => 'path.to.my.view',
+    'after-wrapper' => 'path.to.my.view',
   ]);
 }
 ```
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index f534f7f49..e92119d9b 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -7,15 +7,24 @@
 @php($isBootstrap5 = $this->isBootstrap5)
 
 <div {{ $this->getTopLevelAttributes() }}>
+
+    @includeWhen(
+        $this->hasConfigurableAreaFor('before-wrapper'), 
+        $this->getConfigurableAreaFor('before-wrapper'), 
+        $this->getParametersForConfigurableArea('before-wrapper')
+    )
+
     <x-livewire-tables::wrapper :component="$this" :tableName="$tableName" :$primaryKey :$isTailwind :$isBootstrap :$isBootstrap4 :$isBootstrap5>
         @if($this->hasActions && !$this->showActionsInToolbar)
             <x-livewire-tables::includes.actions/>    
         @endif
     
 
-        @if ($this->hasConfigurableAreaFor('before-tools'))
-            @include($this->getConfigurableAreaFor('before-tools'), $this->getParametersForConfigurableArea('before-tools'))
-        @endif
+        @includeWhen(
+            $this->hasConfigurableAreaFor('before-tools'), 
+            $this->getConfigurableAreaFor('before-tools'), 
+            $this->getParametersForConfigurableArea('before-tools')
+        )
 
         @if($this->shouldShowTools)
         <x-livewire-tables::tools>
@@ -26,11 +35,21 @@
                 <x-livewire-tables::tools.filter-pills />
             @endif
 
-            @includeWhen($this->hasConfigurableAreaFor('before-toolbar'), $this->getConfigurableAreaFor('before-toolbar'), $this->getParametersForConfigurableArea('before-toolbar'))
+            @includeWhen(
+                $this->hasConfigurableAreaFor('before-toolbar'), 
+                $this->getConfigurableAreaFor('before-toolbar'), 
+                $this->getParametersForConfigurableArea('before-toolbar')
+            )
+
             @if($this->shouldShowToolBar)
                 <x-livewire-tables::tools.toolbar />
             @endif
-            @includeWhen($this->hasConfigurableAreaFor('after-toolbar'), $this->getConfigurableAreaFor('after-toolbar'), $this->getParametersForConfigurableArea('after-toolbar'))
+
+            @includeWhen(
+                $this->hasConfigurableAreaFor('after-toolbar'), 
+                $this->getConfigurableAreaFor('after-toolbar'), 
+                $this->getParametersForConfigurableArea('after-toolbar')
+            )
             
         </x-livewire-tables::tools>
         @endif
@@ -110,4 +129,11 @@
 
         @includeIf($customView)
     </x-livewire-tables::wrapper>
+
+    @includeWhen(
+            $this->hasConfigurableAreaFor('after-wrapper'), 
+            $this->getConfigurableAreaFor('after-wrapper'), 
+            $this->getParametersForConfigurableArea('after-wrapper')
+    )
+    
 </div>

From 6bf0d09a013dcc30994adab66f418d736a369d2c Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 29 Sep 2024 03:19:18 +0100
Subject: [PATCH 069/103] Add initial commit for setPaginationWrapperAttributes
 (#1978)

* Add initial commit for setPaginationWrapperAttributes

* Fix styling

* Update ChangeLog

* Adjust Tests & Methods

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 CHANGELOG.md                                  |  4 +++
 docs/pagination/available-methods.md          | 11 +++++++
 .../views/components/pagination.blade.php     | 22 ++++++++------
 .../Configuration/PaginationConfiguration.php |  7 +++++
 src/Traits/Helpers/PaginationHelpers.php      | 12 ++++++++
 src/Traits/WithPagination.php                 |  3 ++
 .../Traits/Helpers/PaginationHelpersTest.php  | 29 +++++++++++++++++++
 7 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f9c6c307..329d7b70a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## UNRELEASED
+### New Features
+- Add setPaginationWrapperAttributes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1978
+
 ## [v3.4.22] - 2024-09-27
 ### Bug Fixes
 - Fix Loading Placeholder Bug - Breaking Table by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1969
diff --git a/docs/pagination/available-methods.md b/docs/pagination/available-methods.md
index 638e58a4b..eae078132 100644
--- a/docs/pagination/available-methods.md
+++ b/docs/pagination/available-methods.md
@@ -296,3 +296,14 @@ public function configure(): void
     $this->setShouldRetrieveTotalItemCountDisabled();
 }
 ```
+
+## setPaginationWrapperAttributes
+
+Used to set attributes for the "div" that wraps the pagination section
+
+```php
+public function configure(): void
+{
+    $this->setPaginationWrapperAttributes(['class' => 'text-lg']);
+}
+```
diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php
index b69ca77ff..836609b67 100644
--- a/resources/views/components/pagination.blade.php
+++ b/resources/views/components/pagination.blade.php
@@ -1,11 +1,13 @@
 @aware(['component','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 
-@if ($this->hasConfigurableAreaFor('before-pagination'))
-    @include($this->getConfigurableAreaFor('before-pagination'), $this->getParametersForConfigurableArea('before-pagination'))
-@endif
+@includeWhen(
+    $this->hasConfigurableAreaFor('before-pagination'), 
+    $this->getConfigurableAreaFor('before-pagination'), 
+    $this->getParametersForConfigurableArea('before-pagination')
+)
 
 @if ($this->isTailwind)
-    <div>
+    <div {{ $this->getPaginationWrapperAttributesBag() }}>
         @if ($this->paginationVisibilityIsEnabled())
             <div class="mt-4 px-4 md:p-0 sm:flex justify-between items-center space-y-4 sm:space-y-0">
                 <div>
@@ -47,7 +49,7 @@
         @endif
     </div>
 @elseif ($this->isBootstrap4)
-    <div >
+    <div {{ $this->getPaginationWrapperAttributesBag() }}>
         @if ($this->paginationVisibilityIsEnabled())
             @if ($this->paginationIsEnabled() && $this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
                 <div class="row mt-3">
@@ -100,7 +102,7 @@
         @endif
     </div>
 @elseif ($this->isBootstrap5)
-    <div >
+    <div {{ $this->getPaginationWrapperAttributesBag() }} >
         @if ($this->paginationVisibilityIsEnabled())
             @if ($this->paginationIsEnabled() && $this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
                 <div class="row mt-3">
@@ -152,6 +154,8 @@
     </div>
 @endif
 
-@if ($this->hasConfigurableAreaFor('after-pagination'))
-    @include($this->getConfigurableAreaFor('after-pagination'), $this->getParametersForConfigurableArea('after-pagination'))
-@endif
\ No newline at end of file
+@includeWhen(
+    $this->hasConfigurableAreaFor('after-pagination'), 
+    $this->getConfigurableAreaFor('after-pagination'), 
+    $this->getParametersForConfigurableArea('after-pagination')
+)
diff --git a/src/Traits/Configuration/PaginationConfiguration.php b/src/Traits/Configuration/PaginationConfiguration.php
index a8877653a..35c618e0c 100644
--- a/src/Traits/Configuration/PaginationConfiguration.php
+++ b/src/Traits/Configuration/PaginationConfiguration.php
@@ -177,4 +177,11 @@ public function setShouldRetrieveTotalItemCountDisabled(): self
 
         return $this;
     }
+
+    public function setPaginationWrapperAttributes(array $paginationWrapperAttributes): self
+    {
+        $this->paginationWrapperAttributes = array_merge(['class' => ''], $paginationWrapperAttributes);
+
+        return $this;
+    }
 }
diff --git a/src/Traits/Helpers/PaginationHelpers.php b/src/Traits/Helpers/PaginationHelpers.php
index 717af7c12..9654b3a72 100644
--- a/src/Traits/Helpers/PaginationHelpers.php
+++ b/src/Traits/Helpers/PaginationHelpers.php
@@ -2,6 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
 
+use Illuminate\View\ComponentAttributeBag;
 use Livewire\Attributes\Computed;
 
 trait PaginationHelpers
@@ -155,4 +156,15 @@ public function getShouldRetrieveTotalItemCount(): bool
     {
         return $this->shouldRetrieveTotalItemCount;
     }
+
+    public function getPaginationWrapperAttributes(): array
+    {
+        return $this->paginationWrapperAttributes ?? ['class' => ''];
+    }
+
+    #[Computed]
+    public function getPaginationWrapperAttributesBag(): ComponentAttributeBag
+    {
+        return new ComponentAttributeBag($this->getPaginationWrapperAttributes());
+    }
 }
diff --git a/src/Traits/WithPagination.php b/src/Traits/WithPagination.php
index c8c56a3c9..8e6a44aa0 100644
--- a/src/Traits/WithPagination.php
+++ b/src/Traits/WithPagination.php
@@ -52,6 +52,9 @@ trait WithPagination
 
     protected bool $shouldRetrieveTotalItemCount = true;
 
+    // Used In Frontend
+    protected array $paginationWrapperAttributes = ['class' => ''];
+
     public function mountWithPagination(): void
     {
         $sessionPerPage = session()->get($this->getPerPagePaginationSessionKey(), $this->getPerPageAccepted()[0] ?? 10);
diff --git a/tests/Traits/Helpers/PaginationHelpersTest.php b/tests/Traits/Helpers/PaginationHelpersTest.php
index d3744c326..067c0e208 100644
--- a/tests/Traits/Helpers/PaginationHelpersTest.php
+++ b/tests/Traits/Helpers/PaginationHelpersTest.php
@@ -173,4 +173,33 @@ public function test_can_toggle_total_item_count_retrieval_via_status(): void
         $this->assertTrue($this->basicTable->getShouldRetrieveTotalItemCount());
 
     }
+
+    public function test_can_get_pagination_wrapper_attributes(): void
+    {
+
+        $this->assertSame(['class' => ''], $this->basicTable->getPaginationWrapperAttributes());
+
+        $this->basicTable->setPaginationWrapperAttributes(['class' => 'text-lg']);
+
+        $this->assertSame(['class' => 'text-lg'], $this->basicTable->getPaginationWrapperAttributes());
+
+        $this->basicTable->setPaginationWrapperAttributes(['class' => 'text-lg', 'testval' => '456']);
+
+        $this->assertSame(['class' => 'text-lg', 'testval' => '456'], $this->basicTable->getPaginationWrapperAttributes());
+
+    }
+
+    public function test_can_get_pagination_wrapper_attributes_bag(): void
+    {
+        $this->assertSame((new \Illuminate\View\ComponentAttributeBag(['class' => '']))->getAttributes(), $this->basicTable->getPaginationWrapperAttributesBag()->getAttributes());
+
+        $this->basicTable->setPaginationWrapperAttributes(['class' => 'text-lg']);
+
+        $this->assertSame((new \Illuminate\View\ComponentAttributeBag(['class' => 'text-lg']))->getAttributes(), $this->basicTable->getPaginationWrapperAttributesBag()->getAttributes());
+
+        $this->basicTable->setPaginationWrapperAttributes(['class' => 'text-lg', 'testval' => '123']);
+
+        $this->assertSame((new \Illuminate\View\ComponentAttributeBag(['class' => 'text-lg', 'testval' => '123']))->getAttributes(), $this->basicTable->getPaginationWrapperAttributesBag()->getAttributes());
+
+    }
 }

From b4a247d3b0dd3bca42c4160b8f01ae38c6c7893b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 29 Sep 2024 03:54:44 +0100
Subject: [PATCH 070/103] Update ChangeLog

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 329d7b70a..5de68262a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,13 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## UNRELEASED
+## [v3.4.23] - UNRELEASED
 ### New Features
 - Add setPaginationWrapperAttributes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1978
+- Add configurable areas - before-wrapper and after-wrapper by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1977
+
+### Docs
+- Add getTitle reference for setTdAttributes/setTrAttributes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1976
 
 ## [v3.4.22] - 2024-09-27
 ### Bug Fixes

From 8b3df641ec530331d7ae7ddb283edb5bec03d435 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 29 Sep 2024 03:55:29 +0100
Subject: [PATCH 071/103] Update ChangeLog

---
 CHANGELOG.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5de68262a..961c85f42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## [v3.4.23] - UNRELEASED
+## [v3.4.22] - UNRELEASED
+### Bug Fixes
+- Fix Loading Placeholder Bug - Breaking Table by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1969
+
 ### New Features
 - Add setPaginationWrapperAttributes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1978
 - Add configurable areas - before-wrapper and after-wrapper by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1977
@@ -10,10 +13,6 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 ### Docs
 - Add getTitle reference for setTdAttributes/setTrAttributes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1976
 
-## [v3.4.22] - 2024-09-27
-### Bug Fixes
-- Fix Loading Placeholder Bug - Breaking Table by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1969
-
 ## [v3.4.21] - 2024-09-25
 ### Bug Fixes
 - Remove persist from getFilterGenericData by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1966

From a7b1579253488cc1d9c37140a69ae34f8d242db3 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 29 Sep 2024 04:00:22 +0100
Subject: [PATCH 072/103] Adjust ChangeLog Date

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 961c85f42..7c9f7700e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## [v3.4.22] - UNRELEASED
+## [v3.4.22] - 2024-09-29
 ### Bug Fixes
 - Fix Loading Placeholder Bug - Breaking Table by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1969
 

From cd89e9eafbb331cf9a54a84e7316e32731b636bd Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 30 Sep 2024 00:05:13 +0100
Subject: [PATCH 073/103] Add ToolsAttributes and ToolbarAttributes (#1982)

* Initial Commit

* Fix styling

* Add getCustomAttributesBagFromArray

* Fix styling

* Reorder Array

* Reorder Initial Array - Add Additional Test

* Fix styling

* Add More Tests

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 resources/views/components/tools.blade.php    | 12 ++--
 .../views/components/tools/toolbar.blade.php  | 20 +++---
 src/Traits/Core/HasCustomAttributes.php       |  5 ++
 .../ToolsStylingConfiguration.php             | 20 ++++++
 src/Traits/Styling/HasToolsStyling.php        | 16 +++++
 .../Styling/Helpers/ToolsStylingHelpers.php   | 32 +++++++++
 src/Traits/WithTools.php                      |  4 +-
 .../Helpers/ToolsStylingHelpersTest.php       | 67 +++++++++++++++++++
 8 files changed, 161 insertions(+), 15 deletions(-)
 create mode 100644 src/Traits/Styling/Configuration/ToolsStylingConfiguration.php
 create mode 100644 src/Traits/Styling/HasToolsStyling.php
 create mode 100644 src/Traits/Styling/Helpers/ToolsStylingHelpers.php
 create mode 100644 tests/Traits/Helpers/ToolsStylingHelpersTest.php

diff --git a/resources/views/components/tools.blade.php b/resources/views/components/tools.blade.php
index 4a5dfa7b8..bdb31a745 100644
--- a/resources/views/components/tools.blade.php
+++ b/resources/views/components/tools.blade.php
@@ -1,8 +1,12 @@
 @aware(['component','isTailwind','isBootstrap'])
+@php($toolsAttributes = $this->getToolsAttributesBag())
 
-<div @class([
-    'flex-col' => $isTailwind,
-    'd-flex flex-column ' => ($isBootstrap),
-])>
+<div {{ 
+    $toolsAttributes->merge()
+        ->class(['flex-col' => $isTailwind && ($toolsAttributes['default-styling'] ?? true)])
+        ->class(['d-flex flex-column' => $isBootstrap && ($toolsAttributes['default-styling'] ?? true)])
+        ->except(['default','default-styling','default-colors']) 
+    }}
+>
     {{ $slot }}
 </div>
diff --git a/resources/views/components/tools/toolbar.blade.php b/resources/views/components/tools/toolbar.blade.php
index 8a3c8901b..65e8c086b 100644
--- a/resources/views/components/tools/toolbar.blade.php
+++ b/resources/views/components/tools/toolbar.blade.php
@@ -1,10 +1,14 @@
 @aware(['component', 'tableName','isTailwind','isBootstrap'])
 @props([])
+@php($toolBarAttributes = $this->getToolBarAttributesBag())
 
-<div @class([
-        'd-md-flex justify-content-between mb-3' => $this->isBootstrap,
-        'md:flex md:justify-between mb-4 px-4 md:p-0' => $this->isTailwind,
-    ])
+<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)])
+        ->except(['default','default-styling','default-colors']) 
+    }}
 >
     <div @class([
             'd-md-flex' => $this->isBootstrap,
@@ -52,9 +56,7 @@
             'md:flex md:items-center space-y-4 md:space-y-0 md:space-x-2' => $this->isTailwind,
         ])
     >
-        @if ($this->hasConfigurableAreaFor('toolbar-right-start'))
-            @include($this->getConfigurableAreaFor('toolbar-right-start'), $this->getParametersForConfigurableArea('toolbar-right-start'))
-        @endif
+        @includeWhen($this->hasConfigurableAreaFor('toolbar-right-start'), $this->getConfigurableAreaFor('toolbar-right-start'), $this->getParametersForConfigurableArea('toolbar-right-start'))
 
         @if($this->hasActions && $this->showActionsInToolbar && $this->getActionsPosition == 'right')
             <x-livewire-tables::includes.actions/>    
@@ -72,9 +74,7 @@
             <x-livewire-tables::tools.toolbar.items.pagination-dropdown />
         @endif
 
-        @if ($this->hasConfigurableAreaFor('toolbar-right-end'))
-            @include($this->getConfigurableAreaFor('toolbar-right-end'), $this->getParametersForConfigurableArea('toolbar-right-end'))
-        @endif
+        @includeWhen($this->hasConfigurableAreaFor('toolbar-right-end'), $this->getConfigurableAreaFor('toolbar-right-end'), $this->getParametersForConfigurableArea('toolbar-right-end'))
     </div>
 </div>
 @if (
diff --git a/src/Traits/Core/HasCustomAttributes.php b/src/Traits/Core/HasCustomAttributes.php
index 99afeb4c4..cbc3bcd85 100644
--- a/src/Traits/Core/HasCustomAttributes.php
+++ b/src/Traits/Core/HasCustomAttributes.php
@@ -46,4 +46,9 @@ public function setCustomAttributes(string $propertyName, array $customAttribute
 
         return $this;
     }
+
+    public function getCustomAttributesBagFromArray(array $attributesArray): ComponentAttributeBag
+    {
+        return new ComponentAttributeBag($attributesArray);
+    }
 }
diff --git a/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php b/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php
new file mode 100644
index 000000000..9b2ca17f4
--- /dev/null
+++ b/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
+
+trait ToolsStylingConfiguration
+{
+    public function setToolsAttributes(array $toolsAttributes = []): self
+    {
+        $this->setCustomAttributes(propertyName: 'toolsAttributes', customAttributes: $toolsAttributes);
+
+        return $this;
+    }
+
+    public function setToolBarAttributes(array $toolBarAttributes = []): self
+    {
+        $this->setCustomAttributes(propertyName: 'toolBarAttributes', customAttributes: $toolBarAttributes);
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Styling/HasToolsStyling.php b/src/Traits/Styling/HasToolsStyling.php
new file mode 100644
index 000000000..a56123311
--- /dev/null
+++ b/src/Traits/Styling/HasToolsStyling.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling;
+
+use Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration\ToolsStylingConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers\ToolsStylingHelpers;
+
+trait HasToolsStyling
+{
+    use ToolsStylingConfiguration,
+        ToolsStylingHelpers;
+
+    protected array $toolsAttributes = ['class' => '', 'default-colors' => true, 'default-styling' => true];
+
+    protected array $toolBarAttributes = ['class' => '', 'default-colors' => true, 'default-styling' => true];
+}
diff --git a/src/Traits/Styling/Helpers/ToolsStylingHelpers.php b/src/Traits/Styling/Helpers/ToolsStylingHelpers.php
new file mode 100644
index 000000000..95aa8684f
--- /dev/null
+++ b/src/Traits/Styling/Helpers/ToolsStylingHelpers.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers;
+
+use Illuminate\View\ComponentAttributeBag;
+use Livewire\Attributes\Computed;
+
+trait ToolsStylingHelpers
+{
+    protected function getToolsAttributes(): array
+    {
+        return $this->getCustomAttributes(propertyName: 'toolsAttributes', default: false, classicMode: false);
+    }
+
+    #[Computed]
+    public function getToolsAttributesBag(): ComponentAttributeBag
+    {
+        return $this->getCustomAttributesBagFromArray($this->getToolsAttributes());
+    }
+
+    protected function getToolBarAttributes(): array
+    {
+        return $this->getCustomAttributes(propertyName: 'toolBarAttributes', default: false, classicMode: false);
+    }
+
+    #[Computed]
+    public function getToolBarAttributesBag(): ComponentAttributeBag
+    {
+        return $this->getCustomAttributesBagFromArray($this->getToolBarAttributes());
+
+    }
+}
diff --git a/src/Traits/WithTools.php b/src/Traits/WithTools.php
index 31d91a57a..8ede2e382 100644
--- a/src/Traits/WithTools.php
+++ b/src/Traits/WithTools.php
@@ -4,11 +4,13 @@
 
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\ToolsConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\ToolsHelpers;
+use Rappasoft\LaravelLivewireTables\Traits\Styling\HasToolsStyling;
 
 trait WithTools
 {
     use ToolsConfiguration,
-        ToolsHelpers;
+        ToolsHelpers,
+        HasToolsStyling;
 
     protected bool $toolsStatus = true;
 
diff --git a/tests/Traits/Helpers/ToolsStylingHelpersTest.php b/tests/Traits/Helpers/ToolsStylingHelpersTest.php
new file mode 100644
index 000000000..560385a89
--- /dev/null
+++ b/tests/Traits/Helpers/ToolsStylingHelpersTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class ToolsStylingHelpersTest extends TestCase
+{
+    public function test_can_get_tools_attributes_initial_status(): void
+    {
+        $this->assertTrue($this->basicTable->hasCustomAttributes('toolsAttributes'));
+    }
+
+    public function test_can_get_tools_attributes_initial_values(): void
+    {
+        $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes());
+    }
+
+    public function test_can_change_tools_attributes_initial_values(): void
+    {
+        $this->basicTable->setToolsAttributes(['class' => 'bg-red-500', 'default-colors' => true, 'default-styling' => true]);
+        $this->assertSame(['class' => 'bg-red-500', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes());
+        $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes());
+    }
+
+    public function test_can_change_tools_attributes_initial_values_no_defaults(): void
+    {
+        $this->basicTable->setToolsAttributes(['class' => 'bg-amber-500']);
+        $this->assertSame(['class' => 'bg-amber-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolsAttributesBag()->getAttributes());
+        $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes());
+
+    }
+
+    public function test_can_get_toolbar_attributes_initial_status(): void
+    {
+        $this->assertTrue($this->basicTable->hasCustomAttributes('toolBarAttributes'));
+    }
+
+    public function test_can_get_toolbar_attributes_initial_values(): void
+    {
+        $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes());
+    }
+
+    public function test_can_change_toolbar_attributes_initial_values(): void
+    {
+        $this->basicTable->setToolBarAttributes(['class' => 'bg-blue-500', 'default-colors' => true, 'default-styling' => true]);
+        $this->assertSame(['class' => 'bg-blue-500', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes());
+        $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes());
+
+    }
+
+    public function test_can_change_toolbar_attributes_initial_values_no_defaults(): void
+    {
+        $this->basicTable->setToolBarAttributes(['class' => 'bg-green-500']);
+        $this->assertSame(['class' => 'bg-green-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolBarAttributesBag()->getAttributes());
+        $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes());
+    }
+
+    public function test_can_change_tools_and_toolbar_attributes_initial_values_no_defaults(): void
+    {
+        $this->basicTable->setToolsAttributes(['class' => 'bg-amber-500'])->setToolBarAttributes(['class' => 'bg-green-500']);
+
+        $this->assertSame(['class' => 'bg-amber-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolsAttributesBag()->getAttributes());
+
+        $this->assertSame(['class' => 'bg-green-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolBarAttributesBag()->getAttributes());
+    }
+}

From cf0a41ffc876c69da2685e10d57df97698fde405 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 30 Sep 2024 00:22:49 +0100
Subject: [PATCH 074/103] Add docs for the ColumnSelect lifecycle hooks (#1983)

---
 docs/misc/lifecycle-hooks.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/misc/lifecycle-hooks.md b/docs/misc/lifecycle-hooks.md
index 1e05569a9..f56ce1f9a 100644
--- a/docs/misc/lifecycle-hooks.md
+++ b/docs/misc/lifecycle-hooks.md
@@ -19,6 +19,12 @@ This is called prior to setting up the available Columns via the columns() metho
 ## columnsSet
 This is called immediately after the Columns are set up
 
+## configuringColumnSelect
+This is called immediately prior to setting up Column Select
+
+## configuredColumnSelect
+This is called immediately after setting up Column Select
+
 ## rowsRetrieved
 This is called immediately after the query is executed, and is passed the result from the executed query.
 

From 7dc5e8f3a2fb42b17b8aaabab9836d24f210117b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 30 Sep 2024 01:37:09 +0100
Subject: [PATCH 075/103] Add setToolsAttributes and setToolBarAttributes docs
 (#1984)

---
 docs/misc/tools.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/docs/misc/tools.md b/docs/misc/tools.md
index 7904caa0c..0d9dbc390 100644
--- a/docs/misc/tools.md
+++ b/docs/misc/tools.md
@@ -56,4 +56,28 @@ Disables the Toolbar, which contains the Reorder, Filters, Search, Column Select
     {
         $this->setToolBarDisabled();
     }
-```
\ No newline at end of file
+```
+
+### setToolsAttributes
+Allows setting of attributes for the parent element in the tools blade
+
+By default, this replaces the default classes on the tools blade, if you would like to keep them, set the default-colors/default-styling flags to true as appropriate
+
+```php
+    public function configure(): void
+    {
+       $this->setToolsAttributes(['class' => ' bg-green-500', 'default-colors' => false, 'default-styling' => true]);
+    }
+```
+
+### setToolBarAttributes
+Allows setting of attributes for the parent element in the toolbar blade.
+
+By default, this replaces the default classes on the toolbar blade, if you would like to keep them, set the default-colors/default-styling flags to true as appropriate
+
+```php
+    public function configure(): void
+    {
+       $this->setToolBarAttributes(['class' => ' bg-red-500', 'default-colors' => false, 'default-styling' => true]);
+    }
+```

From 61a9b66f0c88b257a471b9154c3a91f843dc91fa Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 30 Sep 2024 01:52:36 +0100
Subject: [PATCH 076/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c9f7700e..553622c32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,12 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 ### New Features
 - Add setPaginationWrapperAttributes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1978
 - Add configurable areas - before-wrapper and after-wrapper by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1977
+- Add ToolsAttributes and ToolbarAttributes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1982
 
 ### Docs
 - Add getTitle reference for setTdAttributes/setTrAttributes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1976
+- Add setToolsAttributes and setToolBarAttributes docs by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1984
+- Add docs for the ColumnSelect lifecycle hooks by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1983
 
 ## [v3.4.21] - 2024-09-25
 ### Bug Fixes

From e6f36568404773740ee9c8ad315d47481cbf3aec Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 1 Oct 2024 04:37:14 +0100
Subject: [PATCH 077/103] Adding Tools/Toolbar Enable Tests (#1986)

* Adding Tools/Toolbar Enable Tests

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 tests/Traits/Helpers/ToolsHelpersTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/Traits/Helpers/ToolsHelpersTest.php b/tests/Traits/Helpers/ToolsHelpersTest.php
index 07533cbbc..9f2601462 100644
--- a/tests/Traits/Helpers/ToolsHelpersTest.php
+++ b/tests/Traits/Helpers/ToolsHelpersTest.php
@@ -16,6 +16,11 @@ public function test_can_get_toolbar_status(): void
         $this->assertFalse($this->basicTable->getToolBarStatus());
         $this->assertTrue($this->basicTable->getToolsStatus());
 
+        $this->basicTable->setToolBarEnabled();
+
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+        $this->assertTrue($this->basicTable->getToolsStatus());
+
     }
 
     public function test_can_get_tools_status(): void
@@ -27,6 +32,12 @@ public function test_can_get_tools_status(): void
 
         $this->assertFalse($this->basicTable->getToolsStatus());
         $this->assertTrue($this->basicTable->getToolBarStatus());
+
+        $this->basicTable->setToolsEnabled();
+
+        $this->assertTrue($this->basicTable->getToolsStatus());
+        $this->assertTrue($this->basicTable->getToolBarStatus());
+
     }
 
     public function test_can_get_tools_should_display(): void

From 2fe4db1924b121171cf0d057a1b10d04bbfdc45b Mon Sep 17 00:00:00 2001
From: Christian <candreassen@pm.me>
Date: Sat, 5 Oct 2024 03:17:01 +0200
Subject: [PATCH 078/103] Add lang Norwegian and Albanian (#1988)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add Norwegian Bokmål nb.json

GTP translated verified by human

* Added Albanian sq.json

GTP translated, not verified by human
---
 resources/lang/nb.json | 70 ++++++++++++++++++++++++++++++++++++++++++
 resources/lang/sq.json | 70 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)
 create mode 100644 resources/lang/nb.json
 create mode 100644 resources/lang/sq.json

diff --git a/resources/lang/nb.json b/resources/lang/nb.json
new file mode 100644
index 000000000..b7bb83929
--- /dev/null
+++ b/resources/lang/nb.json
@@ -0,0 +1,70 @@
+{
+    "livewire-tables::All": "Alle",
+    "livewire-tables::All Columns": "Alle kolonner",
+    "livewire-tables::Applied Filters": "Anvendte filtre",
+    "livewire-tables::Applied Sorting": "Anvendt sortering",
+    "livewire-tables::Bulk Actions": "Massehandlinger",
+    "livewire-tables::Bulk Actions Confirm": "Er du sikker?",
+    "livewire-tables::Clear": "Tøm",
+    "livewire-tables::Columns": "Kolonner",
+    "livewire-tables::Debugging Values": "Debugger Verdier",
+    "livewire-tables::Deselect All": "Opphev alle",
+    "livewire-tables::Done Reordering": "Ferdig med omorganisering",
+    "livewire-tables::Filters": "Filtre",
+    "livewire-tables::max": "Maks",
+    "livewire-tables::min": "Min",
+    "livewire-tables::not_applicable": "I/T",
+    "livewire-tables::No": "Nei",
+    "livewire-tables::No items found. Try to broaden your search.": "Ingen elementer funnet. Prøv å utvide søket.",
+    "livewire-tables::of": "av",
+    "livewire-tables::Remove filter option": "Fjern filtervalg",
+    "livewire-tables::Remove sort option": "Fjern sorteringsvalg",
+    "livewire-tables::Reorder": "Omorganiser",
+    "livewire-tables::results": "resultater",
+    "livewire-tables::row": "rad",
+    "livewire-tables::rows": "rader",
+    "livewire-tables::rows, do you want to select all": "rader, vil du velge alle",
+    "livewire-tables::Search": "Søk",
+    "livewire-tables::Select All": "Velg alle",
+    "livewire-tables::Select All On Page": "Velg alle på siden",
+    "livewire-tables::Showing": "Viser",
+    "livewire-tables::to": "til",
+    "livewire-tables::Yes": "Ja",
+    "livewire-tables::You are currently selecting all": "Du velger for øyeblikket alle",
+    "livewire-tables::You are not connected to the internet.": "Du er ikke tilkoblet internett.",
+    "livewire-tables::You have selected": "Du har valgt",
+    "All": "Alle",
+    "All Columns": "Alle kolonner",
+    "Applied Filters": "Anvendte filtre",
+    "Applied Sorting": "Anvendt sortering",
+    "Bulk Actions": "Massehandlinger",
+    "Bulk Actions Confirm": "Er du sikker?",
+    "Clear": "Tøm",
+    "Columns": "Kolonner",
+    "Debugging Values": "Debugger verdier",
+    "Deselect All": "Opphev valg for alle",
+    "Done Reordering": "Ferdig med omorganisering",
+    "Filters": "Filtre",
+    "max": "Maks",
+    "min": "Min",
+    "not_applicable": "I/T",
+    "No": "Nei",
+    "No items found. Try to broaden your search.": "Ingen elementer funnet. Prøv å utvide søket.",
+    "of": "av",
+    "Remove filter option": "Fjern filtervalg",
+    "Remove sort option": "Fjern sorteringsvalg",
+    "Reorder": "Omorganiser",
+    "results": "resultater",
+    "row": "rad",
+    "rows": "rader",
+    "rows, do you want to select all": "rader, vil du velge alle",
+    "Search": "Søk",
+    "Select All": "Velg alle",
+    "Select All On Page": "Velg alle på siden",
+    "Showing": "Viser",
+    "to": "til",
+    "Yes": "Ja",
+    "You are currently selecting all": "Du velger for øyeblikket alle",
+    "You are not connected to the internet.": "Du er ikke tilkoblet internett.",
+    "You have selected": "Du har valgt"
+}
diff --git a/resources/lang/sq.json b/resources/lang/sq.json
new file mode 100644
index 000000000..1784fa2cc
--- /dev/null
+++ b/resources/lang/sq.json
@@ -0,0 +1,70 @@
+{
+    "livewire-tables::All": "Të gjitha",
+    "livewire-tables::All Columns": "Të gjitha kolonat",
+    "livewire-tables::Applied Filters": "Filtrat e aplikuara",
+    "livewire-tables::Applied Sorting": "Renditja e aplikuar",
+    "livewire-tables::Bulk Actions": "Veprime në masë",
+    "livewire-tables::Bulk Actions Confirm": "A jeni i sigurt?",
+    "livewire-tables::Clear": "Pastro",
+    "livewire-tables::Columns": "Kolonat",
+    "livewire-tables::Debugging Values": "Vlerat e korrigjimit",
+    "livewire-tables::Deselect All": "Heq të gjitha",
+    "livewire-tables::Done Reordering": "Përfundoi riorganizimi",
+    "livewire-tables::Filters": "Filtrat",
+    "livewire-tables::max": "Maksimumi",
+    "livewire-tables::min": "Minimumi",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Jo",
+    "livewire-tables::No items found. Try to broaden your search.": "Nuk u gjetën artikuj. Provoni të zgjeroni kërkimin tuaj.",
+    "livewire-tables::of": "nga",
+    "livewire-tables::Remove filter option": "Hiq opsionin e filtrit",
+    "livewire-tables::Remove sort option": "Hiq opsionin e renditjes",
+    "livewire-tables::Reorder": "Riorganizo",
+    "livewire-tables::results": "rezultate",
+    "livewire-tables::row": "rreshti",
+    "livewire-tables::rows": "rreshtat",
+    "livewire-tables::rows, do you want to select all": "rreshtat, dëshironi të zgjidhni të gjitha",
+    "livewire-tables::Search": "Kërko",
+    "livewire-tables::Select All": "Zgjidh të gjitha",
+    "livewire-tables::Select All On Page": "Zgjidh të gjitha në faqe",
+    "livewire-tables::Showing": "Duke treguar",
+    "livewire-tables::to": "te",
+    "livewire-tables::Yes": "Po",
+    "livewire-tables::You are currently selecting all": "Po zgjedhni të gjitha aktualisht",
+    "livewire-tables::You are not connected to the internet.": "Nuk jeni të lidhur me internetin.",
+    "livewire-tables::You have selected": "Keni zgjedhur",
+    "All": "Të gjitha",
+    "All Columns": "Të gjitha kolonat",
+    "Applied Filters": "Filtrat e aplikuara",
+    "Applied Sorting": "Renditja e aplikuar",
+    "Bulk Actions": "Veprime në masë",
+    "Bulk Actions Confirm": "A jeni i sigurt?",
+    "Clear": "Pastro",
+    "Columns": "Kolonat",
+    "Debugging Values": "Vlerat e korrigjimit",
+    "Deselect All": "Heq të gjitha",
+    "Done Reordering": "Përfundoi riorganizimi",
+    "Filters": "Filtrat",
+    "max": "Maksimumi",
+    "min": "Minimumi",
+    "not_applicable": "N/A",
+    "No": "Jo",
+    "No items found. Try to broaden your search.": "Nuk u gjetën artikuj. Provoni të zgjeroni kërkimin tuaj.",
+    "of": "nga",
+    "Remove filter option": "Hiq opsionin e filtrit",
+    "Remove sort option": "Hiq opsionin e renditjes",
+    "Reorder": "Riorganizo",
+    "results": "rezultate",
+    "row": "rreshti",
+    "rows": "rreshtat",
+    "rows, do you want to select all": "rreshtat, dëshironi të zgjidhni të gjitha",
+    "Search": "Kërko",
+    "Select All": "Zgjidh të gjitha",
+    "Select All On Page": "Zgjidh të gjitha në faqe",
+    "Showing": "Duke treguar",
+    "to": "te",
+    "Yes": "Po",
+    "You are currently selecting all": "Po zgjedhni të gjitha aktualisht",
+    "You are not connected to the internet.": "Nuk jeni të lidhur me internetin.",
+    "You have selected": "Keni zgjedhur"
+}

From 9fc6ad8da3470eeacc083dde653b9e7d9273194d Mon Sep 17 00:00:00 2001
From: Paoulo Riveros <khwadj@gmail.com>
Date: Fri, 18 Oct 2024 04:21:50 +0200
Subject: [PATCH 079/103] Fix missing i18n keys  for FR, IT, EN, DE (#1993)

* Clean localization files by adding missing keys (in english) and re-ordering a few misplaced ones

* Update localization for french

* Update localization for spanish

* Update localization for italian

* Update localization for german

* Revert "Clean localization files by adding missing keys (in english) and re-ordering a few misplaced ones"

This reverts commit d440bd2da68f05333ff6e1e1835cf09f2517ac39.
---
 resources/lang/de.json | 4 ++++
 resources/lang/es.json | 2 ++
 resources/lang/fr.json | 8 ++++++--
 resources/lang/it.json | 8 ++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/resources/lang/de.json b/resources/lang/de.json
index 2ddfa94cc..6ef76e8bf 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -5,6 +5,7 @@
     "livewire-tables::Applied Sorting": "Angewendete Sortierung",
     "livewire-tables::Bulk Actions": "Aktionen",
     "livewire-tables::Clear": "Zurücksetzen",
+    "livewire-tables::Bulk Actions Confirm": "Bist du sicher?",
     "livewire-tables::Columns": "Spalten",
     "livewire-tables::Debugging Values": "Werte debuggen",
     "livewire-tables::Deselect All": "Alle abwählen",
@@ -23,6 +24,7 @@
     "livewire-tables::rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
     "livewire-tables::Search": "Suche",
     "livewire-tables::Select All": "Alle auswählen",
+    "livewire-tables::Select All On Page": "Alle auf der Seite auswählen",
     "livewire-tables::Showing": "Anzeigen",
     "livewire-tables::to": "nach",
     "livewire-tables::Yes": "Ja",
@@ -34,6 +36,7 @@
     "Applied Filters": "Angewendete Filter",
     "Applied Sorting": "Angewendete Sortierung",
     "Bulk Actions": "Aktionen",
+    "Bulk Actions Confirm": "Bist du sicher?",
     "Clear": "Zurücksetzen",
     "Columns": "Spalten",
     "Debugging Values": "Werte debuggen",
@@ -53,6 +56,7 @@
     "rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
     "Search": "Suche",
     "Select All": "Alle auswählen",
+    "Select All On Page": "Alle auf der Seite auswählen",
     "Showing": "Anzeigen",
     "to": "nach",
     "Yes": "Ja",
diff --git a/resources/lang/es.json b/resources/lang/es.json
index b03b2e25f..8654e82ca 100644
--- a/resources/lang/es.json
+++ b/resources/lang/es.json
@@ -4,6 +4,7 @@
     "livewire-tables::Applied Filters": "Filtros Aplicados",
     "livewire-tables::Applied Sorting": "Ordenamiento Aplicado",
     "livewire-tables::Bulk Actions": "Acciones Masivas",
+    "livewire-tables::Bulk Actions Confirm": "Está seguro?",
     "livewire-tables::Clear": "Borrar",
     "livewire-tables::Columns": "Columnas",
     "livewire-tables::Debugging Values": "Valores de depuración",
@@ -35,6 +36,7 @@
     "Applied Filters": "Filtros Aplicados",
     "Applied Sorting": "Ordenamiento Aplicado",
     "Bulk Actions": "Acciones Masivas",
+    "Bulk Actions Confirm": "Está seguro?",
     "Clear": "Borrar",
     "Columns": "Columnas",
     "Debugging Values": "Valores de depuración",
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 89323dc4a..9cb399d08 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -4,6 +4,7 @@
     "livewire-tables::Applied Filters": "Filtres appliqués",
     "livewire-tables::Applied Sorting": "Tris appliqués",
     "livewire-tables::Bulk Actions": "Actions en masse",
+    "livewire-tables::Bulk Actions Confirm": "Êtes-vous sûr ?",
     "livewire-tables::Clear": "Effacer",
     "livewire-tables::Columns": "Colonnes",
     "livewire-tables::Debugging Values": "Valeurs de débogage",
@@ -23,7 +24,8 @@
     "livewire-tables::rows, do you want to select all": "lignes, voulez-vous tout sélectionner ?",
     "livewire-tables::Search": "Rechercher",
     "livewire-tables::Select All": "Tout sélectionner",
-    "livewire-tables::Showing": "Montrant",
+    "livewire-tables::Select All On Page": "Tout sélectionner sur la page",
+    "livewire-tables::Showing": "Résultats",
     "livewire-tables::to": "à",
     "livewire-tables::Yes": "Oui",
     "livewire-tables::You are currently selecting all": "Vous êtes en train de sélectionner ",
@@ -34,6 +36,7 @@
     "Applied Filters": "Filtres appliqués",
     "Applied Sorting": "Tris appliqués",
     "Bulk Actions": "Actions en masse",
+    "Bulk Actions Confirm": "Êtes-vous sûr ?",
     "Clear": "Effacer",
     "Columns": "Colonnes",
     "Debugging Values": "Valeurs de débogage",
@@ -53,7 +56,8 @@
     "rows, do you want to select all": "lignes, voulez-vous tout sélectionner ?",
     "Search": "Rechercher",
     "Select All": "Tout sélectionner",
-    "Showing": "Montrant",
+    "Select All On Page": "Tout sélectionner sur la page",
+    "Showing": "Résultats",
     "to": "à",
     "Yes": "Oui",
     "You are currently selecting all": "Vous êtes en train de sélectionner ",
diff --git a/resources/lang/it.json b/resources/lang/it.json
index a1c50fb21..ceaffa5fc 100644
--- a/resources/lang/it.json
+++ b/resources/lang/it.json
@@ -4,6 +4,7 @@
     "livewire-tables::Applied Filters": "Filtri Applicati",
     "livewire-tables::Applied Sorting": "Ordinamento Applicato",
     "livewire-tables::Bulk Actions": "Azioni di Gruppo",
+    "livewire-tables::Bulk Actions Confirm": "Sei sicuro?",
     "livewire-tables::Clear": "Pulisci",
     "livewire-tables::Columns": "Colonne",
     "livewire-tables::Debugging Values": "Valori di debug",
@@ -22,7 +23,8 @@
     "livewire-tables::rows": "righe",
     "livewire-tables::rows, do you want to select all": "righe, vuoi selezionarle tutte",
     "livewire-tables::Search": "Cerca",
-    "livewire-tables::Select All": "Seleziona Tutto",
+    "livewire-tables::Select All": "Seleziona tutto",
+    "livewire-tables::Select All On Page": "Seleziona tutto sulla pagina",
     "livewire-tables::Showing": "Visualizzati",
     "livewire-tables::to": "a",
     "livewire-tables::Yes": "SÌ",
@@ -34,6 +36,7 @@
     "Applied Filters": "Filtri Applicati",
     "Applied Sorting": "Ordinamento Applicato",
     "Bulk Actions": "Azioni di Gruppo",
+    "Bulk Actions Confirm": "Sei sicuro?",
     "Clear": "Pulisci",
     "Columns": "Colonne",
     "Debugging Values": "Valori di debug",
@@ -52,7 +55,8 @@
     "rows": "righe",
     "rows, do you want to select all": "righe, vuoi selezionarle tutte",
     "Search": "Cerca",
-    "Select All": "Seleziona Tutto",
+    "Select All": "Seleziona tutto",
+    "Select All On Page": "Seleziona tutto sulla pagina",
     "Showing": "Visualizzati",
     "to": "a",
     "Yes": "SÌ",

From c134e6a15a5f97b5078514a53f4a794252943d9a Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 20 Oct 2024 04:03:01 +0100
Subject: [PATCH 080/103] Loading Placeholder Adjustments (#1987)

* Move LoadingPlaceholderStyling into new method

* Add "Loading" default translation

* Move Placeholder Blade Config backwards

* Adjustments to Placeholder Attributes

* Tweak Row Behaviour

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/misc/loading-placeholder.md              | 20 +++++-
 resources/lang/en.json                        |  2 +
 .../components/includes/loading.blade.php     | 55 ++++++++--------
 .../LoadingPlaceholderConfiguration.php       | 21 ------
 .../Helpers/LoadingPlaceholderHelpers.php     | 18 +-----
 ...LoadingPlaceholderStylingConfiguration.php | 34 ++++++++++
 .../Styling/HasLoadingPlaceholderStyling.php  | 22 +++++++
 .../LoadingPlaceholderStylingHelpers.php      | 36 +++++++++++
 src/Traits/WithLoadingPlaceholder.php         | 10 +--
 .../LoadingPlaceholderConfigurationTest.php   | 64 +++++++++++++++++--
 10 files changed, 204 insertions(+), 78 deletions(-)
 create mode 100644 src/Traits/Styling/Configuration/LoadingPlaceholderStylingConfiguration.php
 create mode 100644 src/Traits/Styling/HasLoadingPlaceholderStyling.php
 create mode 100644 src/Traits/Styling/Helpers/LoadingPlaceholderStylingHelpers.php

diff --git a/docs/misc/loading-placeholder.md b/docs/misc/loading-placeholder.md
index 20ca7f9b5..67c4977ac 100644
--- a/docs/misc/loading-placeholder.md
+++ b/docs/misc/loading-placeholder.md
@@ -47,7 +47,9 @@ You may use this method to set custom text for the placeholder:
         $this->setLoadingPlaceholderContent('Text To Display');
     }
 ```
-### setLoadingPlaceHolderWrapperAttributes
+### setLoadingPlaceHolderWrapperAttributes (Deprecated)
+
+This is replaced by setLoadingPlaceHolderRowAttributes, but remains functional.
 
 This method allows you to customise the attributes for the &lt;tr&gt; element used as a Placeholder when the table is loading.  Similar to other setAttribute methods, this accepts a range of attributes, and a boolean "default", which will enable/disable the default attributes.
 
@@ -62,6 +64,22 @@ This method allows you to customise the attributes for the &lt;tr&gt; element us
 
 ```
 
+### setLoadingPlaceHolderRowAttributes
+
+Replaces setLoadingPlaceHolderWrapperAttributes
+This method allows you to customise the attributes for the &lt;tr&gt; element used as a Placeholder when the table is loading.  Similar to other setAttribute methods, this accepts a range of attributes, and a boolean "default", which will enable/disable the default attributes.
+
+```php
+    public function configure(): void
+    {
+        $this->setLoadingPlaceHolderRowAttributes([
+            'class' => 'text-bold',
+            'default' => false,
+        ]);
+    }
+
+```
+
 ### setLoadingPlaceHolderIconAttributes
 
 This method allows you to customise the attributes for the &lt;div&gt; element that is used solely for the PlaceholderIcon.  Similar to other setAttribute methods, this accepts a range of attributes, and a boolean "default", which will enable/disable the default attributes.
diff --git a/resources/lang/en.json b/resources/lang/en.json
index dcf30f145..1579cbbe2 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -11,6 +11,7 @@
     "livewire-tables::Deselect All": "Deselect All",
     "livewire-tables::Done Reordering": "Done Reordering",
     "livewire-tables::Filters": "Filters",
+    "livewire-tables::loading": "Loading",
     "livewire-tables::max": "Max",
     "livewire-tables::min": "Min",
     "livewire-tables::not_applicable": "N/A",
@@ -45,6 +46,7 @@
     "Deselect All": "Deselect All",
     "Done Reordering": "Done Reordering",
     "Filters": "Filters",
+    "loading": "Loading",
     "max": "Max",
     "min": "Min",
     "not_applicable": "N/A",
diff --git a/resources/views/components/includes/loading.blade.php b/resources/views/components/includes/loading.blade.php
index f22096321..d439e6c93 100644
--- a/resources/views/components/includes/loading.blade.php
+++ b/resources/views/components/includes/loading.blade.php
@@ -1,35 +1,38 @@
-@aware(['isTailwind', 'isBootstrap', 'tableName', 'component'])
+@aware(['tableName'])
 @props(['colCount' => 1])
 
 @php
-$customAttributes['loader-wrapper'] = $this->getLoadingPlaceHolderWrapperAttributes();
-$customAttributes['loader-icon'] = $this->getLoadingPlaceHolderIconAttributes();
+$loaderRow = $this->getLoadingPlaceHolderRowAttributes();
+$loaderCell = $this->getLoadingPlaceHolderCellAttributes();
+$loaderIcon = $this->getLoadingPlaceHolderIconAttributes();
 @endphp
-@if($this->hasLoadingPlaceholderBlade())
-    @include($this->getLoadingPlaceHolderBlade(), ['colCount' => $colCount])
-@else
 
-    <tr wire:key="{{ $tableName }}-loader"
-    {{
-        $attributes->merge($customAttributes['loader-wrapper'])
-            ->class(['hidden w-full text-center h-screen place-items-center align-middle' => $isTailwind && ($customAttributes['loader-wrapper']['default'] ?? true)])
-            ->class(['d-none w-100 text-center h-100 align-items-center' => $isBootstrap && ($customAttributes['loader-wrapper']['default'] ?? true)]);
-    }}
-    wire:loading.class.remove="hidden d-none"
-    >
-        <td colspan="{{ $colCount }}" wire:key="{{ $tableName }}-loader-column" >
+<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)])
+        ->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)])
+            ->except(['default','default-styling','default-colors', 'colspan','wire:key'])
+    }}>
+        @if($this->hasLoadingPlaceholderBlade())
+            @include($this->getLoadingPlaceHolderBlade(), ['colCount' => $colCount])
+        @else
+
             <div class="h-min self-center align-middle text-center">
-                <div class="lds-hourglass"
-                {{
-                        $attributes->merge($customAttributes['loader-icon'])
-                            ->class(['lds-hourglass' => $isTailwind && ($customAttributes['loader-icon']['default'] ?? true)])
-                            ->class(['lds-hourglass' => $isBootstrap && ($customAttributes['loader-icon']['default'] ?? true)])
+                <div class="lds-hourglass"{{
+                        $attributes->merge($loaderIcon)
+                            ->class(['lds-hourglass' => $this->isTailwind && ($loaderIcon['default'] ?? true)])
+                            ->class(['lds-hourglass' => $this->isBootstrap && ($loaderIcon['default'] ?? true)])
                             ->except(['default','default-styling','default-colors']);
-                }}
-                ></div>
-                <div>{{ $this->getLoadingPlaceholderContent() }}</div>
+                }}></div>
+                <div>{!! $this->getLoadingPlaceholderContent() !!}</div>
             </div>
-        </td>
-    </tr>
+        @endif
+    </td>
+</tr>
 
-@endif
diff --git a/src/Traits/Configuration/LoadingPlaceholderConfiguration.php b/src/Traits/Configuration/LoadingPlaceholderConfiguration.php
index a88bcccda..1c7f7b988 100644
--- a/src/Traits/Configuration/LoadingPlaceholderConfiguration.php
+++ b/src/Traits/Configuration/LoadingPlaceholderConfiguration.php
@@ -32,27 +32,6 @@ public function setLoadingPlaceholderContent(string $content): self
         return $this;
     }
 
-    public function setLoadingPlaceHolderAttributes(array $attributes): self
-    {
-        $this->loadingPlaceHolderAttributes = $attributes;
-
-        return $this;
-    }
-
-    public function setLoadingPlaceHolderIconAttributes(array $attributes): self
-    {
-        $this->loadingPlaceHolderIconAttributes = $attributes;
-
-        return $this;
-    }
-
-    public function setLoadingPlaceHolderWrapperAttributes(array $attributes): self
-    {
-        $this->loadingPlaceHolderWrapperAttributes = $attributes;
-
-        return $this;
-    }
-
     public function setLoadingPlaceholderBlade(string $customBlade): self
     {
         $this->loadingPlaceholderBlade = $customBlade;
diff --git a/src/Traits/Helpers/LoadingPlaceholderHelpers.php b/src/Traits/Helpers/LoadingPlaceholderHelpers.php
index 4a5a9e7e7..cd43c583f 100644
--- a/src/Traits/Helpers/LoadingPlaceholderHelpers.php
+++ b/src/Traits/Helpers/LoadingPlaceholderHelpers.php
@@ -16,23 +16,7 @@ public function getDisplayLoadingPlaceholder(): bool
 
     public function getLoadingPlaceholderContent(): string
     {
-        return $this->loadingPlaceholderContent ?? __('livewire-tables:loading');
-    }
-
-    public function getLoadingPlaceholderAttributes(): array
-    {
-        return count($this->loadingPlaceHolderAttributes) ? $this->loadingPlaceHolderAttributes : ['default' => true];
-
-    }
-
-    public function getLoadingPlaceHolderIconAttributes(): array
-    {
-        return count($this->loadingPlaceHolderIconAttributes) ? $this->loadingPlaceHolderIconAttributes : ['default' => true];
-    }
-
-    public function getLoadingPlaceHolderWrapperAttributes(): array
-    {
-        return count($this->loadingPlaceHolderWrapperAttributes) ? $this->loadingPlaceHolderWrapperAttributes : ['default' => true];
+        return $this->loadingPlaceholderContent ?? __('livewire-tables::loading');
     }
 
     public function hasLoadingPlaceholderBlade(): bool
diff --git a/src/Traits/Styling/Configuration/LoadingPlaceholderStylingConfiguration.php b/src/Traits/Styling/Configuration/LoadingPlaceholderStylingConfiguration.php
new file mode 100644
index 000000000..c07780bdc
--- /dev/null
+++ b/src/Traits/Styling/Configuration/LoadingPlaceholderStylingConfiguration.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
+
+trait LoadingPlaceholderStylingConfiguration
+{
+    public function setLoadingPlaceHolderAttributes(array $attributes): self
+    {
+        $this->setCustomAttributes('loadingPlaceHolderAttributes', [...$this->getCustomAttributes(propertyName: 'loadingPlaceHolderAttributes', default: false, classicMode: true), ...$attributes]);
+
+        return $this;
+    }
+
+    public function setLoadingPlaceHolderIconAttributes(array $attributes): self
+    {
+        $this->setCustomAttributes('loadingPlaceHolderIconAttributes', [...$this->getCustomAttributes(propertyName: 'loadingPlaceHolderIconAttributes', default: false, classicMode: true), ...$attributes]);
+
+        return $this;
+    }
+
+    public function setLoadingPlaceHolderRowAttributes(array $attributes): self
+    {
+        $this->setCustomAttributes('loadingPlaceHolderRowAttributes', [...$this->getCustomAttributes(propertyName: 'loadingPlaceHolderRowAttributes', default: false, classicMode: true), ...$attributes]);
+
+        return $this;
+    }
+
+    public function setLoadingPlaceHolderWrapperAttributes(array $attributes): self
+    {
+        $this->setCustomAttributes('loadingPlaceHolderRowAttributes', [...$this->getCustomAttributes(propertyName: 'loadingPlaceHolderRowAttributes', default: false, classicMode: true), ...$attributes]);
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Styling/HasLoadingPlaceholderStyling.php b/src/Traits/Styling/HasLoadingPlaceholderStyling.php
new file mode 100644
index 000000000..1dbb2b80d
--- /dev/null
+++ b/src/Traits/Styling/HasLoadingPlaceholderStyling.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling;
+
+use Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration\LoadingPlaceholderStylingConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers\LoadingPlaceholderStylingHelpers;
+
+trait HasLoadingPlaceholderStyling
+{
+    use LoadingPlaceholderStylingConfiguration,
+        LoadingPlaceholderStylingHelpers;
+
+    protected array $loadingPlaceHolderAttributes = [];
+
+    protected array $loadingPlaceHolderIconAttributes = [];
+
+    protected array $loadingPlaceHolderWrapperAttributes = [];
+
+    protected array $loadingPlaceHolderRowAttributes = [];
+
+    protected array $loadingPlaceHolderCellAttributes = ['class' => '', 'default' => true];
+}
diff --git a/src/Traits/Styling/Helpers/LoadingPlaceholderStylingHelpers.php b/src/Traits/Styling/Helpers/LoadingPlaceholderStylingHelpers.php
new file mode 100644
index 000000000..ef115641f
--- /dev/null
+++ b/src/Traits/Styling/Helpers/LoadingPlaceholderStylingHelpers.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers;
+
+use Livewire\Attributes\Computed;
+
+trait LoadingPlaceholderStylingHelpers
+{
+    public function getLoadingPlaceholderAttributes(): array
+    {
+        return $this->getCustomAttributes(propertyName: 'loadingPlaceHolderAttributes', default: true, classicMode: true);
+
+    }
+
+    public function getLoadingPlaceHolderIconAttributes(): array
+    {
+        return $this->getCustomAttributes(propertyName: 'loadingPlaceHolderIconAttributes', default: true, classicMode: true);
+
+    }
+
+    public function getLoadingPlaceHolderWrapperAttributes(): array
+    {
+        return $this->getCustomAttributes(propertyName: 'loadingPlaceHolderRowAttributes', default: true, classicMode: true);
+    }
+
+    public function getLoadingPlaceHolderRowAttributes(): array
+    {
+        return $this->getCustomAttributes(propertyName: 'loadingPlaceHolderRowAttributes', default: true, classicMode: true);
+    }
+
+    public function getLoadingPlaceHolderCellAttributes(): array
+    {
+        return $this->getCustomAttributes(propertyName: 'loadingPlaceHolderCellAttributes', default: true, classicMode: true);
+
+    }
+}
diff --git a/src/Traits/WithLoadingPlaceholder.php b/src/Traits/WithLoadingPlaceholder.php
index 47c3a3072..130b6d51b 100644
--- a/src/Traits/WithLoadingPlaceholder.php
+++ b/src/Traits/WithLoadingPlaceholder.php
@@ -4,21 +4,17 @@
 
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\LoadingPlaceholderConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\LoadingPlaceholderHelpers;
+use Rappasoft\LaravelLivewireTables\Traits\Styling\HasLoadingPlaceholderStyling;
 
 trait WithLoadingPlaceholder
 {
     use LoadingPlaceholderConfiguration,
-        LoadingPlaceholderHelpers;
+        LoadingPlaceholderHelpers,
+        HasLoadingPlaceholderStyling;
 
     protected bool $displayLoadingPlaceholder = false;
 
     protected string $loadingPlaceholderContent = 'Loading';
 
     protected ?string $loadingPlaceholderBlade = null;
-
-    protected array $loadingPlaceHolderAttributes = [];
-
-    protected array $loadingPlaceHolderIconAttributes = [];
-
-    protected array $loadingPlaceHolderWrapperAttributes = [];
 }
diff --git a/tests/Traits/Configuration/LoadingPlaceholderConfigurationTest.php b/tests/Traits/Configuration/LoadingPlaceholderConfigurationTest.php
index 1206f1608..28a3b97ad 100644
--- a/tests/Traits/Configuration/LoadingPlaceholderConfigurationTest.php
+++ b/tests/Traits/Configuration/LoadingPlaceholderConfigurationTest.php
@@ -48,11 +48,19 @@ public function test_can_set_loading_placeholder_attributes(): void
     {
         $this->basicTable->setLoadingPlaceholderEnabled();
 
-        $this->assertSame(['default' => true], $this->basicTable->getLoadingPlaceHolderAttributes());
+        $this->assertSame(['default' => true, 'default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderAttributes());
 
         $this->basicTable->setLoadingPlaceHolderAttributes(['class' => 'test12345']);
 
-        $this->assertSame(['class' => 'test12345'], $this->basicTable->getLoadingPlaceHolderAttributes());
+        $this->assertSame(['class' => 'test12345', 'default' => false, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getLoadingPlaceHolderAttributes());
+
+        $this->basicTable->setLoadingPlaceHolderAttributes(['class' => 'test12345', 'default' => true, 'default-colors' => true, 'default-styling' => true]);
+
+        $this->assertSame(['class' => 'test12345', 'default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderAttributes());
+
+        $this->basicTable->setLoadingPlaceHolderAttributes(['class' => 'test12345', 'default' => false, 'default-colors' => false, 'default-styling' => true]);
+
+        $this->assertSame(['class' => 'test12345', 'default' => false, 'default-colors' => false, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderAttributes());
 
     }
 
@@ -60,11 +68,19 @@ public function test_can_set_loading_placeholder_icon_attributes(): void
     {
         $this->basicTable->setLoadingPlaceholderEnabled();
 
-        $this->assertSame(['default' => true], $this->basicTable->getLoadingPlaceHolderIconAttributes());
+        $this->assertSame(['default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderIconAttributes());
 
         $this->basicTable->setLoadingPlaceHolderIconAttributes(['class' => 'test123']);
 
-        $this->assertSame(['class' => 'test123'], $this->basicTable->getLoadingPlaceHolderIconAttributes());
+        $this->assertSame(['class' => 'test123', 'default' => false, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getLoadingPlaceHolderIconAttributes());
+
+        $this->basicTable->setLoadingPlaceHolderIconAttributes(['class' => 'test123', 'default' => true, 'default-colors' => true, 'default-styling' => true]);
+
+        $this->assertSame(['class' => 'test123', 'default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderIconAttributes());
+
+        $this->basicTable->setLoadingPlaceHolderIconAttributes(['class' => 'test123', 'default' => false, 'default-colors' => false, 'default-styling' => true]);
+
+        $this->assertSame(['class' => 'test123', 'default' => false, 'default-colors' => false, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderIconAttributes());
 
     }
 
@@ -72,11 +88,47 @@ public function test_can_set_loading_placeholder_wrapper_attributes(): void
     {
         $this->basicTable->setLoadingPlaceholderEnabled();
 
-        $this->assertSame(['default' => true], $this->basicTable->getLoadingPlaceHolderWrapperAttributes());
+        $this->assertSame(['default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderWrapperAttributes());
+        $this->assertSame(['default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderRowAttributes());
 
         $this->basicTable->setLoadingPlaceHolderWrapperAttributes(['class' => 'test1234567-wrapper']);
 
-        $this->assertSame(['class' => 'test1234567-wrapper'], $this->basicTable->getLoadingPlaceHolderWrapperAttributes());
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getLoadingPlaceHolderWrapperAttributes());
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getLoadingPlaceHolderRowAttributes());
+
+        $this->basicTable->setLoadingPlaceHolderWrapperAttributes(['class' => 'test1234567-wrapper', 'default' => true, 'default-colors' => true, 'default-styling' => true]);
+
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderWrapperAttributes());
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderRowAttributes());
+
+        $this->basicTable->setLoadingPlaceHolderWrapperAttributes(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => true]);
+
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderWrapperAttributes());
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderRowAttributes());
+
+    }
+
+    public function test_can_set_loading_placeholder_row_attributes(): void
+    {
+        $this->basicTable->setLoadingPlaceholderEnabled();
+
+        $this->assertSame(['default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderRowAttributes());
+
+        $this->basicTable->setLoadingPlaceHolderRowAttributes(['class' => 'test1234567-wrapper']);
+
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getLoadingPlaceHolderRowAttributes());
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getLoadingPlaceHolderWrapperAttributes());
+
+        $this->basicTable->setLoadingPlaceHolderRowAttributes(['class' => 'test1234567-wrapper', 'default' => true, 'default-colors' => true, 'default-styling' => true]);
+
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderRowAttributes());
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderWrapperAttributes());
+
+        $this->basicTable->setLoadingPlaceHolderRowAttributes(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => true]);
+
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderRowAttributes());
+        $this->assertSame(['class' => 'test1234567-wrapper', 'default' => false, 'default-colors' => false, 'default-styling' => true], $this->basicTable->getLoadingPlaceHolderWrapperAttributes());
+
     }
 
     public function test_can_set_loading_placeholder_custom_blade(): void

From c15c1d1ebc16bbf15c280d5062c377b8235809cf Mon Sep 17 00:00:00 2001
From: Chris Thompson <christhompsontldr@gmail.com>
Date: Sat, 19 Oct 2024 22:04:32 -0500
Subject: [PATCH 081/103] Livewire column doesn't have title() method (#2002)

Adjusting Documentation -> The Livewire column type doesn't have the `HasTitleCallback` trait, so you can't use `->title()`.
---
 docs/column-types/livewire_component_column.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/column-types/livewire_component_column.md b/docs/column-types/livewire_component_column.md
index 9b1851299..6a6af2eea 100644
--- a/docs/column-types/livewire_component_column.md
+++ b/docs/column-types/livewire_component_column.md
@@ -10,7 +10,6 @@ This is **not recommended** as due to the nature of Livewire, it becomes ineffic
 ## component
 ```
 LivewireComponentColumn::make('Action')
-    ->title(fn($row) => 'Edit')
     ->component('PathToLivewireComponent'),
 
 ```
@@ -29,4 +28,4 @@ Please also see the following for other available methods:
     <li>
         <a href="https://rappasoft.com/docs/laravel-livewire-tables/v3/columns/footer">Footer</a>
     </li>
-</ul>
\ No newline at end of file
+</ul>

From e3c79b4ef2293b475e9a36523bc43dace9cd1875 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 25 Oct 2024 17:55:07 +0100
Subject: [PATCH 082/103] Add Value to BooleanColumn custom view (#2010)

* Add Value to BooleanColumn view

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Views/Columns/BooleanColumn.php       |  1 +
 tests/Views/Columns/BooleanColumnTest.php | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/Views/Columns/BooleanColumn.php b/src/Views/Columns/BooleanColumn.php
index 38dcf7216..30716b0e3 100644
--- a/src/Views/Columns/BooleanColumn.php
+++ b/src/Views/Columns/BooleanColumn.php
@@ -45,6 +45,7 @@ public function getContents(Model $row): null|string|\Illuminate\Support\HtmlStr
             ->withIsBootstrap($this->isBootstrap())
             ->withSuccessValue($this->getSuccessValue())
             ->withType($this->getType())
+            ->withValue($value)
             ->withStatus($this->hasCallback() ? call_user_func($this->getCallback(), $value, $row) : (bool) $value === true);
     }
 }
diff --git a/tests/Views/Columns/BooleanColumnTest.php b/tests/Views/Columns/BooleanColumnTest.php
index 6280af52c..726b6cfda 100644
--- a/tests/Views/Columns/BooleanColumnTest.php
+++ b/tests/Views/Columns/BooleanColumnTest.php
@@ -104,6 +104,19 @@ public function test_can_set_toggleable_with_confirm_message(): void
         $this->assertTrue($column->hasConfirmMessage());
 
         $this->assertSame('Are you sure?', $column->getConfirmMessage());
+    }
+
+    public function test_can_get_value(): void
+    {
+        $column = BooleanColumn::make('Name')->getContents(Pet::find(1));
+        $this->assertSame($column['value'], 'Cartman');
+    }
+
+    public function test_can_get_is_tailwind(): void
+    {
+        $column = BooleanColumn::make('Name')->getContents(Pet::find(1));
+        $this->assertSame($column['isTailwind'], true);
+        $this->assertSame($column['isBootstrap'], false);
 
     }
 }

From 1275e3ff3cf491d01544749eaf12fa6b0117ad36 Mon Sep 17 00:00:00 2001
From: Julian Edwards <82068546+me-julian@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:57:03 -0500
Subject: [PATCH 083/103] Add config option to bypass setting User on Events.
 (#2006)

Co-authored-by: julianmedwards <82068546+julianmedwards@users.noreply.github.com>
---
 config/livewire-tables.php                | 10 ++++++++++
 docs/datatable/events.md                  |  2 ++
 docs/start/configuration.md               | 19 +++++++++++++++++++
 src/Events/LaravelLivewireTablesEvent.php |  2 +-
 tests/Events/ColumnsSelectedTest.php      | 19 +++++++++++++++++++
 tests/Events/FilterAppliedTest.php        | 19 +++++++++++++++++++
 tests/Events/SearchAppliedTest.php        | 19 +++++++++++++++++++
 7 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/config/livewire-tables.php b/config/livewire-tables.php
index 4cc3dccab..9a176a2fd 100644
--- a/config/livewire-tables.php
+++ b/config/livewire-tables.php
@@ -114,4 +114,14 @@
         'defaultConfig' => [],
     ],
 
+    /**
+     * Configuration options for Events
+     */
+    'events' => [
+        /**
+        * Enable or disable passing the user from Laravel's Auth service to events
+        */
+        'enableUserForEvent' => true,
+    ],
+
 ];
diff --git a/docs/datatable/events.md b/docs/datatable/events.md
index 2a64763a7..dc81a5695 100644
--- a/docs/datatable/events.md
+++ b/docs/datatable/events.md
@@ -55,6 +55,8 @@ There are several events, all in the Rappasoft\LaravelLivewireTables\Events name
 | FilterApplied | Applied when a Filter is applied (not when removed) |  The Table Name ($tableName), Filter Key ($key), Filter Value ($value), Logged In User ($user) |
 | SearchApplied | Applied when a Search is applied (not when removed) | The Table Name ($tableName), Search Term ($value), Logged In User ($user) |
 
+Passing the user with an event is optional and [can be disabled in the config](../start/configuration.md#bypassing-laravels-auth-service).
+
 By default, the Tables will dispatch an event when the Selected Columns is changed, you may customise this behaviour:
 
 #### enableAllEvents
diff --git a/docs/start/configuration.md b/docs/start/configuration.md
index 3e264c578..01725843f 100644
--- a/docs/start/configuration.md
+++ b/docs/start/configuration.md
@@ -81,3 +81,22 @@ You must also make sure you have this Alpine style available globally. Note that
     [x-cloak] { display: none !important; }
 </style>
 ```
+
+## Bypassing Laravel's Auth Service
+
+By default, all [events](../datatable/events#dispatched) will retrieve any currently authenticated user from Laravel's [Auth service](https://laravel.com/docs/authentication) and pass it along with the event.
+
+If your project doesn't include the Illuminate/Auth package, or you otherwise want to prevent this, you can set the `enableUserForEvent` config option to false.
+
+```php
+// config/livewire-tables.php
+return [
+    // ...
+    'events' => [
+        /**
+        * Enable or disable passing the user from Laravel's Auth service to events
+        */
+        'enableUserForEvent' => false,
+    ],
+];
+```
diff --git a/src/Events/LaravelLivewireTablesEvent.php b/src/Events/LaravelLivewireTablesEvent.php
index 89026ead2..b1a034367 100644
--- a/src/Events/LaravelLivewireTablesEvent.php
+++ b/src/Events/LaravelLivewireTablesEvent.php
@@ -42,7 +42,7 @@ public function setTableForEvent(string $tableName): self
 
     public function setUserForEvent(): self
     {
-        if (auth()->user()) {
+        if (config('livewire-tables.events.enableUserForEvent', true) && auth()->user()) {
             $this->user = auth()->user();
         }
 
diff --git a/tests/Events/ColumnsSelectedTest.php b/tests/Events/ColumnsSelectedTest.php
index 197b1450f..a6dd19580 100644
--- a/tests/Events/ColumnsSelectedTest.php
+++ b/tests/Events/ColumnsSelectedTest.php
@@ -80,4 +80,23 @@ public function test_an_event_is_emitted_when_a_column_selection_are_updated_and
             return $event->columns == [] && $event->user->id == '1234' && $event->tableName == $this->basicTable->getTableName();
         });
     }
+
+    public function test_user_not_set_on_event_when_a_column_selection_is_updated_and_user_for_event_disabled()
+    {
+        Event::fake();
+
+        config()->set('livewire-tables.events.enableUserForEvent', false);
+
+        $user = new \Illuminate\Foundation\Auth\User;
+        $user->id = '1234';
+        $user->name = 'Bob';
+        $this->actingAs($user);
+
+        $this->basicTable->selectAllColumns();
+
+        Event::assertDispatched(ColumnsSelected::class, function ($event) {
+            $this->assertFalse(isset($event->user), "User set on Event when config is set to disable this behavior");
+            return true;
+        });
+    }
 }
diff --git a/tests/Events/FilterAppliedTest.php b/tests/Events/FilterAppliedTest.php
index ef59c5719..d48040b86 100644
--- a/tests/Events/FilterAppliedTest.php
+++ b/tests/Events/FilterAppliedTest.php
@@ -61,4 +61,23 @@ public function test_an_event_is_emitted_when_a_filter_is_applied_with_values_an
             return $event->value == 'test value' && $event->user->id == '1234' && $event->key = 'pet_name_filter' && $event->tableName == $this->basicTable->getTableName();
         });
     }
+
+    public function test_user_not_set_on_event_when_a_filter_is_applied_and_user_for_event_disabled()
+    {
+        Event::fake();
+
+        config()->set('livewire-tables.events.enableUserForEvent', false);
+
+        $user = new \Illuminate\Foundation\Auth\User;
+        $user->id = '1234';
+        $user->name = 'Bob';
+        $this->actingAs($user);
+
+        $this->basicTable->enableFilterAppliedEvent()->setFilter('pet_name_filter', 'test value');
+
+        Event::assertDispatched(FilterApplied::class, function ($event) {
+            $this->assertFalse(isset($event->user), "User set on Event when config is set to disable this behavior");
+            return true;
+        });
+    }
 }
diff --git a/tests/Events/SearchAppliedTest.php b/tests/Events/SearchAppliedTest.php
index d7abc2bc7..d559697c6 100644
--- a/tests/Events/SearchAppliedTest.php
+++ b/tests/Events/SearchAppliedTest.php
@@ -71,4 +71,23 @@ public function test_an_event_is_emitted_when_a_search_is_applied_and_event_enab
             return $event->value == 'test search value' && $event->user->id == '1234' && $event->tableName == $this->basicTable->getTableName();
         });
     }
+
+    public function test_user_not_set_on_event_when_a_search_is_applied_and_user_for_event_disabled()
+    {
+        Event::fake();
+
+        config()->set('livewire-tables.events.enableUserForEvent', false);
+
+        $user = new \Illuminate\Foundation\Auth\User;
+        $user->id = '1234';
+        $user->name = 'Bob';
+        $this->actingAs($user);
+
+        $this->basicTable->enableSearchAppliedEvent()->setSearch('test')->applySearch();
+
+        Event::assertDispatched(SearchApplied::class, function ($event) {
+            $this->assertFalse(isset($event->user), "User set on Event when config is set to disable this behavior");
+            return true;
+        });
+    }
 }

From 99167736db2b157f6a65ab89bba60fda7ddff4a7 Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Fri, 25 Oct 2024 16:57:25 +0000
Subject: [PATCH 084/103] Fix styling

---
 config/livewire-tables.php           | 4 ++--
 tests/Events/ColumnsSelectedTest.php | 3 ++-
 tests/Events/FilterAppliedTest.php   | 3 ++-
 tests/Events/SearchAppliedTest.php   | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/config/livewire-tables.php b/config/livewire-tables.php
index 9a176a2fd..7c2e20983 100644
--- a/config/livewire-tables.php
+++ b/config/livewire-tables.php
@@ -119,8 +119,8 @@
      */
     'events' => [
         /**
-        * Enable or disable passing the user from Laravel's Auth service to events
-        */
+         * Enable or disable passing the user from Laravel's Auth service to events
+         */
         'enableUserForEvent' => true,
     ],
 
diff --git a/tests/Events/ColumnsSelectedTest.php b/tests/Events/ColumnsSelectedTest.php
index a6dd19580..bf32df5a6 100644
--- a/tests/Events/ColumnsSelectedTest.php
+++ b/tests/Events/ColumnsSelectedTest.php
@@ -95,7 +95,8 @@ public function test_user_not_set_on_event_when_a_column_selection_is_updated_an
         $this->basicTable->selectAllColumns();
 
         Event::assertDispatched(ColumnsSelected::class, function ($event) {
-            $this->assertFalse(isset($event->user), "User set on Event when config is set to disable this behavior");
+            $this->assertFalse(isset($event->user), 'User set on Event when config is set to disable this behavior');
+
             return true;
         });
     }
diff --git a/tests/Events/FilterAppliedTest.php b/tests/Events/FilterAppliedTest.php
index d48040b86..612530494 100644
--- a/tests/Events/FilterAppliedTest.php
+++ b/tests/Events/FilterAppliedTest.php
@@ -76,7 +76,8 @@ public function test_user_not_set_on_event_when_a_filter_is_applied_and_user_for
         $this->basicTable->enableFilterAppliedEvent()->setFilter('pet_name_filter', 'test value');
 
         Event::assertDispatched(FilterApplied::class, function ($event) {
-            $this->assertFalse(isset($event->user), "User set on Event when config is set to disable this behavior");
+            $this->assertFalse(isset($event->user), 'User set on Event when config is set to disable this behavior');
+
             return true;
         });
     }
diff --git a/tests/Events/SearchAppliedTest.php b/tests/Events/SearchAppliedTest.php
index d559697c6..d76af688e 100644
--- a/tests/Events/SearchAppliedTest.php
+++ b/tests/Events/SearchAppliedTest.php
@@ -86,7 +86,8 @@ public function test_user_not_set_on_event_when_a_search_is_applied_and_user_for
         $this->basicTable->enableSearchAppliedEvent()->setSearch('test')->applySearch();
 
         Event::assertDispatched(SearchApplied::class, function ($event) {
-            $this->assertFalse(isset($event->user), "User set on Event when config is set to disable this behavior");
+            $this->assertFalse(isset($event->user), 'User set on Event when config is set to disable this behavior');
+
             return true;
         });
     }

From 2cd034417bc841cb46fac9f2ba2c60254ad5f2fa Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 25 Oct 2024 20:26:44 +0100
Subject: [PATCH 085/103] Improve Workflow Caches (#2013)

* Improve Workflow Caches

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .github/workflows/pint.yml                |   2 +-
 .github/workflows/run-phpstan-pull.yml    | 104 ++++++++++++++++++++++
 .github/workflows/run-phpstan.yml         |  30 +++++--
 .github/workflows/run-tests-pcov-pull.yml |  12 ++-
 .github/workflows/run-tests-pull.yml      |  22 ++---
 .github/workflows/run-tests.yml           |  40 ++++++---
 6 files changed, 177 insertions(+), 33 deletions(-)
 create mode 100644 .github/workflows/run-phpstan-pull.yml

diff --git a/.github/workflows/pint.yml b/.github/workflows/pint.yml
index 356103132..c533df969 100644
--- a/.github/workflows/pint.yml
+++ b/.github/workflows/pint.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Fix PHP code style issues
         uses: aglipanci/laravel-pint-action@latest
 
-      - name: Commit changes
+      - name: Commit styling changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Fix styling
diff --git a/.github/workflows/run-phpstan-pull.yml b/.github/workflows/run-phpstan-pull.yml
new file mode 100644
index 000000000..e6663148e
--- /dev/null
+++ b/.github/workflows/run-phpstan-pull.yml
@@ -0,0 +1,104 @@
+name: run-phpstan-pull
+
+on:
+  pull_request:
+    branches:
+      - 'master'
+      - 'development'
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        php: [8.3]
+        laravel: [11]
+        stability: [prefer-dist]
+
+    name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    env:
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
+      extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+
+    steps:
+      - name: Wait for tests to finish
+        uses: lewagon/wait-on-check-action@v1.3.4
+        with:
+          ref: ${{ github.ref }}
+          running-workflow-name: 'Run Tests Pull'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 20
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup cache environment
+        id: extcache
+        uses: shivammathur/cache-extensions@v1
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: ${{ env.extensions }}
+          key: ${{ env.extensionKey }}
+
+      - name: Cache extensions
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.extcache.outputs.dir }}
+          key: ${{ steps.extcache.outputs.key }}
+          restore-keys: ${{ steps.extcache.outputs.key }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: ${{ env.extensions }}
+          coverage: pcov
+          tools: phpunit:9.5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          
+      - name: Get composer cache directory
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
+
+      - name: Add token
+        run: |
+          composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          
+      - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: composer require "laravel/framework:${{ matrix.laravel }}.*" --no-interaction --no-update
+
+      - name: Update dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: composer update --${{ matrix.stability }} --no-interaction
+
+      - name: Install PHPStan
+        run: composer require larastan/larastan:^2.0 --no-interaction
+
+      - uses: actions/cache/restore@v4
+        id: larastan-restore
+        with:
+          path: ./build/phpstan
+          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
+
+      - name: Run PHPStan Tests
+        run: ./vendor/bin/phpstan analyse
+
+      - uses: actions/cache/save@v4
+        id: larastan-save
+        with:
+          path: ./build/phpstan
+          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
diff --git a/.github/workflows/run-phpstan.yml b/.github/workflows/run-phpstan.yml
index 3701660df..1b7304a85 100644
--- a/.github/workflows/run-phpstan.yml
+++ b/.github/workflows/run-phpstan.yml
@@ -1,10 +1,6 @@
 name: run-phpstan
 
 on:
-  pull_request:
-    branches:
-      - 'master'
-      - 'development'
   push:
     branches:
       - '*'         # matches every branch that doesn't contain a '/'
@@ -26,10 +22,18 @@ jobs:
 
     name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
     env:
-      extensionKey: phpextensions
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
 
     steps:
+      - name: Wait for tests to finish
+        uses: lewagon/wait-on-check-action@v1.3.4
+        with:
+          ref: ${{ github.ref }}
+          running-workflow-name: 'Run Standard Tests'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 20
+
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -69,8 +73,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
+          key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
         run: |
@@ -87,5 +91,17 @@ jobs:
       - name: Install PHPStan
         run: composer require larastan/larastan:^2.0 --dev --no-interaction
 
+      - uses: actions/cache/restore@v4
+        id: larastan-restore
+        with:
+          path: ./build/phpstan
+          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
+
       - name: Run PHPStan Tests
         run: ./vendor/bin/phpstan analyse
+
+      - uses: actions/cache/save@v4
+        id: larastan-save
+        with:
+          path: ./build/phpstan
+          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
index fffe0618f..639edbf63 100644
--- a/.github/workflows/run-tests-pcov-pull.yml
+++ b/.github/workflows/run-tests-pcov-pull.yml
@@ -26,6 +26,14 @@ jobs:
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pcov,pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
 
     steps:
+      - name: Wait for tests to finish
+        uses: lewagon/wait-on-check-action@v1.3.4
+        with:
+          ref: ${{ github.ref }}
+          running-workflow-name: 'Run Tests Pull'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 20
+
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -66,8 +74,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-
+          key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
         run: |
diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
index 80c625554..28e642d03 100644
--- a/.github/workflows/run-tests-pull.yml
+++ b/.github/workflows/run-tests-pull.yml
@@ -1,4 +1,4 @@
-name: run-tests-pull
+name: Run Tests Pull
 
 on:
   pull_request:
@@ -20,7 +20,7 @@ jobs:
 
     name: PULL PHP-${{ matrix.php }} - Laravel-10
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
@@ -39,8 +39,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
+          key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
+          restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -64,8 +64,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
+          key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
         run: |
@@ -118,8 +118,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
+          key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
+          restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -143,8 +143,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
+          key: ${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
         run: |
@@ -162,4 +162,4 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/paratest --no-coverage
+        run: php ./vendor/bin/phpunit --no-coverage
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index bcb0d7031..490c6a3a3 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -1,4 +1,4 @@
-name: run-tests
+name: Run Standard Tests
 
 on:
   push:
@@ -22,10 +22,18 @@ jobs:
 
     name: PHP-${{ matrix.php }} - Laravel-10
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
+      - name: Wait for styling to finish
+        uses: lewagon/wait-on-check-action@v1.3.4
+        with:
+          ref: ${{ github.ref }}
+          running-workflow-name: 'Fix PHP code style issues'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 20
+
       - name: Checkout code
         uses: actions/checkout@v4
         
@@ -41,8 +49,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
+          key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
+          restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -66,8 +74,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
+          key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
         run: |
@@ -101,10 +109,18 @@ jobs:
 
     name: PHP-${{ matrix.php }} - Laravel-11
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
+      - name: Wait for styling to finish
+        uses: lewagon/wait-on-check-action@v1.3.4
+        with:
+          ref: ${{ github.ref }}
+          running-workflow-name: 'Fix PHP code style issues'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 20
+
       - name: Checkout code
         uses: actions/checkout@v4
         
@@ -120,8 +136,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
+          key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
+          restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -145,8 +161,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
+          key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
         run: |
@@ -164,4 +180,4 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/paratest --no-coverage
+        run: php ./vendor/bin/phpunit --no-coverage

From 124bac18a6da32f22c0b6df88b38ded021b43b9b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 25 Oct 2024 20:27:07 +0100
Subject: [PATCH 086/103] Add customisation for QueryString specific to Filters
 (#2011)

* Add customisation for QueryString specific to Filters

* Move all QueryString Filter Code to HasQueryStringForFilter


---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/datatable/available-methods.md           |  38 +-----
 docs/datatable/query-string.md                | 105 +++++++++++++++++
 docs/datatable/styling.md                     |   2 +-
 .../QueryStrings/HasQueryStringForFilter.php  |  87 ++++++++++++++
 src/Traits/WithFilters.php                    |  14 +--
 .../QueryStringForFiltersTest.php             | 109 ++++++++++++++++++
 6 files changed, 305 insertions(+), 50 deletions(-)
 create mode 100644 docs/datatable/query-string.md
 create mode 100644 src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
 create mode 100644 tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php

diff --git a/docs/datatable/available-methods.md b/docs/datatable/available-methods.md
index 13d4091b3..3cf5c303c 100644
--- a/docs/datatable/available-methods.md
+++ b/docs/datatable/available-methods.md
@@ -76,43 +76,7 @@ public function configure(): void
 
 ## Query String
 
-The query string is **enabled by default**, but if you ever needed to toggle it you can use the following methods:
-
-### setQueryStringStatus
-
-Enable/disable the query string.
-
-```php
-public function configure(): void
-{
-  $this->setQueryStringStatus(true);
-  $this->setQueryStringStatus(false);
-}
-```
-
-### setQueryStringEnabled
-
-Enable the query string.
-
-```php
-public function configure(): void
-{
-  // Shorthand for $this->setQueryStringStatus(true)
-  $this->setQueryStringEnabled();
-}
-```
-
-### setQueryStringDisabled
-
-Disable the query string.
-
-```php
-public function configure(): void
-{
-  // Shorthand for $this->setQueryStringStatus(false)
-  $this->setQueryStringDisabled();
-}
-```
+The documentation for Query String now lives: [here](./query-string)
 
 ## Relationships
 
diff --git a/docs/datatable/query-string.md b/docs/datatable/query-string.md
new file mode 100644
index 000000000..8f1e2b3c1
--- /dev/null
+++ b/docs/datatable/query-string.md
@@ -0,0 +1,105 @@
+---
+title: Query String
+weight: 5
+---
+
+The query string is **enabled by default**, but if you ever needed to toggle it you can use the following methods:
+
+## Global 
+### setQueryStringStatus
+
+Enable/disable the query string.
+
+```php
+public function configure(): void
+{
+  $this->setQueryStringStatus(true);
+  $this->setQueryStringStatus(false);
+}
+```
+
+### setQueryStringEnabled
+
+Enable the query string.
+
+```php
+public function configure(): void
+{
+  // Shorthand for $this->setQueryStringStatus(true)
+  $this->setQueryStringEnabled();
+}
+```
+
+### setQueryStringDisabled
+
+Disable the query string.
+
+```php
+public function configure(): void
+{
+  // Shorthand for $this->setQueryStringStatus(false)
+  $this->setQueryStringDisabled();
+}
+```
+
+### setQueryStringAlias
+
+Change the Alias in the URL, otherwise defaults to "$tablename"
+
+```php
+public function configure(): void
+{
+  $this->setQueryStringAlias('table1');
+}
+```
+
+## Filters
+
+The filter query string is **enabled by default**, but if you ever needed to toggle it you can use the following methods:
+
+### setQueryStringStatusForFilter
+
+Enable/disable the query string for the filters
+
+```php
+public function configure(): void
+{
+  $this->setQueryStringStatusForFilter(true);
+  $this->setQueryStringStatusForFilter(false);
+}
+```
+
+### setQueryStringForFilterEnabled
+
+Enable the query string for the filters
+
+```php
+public function configure(): void
+{
+  // Shorthand for $this->setQueryStringStatusForFilter(true)
+  $this->setQueryStringForFilterEnabled();
+}
+```
+
+### setQueryStringForFilterDisabled
+
+Disable the query string for the filters
+
+```php
+public function configure(): void
+{
+  // Shorthand for $this->setQueryStringStatusForFilter(false)
+  $this->setQueryStringForFilterDisabled();
+}
+```
+
+### setQueryStringAliasForFilter
+
+Change the Alias in the URL for the filter, otherwise defaults to "$tablename-filters"
+
+```php
+public function configure(): void
+{
+  $this->setQueryStringAliasForFilter('filtervalues');
+}
+```
\ No newline at end of file
diff --git a/docs/datatable/styling.md b/docs/datatable/styling.md
index 9353ad00e..937a6df94 100644
--- a/docs/datatable/styling.md
+++ b/docs/datatable/styling.md
@@ -1,6 +1,6 @@
 ---
 title: Styling
-weight: 5
+weight: 6
 ---
 
 The package offers significant opportunities to customise the look & feel of the core table, as well as other elements (which are documented in the relevant sections).
diff --git a/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php b/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
new file mode 100644
index 000000000..8a84ab222
--- /dev/null
+++ b/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings;
+
+use Livewire\Attributes\Locked;
+
+trait HasQueryStringForFilter
+{
+    #[Locked]
+    public ?bool $queryStringStatusForFilter;
+
+    protected ?string $queryStringAliasForFilter;
+
+    protected function queryStringHasQueryStringForFilter(): array
+    {
+        if ($this->queryStringForFilterIsEnabled()) {
+            return [
+                'appliedFilters' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForFilter()],
+                'filterComponents' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForFilter()],
+            ];
+        }
+
+        return [];
+    }
+
+    public function setupQueryStringStatusForFilter(): void
+    {
+        if (! $this->hasQueryStringStatusForFilter()) {
+            $this->setQueryStringForFilterEnabled();
+        }
+    }
+
+    public function hasQueryStringStatusForFilter(): bool
+    {
+        return isset($this->queryStringStatusForFilter);
+    }
+
+    public function getQueryStringStatusForFilter(): bool
+    {
+        return $this->queryStringStatusForFilter ?? true;
+    }
+
+    public function queryStringForFilterIsEnabled(): bool
+    {
+        $this->setupQueryStringStatusForFilter();
+
+        return ($this->queryStringIsEnabled() === true || $this->getQueryStringStatusForFilter() === true) && $this->filtersAreEnabled();
+    }
+
+    public function setQueryStringStatusForFilter(bool $status): self
+    {
+        $this->queryStringStatusForFilter = $status;
+
+        return $this;
+    }
+
+    public function setQueryStringForFilterEnabled(): self
+    {
+        $this->setQueryStringStatusForFilter(true);
+
+        return $this;
+    }
+
+    public function setQueryStringForFilterDisabled(): self
+    {
+        $this->setQueryStringStatusForFilter(false);
+
+        return $this;
+    }
+
+    public function hasQueryStringAliasForFilter(): bool
+    {
+        return isset($this->queryStringAliasForFilter);
+    }
+
+    public function getQueryStringAliasForFilter(): string
+    {
+        return $this->queryStringAliasForFilter ?? $this->getQueryStringAlias().'-filters';
+    }
+
+    public function setQueryStringAliasForFilter(string $alias): self
+    {
+        $this->queryStringAliasForFilter = $alias;
+
+        return $this;
+    }
+}
diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php
index 3c2ff58c5..e9469ea44 100644
--- a/src/Traits/WithFilters.php
+++ b/src/Traits/WithFilters.php
@@ -7,12 +7,14 @@
 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\Helpers\FilterHelpers;
 
 trait WithFilters
 {
     use FilterConfiguration,
         FilterHelpers;
+    use HasQueryStringForFilter;
 
     #[Locked]
     public bool $filtersStatus = true;
@@ -47,18 +49,6 @@ public function filters(): array
         return [];
     }
 
-    protected function queryStringWithFilters(): array
-    {
-        if ($this->queryStringIsEnabled() && $this->filtersAreEnabled()) {
-            return [
-                'appliedFilters' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-filters'],
-                'filterComponents' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-filters'],
-            ];
-        }
-
-        return [];
-    }
-
     public function applyFilters(): Builder
     {
         if ($this->filtersAreEnabled() && $this->hasFilters() && $this->hasAppliedFiltersWithValues()) {
diff --git a/tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php b/tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
new file mode 100644
index 000000000..9387e6cdb
--- /dev/null
+++ b/tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Core\QueryStrings;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class QueryStringForFiltersTest extends TestCase
+{
+    public function test_can_get_default_filter_query_string_status(): void
+    {
+        $mock = new class extends PetsTable
+        {
+            public ?array $testAttributesArray;
+
+            public function configure(): void
+            {
+                $this->setDataTableFingerprint('test');
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame(true, $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());
+    }
+
+    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();
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame(false, $mock->getQueryStringStatusForFilter());
+        $mock->setQueryStringForFilterEnabled();
+        $this->assertSame(true, $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');
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame('table-filters', $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();
+
+        $this->assertSame('table-filters', $mock->getQueryStringAliasForFilter());
+        $mock->setQueryStringAliasForFilter('pet-filters');
+        $this->assertSame('pet-filters', $mock->getQueryStringAliasForFilter());
+    }
+}

From ad80321aaf546ec2c47cacf6b26227373d3a41ce Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:08:25 +0100
Subject: [PATCH 087/103] Adjust Workflow Cache for Issue (#2015)

---
 .github/workflows/run-phpstan-pull.yml | 23 ++++-------------------
 .github/workflows/run-phpstan.yml      | 23 ++++-------------------
 .github/workflows/run-tests.yml        | 16 ----------------
 3 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/run-phpstan-pull.yml b/.github/workflows/run-phpstan-pull.yml
index e6663148e..9f8b7a5d7 100644
--- a/.github/workflows/run-phpstan-pull.yml
+++ b/.github/workflows/run-phpstan-pull.yml
@@ -23,14 +23,6 @@ jobs:
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
 
     steps:
-      - name: Wait for tests to finish
-        uses: lewagon/wait-on-check-action@v1.3.4
-        with:
-          ref: ${{ github.ref }}
-          running-workflow-name: 'Run Tests Pull'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 20
-
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -70,8 +62,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
+          key: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
         run: |
@@ -88,17 +80,10 @@ jobs:
       - name: Install PHPStan
         run: composer require larastan/larastan:^2.0 --no-interaction
 
-      - uses: actions/cache/restore@v4
-        id: larastan-restore
+      - uses: actions/cache@v4
         with:
           path: ./build/phpstan
           key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
 
       - name: Run PHPStan Tests
-        run: ./vendor/bin/phpstan analyse
-
-      - uses: actions/cache/save@v4
-        id: larastan-save
-        with:
-          path: ./build/phpstan
-          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
+        run: ./vendor/bin/phpstan analyse
\ No newline at end of file
diff --git a/.github/workflows/run-phpstan.yml b/.github/workflows/run-phpstan.yml
index 1b7304a85..742eb28a7 100644
--- a/.github/workflows/run-phpstan.yml
+++ b/.github/workflows/run-phpstan.yml
@@ -26,14 +26,6 @@ jobs:
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
 
     steps:
-      - name: Wait for tests to finish
-        uses: lewagon/wait-on-check-action@v1.3.4
-        with:
-          ref: ${{ github.ref }}
-          running-workflow-name: 'Run Standard Tests'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 20
-
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -73,8 +65,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
+          key: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
         run: |
@@ -91,17 +83,10 @@ jobs:
       - name: Install PHPStan
         run: composer require larastan/larastan:^2.0 --dev --no-interaction
 
-      - uses: actions/cache/restore@v4
-        id: larastan-restore
+      - uses: actions/cache@v4
         with:
           path: ./build/phpstan
           key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
 
       - name: Run PHPStan Tests
-        run: ./vendor/bin/phpstan analyse
-
-      - uses: actions/cache/save@v4
-        id: larastan-save
-        with:
-          path: ./build/phpstan
-          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
+        run: ./vendor/bin/phpstan analyse
\ No newline at end of file
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 490c6a3a3..5fdfbfd7d 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -26,14 +26,6 @@ jobs:
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
-      - name: Wait for styling to finish
-        uses: lewagon/wait-on-check-action@v1.3.4
-        with:
-          ref: ${{ github.ref }}
-          running-workflow-name: 'Fix PHP code style issues'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 20
-
       - name: Checkout code
         uses: actions/checkout@v4
         
@@ -113,14 +105,6 @@ jobs:
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
-      - name: Wait for styling to finish
-        uses: lewagon/wait-on-check-action@v1.3.4
-        with:
-          ref: ${{ github.ref }}
-          running-workflow-name: 'Fix PHP code style issues'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 20
-
       - name: Checkout code
         uses: actions/checkout@v4
         

From 92dc8fb6ea8785ac8f462e1cef4840d63f472039 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:19:21 +0100
Subject: [PATCH 088/103] Fix bug with FilterQueryString (#2014)

* Fix bug with FilterQueryString

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Traits/Core/QueryStrings/HasQueryStringForFilter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php b/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
index 8a84ab222..143aae376 100644
--- a/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
+++ b/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
@@ -44,7 +44,7 @@ public function queryStringForFilterIsEnabled(): bool
     {
         $this->setupQueryStringStatusForFilter();
 
-        return ($this->queryStringIsEnabled() === true || $this->getQueryStringStatusForFilter() === true) && $this->filtersAreEnabled();
+        return $this->getQueryStringStatusForFilter() && $this->filtersAreEnabled();
     }
 
     public function setQueryStringStatusForFilter(bool $status): self

From 351757e2af7b181bb91274027260bab4e5f29c60 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 27 Oct 2024 01:08:25 +0000
Subject: [PATCH 089/103] Add Customisation for "Search" in QueryString (#2017)

* AddSearchQueryString

* Add tests for hasQueryStringAliasFor...

* Additional Tests For SearchQueryString

* Move Livewire to Visuals section

* Simplify the queryString methods

* Add hasQueryStringAliasForSearch test

* PCOV Runs as PHPUnit not ParaTest

* Remove PCOV From Workflows Where Not Used

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .github/workflows/run-tests-pcov-pull.yml     |   2 +-
 .github/workflows/run-tests-pull.yml          |   4 +-
 .github/workflows/run-tests.yml               |   4 +-
 docs/datatable/query-string.md                |  51 ++++++++
 .../QueryStrings/HasQueryStringForFilter.php  |   9 +-
 .../QueryStrings/HasQueryStringForSearch.php  |  81 +++++++++++++
 src/Traits/WithSearch.php                     |  13 +--
 .../QueryStringForFiltersTest.php             |   1 +
 .../QueryStrings/QueryStringForSearchTest.php | 110 ++++++++++++++++++
 tests/Traits/Visuals/SearchVisualsTest.php    |  46 ++++++++
 10 files changed, 299 insertions(+), 22 deletions(-)
 create mode 100644 src/Traits/Core/QueryStrings/HasQueryStringForSearch.php
 create mode 100644 tests/Traits/Core/QueryStrings/QueryStringForSearchTest.php

diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
index 639edbf63..785b3c173 100644
--- a/.github/workflows/run-tests-pcov-pull.yml
+++ b/.github/workflows/run-tests-pcov-pull.yml
@@ -93,7 +93,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/paratest --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
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
index 28e642d03..8b0fdd2c4 100644
--- a/.github/workflows/run-tests-pull.yml
+++ b/.github/workflows/run-tests-pull.yml
@@ -21,7 +21,7 @@ jobs:
     name: PULL PHP-${{ matrix.php }} - Laravel-10
     env:
       extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
-      extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
+      extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
       - name: Checkout code
@@ -100,7 +100,7 @@ jobs:
     name: PULL PHP-${{ matrix.php }} - Laravel-11
     env:
       extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
-      extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
+      extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
       - name: Checkout code
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 5fdfbfd7d..8078c1ddb 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -23,7 +23,7 @@ jobs:
     name: PHP-${{ matrix.php }} - Laravel-10
     env:
       extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
-      extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
+      extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
       - name: Checkout code
@@ -102,7 +102,7 @@ jobs:
     name: PHP-${{ matrix.php }} - Laravel-11
     env:
       extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
-      extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
+      extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
       - name: Checkout code
diff --git a/docs/datatable/query-string.md b/docs/datatable/query-string.md
index 8f1e2b3c1..f0763a643 100644
--- a/docs/datatable/query-string.md
+++ b/docs/datatable/query-string.md
@@ -102,4 +102,55 @@ public function configure(): void
 {
   $this->setQueryStringAliasForFilter('filtervalues');
 }
+```
+
+## Search
+
+The search query string is **enabled by default**, but if you ever needed to toggle it you can use the following methods:
+
+### setQueryStringStatusForSearch
+
+Enable/disable the query string for search
+
+```php
+public function configure(): void
+{
+  $this->setQueryStringStatusForSearch(true);
+  $this->setQueryStringStatusForSearch(false);
+}
+```
+
+### setQueryStringForSearchEnabled
+
+Enable the query string for search
+
+```php
+public function configure(): void
+{
+  // Shorthand for $this->setQueryStringStatusForSearch(true)
+  $this->setQueryStringForSearchEnabled();
+}
+```
+
+### setQueryStringForSearchDisabled
+
+Disable the query string for search
+
+```php
+public function configure(): void
+{
+  // Shorthand for $this->setQueryStringStatusForSearch(false)
+  $this->setQueryStringForSearchDisabled();
+}
+```
+
+### setQueryStringAliasForSearch
+
+Change the Alias in the URL for the search, otherwise defaults to "$tablename-search"
+
+```php
+public function configure(): void
+{
+  $this->setQueryStringAliasForSearch('search');
+}
 ```
\ No newline at end of file
diff --git a/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php b/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
index 143aae376..624242301 100644
--- a/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
+++ b/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
@@ -13,14 +13,11 @@ trait HasQueryStringForFilter
 
     protected function queryStringHasQueryStringForFilter(): array
     {
-        if ($this->queryStringForFilterIsEnabled()) {
-            return [
+        return ($this->queryStringForFilterIsEnabled()) ?
+            [
                 'appliedFilters' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForFilter()],
                 'filterComponents' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForFilter()],
-            ];
-        }
-
-        return [];
+            ] : [];
     }
 
     public function setupQueryStringStatusForFilter(): void
diff --git a/src/Traits/Core/QueryStrings/HasQueryStringForSearch.php b/src/Traits/Core/QueryStrings/HasQueryStringForSearch.php
new file mode 100644
index 000000000..10cac7fb9
--- /dev/null
+++ b/src/Traits/Core/QueryStrings/HasQueryStringForSearch.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings;
+
+use Livewire\Attributes\Locked;
+
+trait HasQueryStringForSearch
+{
+    #[Locked]
+    public ?bool $queryStringStatusForSearch;
+
+    protected ?string $queryStringAliasForSearch;
+
+    protected function queryStringHasQueryStringForSearch(): array
+    {
+        return ($this->queryStringForSearchEnabled() && $this->searchIsEnabled()) ? ['search' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForSearch()]] : [];
+
+    }
+
+    public function setupQueryStringStatusForSearch(): void
+    {
+        if (! $this->hasQueryStringStatusForSearch()) {
+            $this->setQueryStringForSearchEnabled();
+        }
+    }
+
+    public function hasQueryStringStatusForSearch(): bool
+    {
+        return isset($this->queryStringStatusForSearch);
+    }
+
+    public function getQueryStringStatusForSearch(): bool
+    {
+        return $this->queryStringStatusForSearch ?? true;
+    }
+
+    public function queryStringForSearchEnabled(): bool
+    {
+        $this->setupQueryStringStatusForSearch();
+
+        return $this->getQueryStringStatusForSearch() && $this->searchIsEnabled();
+    }
+
+    public function setQueryStringStatusForSearch(bool $status): self
+    {
+        $this->queryStringStatusForSearch = $status;
+
+        return $this;
+    }
+
+    public function setQueryStringForSearchEnabled(): self
+    {
+        $this->setQueryStringStatusForSearch(true);
+
+        return $this;
+    }
+
+    public function setQueryStringForSearchDisabled(): self
+    {
+        $this->setQueryStringStatusForSearch(false);
+
+        return $this;
+    }
+
+    public function hasQueryStringAliasForSearch(): bool
+    {
+        return isset($this->queryStringAliasForSearch);
+    }
+
+    public function getQueryStringAliasForSearch(): string
+    {
+        return $this->queryStringAliasForSearch ?? $this->getQueryStringAlias().'-search';
+    }
+
+    public function setQueryStringAliasForSearch(string $alias): self
+    {
+        $this->queryStringAliasForSearch = $alias;
+
+        return $this;
+    }
+}
diff --git a/src/Traits/WithSearch.php b/src/Traits/WithSearch.php
index 0d86e1397..ddfe98553 100644
--- a/src/Traits/WithSearch.php
+++ b/src/Traits/WithSearch.php
@@ -6,12 +6,14 @@
 use Livewire\Attributes\Locked;
 use Rappasoft\LaravelLivewireTables\Events\SearchApplied;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\SearchConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings\HasQueryStringForSearch;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\SearchHelpers;
 
 trait WithSearch
 {
     use SearchConfiguration,
         SearchHelpers;
+    use HasQueryStringForSearch;
 
     public string $search = '';
 
@@ -38,17 +40,6 @@ trait WithSearch
 
     protected bool $trimSearchString = false;
 
-    protected function queryStringWithSearch(): array
-    {
-        if ($this->queryStringIsEnabled() && $this->searchIsEnabled()) {
-            return [
-                'search' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-search'],
-            ];
-        }
-
-        return [];
-    }
-
     // TODO
     public function applySearch(): Builder
     {
diff --git a/tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php b/tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
index 9387e6cdb..6ee41bccb 100644
--- a/tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
+++ b/tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
@@ -105,5 +105,6 @@ public function configure(): void
         $this->assertSame('table-filters', $mock->getQueryStringAliasForFilter());
         $mock->setQueryStringAliasForFilter('pet-filters');
         $this->assertSame('pet-filters', $mock->getQueryStringAliasForFilter());
+        $this->assertTrue($mock->hasQueryStringAliasForFilter());
     }
 }
diff --git a/tests/Traits/Core/QueryStrings/QueryStringForSearchTest.php b/tests/Traits/Core/QueryStrings/QueryStringForSearchTest.php
new file mode 100644
index 000000000..6fb3c5a71
--- /dev/null
+++ b/tests/Traits/Core/QueryStrings/QueryStringForSearchTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Core\QueryStrings;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class QueryStringForSearchTest extends TestCase
+{
+    public function test_can_get_default_search_query_string_status(): void
+    {
+        $mock = new class extends PetsTable
+        {
+            public ?array $testAttributesArray;
+
+            public function configure(): void
+            {
+                $this->setDataTableFingerprint('test');
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame(true, $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();
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame(false, $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());
+
+    }
+
+    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();
+
+        $this->assertSame('table-search', $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());
+    }
+}
diff --git a/tests/Traits/Visuals/SearchVisualsTest.php b/tests/Traits/Visuals/SearchVisualsTest.php
index 1891bfd16..c025e1185 100644
--- a/tests/Traits/Visuals/SearchVisualsTest.php
+++ b/tests/Traits/Visuals/SearchVisualsTest.php
@@ -76,4 +76,50 @@ public function test_search_live_filter_is_applied(): void
             ->call('setSearchLive')
             ->assertSeeHtml('wire:model.live="search"');
     }
+
+    public function test_search_via_query_string_functions(): void
+    {
+        Livewire::withQueryParams(['table-search' => 'Cartman'])
+            ->test(PetsTable::class)
+            ->assertSee('Cartman')
+            ->assertDontSee('Chico');
+
+        Livewire::withQueryParams(['table-search' => 'Chico'])
+            ->test(PetsTable::class)
+            ->assertSee('Chico')
+            ->assertDontSee('Cartman');
+
+        $mock = new class extends PetsTable
+        {
+            public ?array $testAttributesArray;
+
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+                $this->setDataTableFingerprint('test');
+                $this->setQueryStringAliasForSearch('pet-search');
+            }
+        };
+
+        Livewire::withQueryParams(['table-search' => 'Chico'])
+            ->test($mock)
+            ->assertSee('Chico')
+            ->assertSee('Cartman');
+
+        Livewire::withQueryParams(['pet-search' => 'Chico'])
+            ->test($mock)
+            ->assertSee('Chico')
+            ->assertDontSee('Cartman');
+
+        Livewire::withQueryParams(['pet-search' => null])
+            ->test($mock)
+            ->assertSee('Chico')
+            ->assertSee('Cartman');
+
+        Livewire::withQueryParams([])
+            ->test($mock)
+            ->assertSee('Chico')
+            ->assertSee('Cartman');
+
+    }
 }

From 542e797912ceb5bad3852b5d212d07a16258c345 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 30 Oct 2024 22:22:37 +0000
Subject: [PATCH 090/103] Add QueryStringForSort (#2018)

* Add QueryStringForSort

* Adjust for SortQueryString

* Tests

* Tweaks to Configure Approach


---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 docs/datatable/query-string.md                |  51 ++++++++
 src/Traits/ComponentUtilities.php             |  32 +++--
 .../QueryStringConfiguration.php              |   2 +-
 .../Core/QueryStrings/HasQueryString.php      |  59 ++++++++++
 .../QueryStrings/HasQueryStringForFilter.php  |   2 +-
 .../QueryStrings/HasQueryStringForSearch.php  |  33 ++----
 .../QueryStrings/HasQueryStringForSort.php    |  66 +++++++++++
 src/Traits/HasAllTraits.php                   |   2 +-
 src/Traits/WithQueryString.php                |   2 +
 src/Traits/WithSorting.php                    |  13 +--
 .../QueryStrings/QueryStringForSortTest.php   | 110 ++++++++++++++++++
 11 files changed, 324 insertions(+), 48 deletions(-)
 create mode 100644 src/Traits/Core/QueryStrings/HasQueryString.php
 create mode 100644 src/Traits/Core/QueryStrings/HasQueryStringForSort.php
 create mode 100644 tests/Traits/Core/QueryStrings/QueryStringForSortTest.php

diff --git a/docs/datatable/query-string.md b/docs/datatable/query-string.md
index f0763a643..c830ef15a 100644
--- a/docs/datatable/query-string.md
+++ b/docs/datatable/query-string.md
@@ -153,4 +153,55 @@ public function configure(): void
 {
   $this->setQueryStringAliasForSearch('search');
 }
+```
+
+## Sorts
+
+The sorts query string is **enabled by default**, but if you ever needed to toggle it you can use the following methods:
+
+### setQueryStringStatusForSort
+
+Enable/disable the query string for sort
+
+```php
+public function configure(): void
+{
+  $this->setQueryStringStatusForSort(true);
+  $this->setQueryStringStatusForSort(false);
+}
+```
+
+### setQueryStringForSortEnabled
+
+Enable the query string for sort
+
+```php
+public function configure(): void
+{
+  // Shorthand for $this->setQueryStringStatusForSort(true)
+  $this->setQueryStringForSortEnabled();
+}
+```
+
+### setQueryStringForSortDisabled
+
+Disable the query string for sort
+
+```php
+public function configure(): void
+{
+  // Shorthand for $this->setQueryStringStatusForSort(false)
+  $this->setQueryStringForSortDisabled();
+}
+```
+
+### setQueryStringAliasForSort
+
+Change the Alias in the URL for the sorts, otherwise defaults to "$tablename-sorts"
+
+```php
+public function configure(): void
+{
+  $this->setQueryStringAliasForSort('sorts');
+}
 ```
\ No newline at end of file
diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index 8cf7bad19..de24d0e72 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -48,6 +48,8 @@ trait ComponentUtilities
 
     protected bool $useComputedProperties = true;
 
+    protected bool $hasRunConfigure = false;
+
     /**
      * Set any configuration options
      */
@@ -71,16 +73,7 @@ public function mountComponentUtilities(): void
      */
     public function bootedComponentUtilities(): void
     {
-        // Fire Lifecycle Hooks for configuring
-        $this->callHook('configuring');
-        $this->callTraitHook('configuring');
-
-        // Call the configure() method
-        $this->configure();
-
-        // Fire Lifecycle Hooks for configured
-        $this->callHook('configured');
-        $this->callTraitHook('configured');
+        $this->runCoreConfiguration();
 
         // Make sure a primary key is set
         if (! $this->hasPrimaryKey()) {
@@ -89,6 +82,25 @@ public function bootedComponentUtilities(): void
 
     }
 
+    protected function runCoreConfiguration(): void
+    {
+        if (! $this->hasRunConfigure) {
+            // Fire Lifecycle Hooks for configuring
+            $this->callHook('configuring');
+            $this->callTraitHook('configuring');
+
+            // Call the configure() method
+            $this->configure();
+
+            // Fire Lifecycle Hooks for configured
+            $this->callHook('configured');
+            $this->callTraitHook('configured');
+
+            $this->hasRunConfigure = true;
+
+        }
+    }
+
     /**
      * Returns a unique id for the table, used as an alias to identify one table from another session and query string to prevent conflicts
      */
diff --git a/src/Traits/Configuration/QueryStringConfiguration.php b/src/Traits/Configuration/QueryStringConfiguration.php
index 771c640c2..fb0dedfad 100644
--- a/src/Traits/Configuration/QueryStringConfiguration.php
+++ b/src/Traits/Configuration/QueryStringConfiguration.php
@@ -14,7 +14,7 @@ public function setQueryStringAlias(string $queryStringAlias): self
     public function setupQueryStringStatus(): void
     {
         if (! $this->hasQueryStringStatus()) {
-            $this->configure();
+            $this->runCoreConfiguration();
             if (! $this->hasQueryStringStatus()) {
                 $this->setQueryStringEnabled();
             }
diff --git a/src/Traits/Core/QueryStrings/HasQueryString.php b/src/Traits/Core/QueryStrings/HasQueryString.php
new file mode 100644
index 000000000..7c1f567b6
--- /dev/null
+++ b/src/Traits/Core/QueryStrings/HasQueryString.php
@@ -0,0 +1,59 @@
+<?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/HasQueryStringForFilter.php b/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
index 624242301..add0a331f 100644
--- a/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
+++ b/src/Traits/Core/QueryStrings/HasQueryStringForFilter.php
@@ -20,7 +20,7 @@ protected function queryStringHasQueryStringForFilter(): array
             ] : [];
     }
 
-    public function setupQueryStringStatusForFilter(): void
+    protected function setupQueryStringStatusForFilter(): void
     {
         if (! $this->hasQueryStringStatusForFilter()) {
             $this->setQueryStringForFilterEnabled();
diff --git a/src/Traits/Core/QueryStrings/HasQueryStringForSearch.php b/src/Traits/Core/QueryStrings/HasQueryStringForSearch.php
index 10cac7fb9..c987e4ccc 100644
--- a/src/Traits/Core/QueryStrings/HasQueryStringForSearch.php
+++ b/src/Traits/Core/QueryStrings/HasQueryStringForSearch.php
@@ -2,22 +2,15 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings;
 
-use Livewire\Attributes\Locked;
-
 trait HasQueryStringForSearch
 {
-    #[Locked]
-    public ?bool $queryStringStatusForSearch;
-
-    protected ?string $queryStringAliasForSearch;
-
     protected function queryStringHasQueryStringForSearch(): array
     {
         return ($this->queryStringForSearchEnabled() && $this->searchIsEnabled()) ? ['search' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForSearch()]] : [];
 
     }
 
-    public function setupQueryStringStatusForSearch(): void
+    protected function setupQueryStringStatusForSearch(): void
     {
         if (! $this->hasQueryStringStatusForSearch()) {
             $this->setQueryStringForSearchEnabled();
@@ -26,12 +19,12 @@ public function setupQueryStringStatusForSearch(): void
 
     public function hasQueryStringStatusForSearch(): bool
     {
-        return isset($this->queryStringStatusForSearch);
+        return $this->hasQueryStringConfigStatus('search');
     }
 
     public function getQueryStringStatusForSearch(): bool
     {
-        return $this->queryStringStatusForSearch ?? true;
+        return $this->getQueryStringConfigStatus('search');
     }
 
     public function queryStringForSearchEnabled(): bool
@@ -43,39 +36,31 @@ public function queryStringForSearchEnabled(): bool
 
     public function setQueryStringStatusForSearch(bool $status): self
     {
-        $this->queryStringStatusForSearch = $status;
-
-        return $this;
+        return $this->setQueryStringConfigStatus('search', $status);
     }
 
     public function setQueryStringForSearchEnabled(): self
     {
-        $this->setQueryStringStatusForSearch(true);
-
-        return $this;
+        return $this->setQueryStringStatusForSearch(true);
     }
 
     public function setQueryStringForSearchDisabled(): self
     {
-        $this->setQueryStringStatusForSearch(false);
-
-        return $this;
+        return $this->setQueryStringStatusForSearch(false);
     }
 
     public function hasQueryStringAliasForSearch(): bool
     {
-        return isset($this->queryStringAliasForSearch);
+        return $this->hasQueryStringConfigAlias('search');
     }
 
     public function getQueryStringAliasForSearch(): string
     {
-        return $this->queryStringAliasForSearch ?? $this->getQueryStringAlias().'-search';
+        return $this->getQueryStringConfigAlias('search');
     }
 
     public function setQueryStringAliasForSearch(string $alias): self
     {
-        $this->queryStringAliasForSearch = $alias;
-
-        return $this;
+        return $this->setQueryStringConfigAlias('search', $alias);
     }
 }
diff --git a/src/Traits/Core/QueryStrings/HasQueryStringForSort.php b/src/Traits/Core/QueryStrings/HasQueryStringForSort.php
new file mode 100644
index 000000000..cbdad07af
--- /dev/null
+++ b/src/Traits/Core/QueryStrings/HasQueryStringForSort.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings;
+
+trait HasQueryStringForSort
+{
+    protected function queryStringHasQueryStringForSort(): array
+    {
+        return ($this->queryStringForSortEnabled() && $this->sortingIsEnabled()) ? ['sorts' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAliasForSort()]] : [];
+
+    }
+
+    protected function setupQueryStringStatusForSort(): void
+    {
+        if (! $this->hasQueryStringStatusForSort()) {
+            $this->setQueryStringForSortEnabled();
+        }
+    }
+
+    public function hasQueryStringStatusForSort(): bool
+    {
+        return $this->hasQueryStringConfigStatus('sorts');
+    }
+
+    public function getQueryStringStatusForSort(): bool
+    {
+        return $this->getQueryStringConfigStatus('sorts');
+    }
+
+    public function queryStringForSortEnabled(): bool
+    {
+        $this->setupQueryStringStatusForSort();
+
+        return $this->getQueryStringStatusForSort() && $this->sortingIsEnabled();
+    }
+
+    public function setQueryStringStatusForSort(bool $status): self
+    {
+        return $this->setQueryStringConfigStatus('sorts', $status);
+    }
+
+    public function setQueryStringForSortEnabled(): self
+    {
+        return $this->setQueryStringStatusForSort(true);
+    }
+
+    public function setQueryStringForSortDisabled(): self
+    {
+        return $this->setQueryStringStatusForSort(false);
+    }
+
+    public function hasQueryStringAliasForSort(): bool
+    {
+        return $this->hasQueryStringConfigAlias('sorts');
+    }
+
+    public function getQueryStringAliasForSort(): string
+    {
+        return $this->getQueryStringConfigAlias('sorts');
+    }
+
+    public function setQueryStringAliasForSort(string $alias): self
+    {
+        return $this->setQueryStringConfigAlias('sorts', $alias);
+    }
+}
diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php
index 70ddd3eb5..b8da012d7 100644
--- a/src/Traits/HasAllTraits.php
+++ b/src/Traits/HasAllTraits.php
@@ -14,6 +14,7 @@ trait HasAllTraits
     use ComponentUtilities,
         WithActions,
         WithData,
+        WithQueryString,
         WithColumns,
         WithSorting,
         WithSearch,
@@ -28,7 +29,6 @@ trait HasAllTraits
         WithEvents,
         WithFilters,
         WithFooter,
-        WithQueryString,
         WithRefresh,
         WithReordering,
         WithSecondaryHeader,
diff --git a/src/Traits/WithQueryString.php b/src/Traits/WithQueryString.php
index ccc11d5e9..56dee3699 100644
--- a/src/Traits/WithQueryString.php
+++ b/src/Traits/WithQueryString.php
@@ -4,12 +4,14 @@
 
 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 ?bool $queryStringStatus;
diff --git a/src/Traits/WithSorting.php b/src/Traits/WithSorting.php
index 78c8e9a73..1ed30366e 100644
--- a/src/Traits/WithSorting.php
+++ b/src/Traits/WithSorting.php
@@ -6,12 +6,14 @@
 use Illuminate\Support\Collection;
 use Livewire\Attributes\Locked;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\SortingConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Core\QueryStrings\HasQueryStringForSort;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\SortingHelpers;
 
 trait WithSorting
 {
     use SortingConfiguration,
         SortingHelpers;
+    use HasQueryStringForSort;
 
     public array $sorts = [];
 
@@ -31,17 +33,6 @@ trait WithSorting
 
     public string $defaultSortingLabelDesc = 'Z-A';
 
-    public function queryStringWithSorting(): array
-    {
-        if ($this->queryStringIsEnabled() && $this->sortingIsEnabled()) {
-            return [
-                'sorts' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-sorts'],
-            ];
-        }
-
-        return [];
-    }
-
     public function sortBy(string $columnSelectName): ?string
     {
 
diff --git a/tests/Traits/Core/QueryStrings/QueryStringForSortTest.php b/tests/Traits/Core/QueryStrings/QueryStringForSortTest.php
new file mode 100644
index 000000000..7db6d3eb9
--- /dev/null
+++ b/tests/Traits/Core/QueryStrings/QueryStringForSortTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Core\QueryStrings;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+final class QueryStringForSortTest extends TestCase
+{
+    public function test_can_get_default_sort_query_string_status(): void
+    {
+        $mock = new class extends PetsTable
+        {
+            public ?array $testAttributesArray;
+
+            public function configure(): void
+            {
+                $this->setDataTableFingerprint('test');
+            }
+        };
+
+        $mock->configure();
+        $mock->boot();
+
+        $this->assertSame(true, $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();
+
+        $this->assertSame(false, $mock->getQueryStringStatusForSort());
+    }
+
+    public function test_can_enable_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();
+
+        $this->assertSame(false, $mock->getQueryStringStatusForSort());
+        $mock->setQueryStringForSortEnabled();
+        $this->assertSame(true, $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();
+
+        $this->assertSame('table-sorts', $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());
+    }
+}

From 3e18b270e6ae594658d37c353ed70ac152bdbcf4 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 30 Oct 2024 22:30:10 +0000
Subject: [PATCH 091/103] BETA: Livewire Custom Filter (Array) (#2025)

* Initial Commit

* Add blade for Livewire Component Array Filter - not live

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../livewire-component-array-filter.blade.php |  4 +
 .../livewire-component-filter.blade.php       |  3 +-
 src/Traits/Helpers/FilterHelpers.php          | 10 +++
 .../Filters/LivewireComponentArrayFilter.php  | 58 +++++++++++++++
 src/Views/Filters/LivewireComponentFilter.php | 38 +---------
 src/Views/Traits/Filters/HasOptions.php       |  2 +-
 .../Filters/IsLivewireComponentFilter.php     | 44 +++++++++++
 src/Views/Traits/IsExternalArrayFilter.php    | 73 +++++++++++++++++++
 8 files changed, 193 insertions(+), 39 deletions(-)
 create mode 100644 resources/views/components/tools/filters/livewire-component-array-filter.blade.php
 create mode 100644 src/Views/Filters/LivewireComponentArrayFilter.php
 create mode 100644 src/Views/Traits/Filters/IsLivewireComponentFilter.php
 create mode 100644 src/Views/Traits/IsExternalArrayFilter.php

diff --git a/resources/views/components/tools/filters/livewire-component-array-filter.blade.php b/resources/views/components/tools/filters/livewire-component-array-filter.blade.php
new file mode 100644
index 000000000..237d062fa
--- /dev/null
+++ b/resources/views/components/tools/filters/livewire-component-array-filter.blade.php
@@ -0,0 +1,4 @@
+<div wire:key="filterComponents.{{ $filter->getKey() }}-wrapper">
+    <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
+    <livewire:dynamic-component :is="$livewireComponent" :tableComponent="get_class($this)" :filterKey="$filter->getKey()" :$tableName :key="'filterComponents-'.$filter->getKey()" wire:model="filterComponents.{{ $filter->getKey() }}" />
+</div>
diff --git a/resources/views/components/tools/filters/livewire-component-filter.blade.php b/resources/views/components/tools/filters/livewire-component-filter.blade.php
index 89b407133..a430faf9f 100644
--- a/resources/views/components/tools/filters/livewire-component-filter.blade.php
+++ b/resources/views/components/tools/filters/livewire-component-filter.blade.php
@@ -1,5 +1,4 @@
 <div wire:key="filterComponents.{{ $filter->getKey() }}-wrapper">
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
-
-    <livewire:dynamic-component :is="$livewireComponent" :filterKey="$filter->getKey()" :key="'filterComponents-'.$filter->getKey()" wire:model.live="filterComponents.{{ $filter->getKey() }}" />
+    <livewire:dynamic-component :is="$livewireComponent" :tableComponent="get_class($this)" :filterKey="$filter->getKey()" :$tableName :key="'filterComponents-'.$filter->getKey()" wire:model.live="filterComponents.{{ $filter->getKey() }}" />
 </div>
diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php
index 056500190..d9bfddf51 100644
--- a/src/Traits/Helpers/FilterHelpers.php
+++ b/src/Traits/Helpers/FilterHelpers.php
@@ -345,4 +345,14 @@ public function showFilterPillsSection(): bool
     {
         return $this->filtersAreEnabled() && $this->filterPillsAreEnabled() && $this->hasAppliedVisibleFiltersForPills();
     }
+
+    #[On('livewireArrayFilterUpdateValues')]
+    public function updateLivewireArrayFilterValues(string $filterKey, string $tableName, array $values): void
+    {
+        if ($this->tableName == $tableName) {
+            $filter = $this->getFilterByKey($filterKey);
+            $filter->options($values);
+        }
+
+    }
 }
diff --git a/src/Views/Filters/LivewireComponentArrayFilter.php b/src/Views/Filters/LivewireComponentArrayFilter.php
new file mode 100644
index 000000000..ad995b3dc
--- /dev/null
+++ b/src/Views/Filters/LivewireComponentArrayFilter.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Filters;
+
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+use Rappasoft\LaravelLivewireTables\Views\Filter;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasOptions,IsArrayFilter, IsLivewireComponentFilter};
+
+class LivewireComponentArrayFilter extends Filter
+{
+    use HasWireables;
+    use IsArrayFilter;
+    use HasOptions;
+    use IsLivewireComponentFilter;
+
+    public string $wireMethod = 'blur';
+
+    protected string $view = 'livewire-tables::components.tools.filters.livewire-component-array-filter';
+
+    public function validate(array $value): array|bool
+    {
+
+        return $value;
+    }
+
+    public function isEmpty(array $value = []): bool
+    {
+        return empty($value);
+    }
+
+    /**
+     * Gets the Default Value for this Filter via the Component
+     */
+    public function getFilterDefaultValue(): ?string
+    {
+        return $this->filterDefaultValue ?? null;
+    }
+
+    public function getFilterPillValue($value): array|string|bool|null
+    {
+        $values = [];
+        foreach ($value as $key => $item) {
+
+            $found = $this->getCustomFilterPillValue($item) ?? ($this->options[$item] ?? $item);
+            if ($found) {
+                $values[] = $found;
+            }
+        }
+
+        return $values;
+    }
+
+    public function getKeys(): array
+    {
+        return array_keys($this->options ?? []);
+    }
+}
diff --git a/src/Views/Filters/LivewireComponentFilter.php b/src/Views/Filters/LivewireComponentFilter.php
index cfcf29e8c..8605c2e99 100644
--- a/src/Views/Filters/LivewireComponentFilter.php
+++ b/src/Views/Filters/LivewireComponentFilter.php
@@ -5,17 +5,17 @@
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Views\Filter;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\IsLivewireComponentFilter;
 
 class LivewireComponentFilter extends Filter
 {
     use HasWireables;
+    use IsLivewireComponentFilter;
 
     public string $wireMethod = 'blur';
 
     protected string $view = 'livewire-tables::components.tools.filters.livewire-component-filter';
 
-    public string $livewireComponent = '';
-
     public function validate(string $value): string|bool
     {
         return $value;
@@ -33,38 +33,4 @@ public function getFilterDefaultValue(): ?string
     {
         return $this->filterDefaultValue ?? null;
     }
-
-    public function setLivewireComponent(string $livewireComponent): self
-    {
-
-        $class = '\\'.config('livewire.class_namespace').'\\'.collect(str($livewireComponent)->explode('.'))->map(fn ($segment) => (string) str($segment)->studly())->join('\\');
-
-        if (! class_exists($class)) {
-            throw new DataTableConfigurationException('You must specify a valid path to your Livewire Component Filter.');
-        }
-
-        if (! is_subclass_of($class, \Livewire\Component::class)) {
-            throw new DataTableConfigurationException('Your Livewire Component Filter MUST Extend Livewire\Component.');
-        }
-
-        $this->livewireComponent = $livewireComponent;
-
-        return $this;
-    }
-
-    public function getLivewireComponent(): string
-    {
-        return $this->livewireComponent ?? '';
-    }
-
-    public function render(): string|\Illuminate\Contracts\Foundation\Application|\Illuminate\View\View|\Illuminate\View\Factory
-    {
-        if ($this->livewireComponent == '') {
-            throw new DataTableConfigurationException('You must specify a valid path to your Livewire Component Filter.');
-        }
-
-        return view($this->getViewPath(), $this->getFilterDisplayData())->with([
-            'livewireComponent' => $this->livewireComponent,
-        ]);
-    }
 }
diff --git a/src/Views/Traits/Filters/HasOptions.php b/src/Views/Traits/Filters/HasOptions.php
index 3447fe660..a8e39a363 100644
--- a/src/Views/Traits/Filters/HasOptions.php
+++ b/src/Views/Traits/Filters/HasOptions.php
@@ -33,7 +33,7 @@ public function options(array $options = []): self
 
     public function getOptions(): array
     {
-        return $this->options ?? $this->options = config($this->optionsPath, []);
+        return $this->options ?? $this->options = (property_exists($this, 'optionsPath') ? config($this->optionsPath, []) : []);
     }
 
     public function getKeys(): array
diff --git a/src/Views/Traits/Filters/IsLivewireComponentFilter.php b/src/Views/Traits/Filters/IsLivewireComponentFilter.php
new file mode 100644
index 000000000..fbcf83d0a
--- /dev/null
+++ b/src/Views/Traits/Filters/IsLivewireComponentFilter.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+
+trait IsLivewireComponentFilter
+{
+    public string $livewireComponent = '';
+
+    public function setLivewireComponent(string $livewireComponent): self
+    {
+
+        $class = '\\'.config('livewire.class_namespace').'\\'.collect(str($livewireComponent)->explode('.'))->map(fn ($segment) => (string) str($segment)->studly())->join('\\');
+
+        if (! class_exists($class)) {
+            throw new DataTableConfigurationException('You must specify a valid path to your Livewire Component Filter.');
+        }
+
+        if (! is_subclass_of($class, \Livewire\Component::class)) {
+            throw new DataTableConfigurationException('Your Livewire Component Filter MUST Extend Livewire\Component.');
+        }
+
+        $this->livewireComponent = $livewireComponent;
+
+        return $this;
+    }
+
+    public function getLivewireComponent(): string
+    {
+        return $this->livewireComponent ?? '';
+    }
+
+    public function render(): string|\Illuminate\Contracts\Foundation\Application|\Illuminate\View\View|\Illuminate\View\Factory
+    {
+        if ($this->livewireComponent == '') {
+            throw new DataTableConfigurationException('You must specify a valid path to your Livewire Component Filter.');
+        }
+
+        return view($this->getViewPath(), $this->getFilterDisplayData())->with([
+            'livewireComponent' => $this->livewireComponent,
+        ]);
+    }
+}
diff --git a/src/Views/Traits/IsExternalArrayFilter.php b/src/Views/Traits/IsExternalArrayFilter.php
new file mode 100644
index 000000000..480d36e82
--- /dev/null
+++ b/src/Views/Traits/IsExternalArrayFilter.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits;
+
+use Livewire\Attributes\{Modelable,On,Renderless};
+
+trait IsExternalArrayFilter
+{
+    #[Modelable]
+    public array $value = [];
+
+    public string $filterKey = '';
+
+    public string $tableName = '';
+
+    public string $tableComponent = '';
+
+    protected bool $needsUpdating = false;
+
+    protected array $returnValues = [];
+
+    public array $selectedItems = [];
+
+    public array $selectOptions = [];
+
+    #[On('filter-was-set')]
+    public function setFilterValues(string $tableName, string $filterKey, array $value): void
+    {
+        if ($tableName == $this->tableName && $filterKey == $this->filterKey && $this->selectedItems != $value) {
+            $this->selectedItems = $value;
+            $this->needsUpdating = false;
+
+        }
+    }
+
+    protected function clearFilter() {}
+
+    #[Renderless]
+    public function updatedSelectedItems(string $value): void
+    {
+        if (! $this->needsUpdating) {
+            $this->needsUpdating = true;
+
+        }
+    }
+
+    #[Renderless]
+    protected function sendUpdateDispatch(array $returnValues): void
+    {
+        if ($this->needsUpdating) {
+            if (! empty($returnValues)) {
+                $this->value = array_keys($returnValues);
+            } else {
+                $this->value = [];
+            }
+            $this->dispatch('livewireArrayFilterUpdateValues', tableName: $this->tableName, filterKey: $this->filterKey, values: $returnValues)->to($this->tableComponent);
+
+        }
+    }
+
+    #[Renderless]
+    public function renderingIsExternalArrayFilter(): void
+    {
+        $returnValues = [];
+
+        if ($this->needsUpdating == true && ! empty($this->selectedItems)) {
+            foreach ($this->selectedItems as $selectedItem) {
+                $returnValues[$selectedItem] = $this->selectOptions[$selectedItem] ?? 'Unknown';
+            }
+            $this->sendUpdateDispatch($returnValues);
+        }
+    }
+}

From 211b39e6f3119ac00520d6ee389e9ec2c6a43ffb Mon Sep 17 00:00:00 2001
From: Richard Leishman <mrl22@users.noreply.github.com>
Date: Wed, 30 Oct 2024 22:34:41 +0000
Subject: [PATCH 092/103] Fix bug #1997 - Found the issue elsewhere also, so I
 fixed them too. (#2021)

---
 resources/views/components/table/th.blade.php        | 12 ++++++------
 resources/views/components/table/th/plain.blade.php  |  4 ++--
 .../views/components/table/th/reorder.blade.php      |  4 ++--
 .../tools/toolbar/items/search-field.blade.php       |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php
index b12366dc7..3afee536c 100644
--- a/resources/views/components/table/th.blade.php
+++ b/resources/views/components/table/th.blade.php
@@ -20,8 +20,8 @@
 @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(['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()])
@@ -35,8 +35,8 @@
                 <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)])
+                            ->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'])
                     }}
                 >
@@ -71,7 +71,7 @@ class="d-flex align-items-center laravel-livewire-tables-cursor"
                     wire:click="sortBy('{{ $column->getColumnSortKey() }}')"
                     {{
                         $attributes->merge($customSortButtonAttributes)
-                            ->class(['' => ($customSortButtonAttributes['default-styling'] ?? true || $customSortButtonAttributes['default'] ?? true)])
+                            ->class(['' => (($customSortButtonAttributes['default-styling'] ?? true) || ($customSortButtonAttributes['default'] ?? true))])
                             ->except(['default', 'default-colors', 'default-styling', 'wire:key'])
                     }}
                 >
@@ -79,7 +79,7 @@ class="d-flex align-items-center laravel-livewire-tables-cursor"
 
                     <x-livewire-tables::table.th.sort-icons :$direction                     {{
                         $attributes->merge($customSortButtonAttributes)
-                            ->class(['' => ($customSortButtonAttributes['default-colors'] ?? true || $customSortButtonAttributes['default'] ?? true)])
+                            ->class(['' => (($customSortButtonAttributes['default-colors'] ?? true) || ($customSortButtonAttributes['default'] ?? true))])
                             ->except(['default', 'default-colors', 'default-styling', 'wire:key'])
                     }}
                 />
diff --git a/resources/views/components/table/th/plain.blade.php b/resources/views/components/table/th/plain.blade.php
index 4f5837f34..3a0a56d36 100644
--- a/resources/views/components/table/th/plain.blade.php
+++ b/resources/views/components/table/th/plain.blade.php
@@ -4,8 +4,8 @@
 <th x-cloak {{ $attributes }} scope="col"
     {{ 
         $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),
+            '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
diff --git a/resources/views/components/table/th/reorder.blade.php b/resources/views/components/table/th/reorder.blade.php
index 5ba02d959..e4fe7cecb 100644
--- a/resources/views/components/table/th/reorder.blade.php
+++ b/resources/views/components/table/th/reorder.blade.php
@@ -6,8 +6,8 @@
 <x-livewire-tables::table.th.plain x-cloak x-show="currentlyReorderingStatus" wire:key="{{ $tableName }}-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(['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)])
     }}
 >
diff --git a/resources/views/components/tools/toolbar/items/search-field.blade.php b/resources/views/components/tools/toolbar/items/search-field.blade.php
index 755cbab29..6bc8bb9c5 100644
--- a/resources/views/components/tools/toolbar/items/search-field.blade.php
+++ b/resources/views/components/tools/toolbar/items/search-field.blade.php
@@ -12,10 +12,10 @@
             {{ 
                 $attributes->merge($this->getSearchFieldAttributes())
                 ->class([
-                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 rounded-none rounded-l-md focus:ring-0 focus:border-gray-300' => $this->isTailwind && $this->hasSearch() && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-styling'] ?? true),
-                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 rounded-md focus:ring focus:ring-opacity-50' => $this->isTailwind && !$this->hasSearch()  && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-styling'] ?? true),
-                    'border-gray-300 dark:bg-gray-700 dark:text-white dark:border-gray-600 focus:border-gray-300' => $this->isTailwind && $this->hasSearch()  && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-colors'] ?? true),
-                    'border-gray-300 dark:bg-gray-700 dark:text-white dark:border-gray-600 focus:border-indigo-300 focus:ring-indigo-200' => $this->isTailwind && !$this->hasSearch()  && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-colors'] ?? true),
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 rounded-none rounded-l-md focus:ring-0 focus:border-gray-300' => $this->isTailwind && $this->hasSearch() && (($this->getSearchFieldAttributes()['default'] ?? true) || ($this->getSearchFieldAttributes()['default-styling'] ?? true)),
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 rounded-md focus:ring focus:ring-opacity-50' => $this->isTailwind && !$this->hasSearch()  && (($this->getSearchFieldAttributes()['default'] ?? true) || ($this->getSearchFieldAttributes()['default-styling'] ?? true)),
+                    'border-gray-300 dark:bg-gray-700 dark:text-white dark:border-gray-600 focus:border-gray-300' => $this->isTailwind && $this->hasSearch()  && (($this->getSearchFieldAttributes()['default'] ?? true) || ($this->getSearchFieldAttributes()['default-colors'] ?? true)),
+                    'border-gray-300 dark:bg-gray-700 dark:text-white dark:border-gray-600 focus:border-indigo-300 focus:ring-indigo-200' => $this->isTailwind && !$this->hasSearch()  && (($this->getSearchFieldAttributes()['default'] ?? true) || ($this->getSearchFieldAttributes()['default-colors'] ?? true)),
 
                     'form-control' => $this->isBootstrap && $this->getSearchFieldAttributes()['default'] ?? true,
                 ])

From f764de8344e5a73bf22111a8f0e0e7ea2f141cb1 Mon Sep 17 00:00:00 2001
From: Alex Bierhance <alex.soderberg97@gmail.com>
Date: Sat, 2 Nov 2024 00:50:44 +0100
Subject: [PATCH 093/103] Adds Swedish translations (#2027)

* Adds Swedish translations

* Update weird translation strings

I was stressed (:

* Update sv.json
---
 resources/lang/sv.json | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 resources/lang/sv.json

diff --git a/resources/lang/sv.json b/resources/lang/sv.json
new file mode 100644
index 000000000..4bfd4cbfb
--- /dev/null
+++ b/resources/lang/sv.json
@@ -0,0 +1,36 @@
+{
+  "livewire-tables::All": "Alla",
+  "livewire-tables::All Columns": "Alla Columner",
+  "livewire-tables::Applied Filters": "Valda filter",
+  "livewire-tables::Applied Sorting": "Vald sortering",
+  "livewire-tables::Bulk Actions": "Bulk Modifiering",
+  "livewire-tables::Bulk Actions Confirm": "Är du säker?",
+  "livewire-tables::Clear": "Rensa",
+  "livewire-tables::Columns": "Columner",
+  "livewire-tables::Debugging Values": "Debug Värden",
+  "livewire-tables::Deselect All": "Avmarkera alla",
+  "livewire-tables::Done Reordering": "Omordning klart",
+  "livewire-tables::Filters": "Filter",
+  "livewire-tables::max": "Max",
+  "livewire-tables::min": "Min",
+  "livewire-tables::not_applicable": "N/A",
+  "livewire-tables::No": "Nej",
+  "livewire-tables::No items found. Try to broaden your search.": "Inga föremål hittades. Försök vidga din sökning.",
+  "livewire-tables::of": "av",
+  "livewire-tables::Remove filter option": "Rensa valt filter",
+  "livewire-tables::Remove sort option": "Rensa vald sortering",
+  "livewire-tables::Reorder": "Omordna",
+  "livewire-tables::results": "resultat",
+  "livewire-tables::row": "rad",
+  "livewire-tables::rows": "rader",
+  "livewire-tables::rows, do you want to select all": "rader, vill du markera alla",
+  "livewire-tables::Search": "Sök",
+  "livewire-tables::Select All": "Markera alla",
+  "livewire-tables::Select All On Page": "Markera alla på sidan",
+  "livewire-tables::Showing": "Visar",
+  "livewire-tables::to": "till",
+  "livewire-tables::Yes": "Ja",
+  "livewire-tables::You are currently selecting all": "Du markerar för närvarande alla",
+  "livewire-tables::You are not connected to the internet.": "Du är inte uppkopplad till internet.",
+  "livewire-tables::You have selected": "Du har markerat"
+}

From a7521b9ec230e09b52a718ff290ed7873bf14a51 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Wed, 6 Nov 2024 00:32:28 +0000
Subject: [PATCH 094/103] Adjust ChangeLog for 3.5.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 553622c32..02c0cab4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.5.0] - 2024-11-06
+
+### Bug Fixes
+- Issue in multiple places where there is incorrect brackets in conjunction with coalescing operator (??) by @mrl22 in https://github.com/rappasoft/laravel-livewire-tables/pull/2021
+- Add Value to BooleanColumn custom view by @lrjoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2010
+- Add config option to bypass setting User on Events. by @me-julian in https://github.com/rappasoft/laravel-livewire-tables/pull/2006
+- Livewire column doesn't have title() method by @ChrisThompsonTLDR in https://github.com/rappasoft/laravel-livewire-tables/pull/2002
+- Loading Placeholder Adjustments by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1987
+
+### New Features
+- Add Sort in QueryString by @lrjoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2018
+- Add Search in QueryString by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2017
+- Add Filter in QueryString by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2011
+- BETA: Livewire Custom Filter (Array)  by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2025
+
+### Localisation
+- Adds Swedish translations by @Aiiion in https://github.com/rappasoft/laravel-livewire-tables/pull/2027
+- Fix missing i18n keys for FR, IT, EN, DE by @khwadj in https://github.com/rappasoft/laravel-livewire-tables/pull/1993
+- Add lang Norwegian and Albanian by @channor in https://github.com/rappasoft/laravel-livewire-tables/pull/1988
+
+
+
 ## [v3.4.22] - 2024-09-29
 ### Bug Fixes
 - Fix Loading Placeholder Bug - Breaking Table by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1969

From 4f09e076b8c9fb9930f386db70f184aca243ea5d Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 9 Nov 2024 23:39:17 +0000
Subject: [PATCH 095/103] Adjust Number Filter - Convert Value to Float If All
 Digits (#2034)

* Adjust Number Filter - Convert Value to Float/int If All Digits

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 src/Views/Filters/NumberFilter.php           | 15 +++++++++----
 src/Views/Traits/Filters/IsNumericFilter.php | 23 ++++++++++++++++++++
 tests/Views/Filters/NumberFilterTest.php     |  5 ++++-
 3 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 src/Views/Traits/Filters/IsNumericFilter.php

diff --git a/src/Views/Filters/NumberFilter.php b/src/Views/Filters/NumberFilter.php
index d942396cc..259c99b95 100644
--- a/src/Views/Filters/NumberFilter.php
+++ b/src/Views/Filters/NumberFilter.php
@@ -4,11 +4,11 @@
 
 use Rappasoft\LaravelLivewireTables\Views\Filter;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasWireables;
-use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{IsStringFilter};
+use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{IsNumericFilter};
 
 class NumberFilter extends Filter
 {
-    use IsStringFilter;
+    use IsNumericFilter;
     use HasWireables;
 
     public string $wireMethod = 'blur';
@@ -17,12 +17,19 @@ class NumberFilter extends Filter
 
     public function validate(float|int|string|array $value): float|int|string|false
     {
+        $floatValue = (float) $value;
+        $intValue = (int) $value;
+
         if (is_array($value)) {
             return false;
         } elseif (is_float($value)) {
-            return (float) $value;
+            return $floatValue;
         } elseif (is_int($value)) {
-            return (int) $value;
+            return $intValue;
+        } elseif (is_numeric($value)) {
+            return (($floatValue - $intValue) == 0) ? $intValue : $floatValue;
+        } elseif (ctype_digit($value)) {
+            return $intValue;
         }
 
         return false;
diff --git a/src/Views/Traits/Filters/IsNumericFilter.php b/src/Views/Traits/Filters/IsNumericFilter.php
new file mode 100644
index 000000000..602b8fa96
--- /dev/null
+++ b/src/Views/Traits/Filters/IsNumericFilter.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Filters;
+
+use Closure;
+use Illuminate\View\ComponentAttributeBag;
+use Rappasoft\LaravelLivewireTables\Views\{Column,Filter};
+
+trait IsNumericFilter
+{
+    public function isEmpty(float|int|string|array|null $value): bool
+    {
+        return ! is_null($value) ? ($this->validate($value) == false) : true;
+    }
+
+    /**
+     * Gets the Default Value for this Filter via the Component
+     */
+    public function getFilterDefaultValue(): ?string
+    {
+        return $this->filterDefaultValue ?? null;
+    }
+}
diff --git a/tests/Views/Filters/NumberFilterTest.php b/tests/Views/Filters/NumberFilterTest.php
index 17c2dc066..1c732f555 100644
--- a/tests/Views/Filters/NumberFilterTest.php
+++ b/tests/Views/Filters/NumberFilterTest.php
@@ -158,13 +158,16 @@ 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->assertFalse($filter->validate('123'));
+        $this->assertSame(123, $filter->validate('123'));
+        $this->assertSame(123.51, $filter->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'));
     }
 

From c7c97bb1560ddc4d9b2aae47fd324336529e02c6 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 9 Nov 2024 23:53:52 +0000
Subject: [PATCH 096/103] Fixes for Filter Pills - Ensure Invalid Options Are
 Removed (#2035)

* Fixes for Filter Pills - Ensure Invalid Options Are Removed

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .../components/tools/filter-pills.blade.php   | 79 ++-----------------
 .../filter-pills/buttons/reset-all.blade.php  | 25 ++++++
 .../buttons/reset-filter.blade.php            | 31 ++++++++
 .../tools/filter-pills/item.blade.php         | 23 ++++++
 src/Traits/Helpers/FilterHelpers.php          | 15 +++-
 tests/Traits/Helpers/FilterHelpersTest.php    |  2 +-
 .../Helpers/SessionStorageHelpersTest.php     | 30 +++----
 tests/Traits/Visuals/FilterVisualsTest.php    |  1 -
 8 files changed, 116 insertions(+), 90 deletions(-)
 create mode 100644 resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
 create mode 100644 resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
 create mode 100644 resources/views/components/tools/filter-pills/item.blade.php

diff --git a/resources/views/components/tools/filter-pills.blade.php b/resources/views/components/tools/filter-pills.blade.php
index 004f82272..b55792b29 100644
--- a/resources/views/components/tools/filter-pills.blade.php
+++ b/resources/views/components/tools/filter-pills.blade.php
@@ -15,84 +15,19 @@
 
             @foreach($this->getAppliedFiltersWithValues() as $filterSelectName => $value)
                 @php($filter = $this->getFilterByKey($filterSelectName))
-
-                @continue(is_null($filter))
-                @continue($filter->isHiddenFromPills())
+                @continue(is_null($filter) || $filter->isHiddenFromPills())
+                @php( $filterPillTitle = $filter->getFilterPillTitle())
+                @php( $filterPillValue = $filter->getFilterPillValue($value))
+                @php( $separator = method_exists($filter, 'getPillsSeparator') ? $filter->getPillsSeparator() : ', ')
+                @continue((is_array($filterPillValue) && empty($filterPillValue)))
 
                 @if ($filter->hasCustomPillBlade())
                     @include($filter->getCustomPillBlade(), ['filter' => $filter])
                 @else
-                    <span
-                        wire:key="{{ $tableName }}-filter-pill-{{ $filter->getKey() }}"
-                        @class([
-                            'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 bg-indigo-100 text-indigo-800 capitalize dark:bg-indigo-200 dark:text-indigo-900' => $isTailwind,
-                            'badge badge-pill badge-info d-inline-flex align-items-center' => $isBootstrap4,
-                            'badge rounded-pill bg-info d-inline-flex align-items-center' => $isBootstrap5,
-                        ])
-                    >
-                        {{ $filter->getFilterPillTitle() }}: 
-                        @php( $filterPillValue = $filter->getFilterPillValue($value))
-                        @php( $separator = method_exists($filter, 'getPillsSeparator') ? $filter->getPillsSeparator() : ', ')
-
-                        @if(is_array($filterPillValue) && !empty($filterPillValue))
-                            @foreach($filterPillValue as $filterPillArrayValue)
-                                {{ $filterPillArrayValue }}{!! $separator !!}
-                            @endforeach
-                        @else
-                            {{ $filterPillValue }}
-                        @endif
-
-                        @if ($isTailwind)
-                            <button
-                                wire:click="resetFilter('{{ $filter->getKey() }}')"
-                                type="button"
-                                class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
-                            >
-                                <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
-                                <x-heroicon-m-x-mark class="h-full" />
-                            </button>
-                        @else
-                            <a
-                                href="#"
-                                wire:click="resetFilter('{{ $filter->getKey() }}')"
-                                @class([
-                                    'text-white ml-2' => ($isBootstrap),
-                                ])
-                            >
-                                <span @class([
-                                    'sr-only' => $isBootstrap4,
-                                    'visually-hidden' => $isBootstrap5,
-                                ])>
-                                    @lang('livewire-tables::Remove filter option')
-                                </span>
-                                <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-tiny"  />
-                            </a>
-                        @endif
-                    </span>
+                    <x-livewire-tables::tools.filter-pills.item :$filterPillTitle :$filterPillValue :$filterSelectName :$separator/>
                 @endif
             @endforeach
-
-            @if ($isTailwind)
-                <button
-                    wire:click.prevent="setFilterDefaults"
-                    class="focus:outline-none active:outline-none"
-                >
-                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900">
-                        @lang('livewire-tables::Clear')
-                    </span>
-                </button>
-            @else
-                <a
-                    href="#"
-                    wire:click.prevent="setFilterDefaults"
-                    @class([
-                        'badge badge-pill badge-light' => $isBootstrap4,
-                        'badge rounded-pill bg-light text-dark text-decoration-none' => $isBootstrap5,
-                    ])
-                >
-                    @lang('livewire-tables::Clear')
-                </a>
-            @endif
+            <x-livewire-tables::tools.filter-pills.buttons.reset-all />
         </div>
     </div>
 @endif
diff --git a/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php b/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
new file mode 100644
index 000000000..e4b6efb76
--- /dev/null
+++ b/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
@@ -0,0 +1,25 @@
+@aware(['isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@if ($isTailwind)
+    <button
+        wire:click.prevent="setFilterDefaults"
+        @class([
+            "focus:outline-none active:outline-none"
+        ])>
+        <span @class([
+            "inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium",
+            "bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900"
+            ])>
+            @lang('livewire-tables::Clear')
+        </span>
+    </button>
+@else
+    <a
+        href="#"
+        wire:click.prevent="setFilterDefaults"
+        @class([
+            'badge badge-pill badge-light' => $isBootstrap4,
+            'badge rounded-pill bg-light text-dark text-decoration-none' => $isBootstrap5,
+        ])>
+        @lang('livewire-tables::Clear')
+    </a>
+@endif
diff --git a/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php b/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
new file mode 100644
index 000000000..f33073b94
--- /dev/null
+++ b/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
@@ -0,0 +1,31 @@
+@aware(['tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@props(['filterKey'])
+@if ($isTailwind)
+    <button
+        wire:click="resetFilter('{{ $filterKey }}')"
+        type="button"
+        @class([
+            "flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none",
+            "text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white",
+        ])
+    >
+        <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
+        <x-heroicon-m-x-mark class="h-full" />
+    </button>
+@else
+    <a
+        href="#"
+        wire:click="resetFilter('{{ $filterKey }}')"
+        @class([
+            'text-white ml-2' => ($isBootstrap),
+        ])
+    >
+        <span @class([
+            'sr-only' => $isBootstrap4,
+            'visually-hidden' => $isBootstrap5,
+        ])>
+            @lang('livewire-tables::Remove filter option')
+        </span>
+        <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-tiny"  />
+    </a>
+@endif
\ No newline at end of file
diff --git a/resources/views/components/tools/filter-pills/item.blade.php b/resources/views/components/tools/filter-pills/item.blade.php
new file mode 100644
index 000000000..a69edc3a0
--- /dev/null
+++ b/resources/views/components/tools/filter-pills/item.blade.php
@@ -0,0 +1,23 @@
+@aware(['tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@props(['filterPillTitle', 'filterPillValue', 'filterSelectName', 'separator'])
+<span
+    wire:key="{{ $tableName }}-filter-pill-{{ $filterSelectName }}"
+    @class([
+        'inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 bg-indigo-100 text-indigo-800 capitalize dark:bg-indigo-200 dark:text-indigo-900' => $isTailwind,
+        'badge badge-pill badge-info d-inline-flex align-items-center' => $isBootstrap4,
+        'badge rounded-pill bg-info d-inline-flex align-items-center' => $isBootstrap5,
+    ])
+>
+    {{ $filterPillTitle }}: 
+
+    @if(is_array($filterPillValue))
+        @foreach($filterPillValue as $filterPillArrayValue)
+            {{ $filterPillArrayValue }}{!! !$loop->last ? $separator : '' !!}
+        @endforeach
+    @else
+        {{ $filterPillValue }}
+    @endif
+
+    <x-livewire-tables::tools.filter-pills.buttons.reset-filter :filterKey="$filterSelectName" />
+
+</span>
diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php
index d9bfddf51..c42fdeac2 100644
--- a/src/Traits/Helpers/FilterHelpers.php
+++ b/src/Traits/Helpers/FilterHelpers.php
@@ -226,11 +226,24 @@ public function hasAppliedVisibleFiltersForPills(): bool
     /**
      * @return array<mixed>
      */
-    public function getAppliedFiltersWithValues(): array
+    /*public function getAppliedFiltersWithValuesOld(): array
     {
         return $this->appliedFilters = array_filter($this->getAppliedFilters(), function ($item, $key) {
             return ! $this->getFilterByKey($key)->isEmpty($item) && (is_array($item) ? count($item) : $item !== null);
         }, ARRAY_FILTER_USE_BOTH);
+    }*/
+
+    /**
+     * @return array<mixed>
+     */
+    public function getAppliedFiltersWithValues(): array
+    {
+        return $this->appliedFilters = array_filter($this->getAppliedFilters(), function ($item, $key) {
+            $filter = $this->getFilterByKey($key);
+            $item = (! is_null($item) && ! $filter->isEmpty($item)) ? $filter->validate($item) : $item;
+
+            return ! $filter->isEmpty($item) && (is_array($item) ? count($item) : $item !== null);
+        }, ARRAY_FILTER_USE_BOTH);
     }
 
     /**
diff --git a/tests/Traits/Helpers/FilterHelpersTest.php b/tests/Traits/Helpers/FilterHelpersTest.php
index fee1bea06..51825ca62 100644
--- a/tests/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Traits/Helpers/FilterHelpersTest.php
@@ -104,7 +104,7 @@ public function test_can_set_filter_value(): void
 
         $this->assertSame(['1'], $this->basicTable->getAppliedFilterWithValue('breed'));
 
-        $this->basicTable->setFilter('breed_id_filter', '2');
+        $this->basicTable->setFilter('breed_id_filter', 2);
 
         $this->assertSame('2', $this->basicTable->getAppliedFilterWithValue('breed_id_filter'));
 
diff --git a/tests/Traits/Helpers/SessionStorageHelpersTest.php b/tests/Traits/Helpers/SessionStorageHelpersTest.php
index 17362c503..cedade483 100644
--- a/tests/Traits/Helpers/SessionStorageHelpersTest.php
+++ b/tests/Traits/Helpers/SessionStorageHelpersTest.php
@@ -36,26 +36,26 @@ public function test_can_store_for_fikers(): void
         $this->assertSame(['breed' => ['1']], $this->basicTable->appliedFilters);
         $this->assertSame(['breed' => ['1']], $this->basicTable->getStoredFilterValues());
 
-        $this->basicTable->setFilter('breed', ['22']);
-        $this->assertSame(['breed' => ['22']], $this->basicTable->appliedFilters);
-        $this->assertSame(['22'], $this->basicTable->getAppliedFilterWithValue('breed'));
-        $this->assertSame(['breed' => ['22']], $this->basicTable->getStoredFilterValues());
+        $this->basicTable->setFilter('breed', ['2']);
+        $this->assertSame(['breed' => ['2']], $this->basicTable->appliedFilters);
+        $this->assertSame(['2'], $this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->assertSame(['breed' => ['2']], $this->basicTable->getStoredFilterValues());
 
         $this->basicTable->restoreFilterValues();
-        $this->assertSame(['22'], $this->basicTable->getAppliedFilterWithValue('breed'));
-        $this->assertSame(['breed' => ['22']], $this->basicTable->getStoredFilterValues());
+        $this->assertSame(['2'], $this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->assertSame(['breed' => ['2']], $this->basicTable->getStoredFilterValues());
 
         $this->basicTable->clearStoredFilterValues();
         $this->assertSame([], $this->basicTable->getStoredFilterValues());
-        $this->assertSame(['22'], $this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->assertSame(['2'], $this->basicTable->getAppliedFilterWithValue('breed'));
 
-        $this->basicTable->setFilter('breed', ['33']);
-        $this->assertSame(['breed' => ['33']], $this->basicTable->getStoredFilterValues());
-        $this->assertSame(['33'], $this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->basicTable->setFilter('breed', ['3']);
+        $this->assertSame(['breed' => ['3']], $this->basicTable->getStoredFilterValues());
+        $this->assertSame(['3'], $this->basicTable->getAppliedFilterWithValue('breed'));
 
-        $this->basicTable->appliedFilters = $this->basicTable->filterComponents = ['breed' => ['44']];
+        $this->basicTable->appliedFilters = $this->basicTable->filterComponents = ['breed' => ['4']];
         $this->basicTable->storeFilterValues();
-        $this->assertSame(['44'], $this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->assertSame(['4'], $this->basicTable->getAppliedFilterWithValue('breed'));
 
         $this->basicTable->appliedFilters = $this->basicTable->filterComponents = [];
         $this->assertNull($this->basicTable->getAppliedFilterWithValue('breed'));
@@ -63,9 +63,9 @@ public function test_can_store_for_fikers(): void
         $this->assertSame([], $this->basicTable->filterComponents);
 
         $this->basicTable->restoreFilterValues();
-        $this->assertSame(['breed' => ['44']], $this->basicTable->appliedFilters);
-        $this->assertSame(['44'], $this->basicTable->getAppliedFilterWithValue('breed'));
-        $this->assertSame(['breed' => ['44']], $this->basicTable->getStoredFilterValues());
+        $this->assertSame(['breed' => ['4']], $this->basicTable->appliedFilters);
+        $this->assertSame(['4'], $this->basicTable->getAppliedFilterWithValue('breed'));
+        $this->assertSame(['breed' => ['4']], $this->basicTable->getStoredFilterValues());
 
     }
 
diff --git a/tests/Traits/Visuals/FilterVisualsTest.php b/tests/Traits/Visuals/FilterVisualsTest.php
index 5b34da945..2c24ee23c 100644
--- a/tests/Traits/Visuals/FilterVisualsTest.php
+++ b/tests/Traits/Visuals/FilterVisualsTest.php
@@ -152,7 +152,6 @@ public function filters(): array
                 'Cat',
                 '<br />',
                 'Dog',
-                '<br />',
             ])
             ->set('filterComponents.breed', [1, 2])
             ->assertSeeHtmlInOrder([

From 963fca683e3c4ba982267e41303ca910fabd3f5b Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 9 Nov 2024 23:59:40 +0000
Subject: [PATCH 097/103] Update ChangeLog & Contributors

---
 CHANGELOG.md    | 6 +++++-
 CONTRIBUTORS.md | 9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02c0cab4f..3d347b23a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,12 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## [v3.5.0] - 2024-11-06
+## [v3.5.1] - 2024-11-09
+### Bug Fixes
+- Fix NumberFilter bug for string values by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2034
+- Fixes for Filter Pills - Split blades, and ensure invalid filter alues are removed by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2035
 
+## [v3.5.0] - 2024-11-06
 ### Bug Fixes
 - Issue in multiple places where there is incorrect brackets in conjunction with coalescing operator (??) by @mrl22 in https://github.com/rappasoft/laravel-livewire-tables/pull/2021
 - Add Value to BooleanColumn custom view by @lrjoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2010
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ad1b2a7cb..df270ea9a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -5,6 +5,7 @@
 # Localisation Contributors
 | Language | Contributor(s) |
 | --- | --- |
+| Albanian (SQ) | [channor] (https://github.com/channor) |
 | Arabic (AR) | None |
 | Catalan (CA) | None |
 | Brazilian (pt_BR) | [irineujunior](https://github.com/irineujunior)|
@@ -13,15 +14,17 @@
 | Dutch (NL) | [siebsie23](https://github.com/siebsie23), [spekkie2002](https://github.com/spekkie2002), [Jerimu](https://github.com/Jerimu) |
 | English (EN) | Core Team |
 | Finnish (FI) | [devmikromike](https://github.com/devmikromike) |
-| French (FR) | [dgillier](https://github.com/dgillier) |
-| German (DE) | None |
+| French (FR) | [dgillier](https://github.com/dgillier), [khwadj](https://github.com/khwadj)|
+| German (DE) | [khwadj](https://github.com/khwadj) |
 | Indonesian (ID) | None |
-| Italian (IT) | Core Team |
+| Italian (IT) | Core Team, [khwadj](https://github.com/khwadj) |
 | Malay (MS) | [wanadri](https://github.com/wanadri) |
+| Norwegian (NB) | [channor] (https://github.com/channor) |
 | Polish (PL) | [meavric](https://github.com/meavric) |
 | Portugese (PT) | None |
 | Russian (RU) | None |
 | Spanish (ES) | [CristhoferMF](https://github.com/CristhoferMF) |
+| Swedish (SV) | [Aiiion](https://github.com/Aiiion) |
 | Thai (TH) | None |
 | Turkish (TK) | None |
 | Ukrainian (UK) | [Oleksandr-Moik](https://github.com/Oleksandr-Moik) |
\ No newline at end of file

From 03304f29099786f15ea5db0bbadb087abd63eecd Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 10 Nov 2024 02:10:39 +0000
Subject: [PATCH 098/103] Test Suite cleanup - migrating existing tests into
 "Unit" (#2037)

* Initial Movement of Tests into Directories

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 phpunit.xml.dist                                              | 2 +-
 tests/{ => Unit}/Attributes/AggregateColumnProvider.php       | 2 +-
 tests/{ => Unit}/DataTransferObjects/DebuggableDataTest.php   | 2 +-
 tests/{ => Unit}/Events/ColumnsSelectedTest.php               | 0
 tests/{ => Unit}/Events/FilterAppliedTest.php                 | 0
 tests/{ => Unit}/Events/SearchAppliedTest.php                 | 0
 tests/{ => Unit}/Features/AutoInjectRappasoftAssetsTest.php   | 2 +-
 tests/{ => Unit}/Mechanisms/RappasoftFrontendAssetsTest.php   | 2 +-
 .../Traits/Configuration/BulkActionsConfigurationTest.php     | 2 +-
 .../Configuration/BulkActionsStylingConfigurationTest.php     | 2 +-
 .../Traits/Configuration/ColumnSelectConfigurationTest.php    | 2 +-
 .../Traits/Configuration/ComponentConfigurationTest.php       | 2 +-
 .../Traits/Configuration/CustomisationsConfigurationTest.php  | 2 +-
 .../Traits/Configuration/DebuggingConfigurationTest.php       | 2 +-
 .../Traits/Configuration/EventConfigurationTest.php           | 2 +-
 .../Traits/Configuration/FilterConfigurationTest.php          | 2 +-
 .../Traits/Configuration/FingerprintConfigurationTest.php     | 2 +-
 .../Traits/Configuration/FooterConfigurationTest.php          | 2 +-
 .../Configuration/LoadingPlaceholderConfigurationTest.php     | 2 +-
 .../Traits/Configuration/PaginationConfigurationTest.php      | 2 +-
 .../Configuration/QueryStringAliasConfigurationTest.php       | 2 +-
 .../Traits/Configuration/RefreshConfigurationTest.php         | 2 +-
 .../Traits/Configuration/ReorderingConfigurationTest.php      | 2 +-
 .../Traits/Configuration/SearchConfigurationTest.php          | 2 +-
 .../Traits/Configuration/SecondaryHeaderConfigurationTest.php | 2 +-
 .../Traits/Configuration/SortingConfigurationTest.php         | 2 +-
 tests/{ => Unit}/Traits/Core/CustomAttributesTest.php         | 2 +-
 .../Traits/Core/QueryStrings/QueryStringForFiltersTest.php    | 2 +-
 .../Traits/Core/QueryStrings/QueryStringForSearchTest.php     | 2 +-
 .../Traits/Core/QueryStrings/QueryStringForSortTest.php       | 2 +-
 tests/{ => Unit}/Traits/Helpers/BulkActionsHelpersTest.php    | 2 +-
 tests/{ => Unit}/Traits/Helpers/ColumnHelpersTest.php         | 2 +-
 tests/{ => Unit}/Traits/Helpers/ColumnSelectHelpersTest.php   | 2 +-
 tests/{ => Unit}/Traits/Helpers/ComponentHelpersTest.php      | 2 +-
 tests/{ => Unit}/Traits/Helpers/DebugHelpersTest.php          | 2 +-
 tests/{ => Unit}/Traits/Helpers/EventHelpersTest.php          | 2 +-
 tests/{ => Unit}/Traits/Helpers/FilterHelpersTest.php         | 2 +-
 tests/{ => Unit}/Traits/Helpers/FooterHelpersTest.php         | 2 +-
 .../Traits/Helpers/LoadingPlaceholderHelpersTest.php          | 2 +-
 tests/{ => Unit}/Traits/Helpers/PaginationHelpersTest.php     | 2 +-
 tests/{ => Unit}/Traits/Helpers/RefreshHelpersTest.php        | 2 +-
 tests/{ => Unit}/Traits/Helpers/RelationshipHelpersTest.php   | 2 +-
 tests/{ => Unit}/Traits/Helpers/ReorderingHelpersTest.php     | 2 +-
 tests/{ => Unit}/Traits/Helpers/SearchHelpersTest.php         | 2 +-
 .../{ => Unit}/Traits/Helpers/SecondaryHeaderHelpersTest.php  | 2 +-
 tests/{ => Unit}/Traits/Helpers/SessionStorageHelpersTest.php | 2 +-
 tests/{ => Unit}/Traits/Helpers/SortingHelpersTest.php        | 2 +-
 tests/{ => Unit}/Traits/Helpers/TableAttributeHelpersTest.php | 2 +-
 tests/{ => Unit}/Traits/Helpers/ToolsHelpersTest.php          | 2 +-
 tests/{ => Unit}/Traits/Helpers/ToolsStylingHelpersTest.php   | 2 +-
 tests/{ => Unit}/Traits/Visuals/ActionsVisualsTest.php        | 2 +-
 tests/{ => Unit}/Traits/Visuals/BulkActionsVisualsTest.php    | 2 +-
 .../Traits/Visuals/Columns/IconColumnVisualsTest.php          | 2 +-
 tests/{ => Unit}/Traits/Visuals/ComponentVisualsTest.php      | 2 +-
 tests/{ => Unit}/Traits/Visuals/FilterVisualsTest.php         | 2 +-
 .../Traits/Visuals/Filters/TextFilterVisualsTest.php          | 2 +-
 tests/{ => Unit}/Traits/Visuals/HideableTableTest.php         | 2 +-
 .../Traits/Visuals/LoadingPlaceholderVisualsTest.php          | 2 +-
 tests/{ => Unit}/Traits/Visuals/PaginationVisualsTest.php     | 2 +-
 tests/{ => Unit}/Traits/Visuals/RefreshVisualsTest.php        | 2 +-
 tests/{ => Unit}/Traits/Visuals/ReorderingVisualsTest.php     | 2 +-
 tests/{ => Unit}/Traits/Visuals/SearchVisualsTest.php         | 2 +-
 tests/{ => Unit}/Traits/Visuals/SortingVisualsTest.php        | 2 +-
 tests/{ => Unit}/Traits/WithMountTest.php                     | 2 +-
 tests/{ => Unit}/Traits/WithSearchTest.php                    | 2 +-
 tests/{ => Unit}/Traits/WithSortingTest.php                   | 2 +-
 tests/{ => Unit}/Views/Actions/ActionTest.php                 | 2 +-
 tests/{ => Unit}/Views/BooleanColumnTest.php                  | 2 +-
 tests/{ => Unit}/Views/ColumnTest.php                         | 2 +-
 tests/{ => Unit}/Views/Columns/ArrayColumnTest.php            | 2 +-
 tests/{ => Unit}/Views/Columns/AvgColumnTest.php              | 4 ++--
 tests/{ => Unit}/Views/Columns/BooleanColumnTest.php          | 2 +-
 tests/{ => Unit}/Views/Columns/ButtonGroupColumnTest.php      | 2 +-
 tests/{ => Unit}/Views/Columns/ColorColumnTest.php            | 2 +-
 tests/{ => Unit}/Views/Columns/ComponentColumnTest.php        | 2 +-
 tests/{ => Unit}/Views/Columns/CountColumnTest.php            | 2 +-
 tests/{ => Unit}/Views/Columns/DateColumnTest.php             | 2 +-
 tests/{ => Unit}/Views/Columns/IconColumnTest.php             | 2 +-
 tests/{ => Unit}/Views/Columns/ImageColumnTest.php            | 2 +-
 tests/{ => Unit}/Views/Columns/LinkColumnTest.php             | 2 +-
 tests/{ => Unit}/Views/Columns/SumColumnTest.php              | 4 ++--
 tests/{ => Unit}/Views/Columns/ViewComponentColumnTest.php    | 2 +-
 tests/{ => Unit}/Views/Columns/WireLinkColumnTest.php         | 2 +-
 tests/{ => Unit}/Views/ComponentColumnTest.php                | 2 +-
 tests/{ => Unit}/Views/Filters/BooleanFilterTest.php          | 2 +-
 tests/{ => Unit}/Views/Filters/DateFilterTest.php             | 2 +-
 tests/{ => Unit}/Views/Filters/DateRangeFilterTest.php        | 2 +-
 tests/{ => Unit}/Views/Filters/DateTimeFilterTest.php         | 2 +-
 tests/{ => Unit}/Views/Filters/FilterTestCase.php             | 2 +-
 .../Views/Filters/MultiSelectDropdownFilterTest.php           | 2 +-
 tests/{ => Unit}/Views/Filters/MultiSelectFilterTest.php      | 2 +-
 tests/{ => Unit}/Views/Filters/NumberFilterTest.php           | 2 +-
 tests/{ => Unit}/Views/Filters/NumberRangeFilterTest.php      | 2 +-
 tests/{ => Unit}/Views/Filters/SelectFilterTest.php           | 2 +-
 tests/{ => Unit}/Views/Filters/TextFilterTest.php             | 2 +-
 .../Traits/Configuration/BooleanColumnConfigurationTest.php   | 2 +-
 .../Configuration/ButtonGroupColumnConfigurationTest.php      | 2 +-
 .../Views/Traits/Configuration/ColumnConfigurationTest.php    | 2 +-
 .../Traits/Configuration/ComponentColumnConfigurationTest.php | 2 +-
 .../Views/Traits/Configuration/FilterConfigurationTest.php    | 2 +-
 tests/{ => Unit}/Views/Traits/Helpers/ColumnHelpersTest.php   | 2 +-
 tests/{ => Unit}/Views/Traits/Helpers/FilterHelpersTest.php   | 2 +-
 102 files changed, 101 insertions(+), 101 deletions(-)
 rename tests/{ => Unit}/Attributes/AggregateColumnProvider.php (72%)
 rename tests/{ => Unit}/DataTransferObjects/DebuggableDataTest.php (95%)
 rename tests/{ => Unit}/Events/ColumnsSelectedTest.php (100%)
 rename tests/{ => Unit}/Events/FilterAppliedTest.php (100%)
 rename tests/{ => Unit}/Events/SearchAppliedTest.php (100%)
 rename tests/{ => Unit}/Features/AutoInjectRappasoftAssetsTest.php (97%)
 rename tests/{ => Unit}/Mechanisms/RappasoftFrontendAssetsTest.php (99%)
 rename tests/{ => Unit}/Traits/Configuration/BulkActionsConfigurationTest.php (99%)
 rename tests/{ => Unit}/Traits/Configuration/BulkActionsStylingConfigurationTest.php (98%)
 rename tests/{ => Unit}/Traits/Configuration/ColumnSelectConfigurationTest.php (98%)
 rename tests/{ => Unit}/Traits/Configuration/ComponentConfigurationTest.php (99%)
 rename tests/{ => Unit}/Traits/Configuration/CustomisationsConfigurationTest.php (95%)
 rename tests/{ => Unit}/Traits/Configuration/DebuggingConfigurationTest.php (90%)
 rename tests/{ => Unit}/Traits/Configuration/EventConfigurationTest.php (94%)
 rename tests/{ => Unit}/Traits/Configuration/FilterConfigurationTest.php (98%)
 rename tests/{ => Unit}/Traits/Configuration/FingerprintConfigurationTest.php (91%)
 rename tests/{ => Unit}/Traits/Configuration/FooterConfigurationTest.php (96%)
 rename tests/{ => Unit}/Traits/Configuration/LoadingPlaceholderConfigurationTest.php (99%)
 rename tests/{ => Unit}/Traits/Configuration/PaginationConfigurationTest.php (98%)
 rename tests/{ => Unit}/Traits/Configuration/QueryStringAliasConfigurationTest.php (91%)
 rename tests/{ => Unit}/Traits/Configuration/RefreshConfigurationTest.php (94%)
 rename tests/{ => Unit}/Traits/Configuration/ReorderingConfigurationTest.php (98%)
 rename tests/{ => Unit}/Traits/Configuration/SearchConfigurationTest.php (98%)
 rename tests/{ => Unit}/Traits/Configuration/SecondaryHeaderConfigurationTest.php (95%)
 rename tests/{ => Unit}/Traits/Configuration/SortingConfigurationTest.php (97%)
 rename tests/{ => Unit}/Traits/Core/CustomAttributesTest.php (97%)
 rename tests/{ => Unit}/Traits/Core/QueryStrings/QueryStringForFiltersTest.php (97%)
 rename tests/{ => Unit}/Traits/Core/QueryStrings/QueryStringForSearchTest.php (97%)
 rename tests/{ => Unit}/Traits/Core/QueryStrings/QueryStringForSortTest.php (97%)
 rename tests/{ => Unit}/Traits/Helpers/BulkActionsHelpersTest.php (99%)
 rename tests/{ => Unit}/Traits/Helpers/ColumnHelpersTest.php (99%)
 rename tests/{ => Unit}/Traits/Helpers/ColumnSelectHelpersTest.php (98%)
 rename tests/{ => Unit}/Traits/Helpers/ComponentHelpersTest.php (99%)
 rename tests/{ => Unit}/Traits/Helpers/DebugHelpersTest.php (87%)
 rename tests/{ => Unit}/Traits/Helpers/EventHelpersTest.php (87%)
 rename tests/{ => Unit}/Traits/Helpers/FilterHelpersTest.php (99%)
 rename tests/{ => Unit}/Traits/Helpers/FooterHelpersTest.php (92%)
 rename tests/{ => Unit}/Traits/Helpers/LoadingPlaceholderHelpersTest.php (87%)
 rename tests/{ => Unit}/Traits/Helpers/PaginationHelpersTest.php (99%)
 rename tests/{ => Unit}/Traits/Helpers/RefreshHelpersTest.php (93%)
 rename tests/{ => Unit}/Traits/Helpers/RelationshipHelpersTest.php (94%)
 rename tests/{ => Unit}/Traits/Helpers/ReorderingHelpersTest.php (97%)
 rename tests/{ => Unit}/Traits/Helpers/SearchHelpersTest.php (98%)
 rename tests/{ => Unit}/Traits/Helpers/SecondaryHeaderHelpersTest.php (88%)
 rename tests/{ => Unit}/Traits/Helpers/SessionStorageHelpersTest.php (98%)
 rename tests/{ => Unit}/Traits/Helpers/SortingHelpersTest.php (98%)
 rename tests/{ => Unit}/Traits/Helpers/TableAttributeHelpersTest.php (94%)
 rename tests/{ => Unit}/Traits/Helpers/ToolsHelpersTest.php (98%)
 rename tests/{ => Unit}/Traits/Helpers/ToolsStylingHelpersTest.php (98%)
 rename tests/{ => Unit}/Traits/Visuals/ActionsVisualsTest.php (98%)
 rename tests/{ => Unit}/Traits/Visuals/BulkActionsVisualsTest.php (99%)
 rename tests/{ => Unit}/Traits/Visuals/Columns/IconColumnVisualsTest.php (97%)
 rename tests/{ => Unit}/Traits/Visuals/ComponentVisualsTest.php (98%)
 rename tests/{ => Unit}/Traits/Visuals/FilterVisualsTest.php (98%)
 rename tests/{ => Unit}/Traits/Visuals/Filters/TextFilterVisualsTest.php (99%)
 rename tests/{ => Unit}/Traits/Visuals/HideableTableTest.php (96%)
 rename tests/{ => Unit}/Traits/Visuals/LoadingPlaceholderVisualsTest.php (96%)
 rename tests/{ => Unit}/Traits/Visuals/PaginationVisualsTest.php (99%)
 rename tests/{ => Unit}/Traits/Visuals/RefreshVisualsTest.php (94%)
 rename tests/{ => Unit}/Traits/Visuals/ReorderingVisualsTest.php (99%)
 rename tests/{ => Unit}/Traits/Visuals/SearchVisualsTest.php (98%)
 rename tests/{ => Unit}/Traits/Visuals/SortingVisualsTest.php (99%)
 rename tests/{ => Unit}/Traits/WithMountTest.php (97%)
 rename tests/{ => Unit}/Traits/WithSearchTest.php (93%)
 rename tests/{ => Unit}/Traits/WithSortingTest.php (97%)
 rename tests/{ => Unit}/Views/Actions/ActionTest.php (99%)
 rename tests/{ => Unit}/Views/BooleanColumnTest.php (93%)
 rename tests/{ => Unit}/Views/ColumnTest.php (98%)
 rename tests/{ => Unit}/Views/Columns/ArrayColumnTest.php (97%)
 rename tests/{ => Unit}/Views/Columns/AvgColumnTest.php (96%)
 rename tests/{ => Unit}/Views/Columns/BooleanColumnTest.php (98%)
 rename tests/{ => Unit}/Views/Columns/ButtonGroupColumnTest.php (93%)
 rename tests/{ => Unit}/Views/Columns/ColorColumnTest.php (98%)
 rename tests/{ => Unit}/Views/Columns/ComponentColumnTest.php (94%)
 rename tests/{ => Unit}/Views/Columns/CountColumnTest.php (95%)
 rename tests/{ => Unit}/Views/Columns/DateColumnTest.php (98%)
 rename tests/{ => Unit}/Views/Columns/IconColumnTest.php (98%)
 rename tests/{ => Unit}/Views/Columns/ImageColumnTest.php (95%)
 rename tests/{ => Unit}/Views/Columns/LinkColumnTest.php (97%)
 rename tests/{ => Unit}/Views/Columns/SumColumnTest.php (96%)
 rename tests/{ => Unit}/Views/Columns/ViewComponentColumnTest.php (97%)
 rename tests/{ => Unit}/Views/Columns/WireLinkColumnTest.php (96%)
 rename tests/{ => Unit}/Views/ComponentColumnTest.php (94%)
 rename tests/{ => Unit}/Views/Filters/BooleanFilterTest.php (97%)
 rename tests/{ => Unit}/Views/Filters/DateFilterTest.php (99%)
 rename tests/{ => Unit}/Views/Filters/DateRangeFilterTest.php (99%)
 rename tests/{ => Unit}/Views/Filters/DateTimeFilterTest.php (99%)
 rename tests/{ => Unit}/Views/Filters/FilterTestCase.php (97%)
 rename tests/{ => Unit}/Views/Filters/MultiSelectDropdownFilterTest.php (99%)
 rename tests/{ => Unit}/Views/Filters/MultiSelectFilterTest.php (99%)
 rename tests/{ => Unit}/Views/Filters/NumberFilterTest.php (98%)
 rename tests/{ => Unit}/Views/Filters/NumberRangeFilterTest.php (99%)
 rename tests/{ => Unit}/Views/Filters/SelectFilterTest.php (98%)
 rename tests/{ => Unit}/Views/Filters/TextFilterTest.php (98%)
 rename tests/{ => Unit}/Views/Traits/Configuration/BooleanColumnConfigurationTest.php (93%)
 rename tests/{ => Unit}/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php (93%)
 rename tests/{ => Unit}/Views/Traits/Configuration/ColumnConfigurationTest.php (98%)
 rename tests/{ => Unit}/Views/Traits/Configuration/ComponentColumnConfigurationTest.php (92%)
 rename tests/{ => Unit}/Views/Traits/Configuration/FilterConfigurationTest.php (97%)
 rename tests/{ => Unit}/Views/Traits/Helpers/ColumnHelpersTest.php (99%)
 rename tests/{ => Unit}/Views/Traits/Helpers/FilterHelpersTest.php (99%)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1e3747412..b3666050f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,7 +10,7 @@
          beStrictAboutOutputDuringTests="true" >
     <testsuites>
         <testsuite name="Laravel Livewire Tables Test Suite">
-            <directory>tests</directory>
+            <directory>tests/Unit</directory>
         </testsuite>
     </testsuites>
     <source>
diff --git a/tests/Attributes/AggregateColumnProvider.php b/tests/Unit/Attributes/AggregateColumnProvider.php
similarity index 72%
rename from tests/Attributes/AggregateColumnProvider.php
rename to tests/Unit/Attributes/AggregateColumnProvider.php
index 8e8c3f529..a290cfc19 100644
--- a/tests/Attributes/AggregateColumnProvider.php
+++ b/tests/Unit/Attributes/AggregateColumnProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Attributes;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Attributes;
 
 final class AggregateColumnProvider
 {
diff --git a/tests/DataTransferObjects/DebuggableDataTest.php b/tests/Unit/DataTransferObjects/DebuggableDataTest.php
similarity index 95%
rename from tests/DataTransferObjects/DebuggableDataTest.php
rename to tests/Unit/DataTransferObjects/DebuggableDataTest.php
index bdb0c6197..34124e26d 100644
--- a/tests/DataTransferObjects/DebuggableDataTest.php
+++ b/tests/Unit/DataTransferObjects/DebuggableDataTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\DataTransferObjects;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\DataTransferObjects;
 
 use Rappasoft\LaravelLivewireTables\DataTransferObjects\DebuggableData;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Events/ColumnsSelectedTest.php b/tests/Unit/Events/ColumnsSelectedTest.php
similarity index 100%
rename from tests/Events/ColumnsSelectedTest.php
rename to tests/Unit/Events/ColumnsSelectedTest.php
diff --git a/tests/Events/FilterAppliedTest.php b/tests/Unit/Events/FilterAppliedTest.php
similarity index 100%
rename from tests/Events/FilterAppliedTest.php
rename to tests/Unit/Events/FilterAppliedTest.php
diff --git a/tests/Events/SearchAppliedTest.php b/tests/Unit/Events/SearchAppliedTest.php
similarity index 100%
rename from tests/Events/SearchAppliedTest.php
rename to tests/Unit/Events/SearchAppliedTest.php
diff --git a/tests/Features/AutoInjectRappasoftAssetsTest.php b/tests/Unit/Features/AutoInjectRappasoftAssetsTest.php
similarity index 97%
rename from tests/Features/AutoInjectRappasoftAssetsTest.php
rename to tests/Unit/Features/AutoInjectRappasoftAssetsTest.php
index 88c790b83..6986967a9 100644
--- a/tests/Features/AutoInjectRappasoftAssetsTest.php
+++ b/tests/Unit/Features/AutoInjectRappasoftAssetsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Features;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Features;
 
 use Rappasoft\LaravelLivewireTables\Features\AutoInjectRappasoftAssets;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Mechanisms/RappasoftFrontendAssetsTest.php b/tests/Unit/Mechanisms/RappasoftFrontendAssetsTest.php
similarity index 99%
rename from tests/Mechanisms/RappasoftFrontendAssetsTest.php
rename to tests/Unit/Mechanisms/RappasoftFrontendAssetsTest.php
index 2b53fc1fa..ec6a8738e 100644
--- a/tests/Mechanisms/RappasoftFrontendAssetsTest.php
+++ b/tests/Unit/Mechanisms/RappasoftFrontendAssetsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Mechanisms;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Mechanisms;
 
 use PHPUnit\Framework\Attributes\Depends;
 use Rappasoft\LaravelLivewireTables\Mechanisms\RappasoftFrontendAssets;
diff --git a/tests/Traits/Configuration/BulkActionsConfigurationTest.php b/tests/Unit/Traits/Configuration/BulkActionsConfigurationTest.php
similarity index 99%
rename from tests/Traits/Configuration/BulkActionsConfigurationTest.php
rename to tests/Unit/Traits/Configuration/BulkActionsConfigurationTest.php
index de113419f..74f303f84 100644
--- a/tests/Traits/Configuration/BulkActionsConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/BulkActionsConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php b/tests/Unit/Traits/Configuration/BulkActionsStylingConfigurationTest.php
similarity index 98%
rename from tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php
rename to tests/Unit/Traits/Configuration/BulkActionsStylingConfigurationTest.php
index e93674466..fb321a1c4 100644
--- a/tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/BulkActionsStylingConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Illuminate\View\ComponentAttributeBag;
 use PHPUnit\Framework\Attributes\DataProvider;
diff --git a/tests/Traits/Configuration/ColumnSelectConfigurationTest.php b/tests/Unit/Traits/Configuration/ColumnSelectConfigurationTest.php
similarity index 98%
rename from tests/Traits/Configuration/ColumnSelectConfigurationTest.php
rename to tests/Unit/Traits/Configuration/ColumnSelectConfigurationTest.php
index ea79e5a21..447a44974 100644
--- a/tests/Traits/Configuration/ColumnSelectConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/ColumnSelectConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use PHPUnit\Framework\Attributes\Depends;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Traits/Configuration/ComponentConfigurationTest.php b/tests/Unit/Traits/Configuration/ComponentConfigurationTest.php
similarity index 99%
rename from tests/Traits/Configuration/ComponentConfigurationTest.php
rename to tests/Unit/Traits/Configuration/ComponentConfigurationTest.php
index d853d09c1..a477cf06c 100644
--- a/tests/Traits/Configuration/ComponentConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/ComponentConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Illuminate\Database\Eloquent\Model;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Traits/Configuration/CustomisationsConfigurationTest.php b/tests/Unit/Traits/Configuration/CustomisationsConfigurationTest.php
similarity index 95%
rename from tests/Traits/Configuration/CustomisationsConfigurationTest.php
rename to tests/Unit/Traits/Configuration/CustomisationsConfigurationTest.php
index 3ea6350c2..c68b3aa4f 100644
--- a/tests/Traits/Configuration/CustomisationsConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/CustomisationsConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Configuration/DebuggingConfigurationTest.php b/tests/Unit/Traits/Configuration/DebuggingConfigurationTest.php
similarity index 90%
rename from tests/Traits/Configuration/DebuggingConfigurationTest.php
rename to tests/Unit/Traits/Configuration/DebuggingConfigurationTest.php
index 9e30f41cb..ad6917664 100644
--- a/tests/Traits/Configuration/DebuggingConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/DebuggingConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Configuration/EventConfigurationTest.php b/tests/Unit/Traits/Configuration/EventConfigurationTest.php
similarity index 94%
rename from tests/Traits/Configuration/EventConfigurationTest.php
rename to tests/Unit/Traits/Configuration/EventConfigurationTest.php
index cb56bd048..5e132a74d 100644
--- a/tests/Traits/Configuration/EventConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/EventConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Configuration/FilterConfigurationTest.php b/tests/Unit/Traits/Configuration/FilterConfigurationTest.php
similarity index 98%
rename from tests/Traits/Configuration/FilterConfigurationTest.php
rename to tests/Unit/Traits/Configuration/FilterConfigurationTest.php
index 02ee86828..0f5e85b35 100644
--- a/tests/Traits/Configuration/FilterConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/FilterConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Traits/Configuration/FingerprintConfigurationTest.php b/tests/Unit/Traits/Configuration/FingerprintConfigurationTest.php
similarity index 91%
rename from tests/Traits/Configuration/FingerprintConfigurationTest.php
rename to tests/Unit/Traits/Configuration/FingerprintConfigurationTest.php
index 3387e0580..54d2e820e 100644
--- a/tests/Traits/Configuration/FingerprintConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/FingerprintConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Traits/Configuration/FooterConfigurationTest.php b/tests/Unit/Traits/Configuration/FooterConfigurationTest.php
similarity index 96%
rename from tests/Traits/Configuration/FooterConfigurationTest.php
rename to tests/Unit/Traits/Configuration/FooterConfigurationTest.php
index eadc0bd3e..8b161bdc1 100644
--- a/tests/Traits/Configuration/FooterConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/FooterConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Column;
diff --git a/tests/Traits/Configuration/LoadingPlaceholderConfigurationTest.php b/tests/Unit/Traits/Configuration/LoadingPlaceholderConfigurationTest.php
similarity index 99%
rename from tests/Traits/Configuration/LoadingPlaceholderConfigurationTest.php
rename to tests/Unit/Traits/Configuration/LoadingPlaceholderConfigurationTest.php
index 28a3b97ad..224e1f292 100644
--- a/tests/Traits/Configuration/LoadingPlaceholderConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/LoadingPlaceholderConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Configuration/PaginationConfigurationTest.php b/tests/Unit/Traits/Configuration/PaginationConfigurationTest.php
similarity index 98%
rename from tests/Traits/Configuration/PaginationConfigurationTest.php
rename to tests/Unit/Traits/Configuration/PaginationConfigurationTest.php
index 504759bd7..62cf06666 100644
--- a/tests/Traits/Configuration/PaginationConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/PaginationConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Configuration/QueryStringAliasConfigurationTest.php b/tests/Unit/Traits/Configuration/QueryStringAliasConfigurationTest.php
similarity index 91%
rename from tests/Traits/Configuration/QueryStringAliasConfigurationTest.php
rename to tests/Unit/Traits/Configuration/QueryStringAliasConfigurationTest.php
index 1053f42b1..dbee7a390 100644
--- a/tests/Traits/Configuration/QueryStringAliasConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/QueryStringAliasConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Traits/Configuration/RefreshConfigurationTest.php b/tests/Unit/Traits/Configuration/RefreshConfigurationTest.php
similarity index 94%
rename from tests/Traits/Configuration/RefreshConfigurationTest.php
rename to tests/Unit/Traits/Configuration/RefreshConfigurationTest.php
index 4aec6fb3d..af85e6e3c 100644
--- a/tests/Traits/Configuration/RefreshConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/RefreshConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Configuration/ReorderingConfigurationTest.php b/tests/Unit/Traits/Configuration/ReorderingConfigurationTest.php
similarity index 98%
rename from tests/Traits/Configuration/ReorderingConfigurationTest.php
rename to tests/Unit/Traits/Configuration/ReorderingConfigurationTest.php
index 9a6d563ca..09c09fd03 100644
--- a/tests/Traits/Configuration/ReorderingConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/ReorderingConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Configuration/SearchConfigurationTest.php b/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
similarity index 98%
rename from tests/Traits/Configuration/SearchConfigurationTest.php
rename to tests/Unit/Traits/Configuration/SearchConfigurationTest.php
index ad47d954b..c4704d03b 100644
--- a/tests/Traits/Configuration/SearchConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Traits/Configuration/SecondaryHeaderConfigurationTest.php b/tests/Unit/Traits/Configuration/SecondaryHeaderConfigurationTest.php
similarity index 95%
rename from tests/Traits/Configuration/SecondaryHeaderConfigurationTest.php
rename to tests/Unit/Traits/Configuration/SecondaryHeaderConfigurationTest.php
index fc34b8878..9ff12db4c 100644
--- a/tests/Traits/Configuration/SecondaryHeaderConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/SecondaryHeaderConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Column;
diff --git a/tests/Traits/Configuration/SortingConfigurationTest.php b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
similarity index 97%
rename from tests/Traits/Configuration/SortingConfigurationTest.php
rename to tests/Unit/Traits/Configuration/SortingConfigurationTest.php
index b83b19d2f..5e4b6d5ca 100644
--- a/tests/Traits/Configuration/SortingConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/SortingConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Core/CustomAttributesTest.php b/tests/Unit/Traits/Core/CustomAttributesTest.php
similarity index 97%
rename from tests/Traits/Core/CustomAttributesTest.php
rename to tests/Unit/Traits/Core/CustomAttributesTest.php
index cfe3478eb..0f76c067d 100644
--- a/tests/Traits/Core/CustomAttributesTest.php
+++ b/tests/Unit/Traits/Core/CustomAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Core;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Core;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
diff --git a/tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
similarity index 97%
rename from tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
rename to tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
index 6ee41bccb..a9a40033c 100644
--- a/tests/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Core\QueryStrings;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Core\QueryStrings;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
diff --git a/tests/Traits/Core/QueryStrings/QueryStringForSearchTest.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringForSearchTest.php
similarity index 97%
rename from tests/Traits/Core/QueryStrings/QueryStringForSearchTest.php
rename to tests/Unit/Traits/Core/QueryStrings/QueryStringForSearchTest.php
index 6fb3c5a71..c972feb96 100644
--- a/tests/Traits/Core/QueryStrings/QueryStringForSearchTest.php
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringForSearchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Core\QueryStrings;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Core\QueryStrings;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
diff --git a/tests/Traits/Core/QueryStrings/QueryStringForSortTest.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringForSortTest.php
similarity index 97%
rename from tests/Traits/Core/QueryStrings/QueryStringForSortTest.php
rename to tests/Unit/Traits/Core/QueryStrings/QueryStringForSortTest.php
index 7db6d3eb9..10215a710 100644
--- a/tests/Traits/Core/QueryStrings/QueryStringForSortTest.php
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringForSortTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Core\QueryStrings;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Core\QueryStrings;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
diff --git a/tests/Traits/Helpers/BulkActionsHelpersTest.php b/tests/Unit/Traits/Helpers/BulkActionsHelpersTest.php
similarity index 99%
rename from tests/Traits/Helpers/BulkActionsHelpersTest.php
rename to tests/Unit/Traits/Helpers/BulkActionsHelpersTest.php
index 78283a5d9..5196841b7 100644
--- a/tests/Traits/Helpers/BulkActionsHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/BulkActionsHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
similarity index 99%
rename from tests/Traits/Helpers/ColumnHelpersTest.php
rename to tests/Unit/Traits/Helpers/ColumnHelpersTest.php
index a295b721e..8239fcaf3 100644
--- a/tests/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Traits/Helpers/ColumnSelectHelpersTest.php b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
similarity index 98%
rename from tests/Traits/Helpers/ColumnSelectHelpersTest.php
rename to tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
index 6c0d1fbf5..7ddf9d04b 100644
--- a/tests/Traits/Helpers/ColumnSelectHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/ComponentHelpersTest.php b/tests/Unit/Traits/Helpers/ComponentHelpersTest.php
similarity index 99%
rename from tests/Traits/Helpers/ComponentHelpersTest.php
rename to tests/Unit/Traits/Helpers/ComponentHelpersTest.php
index 48a65b2a1..38be7f469 100644
--- a/tests/Traits/Helpers/ComponentHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ComponentHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Traits/Helpers/DebugHelpersTest.php b/tests/Unit/Traits/Helpers/DebugHelpersTest.php
similarity index 87%
rename from tests/Traits/Helpers/DebugHelpersTest.php
rename to tests/Unit/Traits/Helpers/DebugHelpersTest.php
index fcfca12b7..3a4fb5fc2 100644
--- a/tests/Traits/Helpers/DebugHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/DebugHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/EventHelpersTest.php b/tests/Unit/Traits/Helpers/EventHelpersTest.php
similarity index 87%
rename from tests/Traits/Helpers/EventHelpersTest.php
rename to tests/Unit/Traits/Helpers/EventHelpersTest.php
index 310fb423a..bb6c750ac 100644
--- a/tests/Traits/Helpers/EventHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/EventHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
similarity index 99%
rename from tests/Traits/Helpers/FilterHelpersTest.php
rename to tests/Unit/Traits/Helpers/FilterHelpersTest.php
index 51825ca62..25aac3341 100644
--- a/tests/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\DateFilter;
diff --git a/tests/Traits/Helpers/FooterHelpersTest.php b/tests/Unit/Traits/Helpers/FooterHelpersTest.php
similarity index 92%
rename from tests/Traits/Helpers/FooterHelpersTest.php
rename to tests/Unit/Traits/Helpers/FooterHelpersTest.php
index b0d5d7c97..cc7886b6e 100644
--- a/tests/Traits/Helpers/FooterHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/FooterHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/LoadingPlaceholderHelpersTest.php b/tests/Unit/Traits/Helpers/LoadingPlaceholderHelpersTest.php
similarity index 87%
rename from tests/Traits/Helpers/LoadingPlaceholderHelpersTest.php
rename to tests/Unit/Traits/Helpers/LoadingPlaceholderHelpersTest.php
index d49a2f364..db6ea30d6 100644
--- a/tests/Traits/Helpers/LoadingPlaceholderHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/LoadingPlaceholderHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/PaginationHelpersTest.php b/tests/Unit/Traits/Helpers/PaginationHelpersTest.php
similarity index 99%
rename from tests/Traits/Helpers/PaginationHelpersTest.php
rename to tests/Unit/Traits/Helpers/PaginationHelpersTest.php
index 067c0e208..fd4f04645 100644
--- a/tests/Traits/Helpers/PaginationHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/PaginationHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/RefreshHelpersTest.php b/tests/Unit/Traits/Helpers/RefreshHelpersTest.php
similarity index 93%
rename from tests/Traits/Helpers/RefreshHelpersTest.php
rename to tests/Unit/Traits/Helpers/RefreshHelpersTest.php
index f661d13fb..08e76a1c8 100644
--- a/tests/Traits/Helpers/RefreshHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/RefreshHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/RelationshipHelpersTest.php b/tests/Unit/Traits/Helpers/RelationshipHelpersTest.php
similarity index 94%
rename from tests/Traits/Helpers/RelationshipHelpersTest.php
rename to tests/Unit/Traits/Helpers/RelationshipHelpersTest.php
index ff6eb2abe..f7b60ddd5 100644
--- a/tests/Traits/Helpers/RelationshipHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/RelationshipHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Column;
diff --git a/tests/Traits/Helpers/ReorderingHelpersTest.php b/tests/Unit/Traits/Helpers/ReorderingHelpersTest.php
similarity index 97%
rename from tests/Traits/Helpers/ReorderingHelpersTest.php
rename to tests/Unit/Traits/Helpers/ReorderingHelpersTest.php
index 4771f8317..5cf51642b 100644
--- a/tests/Traits/Helpers/ReorderingHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ReorderingHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/SearchHelpersTest.php b/tests/Unit/Traits/Helpers/SearchHelpersTest.php
similarity index 98%
rename from tests/Traits/Helpers/SearchHelpersTest.php
rename to tests/Unit/Traits/Helpers/SearchHelpersTest.php
index 092d996fd..f2d58597c 100644
--- a/tests/Traits/Helpers/SearchHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/SearchHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/SecondaryHeaderHelpersTest.php b/tests/Unit/Traits/Helpers/SecondaryHeaderHelpersTest.php
similarity index 88%
rename from tests/Traits/Helpers/SecondaryHeaderHelpersTest.php
rename to tests/Unit/Traits/Helpers/SecondaryHeaderHelpersTest.php
index 38c8c3832..0acec6b66 100644
--- a/tests/Traits/Helpers/SecondaryHeaderHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/SecondaryHeaderHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/SessionStorageHelpersTest.php b/tests/Unit/Traits/Helpers/SessionStorageHelpersTest.php
similarity index 98%
rename from tests/Traits/Helpers/SessionStorageHelpersTest.php
rename to tests/Unit/Traits/Helpers/SessionStorageHelpersTest.php
index cedade483..017669ea6 100644
--- a/tests/Traits/Helpers/SessionStorageHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/SessionStorageHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/SortingHelpersTest.php b/tests/Unit/Traits/Helpers/SortingHelpersTest.php
similarity index 98%
rename from tests/Traits/Helpers/SortingHelpersTest.php
rename to tests/Unit/Traits/Helpers/SortingHelpersTest.php
index 21892b897..ac88d9caa 100644
--- a/tests/Traits/Helpers/SortingHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/SortingHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/TableAttributeHelpersTest.php b/tests/Unit/Traits/Helpers/TableAttributeHelpersTest.php
similarity index 94%
rename from tests/Traits/Helpers/TableAttributeHelpersTest.php
rename to tests/Unit/Traits/Helpers/TableAttributeHelpersTest.php
index ec62d40c2..856cc4ad5 100644
--- a/tests/Traits/Helpers/TableAttributeHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/TableAttributeHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/ToolsHelpersTest.php b/tests/Unit/Traits/Helpers/ToolsHelpersTest.php
similarity index 98%
rename from tests/Traits/Helpers/ToolsHelpersTest.php
rename to tests/Unit/Traits/Helpers/ToolsHelpersTest.php
index 9f2601462..d7ea6c6f0 100644
--- a/tests/Traits/Helpers/ToolsHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ToolsHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Helpers/ToolsStylingHelpersTest.php b/tests/Unit/Traits/Helpers/ToolsStylingHelpersTest.php
similarity index 98%
rename from tests/Traits/Helpers/ToolsStylingHelpersTest.php
rename to tests/Unit/Traits/Helpers/ToolsStylingHelpersTest.php
index 560385a89..6cc9c8657 100644
--- a/tests/Traits/Helpers/ToolsStylingHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ToolsStylingHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/Visuals/ActionsVisualsTest.php b/tests/Unit/Traits/Visuals/ActionsVisualsTest.php
similarity index 98%
rename from tests/Traits/Visuals/ActionsVisualsTest.php
rename to tests/Unit/Traits/Visuals/ActionsVisualsTest.php
index 85ce07865..a0da08004 100644
--- a/tests/Traits/Visuals/ActionsVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/ActionsVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
diff --git a/tests/Traits/Visuals/BulkActionsVisualsTest.php b/tests/Unit/Traits/Visuals/BulkActionsVisualsTest.php
similarity index 99%
rename from tests/Traits/Visuals/BulkActionsVisualsTest.php
rename to tests/Unit/Traits/Visuals/BulkActionsVisualsTest.php
index 1e61b1940..8c2ebd6c3 100644
--- a/tests/Traits/Visuals/BulkActionsVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/BulkActionsVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
diff --git a/tests/Traits/Visuals/Columns/IconColumnVisualsTest.php b/tests/Unit/Traits/Visuals/Columns/IconColumnVisualsTest.php
similarity index 97%
rename from tests/Traits/Visuals/Columns/IconColumnVisualsTest.php
rename to tests/Unit/Traits/Visuals/Columns/IconColumnVisualsTest.php
index 68d3c80fb..746f8e039 100644
--- a/tests/Traits/Visuals/Columns/IconColumnVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/Columns/IconColumnVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals\Columns;
 
 use Exception;
 use Illuminate\View\ViewException;
diff --git a/tests/Traits/Visuals/ComponentVisualsTest.php b/tests/Unit/Traits/Visuals/ComponentVisualsTest.php
similarity index 98%
rename from tests/Traits/Visuals/ComponentVisualsTest.php
rename to tests/Unit/Traits/Visuals/ComponentVisualsTest.php
index 1b2df3adf..d2eda3b8d 100644
--- a/tests/Traits/Visuals/ComponentVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/ComponentVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Exception;
 use Illuminate\View\ViewException;
diff --git a/tests/Traits/Visuals/FilterVisualsTest.php b/tests/Unit/Traits/Visuals/FilterVisualsTest.php
similarity index 98%
rename from tests/Traits/Visuals/FilterVisualsTest.php
rename to tests/Unit/Traits/Visuals/FilterVisualsTest.php
index 2c24ee23c..a1d474ab5 100644
--- a/tests/Traits/Visuals/FilterVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/FilterVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
diff --git a/tests/Traits/Visuals/Filters/TextFilterVisualsTest.php b/tests/Unit/Traits/Visuals/Filters/TextFilterVisualsTest.php
similarity index 99%
rename from tests/Traits/Visuals/Filters/TextFilterVisualsTest.php
rename to tests/Unit/Traits/Visuals/Filters/TextFilterVisualsTest.php
index 586e17692..6a89e48ef 100644
--- a/tests/Traits/Visuals/Filters/TextFilterVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/Filters/TextFilterVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals\Filters;
 
 use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
diff --git a/tests/Traits/Visuals/HideableTableTest.php b/tests/Unit/Traits/Visuals/HideableTableTest.php
similarity index 96%
rename from tests/Traits/Visuals/HideableTableTest.php
rename to tests/Unit/Traits/Visuals/HideableTableTest.php
index 6af61ed75..06cf02db7 100644
--- a/tests/Traits/Visuals/HideableTableTest.php
+++ b/tests/Unit/Traits/Visuals/HideableTableTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
diff --git a/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php b/tests/Unit/Traits/Visuals/LoadingPlaceholderVisualsTest.php
similarity index 96%
rename from tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php
rename to tests/Unit/Traits/Visuals/LoadingPlaceholderVisualsTest.php
index 5d93e3432..ad8923dad 100644
--- a/tests/Traits/Visuals/LoadingPlaceholderVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/LoadingPlaceholderVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTableLoadingPlaceholder;
diff --git a/tests/Traits/Visuals/PaginationVisualsTest.php b/tests/Unit/Traits/Visuals/PaginationVisualsTest.php
similarity index 99%
rename from tests/Traits/Visuals/PaginationVisualsTest.php
rename to tests/Unit/Traits/Visuals/PaginationVisualsTest.php
index 95cdfd062..8e0134f61 100644
--- a/tests/Traits/Visuals/PaginationVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/PaginationVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
diff --git a/tests/Traits/Visuals/RefreshVisualsTest.php b/tests/Unit/Traits/Visuals/RefreshVisualsTest.php
similarity index 94%
rename from tests/Traits/Visuals/RefreshVisualsTest.php
rename to tests/Unit/Traits/Visuals/RefreshVisualsTest.php
index 5529d7418..ee0f7944a 100644
--- a/tests/Traits/Visuals/RefreshVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/RefreshVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
diff --git a/tests/Traits/Visuals/ReorderingVisualsTest.php b/tests/Unit/Traits/Visuals/ReorderingVisualsTest.php
similarity index 99%
rename from tests/Traits/Visuals/ReorderingVisualsTest.php
rename to tests/Unit/Traits/Visuals/ReorderingVisualsTest.php
index 93764e62a..efc3f8a73 100644
--- a/tests/Traits/Visuals/ReorderingVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/ReorderingVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Depends;
diff --git a/tests/Traits/Visuals/SearchVisualsTest.php b/tests/Unit/Traits/Visuals/SearchVisualsTest.php
similarity index 98%
rename from tests/Traits/Visuals/SearchVisualsTest.php
rename to tests/Unit/Traits/Visuals/SearchVisualsTest.php
index c025e1185..d951d9b6f 100644
--- a/tests/Traits/Visuals/SearchVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/SearchVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
diff --git a/tests/Traits/Visuals/SortingVisualsTest.php b/tests/Unit/Traits/Visuals/SortingVisualsTest.php
similarity index 99%
rename from tests/Traits/Visuals/SortingVisualsTest.php
rename to tests/Unit/Traits/Visuals/SortingVisualsTest.php
index c74999eb0..6e0bb79f4 100644
--- a/tests/Traits/Visuals/SortingVisualsTest.php
+++ b/tests/Unit/Traits/Visuals/SortingVisualsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Depends;
diff --git a/tests/Traits/WithMountTest.php b/tests/Unit/Traits/WithMountTest.php
similarity index 97%
rename from tests/Traits/WithMountTest.php
rename to tests/Unit/Traits/WithMountTest.php
index 96e8ca11b..f7934089e 100644
--- a/tests/Traits/WithMountTest.php
+++ b/tests/Unit/Traits/WithMountTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits;
 
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTableMount;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Traits/WithSearchTest.php b/tests/Unit/Traits/WithSearchTest.php
similarity index 93%
rename from tests/Traits/WithSearchTest.php
rename to tests/Unit/Traits/WithSearchTest.php
index 0d82d2a0c..60389077c 100644
--- a/tests/Traits/WithSearchTest.php
+++ b/tests/Unit/Traits/WithSearchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Traits/WithSortingTest.php b/tests/Unit/Traits/WithSortingTest.php
similarity index 97%
rename from tests/Traits/WithSortingTest.php
rename to tests/Unit/Traits/WithSortingTest.php
index d275e80db..2b7ae66f8 100644
--- a/tests/Traits/WithSortingTest.php
+++ b/tests/Unit/Traits/WithSortingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Traits;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Views/Actions/ActionTest.php b/tests/Unit/Views/Actions/ActionTest.php
similarity index 99%
rename from tests/Views/Actions/ActionTest.php
rename to tests/Unit/Views/Actions/ActionTest.php
index b8bf5f240..6d5b09660 100644
--- a/tests/Views/Actions/ActionTest.php
+++ b/tests/Unit/Views/Actions/ActionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Actions;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Actions;
 
 use Illuminate\View\ComponentAttributeBag;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
diff --git a/tests/Views/BooleanColumnTest.php b/tests/Unit/Views/BooleanColumnTest.php
similarity index 93%
rename from tests/Views/BooleanColumnTest.php
rename to tests/Unit/Views/BooleanColumnTest.php
index bc56fa8fb..86d8152b6 100644
--- a/tests/Views/BooleanColumnTest.php
+++ b/tests/Unit/Views/BooleanColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/ColumnTest.php b/tests/Unit/Views/ColumnTest.php
similarity index 98%
rename from tests/Views/ColumnTest.php
rename to tests/Unit/Views/ColumnTest.php
index 39d6a7215..c15b58374 100644
--- a/tests/Views/ColumnTest.php
+++ b/tests/Unit/Views/ColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Views/Columns/ArrayColumnTest.php b/tests/Unit/Views/Columns/ArrayColumnTest.php
similarity index 97%
rename from tests/Views/Columns/ArrayColumnTest.php
rename to tests/Unit/Views/Columns/ArrayColumnTest.php
index 0eff2808b..1524e9ede 100644
--- a/tests/Views/Columns/ArrayColumnTest.php
+++ b/tests/Unit/Views/Columns/ArrayColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/Columns/AvgColumnTest.php b/tests/Unit/Views/Columns/AvgColumnTest.php
similarity index 96%
rename from tests/Views/Columns/AvgColumnTest.php
rename to tests/Unit/Views/Columns/AvgColumnTest.php
index 7e8cd4b87..b247c11cc 100644
--- a/tests/Views/Columns/AvgColumnTest.php
+++ b/tests/Unit/Views/Columns/AvgColumnTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use PHPUnit\Framework\Attributes\DataProviderExternal;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
-use Rappasoft\LaravelLivewireTables\Tests\Attributes\AggregateColumnProvider;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+use Rappasoft\LaravelLivewireTables\Tests\Unit\Attributes\AggregateColumnProvider;
 use Rappasoft\LaravelLivewireTables\Views\Columns\AvgColumn;
 
 final class AvgColumnTest extends TestCase
diff --git a/tests/Views/Columns/BooleanColumnTest.php b/tests/Unit/Views/Columns/BooleanColumnTest.php
similarity index 98%
rename from tests/Views/Columns/BooleanColumnTest.php
rename to tests/Unit/Views/Columns/BooleanColumnTest.php
index 726b6cfda..e2a8c242b 100644
--- a/tests/Views/Columns/BooleanColumnTest.php
+++ b/tests/Unit/Views/Columns/BooleanColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Views/Columns/ButtonGroupColumnTest.php b/tests/Unit/Views/Columns/ButtonGroupColumnTest.php
similarity index 93%
rename from tests/Views/Columns/ButtonGroupColumnTest.php
rename to tests/Unit/Views/Columns/ButtonGroupColumnTest.php
index 0c5367e92..cab4bdb4f 100644
--- a/tests/Views/Columns/ButtonGroupColumnTest.php
+++ b/tests/Unit/Views/Columns/ButtonGroupColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Views/Columns/ColorColumnTest.php b/tests/Unit/Views/Columns/ColorColumnTest.php
similarity index 98%
rename from tests/Views/Columns/ColorColumnTest.php
rename to tests/Unit/Views/Columns/ColorColumnTest.php
index 62708c259..5455c9e76 100644
--- a/tests/Views/Columns/ColorColumnTest.php
+++ b/tests/Unit/Views/Columns/ColorColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Columns\ColorColumn;
diff --git a/tests/Views/Columns/ComponentColumnTest.php b/tests/Unit/Views/Columns/ComponentColumnTest.php
similarity index 94%
rename from tests/Views/Columns/ComponentColumnTest.php
rename to tests/Unit/Views/Columns/ComponentColumnTest.php
index ee0cd1562..343cab77a 100644
--- a/tests/Views/Columns/ComponentColumnTest.php
+++ b/tests/Unit/Views/Columns/ComponentColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/Columns/CountColumnTest.php b/tests/Unit/Views/Columns/CountColumnTest.php
similarity index 95%
rename from tests/Views/Columns/CountColumnTest.php
rename to tests/Unit/Views/Columns/CountColumnTest.php
index 011a4af84..6890232ef 100644
--- a/tests/Views/Columns/CountColumnTest.php
+++ b/tests/Unit/Views/Columns/CountColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/Columns/DateColumnTest.php b/tests/Unit/Views/Columns/DateColumnTest.php
similarity index 98%
rename from tests/Views/Columns/DateColumnTest.php
rename to tests/Unit/Views/Columns/DateColumnTest.php
index 72358ded7..42985b0d6 100644
--- a/tests/Views/Columns/DateColumnTest.php
+++ b/tests/Unit/Views/Columns/DateColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 //use Illuminate\Support\Facades\Exceptions;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/Columns/IconColumnTest.php b/tests/Unit/Views/Columns/IconColumnTest.php
similarity index 98%
rename from tests/Views/Columns/IconColumnTest.php
rename to tests/Unit/Views/Columns/IconColumnTest.php
index 3ac423234..3696bbc67 100644
--- a/tests/Views/Columns/IconColumnTest.php
+++ b/tests/Unit/Views/Columns/IconColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 //use Illuminate\Support\Facades\Exceptions;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/Columns/ImageColumnTest.php b/tests/Unit/Views/Columns/ImageColumnTest.php
similarity index 95%
rename from tests/Views/Columns/ImageColumnTest.php
rename to tests/Unit/Views/Columns/ImageColumnTest.php
index 1f75591da..af38cb2e6 100644
--- a/tests/Views/Columns/ImageColumnTest.php
+++ b/tests/Unit/Views/Columns/ImageColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/Columns/LinkColumnTest.php b/tests/Unit/Views/Columns/LinkColumnTest.php
similarity index 97%
rename from tests/Views/Columns/LinkColumnTest.php
rename to tests/Unit/Views/Columns/LinkColumnTest.php
index d981d7aad..d81948d91 100644
--- a/tests/Views/Columns/LinkColumnTest.php
+++ b/tests/Unit/Views/Columns/LinkColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/Columns/SumColumnTest.php b/tests/Unit/Views/Columns/SumColumnTest.php
similarity index 96%
rename from tests/Views/Columns/SumColumnTest.php
rename to tests/Unit/Views/Columns/SumColumnTest.php
index 0d3a0acd3..b6d618fc5 100644
--- a/tests/Views/Columns/SumColumnTest.php
+++ b/tests/Unit/Views/Columns/SumColumnTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use PHPUnit\Framework\Attributes\DataProviderExternal;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
-use Rappasoft\LaravelLivewireTables\Tests\Attributes\AggregateColumnProvider;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+use Rappasoft\LaravelLivewireTables\Tests\Unit\Attributes\AggregateColumnProvider;
 use Rappasoft\LaravelLivewireTables\Views\Columns\SumColumn;
 
 final class SumColumnTest extends TestCase
diff --git a/tests/Views/Columns/ViewComponentColumnTest.php b/tests/Unit/Views/Columns/ViewComponentColumnTest.php
similarity index 97%
rename from tests/Views/Columns/ViewComponentColumnTest.php
rename to tests/Unit/Views/Columns/ViewComponentColumnTest.php
index 3fff77cd4..dd96a25c7 100644
--- a/tests/Views/Columns/ViewComponentColumnTest.php
+++ b/tests/Unit/Views/Columns/ViewComponentColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Illuminate\Support\Facades\Blade;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
diff --git a/tests/Views/Columns/WireLinkColumnTest.php b/tests/Unit/Views/Columns/WireLinkColumnTest.php
similarity index 96%
rename from tests/Views/Columns/WireLinkColumnTest.php
rename to tests/Unit/Views/Columns/WireLinkColumnTest.php
index ebe15d32b..e2ed87302 100644
--- a/tests/Views/Columns/WireLinkColumnTest.php
+++ b/tests/Unit/Views/Columns/WireLinkColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Columns;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/ComponentColumnTest.php b/tests/Unit/Views/ComponentColumnTest.php
similarity index 94%
rename from tests/Views/ComponentColumnTest.php
rename to tests/Unit/Views/ComponentColumnTest.php
index 9cea340f9..ba36e2f44 100644
--- a/tests/Views/ComponentColumnTest.php
+++ b/tests/Unit/Views/ComponentColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views;
 
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
diff --git a/tests/Views/Filters/BooleanFilterTest.php b/tests/Unit/Views/Filters/BooleanFilterTest.php
similarity index 97%
rename from tests/Views/Filters/BooleanFilterTest.php
rename to tests/Unit/Views/Filters/BooleanFilterTest.php
index 2fd9b3e68..0215c4a89 100644
--- a/tests/Views/Filters/BooleanFilterTest.php
+++ b/tests/Unit/Views/Filters/BooleanFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Views\Filters\BooleanFilter;
 
diff --git a/tests/Views/Filters/DateFilterTest.php b/tests/Unit/Views/Filters/DateFilterTest.php
similarity index 99%
rename from tests/Views/Filters/DateFilterTest.php
rename to tests/Unit/Views/Filters/DateFilterTest.php
index 3fa33d32c..5305408ae 100644
--- a/tests/Views/Filters/DateFilterTest.php
+++ b/tests/Unit/Views/Filters/DateFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use DateTime;
 use Rappasoft\LaravelLivewireTables\Views\Filters\DateFilter;
diff --git a/tests/Views/Filters/DateRangeFilterTest.php b/tests/Unit/Views/Filters/DateRangeFilterTest.php
similarity index 99%
rename from tests/Views/Filters/DateRangeFilterTest.php
rename to tests/Unit/Views/Filters/DateRangeFilterTest.php
index 380df28f7..aa73aac9b 100644
--- a/tests/Views/Filters/DateRangeFilterTest.php
+++ b/tests/Unit/Views/Filters/DateRangeFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\Views\Filters\DateRangeFilter;
diff --git a/tests/Views/Filters/DateTimeFilterTest.php b/tests/Unit/Views/Filters/DateTimeFilterTest.php
similarity index 99%
rename from tests/Views/Filters/DateTimeFilterTest.php
rename to tests/Unit/Views/Filters/DateTimeFilterTest.php
index e0597efc1..341d2e847 100644
--- a/tests/Views/Filters/DateTimeFilterTest.php
+++ b/tests/Unit/Views/Filters/DateTimeFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use DateTime;
 use Illuminate\Database\Eloquent\Builder;
diff --git a/tests/Views/Filters/FilterTestCase.php b/tests/Unit/Views/Filters/FilterTestCase.php
similarity index 97%
rename from tests/Views/Filters/FilterTestCase.php
rename to tests/Unit/Views/Filters/FilterTestCase.php
index 149fef71f..917bf9a21 100644
--- a/tests/Views/Filters/FilterTestCase.php
+++ b/tests/Unit/Views/Filters/FilterTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
diff --git a/tests/Views/Filters/MultiSelectDropdownFilterTest.php b/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php
similarity index 99%
rename from tests/Views/Filters/MultiSelectDropdownFilterTest.php
rename to tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php
index 8f06e0209..dc5b55880 100644
--- a/tests/Views/Filters/MultiSelectDropdownFilterTest.php
+++ b/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 use PHPUnit\Framework\Attributes\Depends;
diff --git a/tests/Views/Filters/MultiSelectFilterTest.php b/tests/Unit/Views/Filters/MultiSelectFilterTest.php
similarity index 99%
rename from tests/Views/Filters/MultiSelectFilterTest.php
rename to tests/Unit/Views/Filters/MultiSelectFilterTest.php
index 9d52f88bd..3f1937947 100644
--- a/tests/Views/Filters/MultiSelectFilterTest.php
+++ b/tests/Unit/Views/Filters/MultiSelectFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 use PHPUnit\Framework\Attributes\Depends;
diff --git a/tests/Views/Filters/NumberFilterTest.php b/tests/Unit/Views/Filters/NumberFilterTest.php
similarity index 98%
rename from tests/Views/Filters/NumberFilterTest.php
rename to tests/Unit/Views/Filters/NumberFilterTest.php
index 1c732f555..a97a93e35 100644
--- a/tests/Views/Filters/NumberFilterTest.php
+++ b/tests/Unit/Views/Filters/NumberFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Views/Filters/NumberRangeFilterTest.php b/tests/Unit/Views/Filters/NumberRangeFilterTest.php
similarity index 99%
rename from tests/Views/Filters/NumberRangeFilterTest.php
rename to tests/Unit/Views/Filters/NumberRangeFilterTest.php
index 71dd19854..b0790a1d0 100644
--- a/tests/Views/Filters/NumberRangeFilterTest.php
+++ b/tests/Unit/Views/Filters/NumberRangeFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Views/Filters/SelectFilterTest.php b/tests/Unit/Views/Filters/SelectFilterTest.php
similarity index 98%
rename from tests/Views/Filters/SelectFilterTest.php
rename to tests/Unit/Views/Filters/SelectFilterTest.php
index 79716632b..9484c85b0 100644
--- a/tests/Views/Filters/SelectFilterTest.php
+++ b/tests/Unit/Views/Filters/SelectFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
diff --git a/tests/Views/Filters/TextFilterTest.php b/tests/Unit/Views/Filters/TextFilterTest.php
similarity index 98%
rename from tests/Views/Filters/TextFilterTest.php
rename to tests/Unit/Views/Filters/TextFilterTest.php
index e5a5e1b15..72bfd4d3e 100644
--- a/tests/Views/Filters/TextFilterTest.php
+++ b/tests/Unit/Views/Filters/TextFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
diff --git a/tests/Views/Traits/Configuration/BooleanColumnConfigurationTest.php b/tests/Unit/Views/Traits/Configuration/BooleanColumnConfigurationTest.php
similarity index 93%
rename from tests/Views/Traits/Configuration/BooleanColumnConfigurationTest.php
rename to tests/Unit/Views/Traits/Configuration/BooleanColumnConfigurationTest.php
index 31706a6e7..46e96fddb 100644
--- a/tests/Views/Traits/Configuration/BooleanColumnConfigurationTest.php
+++ b/tests/Unit/Views/Traits/Configuration/BooleanColumnConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Configuration;
 
 use Closure;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php b/tests/Unit/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php
similarity index 93%
rename from tests/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php
rename to tests/Unit/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php
index 0aeba195f..951e150ea 100644
--- a/tests/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php
+++ b/tests/Unit/Views/Traits/Configuration/ButtonGroupColumnConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Columns\ButtonGroupColumn;
diff --git a/tests/Views/Traits/Configuration/ColumnConfigurationTest.php b/tests/Unit/Views/Traits/Configuration/ColumnConfigurationTest.php
similarity index 98%
rename from tests/Views/Traits/Configuration/ColumnConfigurationTest.php
rename to tests/Unit/Views/Traits/Configuration/ColumnConfigurationTest.php
index 4fd9bf049..b759304fb 100644
--- a/tests/Views/Traits/Configuration/ColumnConfigurationTest.php
+++ b/tests/Unit/Views/Traits/Configuration/ColumnConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Column;
diff --git a/tests/Views/Traits/Configuration/ComponentColumnConfigurationTest.php b/tests/Unit/Views/Traits/Configuration/ComponentColumnConfigurationTest.php
similarity index 92%
rename from tests/Views/Traits/Configuration/ComponentColumnConfigurationTest.php
rename to tests/Unit/Views/Traits/Configuration/ComponentColumnConfigurationTest.php
index 710dd0517..7e52c5d20 100644
--- a/tests/Views/Traits/Configuration/ComponentColumnConfigurationTest.php
+++ b/tests/Unit/Views/Traits/Configuration/ComponentColumnConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Configuration;
 
 use Closure;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
diff --git a/tests/Views/Traits/Configuration/FilterConfigurationTest.php b/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php
similarity index 97%
rename from tests/Views/Traits/Configuration/FilterConfigurationTest.php
rename to tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php
index 9525f9fa2..2293446a7 100644
--- a/tests/Views/Traits/Configuration/FilterConfigurationTest.php
+++ b/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Traits\Configuration;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Configuration;
 
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
diff --git a/tests/Views/Traits/Helpers/ColumnHelpersTest.php b/tests/Unit/Views/Traits/Helpers/ColumnHelpersTest.php
similarity index 99%
rename from tests/Views/Traits/Helpers/ColumnHelpersTest.php
rename to tests/Unit/Views/Traits/Helpers/ColumnHelpersTest.php
index d5119f088..1e91f776e 100644
--- a/tests/Views/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Unit/Views/Traits/Helpers/ColumnHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Helpers;
 
 use Closure;
 use Illuminate\Database\Eloquent\Builder;
diff --git a/tests/Views/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php
similarity index 99%
rename from tests/Views/Traits/Helpers/FilterHelpersTest.php
rename to tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php
index 7a49dc29f..80822235f 100644
--- a/tests/Views/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Views\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Helpers;
 
 use Illuminate\Database\Eloquent\Builder;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;

From 90355f87de47023776f24de7b84d31399357993a Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 10 Nov 2024 03:21:42 +0000
Subject: [PATCH 099/103] Migrate Localisations To PHP vs JSON (#2038)

* Fix localisations migrate to php files (#91)

* Initial Fixes

* Fix styling

---------

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

* Adjust test suites

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 .github/workflows/run-tests-pcov-pull.yml     |  2 +-
 .github/workflows/run-tests-pull.yml          |  4 +-
 .github/workflows/run-tests.yml               |  4 +-
 docs/datatable/available-methods.md           |  2 +-
 docs/filters/available-methods.md             |  2 +-
 phpunit.xml.dist                              |  8 ++-
 resources/lang/ar.json                        | 62 ----------------
 resources/lang/ar/core.php                    | 34 +++++++++
 resources/lang/ca.json                        | 62 ----------------
 resources/lang/ca/core.php                    | 34 +++++++++
 resources/lang/da.json                        | 62 ----------------
 resources/lang/da/core.php                    | 34 +++++++++
 resources/lang/de.json                        | 66 -----------------
 resources/lang/de/core.php                    | 36 ++++++++++
 resources/lang/en.json                        | 72 -------------------
 resources/lang/en/core.php                    | 39 ++++++++++
 resources/lang/es.json                        | 66 -----------------
 resources/lang/es/core.php                    | 36 ++++++++++
 resources/lang/fr.json                        | 66 -----------------
 resources/lang/fr/core.php                    | 36 ++++++++++
 resources/lang/id.json                        | 63 ----------------
 resources/lang/id/core.php                    | 34 +++++++++
 resources/lang/it.json                        | 67 -----------------
 resources/lang/it/core.php                    | 36 ++++++++++
 resources/lang/ms.json                        | 62 ----------------
 resources/lang/ms/core.php                    | 34 +++++++++
 resources/lang/nb.json                        | 70 ------------------
 resources/lang/nb/core.php                    | 38 ++++++++++
 resources/lang/nl.json                        | 66 -----------------
 resources/lang/nl/core.php                    | 36 ++++++++++
 resources/lang/pl.json                        | 66 -----------------
 resources/lang/pl/core.php                    | 36 ++++++++++
 resources/lang/pt.json                        | 64 -----------------
 resources/lang/pt/core.php                    | 35 +++++++++
 resources/lang/pt_BR.json                     | 66 -----------------
 resources/lang/pt_BR/core.php                 | 36 ++++++++++
 resources/lang/ru.json                        | 62 ----------------
 resources/lang/ru/core.php                    | 34 +++++++++
 resources/lang/sq.json                        | 70 ------------------
 resources/lang/sq/core.php                    | 38 ++++++++++
 resources/lang/sv.json                        | 36 ----------
 resources/lang/sv/core.php                    | 38 ++++++++++
 resources/lang/th.json                        | 66 -----------------
 resources/lang/th/core.php                    | 36 ++++++++++
 resources/lang/tk.json                        | 62 ----------------
 resources/lang/tk/core.php                    | 34 +++++++++
 resources/lang/tr.json                        | 62 ----------------
 resources/lang/tr/core.php                    | 34 +++++++++
 resources/lang/tw.json                        | 66 -----------------
 resources/lang/tw/core.php                    | 36 ++++++++++
 resources/lang/uk.json                        | 68 ------------------
 resources/lang/uk/core.php                    | 37 ++++++++++
 .../views/components/pagination.blade.php     | 48 ++++++-------
 .../table/tr/bulk-actions.blade.php           | 36 +++++-----
 .../components/tools/filter-pills.blade.php   |  2 +-
 .../filter-pills/buttons/reset-all.blade.php  |  4 +-
 .../buttons/reset-filter.blade.php            |  6 +-
 .../tools/filters/boolean.blade.php           |  5 +-
 .../tools/filters/multi-select.blade.php      |  4 +-
 .../components/tools/sorting-pills.blade.php  | 18 ++---
 .../toolbar/items/bulk-actions.blade.php      |  3 +-
 .../toolbar/items/column-select.blade.php     | 10 +--
 .../toolbar/items/filter-button.blade.php     |  2 +-
 .../toolbar/items/filter-popover.blade.php    |  4 +-
 .../items/pagination-dropdown.blade.php       |  2 +-
 .../toolbar/items/reorder-buttons.blade.php   |  6 +-
 resources/views/includes/debug.blade.php      |  3 +-
 resources/views/includes/offline.blade.php    |  5 +-
 src/LaravelLivewireTablesServiceProvider.php  |  9 +--
 src/Traits/ComponentUtilities.php             |  2 +-
 src/Traits/Helpers/BulkActionsHelpers.php     |  2 +-
 src/Traits/Helpers/ComponentHelpers.php       |  6 +-
 .../Helpers/LoadingPlaceholderHelpers.php     |  2 +-
 src/Traits/Helpers/SearchHelpers.php          |  2 +-
 src/Views/Filters/DateRangeFilter.php         |  2 +-
 src/Views/Filters/NumberRangeFilter.php       |  2 +-
 src/Views/Traits/Columns/IsSortable.php       |  4 +-
 tests/Http/Livewire/PetsTable.php             |  6 ++
 tests/Localisations/BaseLocalisationCase.php  | 72 +++++++++++++++++++
 .../Presence/CheckKeyPresenceTest.php         | 29 ++++++++
 .../Unit/Component/EmptyStringTest.php        | 17 +++++
 .../Configuration/SearchConfigurationTest.php |  2 +-
 .../Traits/Helpers/ComponentHelpersTest.php   |  4 +-
 83 files changed, 1057 insertions(+), 1577 deletions(-)
 delete mode 100644 resources/lang/ar.json
 create mode 100644 resources/lang/ar/core.php
 delete mode 100644 resources/lang/ca.json
 create mode 100644 resources/lang/ca/core.php
 delete mode 100644 resources/lang/da.json
 create mode 100644 resources/lang/da/core.php
 delete mode 100644 resources/lang/de.json
 create mode 100644 resources/lang/de/core.php
 delete mode 100644 resources/lang/en.json
 create mode 100644 resources/lang/en/core.php
 delete mode 100644 resources/lang/es.json
 create mode 100644 resources/lang/es/core.php
 delete mode 100644 resources/lang/fr.json
 create mode 100644 resources/lang/fr/core.php
 delete mode 100644 resources/lang/id.json
 create mode 100644 resources/lang/id/core.php
 delete mode 100644 resources/lang/it.json
 create mode 100644 resources/lang/it/core.php
 delete mode 100644 resources/lang/ms.json
 create mode 100644 resources/lang/ms/core.php
 delete mode 100644 resources/lang/nb.json
 create mode 100644 resources/lang/nb/core.php
 delete mode 100644 resources/lang/nl.json
 create mode 100644 resources/lang/nl/core.php
 delete mode 100644 resources/lang/pl.json
 create mode 100644 resources/lang/pl/core.php
 delete mode 100644 resources/lang/pt.json
 create mode 100644 resources/lang/pt/core.php
 delete mode 100644 resources/lang/pt_BR.json
 create mode 100644 resources/lang/pt_BR/core.php
 delete mode 100644 resources/lang/ru.json
 create mode 100644 resources/lang/ru/core.php
 delete mode 100644 resources/lang/sq.json
 create mode 100644 resources/lang/sq/core.php
 delete mode 100644 resources/lang/sv.json
 create mode 100644 resources/lang/sv/core.php
 delete mode 100644 resources/lang/th.json
 create mode 100644 resources/lang/th/core.php
 delete mode 100644 resources/lang/tk.json
 create mode 100644 resources/lang/tk/core.php
 delete mode 100644 resources/lang/tr.json
 create mode 100644 resources/lang/tr/core.php
 delete mode 100644 resources/lang/tw.json
 create mode 100644 resources/lang/tw/core.php
 delete mode 100644 resources/lang/uk.json
 create mode 100644 resources/lang/uk/core.php
 create mode 100644 tests/Localisations/BaseLocalisationCase.php
 create mode 100644 tests/Localisations/Presence/CheckKeyPresenceTest.php
 create mode 100644 tests/Localisations/Unit/Component/EmptyStringTest.php

diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
index 785b3c173..842d682ad 100644
--- a/.github/workflows/run-tests-pcov-pull.yml
+++ b/.github/workflows/run-tests-pcov-pull.yml
@@ -93,7 +93,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
index 8b0fdd2c4..856d27bb9 100644
--- a/.github/workflows/run-tests-pull.yml
+++ b/.github/workflows/run-tests-pull.yml
@@ -83,7 +83,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --no-coverage
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
 
 
   test-laravel11:
@@ -162,4 +162,4 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --no-coverage
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 8078c1ddb..55591c8f1 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -85,7 +85,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --no-coverage
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
 
 
   test-laravel11:
@@ -164,4 +164,4 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/phpunit --no-coverage
+        run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
diff --git a/docs/datatable/available-methods.md b/docs/datatable/available-methods.md
index 3cf5c303c..01023973e 100644
--- a/docs/datatable/available-methods.md
+++ b/docs/datatable/available-methods.md
@@ -154,7 +154,7 @@ public function configure(): void
 
 Set the message displayed when the table is filtered but there are no results to show.
 
-Defaults to: "_No items found. Try to broaden your search._"
+Defaults to: "_No items found, try to broaden your search._"
 
 ```php
 public function configure(): void
diff --git a/docs/filters/available-methods.md b/docs/filters/available-methods.md
index 7d284321b..d67f38037 100644
--- a/docs/filters/available-methods.md
+++ b/docs/filters/available-methods.md
@@ -339,7 +339,7 @@ Example blade:
         type="button"
         class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
     >
-        <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
+        <span class="sr-only">@lang('livewire-tables::core.Remove filter option')</span>
         <svg class="h-2 w-2" stroke="currentColor" fill="none" viewBox="0 0 8 8">
             <path stroke-linecap="round" stroke-width="1.5" d="M1 1l6 6m0-6L1 7" />
         </svg>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b3666050f..5dea165fe 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,9 +9,15 @@
          failOnEmptyTestSuite="false" 
          beStrictAboutOutputDuringTests="true" >
     <testsuites>
-        <testsuite name="Laravel Livewire Tables Test Suite">
+        <testsuite name="Laravel Livewire Tables Unit Test Suite">
             <directory>tests/Unit</directory>
         </testsuite>
+        <testsuite name="Laravel Livewire Tables Localisations Unit">
+            <directory>tests/Localisations/Unit</directory>
+        </testsuite>
+        <testsuite name="Laravel Livewire Tables Localisations Presence">
+            <directory>tests/Localisations/Presence</directory>
+        </testsuite>
     </testsuites>
     <source>
         <include>
diff --git a/resources/lang/ar.json b/resources/lang/ar.json
deleted file mode 100644
index 8ed603244..000000000
--- a/resources/lang/ar.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "livewire-tables::All": "الجميع",
-    "livewire-tables::All Columns": "كافة الأعمدة",
-    "livewire-tables::Applied Filters": "المرشحات التطبيقية",
-    "livewire-tables::Applied Sorting": "الفرز التطبيقي",
-    "livewire-tables::Bulk Actions": "إجراءات جملة",
-    "livewire-tables::Clear": "واضح",
-    "livewire-tables::Columns": "الأعمدة",
-    "livewire-tables::Debugging Values": "قيم التصحيح",
-    "livewire-tables::Deselect All": "الغاء تحديد الكل",
-    "livewire-tables::Done Reordering": "تمت إعادة الترتيب",
-    "livewire-tables::Filters": "المرشحات",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "لا",
-    "livewire-tables::No items found. Try to broaden your search.": "لم يتم العثور على العناصر. حاول توسيع نطاق البحث.",
-    "livewire-tables::of": "ل",
-    "livewire-tables::Remove filter option": "إزالة خيار التصفية",
-    "livewire-tables::Remove sort option": "إزالة خيار الفرز",
-    "livewire-tables::Reorder": "إعادة ترتيب",
-    "livewire-tables::results": "نتائج",
-    "livewire-tables::row": "صف",
-    "livewire-tables::rows": "صفوف",
-    "livewire-tables::rows, do you want to select all": "الصفوف ، هل تريد تحديد الكل",
-    "livewire-tables::Search": "يبحث",
-    "livewire-tables::Select All": "اختر الكل",
-    "livewire-tables::Showing": "عرض",
-    "livewire-tables::to": "ل",
-    "livewire-tables::Yes": "نعم",
-    "livewire-tables::You are currently selecting all": "أنت الآن تختار الكل",
-    "livewire-tables::You are not connected to the internet.": "أنت غير متصل بالإنترنت.",
-    "livewire-tables::You have selected": "قمت بتحديدها",
-    "All": "الجميع",
-    "All Columns": "كافة الأعمدة",
-    "Applied Filters": "المرشحات التطبيقية",
-    "Applied Sorting": "الفرز التطبيقي",
-    "Bulk Actions": "إجراءات جملة",
-    "Clear": "واضح",
-    "Columns": "الأعمدة",
-    "Debugging Values": "قيم التصحيح",
-    "Deselect All": "الغاء تحديد الكل",
-    "Done Reordering": "تمت إعادة الترتيب",
-    "Filters": "المرشحات",
-    "not_applicable": "N/A",
-    "No": "لا",
-    "No items found. Try to broaden your search.": "لم يتم العثور على العناصر. حاول توسيع نطاق البحث.",
-    "of": "ل",
-    "Remove filter option": "إزالة خيار التصفية",
-    "Remove sort option": "إزالة خيار الفرز",
-    "Reorder": "إعادة ترتيب",
-    "results": "نتائج",
-    "row": "صف",
-    "rows": "صفوف",
-    "rows, do you want to select all": "الصفوف ، هل تريد تحديد الكل",
-    "Search": "يبحث",
-    "Select All": "اختر الكل",
-    "Showing": "عرض",
-    "to": "ل",
-    "Yes": "نعم",
-    "You are currently selecting all": "أنت الآن تختار الكل",
-    "You are not connected to the internet.": "أنت غير متصل بالإنترنت.",
-    "You have selected": "قمت بتحديدها"
-}
\ No newline at end of file
diff --git a/resources/lang/ar/core.php b/resources/lang/ar/core.php
new file mode 100644
index 000000000..7a61e7327
--- /dev/null
+++ b/resources/lang/ar/core.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'All' => 'الجميع',
+    'All Columns' => 'كافة الأعمدة',
+    'Applied Filters' => 'المرشحات التطبيقية',
+    'Applied Sorting' => 'الفرز التطبيقي',
+    'Bulk Actions' => 'إجراءات جملة',
+    'Clear' => 'واضح',
+    'Columns' => 'الأعمدة',
+    'Debugging Values' => 'قيم التصحيح',
+    'Deselect All' => 'الغاء تحديد الكل',
+    'Done Reordering' => 'تمت إعادة الترتيب',
+    'Filters' => 'المرشحات',
+    'not_applicable' => 'N/A',
+    'No' => 'لا',
+    'No items found, try to broaden your search' => 'لم يتم العثور على العناصر. حاول توسيع نطاق البحث',
+    'of' => 'ل',
+    'Remove filter option' => 'إزالة خيار التصفية',
+    'Remove sort option' => 'إزالة خيار الفرز',
+    'Reorder' => 'إعادة ترتيب',
+    'results' => 'نتائج',
+    'row' => 'صف',
+    'rows' => 'صفوف',
+    'rows, do you want to select all' => 'الصفوف ، هل تريد تحديد الكل',
+    'Search' => 'يبحث',
+    'Select All' => 'اختر الكل',
+    'Showing' => 'عرض',
+    'to' => 'ل',
+    'Yes' => 'نعم',
+    'You are currently selecting all' => 'أنت الآن تختار الكل',
+    'You are not connected to the internet' => 'أنت غير متصل بالإنترنت',
+    'You have selected' => 'قمت بتحديدها',
+];
diff --git a/resources/lang/ca.json b/resources/lang/ca.json
deleted file mode 100644
index 532ff38b3..000000000
--- a/resources/lang/ca.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "livewire-tables::All": "Tot",
-    "livewire-tables::All Columns": "Totes les columnes",
-    "livewire-tables::Applied Filters": "Filtres Aplicats",
-    "livewire-tables::Applied Sorting": "Ordenació Aplicada",
-    "livewire-tables::Bulk Actions": "Accions Massives",
-    "livewire-tables::Clear": "Esborra",
-    "livewire-tables::Columns": "Columnes",
-    "livewire-tables::Debugging Values": "Valors de depuració",
-    "livewire-tables::Deselect All": "Deselecciona tot",
-    "livewire-tables::Done Reordering": "Reordenació finalitzada",
-    "livewire-tables::Filters": "Filtres",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "No",
-    "livewire-tables::No items found. Try to broaden your search.": "No s'han trobat elements. Intenti ampliar la cerca.",
-    "livewire-tables::of": "de",
-    "livewire-tables::Remove filter option": "Elimina opció de filtre",
-    "livewire-tables::Remove sort option": "Elimina opció d'ordenació",
-    "livewire-tables::Reorder": "Reordena",
-    "livewire-tables::results": "resultats",
-    "livewire-tables::row": "fila",
-    "livewire-tables::rows": "files",
-    "livewire-tables::rows, do you want to select all": "files, vol seleccionar totes",
-    "livewire-tables::to": "a",
-    "livewire-tables::Search": "Cerca",
-    "livewire-tables::Select All": "Selecciona tot",
-    "livewire-tables::Showing": "Mostrant",
-    "livewire-tables::Yes": "Sí",
-    "livewire-tables::You are currently selecting all": "Actualment està seleccionant tot",
-    "livewire-tables::You are not connected to the internet.": "No està conectat a Internet.",
-    "livewire-tables::You have selected": "Ha seleccionat",
-    "All": "Tot",
-    "All Columns": "Totes les columnes",
-    "Applied Filters": "Filtres Aplicats",
-    "Applied Sorting": "Ordenació Aplicada",
-    "Bulk Actions": "Accions Massives",
-    "Clear": "Esborra",
-    "Columns": "Columnes",
-    "Debugging Values": "Valors de depuració",
-    "Deselect All": "Deselecciona tot",
-    "Done Reordering": "Reordenació finalitzada",
-    "Filters": "Filtres",
-    "not_applicable": "N/A",
-    "No": "No",
-    "No items found. Try to broaden your search.": "No s'han trobat elements. Intenti ampliar la cerca.",
-    "of": "de",
-    "Remove filter option": "Elimina opció de filtre",
-    "Remove sort option": "Elimina opció d'ordenació",
-    "Reorder": "Reordena",
-    "results": "resultats",
-    "row": "fila",
-    "rows": "files",
-    "rows, do you want to select all": "files, vol seleccionar totes",
-    "to": "a",
-    "Search": "Cerca",
-    "Select All": "Selecciona tot",
-    "Showing": "Mostrant",
-    "Yes": "Sí",
-    "You are currently selecting all": "Actualment està seleccionant tot",
-    "You are not connected to the internet.": "No està conectat a Internet.",
-    "You have selected": "Ha seleccionat"
-}
\ No newline at end of file
diff --git a/resources/lang/ca/core.php b/resources/lang/ca/core.php
new file mode 100644
index 000000000..475148fa6
--- /dev/null
+++ b/resources/lang/ca/core.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'All' => 'Tot',
+    'All Columns' => 'Totes les columnes',
+    'Applied Filters' => 'Filtres Aplicats',
+    'Applied Sorting' => 'Ordenació Aplicada',
+    'Bulk Actions' => 'Accions Massives',
+    'Clear' => 'Esborra',
+    'Columns' => 'Columnes',
+    'Debugging Values' => 'Valors de depuració',
+    'Deselect All' => 'Deselecciona tot',
+    'Done Reordering' => 'Reordenació finalitzada',
+    'Filters' => 'Filtres',
+    'not_applicable' => 'N/A',
+    'No' => 'No',
+    'No items found, try to broaden your search' => "No s'han trobat elements. Intenti ampliar la cerca",
+    'of' => 'de',
+    'Remove filter option' => 'Elimina opció de filtre',
+    'Remove sort option' => "Elimina opció d'ordenació",
+    'Reorder' => 'Reordena',
+    'results' => 'resultats',
+    'row' => 'fila',
+    'rows' => 'files',
+    'rows, do you want to select all' => 'files, vol seleccionar totes',
+    'to' => 'a',
+    'Search' => 'Cerca',
+    'Select All' => 'Selecciona tot',
+    'Showing' => 'Mostrant',
+    'Yes' => 'Sí',
+    'You are currently selecting all' => 'Actualment està seleccionant tot',
+    'You are not connected to the internet' => 'No està conectat a Internet',
+    'You have selected' => 'Ha seleccionat',
+];
diff --git a/resources/lang/da.json b/resources/lang/da.json
deleted file mode 100644
index 0ce769f43..000000000
--- a/resources/lang/da.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "livewire-tables::All": "Alle",
-    "livewire-tables::All Columns": "Alle kolonner",
-    "livewire-tables::Applied Filters": "Anvendte filtre",
-    "livewire-tables::Applied Sorting": "Anvendt sortering",
-    "livewire-tables::Bulk Actions": "Massehandlinger",
-    "livewire-tables::Clear": "Ryd",
-    "livewire-tables::Columns": "Kolonner",
-    "livewire-tables::Debugging Values": "Debugging-værdier",
-    "livewire-tables::Deselect All": "Fravælg alle",
-    "livewire-tables::Done Reordering": "Færdig med omorganisering",
-    "livewire-tables::Filters": "Filtre",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Nej",
-    "livewire-tables::No items found. Try to broaden your search.": "Ingen elementer fundet. Prøv at udvide din søgning.",
-    "livewire-tables::of": "af",
-    "livewire-tables::Remove filter option": "Fjern filtermulighed",
-    "livewire-tables::Remove sort option": "Fjern sorteringsmulighed",
-    "livewire-tables::Reorder": "Omorganisér",
-    "livewire-tables::results": "resultater",
-    "livewire-tables::row": "række",
-    "livewire-tables::rows": "rækker",
-    "livewire-tables::rows, do you want to select all": "rækker, vil du vælge alle",
-    "livewire-tables::Search": "Søg",
-    "livewire-tables::Select All": "Vælg alle",
-    "livewire-tables::Showing": "Viser",
-    "livewire-tables::to": "til",
-    "livewire-tables::Yes": "Ja",
-    "livewire-tables::You are currently selecting all": "Du vælger i øjeblikket alle",
-    "livewire-tables::You are not connected to the internet.": "Du er ikke forbundet til internettet.",
-    "livewire-tables::You have selected": "Du har valgt",
-    "All": "Alle",
-    "All Columns": "Alle kolonner",
-    "Applied Filters": "Anvendte filtre",
-    "Applied Sorting": "Anvendt sortering",
-    "Bulk Actions": "Massehandlinger",
-    "Clear": "Ryd",
-    "Columns": "Kolonner",
-    "Debugging Values": "Debugging-værdier",
-    "Deselect All": "Fravælg alle",
-    "Done Reordering": "Færdig med omorganisering",
-    "Filters": "Filtre",
-    "not_applicable": "N/A",
-    "No": "Nej",
-    "No items found. Try to broaden your search.": "Ingen elementer fundet. Prøv at udvide din søgning.",
-    "of": "af",
-    "Remove filter option": "Fjern filtermulighed",
-    "Remove sort option": "Fjern sorteringsmulighed",
-    "Reorder": "Omorganisér",
-    "results": "resultater",
-    "row": "række",
-    "rows": "rækker",
-    "rows, do you want to select all": "rækker, vil du vælge alle",
-    "Search": "Søg",
-    "Select All": "Vælg alle",
-    "Showing": "Viser",
-    "to": "til",
-    "Yes": "Ja",
-    "You are currently selecting all": "Du vælger i øjeblikket alle",
-    "You are not connected to the internet.": "Du er ikke forbundet til internettet.",
-    "You have selected": "Du har valgt"
-}
diff --git a/resources/lang/da/core.php b/resources/lang/da/core.php
new file mode 100644
index 000000000..8ec69ce38
--- /dev/null
+++ b/resources/lang/da/core.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'All' => 'Alle',
+    'All Columns' => 'Alle kolonner',
+    'Applied Filters' => 'Anvendte filtre',
+    'Applied Sorting' => 'Anvendt sortering',
+    'Bulk Actions' => 'Massehandlinger',
+    'Clear' => 'Ryd',
+    'Columns' => 'Kolonner',
+    'Debugging Values' => 'Debugging-værdier',
+    'Deselect All' => 'Fravælg alle',
+    'Done Reordering' => 'Færdig med omorganisering',
+    'Filters' => 'Filtre',
+    'not_applicable' => 'N/A',
+    'No' => 'Nej',
+    'No items found, try to broaden your search' => 'Ingen elementer fundet. Prøv at udvide din søgning',
+    'of' => 'af',
+    'Remove filter option' => 'Fjern filtermulighed',
+    'Remove sort option' => 'Fjern sorteringsmulighed',
+    'Reorder' => 'Omorganisér',
+    'results' => 'resultater',
+    'row' => 'række',
+    'rows' => 'rækker',
+    'rows, do you want to select all' => 'rækker, vil du vælge alle',
+    'Search' => 'Søg',
+    'Select All' => 'Vælg alle',
+    'Showing' => 'Viser',
+    'to' => 'til',
+    'Yes' => 'Ja',
+    'You are currently selecting all' => 'Du vælger i øjeblikket alle',
+    'You are not connected to the internet' => 'Du er ikke forbundet til internettet',
+    'You have selected' => 'Du har valgt',
+];
diff --git a/resources/lang/de.json b/resources/lang/de.json
deleted file mode 100644
index 6ef76e8bf..000000000
--- a/resources/lang/de.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "livewire-tables::All": "Alle",
-    "livewire-tables::All Columns": "Alle Spalten",
-    "livewire-tables::Applied Filters": "Angewendete Filter",
-    "livewire-tables::Applied Sorting": "Angewendete Sortierung",
-    "livewire-tables::Bulk Actions": "Aktionen",
-    "livewire-tables::Clear": "Zurücksetzen",
-    "livewire-tables::Bulk Actions Confirm": "Bist du sicher?",
-    "livewire-tables::Columns": "Spalten",
-    "livewire-tables::Debugging Values": "Werte debuggen",
-    "livewire-tables::Deselect All": "Alle abwählen",
-    "livewire-tables::Done Reordering": "Sortieren abgeschlossen",
-    "livewire-tables::Filters": "Filter",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Nein",
-    "livewire-tables::No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern.",
-    "livewire-tables::of": "von",
-    "livewire-tables::Remove filter option": "Entferne Filterauswahl",
-    "livewire-tables::Remove sort option": "Entferne Sortierauswahl",
-    "livewire-tables::Reorder": "erneut Sortieren",
-    "livewire-tables::results": "Ergebnisse",
-    "livewire-tables::row": "Zeile",
-    "livewire-tables::rows": "Zeilen",
-    "livewire-tables::rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
-    "livewire-tables::Search": "Suche",
-    "livewire-tables::Select All": "Alle auswählen",
-    "livewire-tables::Select All On Page": "Alle auf der Seite auswählen",
-    "livewire-tables::Showing": "Anzeigen",
-    "livewire-tables::to": "nach",
-    "livewire-tables::Yes": "Ja",
-    "livewire-tables::You are currently selecting all": "Es sind schon alle ausgewählt",
-    "livewire-tables::You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.",
-    "livewire-tables::You have selected": "Es sind ausgewählt",
-    "All": "Alle",
-    "All Columns": "Alle Spalten",
-    "Applied Filters": "Angewendete Filter",
-    "Applied Sorting": "Angewendete Sortierung",
-    "Bulk Actions": "Aktionen",
-    "Bulk Actions Confirm": "Bist du sicher?",
-    "Clear": "Zurücksetzen",
-    "Columns": "Spalten",
-    "Debugging Values": "Werte debuggen",
-    "Deselect All": "Alle abwählen",
-    "Done Reordering": "Sortieren abgeschlossen",
-    "Filters": "Filter",
-    "not_applicable": "N/A",
-    "No": "Nein",
-    "No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern.",
-    "of": "von",
-    "Remove filter option": "Entferne Filterauswahl",
-    "Remove sort option": "Entferne Sortierauswahl",
-    "Reorder": "erneut Sortieren",
-    "results": "Ergebnisse",
-    "row": "Zeile",
-    "rows": "Zeilen",
-    "rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
-    "Search": "Suche",
-    "Select All": "Alle auswählen",
-    "Select All On Page": "Alle auf der Seite auswählen",
-    "Showing": "Anzeigen",
-    "to": "nach",
-    "Yes": "Ja",
-    "You are currently selecting all": "Es sind schon alle ausgewählt",
-    "You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.",
-    "You have selected": "Es sind ausgewählt"
-}
\ No newline at end of file
diff --git a/resources/lang/de/core.php b/resources/lang/de/core.php
new file mode 100644
index 000000000..04963e20a
--- /dev/null
+++ b/resources/lang/de/core.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'All' => 'Alle',
+    'All Columns' => 'Alle Spalten',
+    'Applied Filters' => 'Angewendete Filter',
+    'Applied Sorting' => 'Angewendete Sortierung',
+    'Bulk Actions' => 'Aktionen',
+    'Bulk Actions Confirm' => 'Bist du sicher?',
+    'Clear' => 'Zurücksetzen',
+    'Columns' => 'Spalten',
+    'Debugging Values' => 'Werte debuggen',
+    'Deselect All' => 'Alle abwählen',
+    'Done Reordering' => 'Sortieren abgeschlossen',
+    'Filters' => 'Filter',
+    'not_applicable' => 'N/A',
+    'No' => 'Nein',
+    'No items found, try to broaden your search' => 'Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern',
+    'of' => 'von',
+    'Remove filter option' => 'Entferne Filterauswahl',
+    'Remove sort option' => 'Entferne Sortierauswahl',
+    'Reorder' => 'erneut Sortieren',
+    'results' => 'Ergebnisse',
+    'row' => 'Zeile',
+    'rows' => 'Zeilen',
+    'rows, do you want to select all' => 'Zeilen, sollen alle ausgewählt werden',
+    'Search' => 'Suche',
+    'Select All' => 'Alle auswählen',
+    'Select All On Page' => 'Alle auf der Seite auswählen',
+    'Showing' => 'Anzeigen',
+    'to' => 'nach',
+    'Yes' => 'Ja',
+    'You are currently selecting all' => 'Es sind schon alle ausgewählt',
+    'You are not connected to the internet' => 'Es liegt keine Verbindung zum Internet vor.',
+    'You have selected' => 'Es sind ausgewählt',
+];
diff --git a/resources/lang/en.json b/resources/lang/en.json
deleted file mode 100644
index 1579cbbe2..000000000
--- a/resources/lang/en.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "livewire-tables::All": "All",
-    "livewire-tables::All Columns": "All Columns",
-    "livewire-tables::Applied Filters": "Applied Filters",
-    "livewire-tables::Applied Sorting": "Applied Sorting",
-    "livewire-tables::Bulk Actions": "Bulk Actions",
-    "livewire-tables::Bulk Actions Confirm": "Are you sure?",
-    "livewire-tables::Clear": "Clear",
-    "livewire-tables::Columns": "Columns",
-    "livewire-tables::Debugging Values": "Debugging Values",
-    "livewire-tables::Deselect All": "Deselect All",
-    "livewire-tables::Done Reordering": "Done Reordering",
-    "livewire-tables::Filters": "Filters",
-    "livewire-tables::loading": "Loading",
-    "livewire-tables::max": "Max",
-    "livewire-tables::min": "Min",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "No",
-    "livewire-tables::No items found. Try to broaden your search.": "No items found. Try to broaden your search.",
-    "livewire-tables::of": "of",
-    "livewire-tables::Remove filter option": "Remove filter option",
-    "livewire-tables::Remove sort option": "Remove sort option",
-    "livewire-tables::Reorder": "Reorder",
-    "livewire-tables::results": "results",
-    "livewire-tables::row": "row",
-    "livewire-tables::rows": "rows",
-    "livewire-tables::rows, do you want to select all": "rows, do you want to select all",
-    "livewire-tables::Search": "Search",
-    "livewire-tables::Select All": "Select All",
-    "livewire-tables::Select All On Page": "Select All On Page",
-    "livewire-tables::Showing": "Showing",
-    "livewire-tables::to": "to",
-    "livewire-tables::Yes": "Yes",
-    "livewire-tables::You are currently selecting all": "You are currently selecting all",
-    "livewire-tables::You are not connected to the internet.": "You are not connected to the internet.",
-    "livewire-tables::You have selected": "You have selected",
-    "All": "All",
-    "All Columns": "All Columns",
-    "Applied Filters": "Applied Filters",
-    "Applied Sorting": "Applied Sorting",
-    "Bulk Actions": "Bulk Actions",
-    "Bulk Actions Confirm": "Are you sure?",
-    "Clear": "Clear",
-    "Columns": "Columns",
-    "Debugging Values": "Debugging Values",
-    "Deselect All": "Deselect All",
-    "Done Reordering": "Done Reordering",
-    "Filters": "Filters",
-    "loading": "Loading",
-    "max": "Max",
-    "min": "Min",
-    "not_applicable": "N/A",
-    "No": "No",
-    "No items found. Try to broaden your search.": "No items found. Try to broaden your search.",
-    "of": "of",
-    "Remove filter option": "Remove filter option",
-    "Remove sort option": "Remove sort option",
-    "Reorder": "Reorder",
-    "results": "results",
-    "row": "row",
-    "rows": "rows",
-    "rows, do you want to select all": "rows, do you want to select all",
-    "Search": "Search",
-    "Select All": "Select All",
-    "Select All On Page": "Select All On Page",
-    "Showing": "Showing",
-    "to": "to",
-    "Yes": "Yes",
-    "You are currently selecting all": "You are currently selecting all",
-    "You are not connected to the internet.": "You are not connected to the internet.",
-    "You have selected": "You have selected"
-}
diff --git a/resources/lang/en/core.php b/resources/lang/en/core.php
new file mode 100644
index 000000000..3a562980d
--- /dev/null
+++ b/resources/lang/en/core.php
@@ -0,0 +1,39 @@
+<?php
+
+return [
+    'All' => 'All',
+    'All Columns' => 'All Columns',
+    'Applied Filters' => 'Applied Filters',
+    'Applied Sorting' => 'Applied Sorting',
+    'Bulk Actions' => 'Bulk Actions',
+    'Bulk Actions Confirm' => 'Are you sure?',
+    'Clear' => 'Clear',
+    'Columns' => 'Columns',
+    'Debugging Values' => 'Debugging Values',
+    'Deselect All' => 'Deselect All',
+    'Done Reordering' => 'Done Reordering',
+    'Filters' => 'Filters',
+    'loading' => 'Loading',
+    'max' => 'Max',
+    'min' => 'Min',
+    'not_applicable' => 'N/A',
+    'No' => 'No',
+    'No items found, try to broaden your search' => 'No items found, try to broaden your search',
+    'of' => 'of',
+    'Remove filter option' => 'Remove filter option',
+    'Remove sort option' => 'Remove sort option',
+    'Reorder' => 'Reorder',
+    'results' => 'results',
+    'row' => 'row',
+    'rows' => 'rows',
+    'rows, do you want to select all' => 'rows, do you want to select all',
+    'Search' => 'Search',
+    'Select All' => 'Select All',
+    'Select All On Page' => 'Select All On Page',
+    'Showing' => 'Showing',
+    'to' => 'to',
+    'Yes' => 'Yes',
+    'You are currently selecting all' => 'You are currently selecting all',
+    'You are not connected to the internet' => 'You are not connected to the internet',
+    'You have selected' => 'You have selected',
+];
diff --git a/resources/lang/es.json b/resources/lang/es.json
deleted file mode 100644
index 8654e82ca..000000000
--- a/resources/lang/es.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "livewire-tables::All": "Todo",
-    "livewire-tables::All Columns": "Todas las columnas",
-    "livewire-tables::Applied Filters": "Filtros Aplicados",
-    "livewire-tables::Applied Sorting": "Ordenamiento Aplicado",
-    "livewire-tables::Bulk Actions": "Acciones Masivas",
-    "livewire-tables::Bulk Actions Confirm": "Está seguro?",
-    "livewire-tables::Clear": "Borrar",
-    "livewire-tables::Columns": "Columnas",
-    "livewire-tables::Debugging Values": "Valores de depuración",
-    "livewire-tables::Deselect All": "Deseleccionar todo",
-    "livewire-tables::Done Reordering": "Reordenación finalizada",
-    "livewire-tables::Filters": "Filtros",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "No",
-    "livewire-tables::No items found. Try to broaden your search.": "No se encontraron elementos. Intente ampliar la búsqueda.",
-    "livewire-tables::of": "de",
-    "livewire-tables::Remove filter option": "Remover opción de filtro",
-    "livewire-tables::Remove sort option": "Remover opción de ordenamineto",
-    "livewire-tables::Reorder": "Reordenar",
-    "livewire-tables::results": "resultados",
-    "livewire-tables::row": "fila",
-    "livewire-tables::rows": "filas",
-    "livewire-tables::rows, do you want to select all": "filas, desea seleccionar todas",
-    "livewire-tables::Search": "Buscar",
-    "livewire-tables::Select All": "Seleccionar todo",
-    "livewire-tables::Select All On Page": "Seleccionar todo en la página",
-    "livewire-tables::Showing": "Mostrando",
-    "livewire-tables::to": "a",
-    "livewire-tables::Yes": "Sí",
-    "livewire-tables::You are currently selecting all": "Actualmente está seleccionando todo",
-    "livewire-tables::You are not connected to the internet.": "No está conectado a Internet.",
-    "livewire-tables::You have selected": "Ha seleccionado",
-    "All": "Todo",
-    "All Columns": "Todas las columnas",
-    "Applied Filters": "Filtros Aplicados",
-    "Applied Sorting": "Ordenamiento Aplicado",
-    "Bulk Actions": "Acciones Masivas",
-    "Bulk Actions Confirm": "Está seguro?",
-    "Clear": "Borrar",
-    "Columns": "Columnas",
-    "Debugging Values": "Valores de depuración",
-    "Deselect All": "Deseleccionar todo",
-    "Done Reordering": "Reordenación finalizada",
-    "Filters": "Filtros",
-    "not_applicable": "N/A",
-    "No": "No",
-    "No items found. Try to broaden your search.": "No se encontraron elementos. Intente ampliar la búsqueda.",
-    "of": "de",
-    "Remove filter option": "Remover opción de filtro",
-    "Remove sort option": "Remover opción de ordenamineto",
-    "Reorder": "Reordenar",
-    "results": "resultados",
-    "row": "fila",
-    "rows": "filas",
-    "rows, do you want to select all": "filas, desea seleccionar todas",
-    "Search": "Buscar",
-    "Select All": "Seleccionar todo",
-    "Select All On Page": "Seleccionar todo en la página",
-    "Showing": "Mostrando",
-    "to": "a",
-    "Yes": "Sí",
-    "You are currently selecting all": "Actualmente está seleccionando todo",
-    "You are not connected to the internet.": "No está conectado a Internet.",
-    "You have selected": "Ha seleccionado"
-}
\ No newline at end of file
diff --git a/resources/lang/es/core.php b/resources/lang/es/core.php
new file mode 100644
index 000000000..6abcb91ea
--- /dev/null
+++ b/resources/lang/es/core.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'All' => 'Todo',
+    'All Columns' => 'Todas las columnas',
+    'Applied Filters' => 'Filtros Aplicados',
+    'Applied Sorting' => 'Ordenamiento Aplicado',
+    'Bulk Actions' => 'Acciones Masivas',
+    'Bulk Actions Confirm' => 'Está seguro?',
+    'Clear' => 'Borrar',
+    'Columns' => 'Columnas',
+    'Debugging Values' => 'Valores de depuración',
+    'Deselect All' => 'Deseleccionar todo',
+    'Done Reordering' => 'Reordenación finalizada',
+    'Filters' => 'Filtros',
+    'not_applicable' => 'N/A',
+    'No' => 'No',
+    'No items found, try to broaden your search' => 'No se encontraron elementos. Intente ampliar la búsqueda',
+    'of' => 'de',
+    'Remove filter option' => 'Remover opción de filtro',
+    'Remove sort option' => 'Remover opción de ordenamineto',
+    'Reorder' => 'Reordenar',
+    'results' => 'resultados',
+    'row' => 'fila',
+    'rows' => 'filas',
+    'rows, do you want to select all' => 'filas, desea seleccionar todas',
+    'Search' => 'Buscar',
+    'Select All' => 'Seleccionar todo',
+    'Select All On Page' => 'Seleccionar todo en la página',
+    'Showing' => 'Mostrando',
+    'to' => 'a',
+    'Yes' => 'Sí',
+    'You are currently selecting all' => 'Actualmente está seleccionando todo',
+    'You are not connected to the internet' => 'No está conectado a Internet',
+    'You have selected' => 'Ha seleccionado',
+];
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
deleted file mode 100644
index 9cb399d08..000000000
--- a/resources/lang/fr.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "livewire-tables::All": "Tous",
-    "livewire-tables::All Columns": "Toutes les colonnes",
-    "livewire-tables::Applied Filters": "Filtres appliqués",
-    "livewire-tables::Applied Sorting": "Tris appliqués",
-    "livewire-tables::Bulk Actions": "Actions en masse",
-    "livewire-tables::Bulk Actions Confirm": "Êtes-vous sûr ?",
-    "livewire-tables::Clear": "Effacer",
-    "livewire-tables::Columns": "Colonnes",
-    "livewire-tables::Debugging Values": "Valeurs de débogage",
-    "livewire-tables::Deselect All": "Tout désélectionner ",
-    "livewire-tables::Done Reordering": "Réordonnancement terminé",
-    "livewire-tables::Filters": "Filtres",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Non",
-    "livewire-tables::No items found. Try to broaden your search.": "Aucun élément trouvé. Essayez d'élargir votre recherche.",
-    "livewire-tables::of": "sur",
-    "livewire-tables::Remove filter option": "Supprimer l'option de filtrage",
-    "livewire-tables::Remove sort option": "Supprimer l'option de tri",
-    "livewire-tables::Reorder": "Réordonner",
-    "livewire-tables::results": "résultats",
-    "livewire-tables::row": "ligne",
-    "livewire-tables::rows": "lignes",
-    "livewire-tables::rows, do you want to select all": "lignes, voulez-vous tout sélectionner ?",
-    "livewire-tables::Search": "Rechercher",
-    "livewire-tables::Select All": "Tout sélectionner",
-    "livewire-tables::Select All On Page": "Tout sélectionner sur la page",
-    "livewire-tables::Showing": "Résultats",
-    "livewire-tables::to": "à",
-    "livewire-tables::Yes": "Oui",
-    "livewire-tables::You are currently selecting all": "Vous êtes en train de sélectionner ",
-    "livewire-tables::You are not connected to the internet.": "Vous n'êtes pas connecté à l'Internet.",
-    "livewire-tables::You have selected": "Vous avez sélectionné",
-    "All": "Tous",
-    "All Columns": "Toutes les colonnes",
-    "Applied Filters": "Filtres appliqués",
-    "Applied Sorting": "Tris appliqués",
-    "Bulk Actions": "Actions en masse",
-    "Bulk Actions Confirm": "Êtes-vous sûr ?",
-    "Clear": "Effacer",
-    "Columns": "Colonnes",
-    "Debugging Values": "Valeurs de débogage",
-    "Deselect All": "Tout désélectionner ",
-    "Done Reordering": "Réordonnancement terminé",
-    "Filters": "Filtres",
-    "not_applicable": "N/A",
-    "No": "Non",
-    "No items found. Try to broaden your search.": "Aucun élément trouvé. Essayez d'élargir votre recherche.",
-    "of": "sur",
-    "Remove filter option": "Supprimer l'option de filtrage",
-    "Remove sort option": "Supprimer l'option de tri",
-    "Reorder": "Réordonner",
-    "results": "résultats",
-    "row": "ligne",
-    "rows": "lignes",
-    "rows, do you want to select all": "lignes, voulez-vous tout sélectionner ?",
-    "Search": "Rechercher",
-    "Select All": "Tout sélectionner",
-    "Select All On Page": "Tout sélectionner sur la page",
-    "Showing": "Résultats",
-    "to": "à",
-    "Yes": "Oui",
-    "You are currently selecting all": "Vous êtes en train de sélectionner ",
-    "You are not connected to the internet.": "Vous n'êtes pas connecté à l'Internet.",
-    "You have selected": "Vous avez sélectionné"
-}
\ No newline at end of file
diff --git a/resources/lang/fr/core.php b/resources/lang/fr/core.php
new file mode 100644
index 000000000..a81d0b8ad
--- /dev/null
+++ b/resources/lang/fr/core.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'All' => 'Tous',
+    'All Columns' => 'Toutes les colonnes',
+    'Applied Filters' => 'Filtres appliqués',
+    'Applied Sorting' => 'Tris appliqués',
+    'Bulk Actions' => 'Actions en masse',
+    'Bulk Actions Confirm' => 'Êtes-vous sûr ?',
+    'Clear' => 'Effacer',
+    'Columns' => 'Colonnes',
+    'Debugging Values' => 'Valeurs de débogage',
+    'Deselect All' => 'Tout désélectionner ',
+    'Done Reordering' => 'Réordonnancement terminé',
+    'Filters' => 'Filtres',
+    'not_applicable' => 'N/A',
+    'No' => 'Non',
+    'No items found, try to broaden your search' => "Aucun élément trouvé. Essayez d'élargir votre recherche.",
+    'of' => 'sur',
+    'Remove filter option' => "Supprimer l'option de filtrage",
+    'Remove sort option' => "Supprimer l'option de tri",
+    'Reorder' => 'Réordonner',
+    'results' => 'résultats',
+    'row' => 'ligne',
+    'rows' => 'lignes',
+    'rows, do you want to select all' => 'lignes, voulez-vous tout sélectionner ?',
+    'Search' => 'Rechercher',
+    'Select All' => 'Tout sélectionner',
+    'Select All On Page' => 'Tout sélectionner sur la page',
+    'Showing' => 'Résultats',
+    'to' => 'à',
+    'Yes' => 'Oui',
+    'You are currently selecting all' => 'Vous êtes en train de sélectionner ',
+    'You are not connected to the internet' => "Vous n'êtes pas connecté à l'Internet",
+    'You have selected' => 'Vous avez sélectionné',
+];
diff --git a/resources/lang/id.json b/resources/lang/id.json
deleted file mode 100644
index 06a9f38cf..000000000
--- a/resources/lang/id.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "livewire-tables::All": "Semua",
-    "livewire-tables::All Columns": "Semua Kolom",
-    "livewire-tables::Applied Filters": "Filter Diterapkan",
-    "livewire-tables::Applied Sorting": "Penyortiran Diterapkan",
-    "livewire-tables::Bulk Actions": "Aksi",
-    "livewire-tables::Clear": "Bersihkan",
-    "livewire-tables::Columns": "Kolom",
-    "livewire-tables::Debugging Values": "Nilai Debug",
-    "livewire-tables::Deselect All": "Batalkan Semua Pilihan",
-    "livewire-tables::Done Reordering": "Selesai Mengurutkan Ulang",
-    "livewire-tables::Filters": "Filter",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Tidak",
-    "livewire-tables::No items found. Try to broaden your search.": "Tidak ada data yang ditemukan. Cobalah untuk memperluas pencarian Anda.",
-    "livewire-tables::of": "dari",
-    "livewire-tables::Remove filter option": "Hapus opsi filter",
-    "livewire-tables::Remove sort option": "Hapus opsi pengurutan",
-    "livewire-tables::Reorder": "Urutkan ulang",
-    "livewire-tables::results": "hasil",
-    "livewire-tables::row": "baris",
-    "livewire-tables::rows": "baris",
-    "livewire-tables::rows, do you want to select all": "baris, apakah Anda ingin memilih semua?",
-    "livewire-tables::Search": "Cari",
-    "livewire-tables::Select All": "Pilih Semua",
-    "livewire-tables::Showing": "Menampilkan",
-    "livewire-tables::to": "ke",
-    "livewire-tables::Yes": "Ya",
-    "livewire-tables::You are currently selecting all": "Anda sedang memilih semua",
-    "livewire-tables::You are not connected to the internet.": "Anda sedang tidak terhubung ke internet.",
-    "livewire-tables::You have selected": "Anda telah memilih",
-    "All": "Semua",
-    "All Columns": "Semua Kolom",
-    "Applied Filters": "Filter Diterapkan",
-    "Applied Sorting": "Penyortiran Diterapkan",
-    "Bulk Actions": "Aksi",
-    "Clear": "Bersihkan",
-    "Columns": "Kolom",
-    "Debugging Values": "Nilai Debug",
-    "Deselect All": "Batalkan Semua Pilihan",
-    "Done Reordering": "Selesai Mengurutkan Ulang",
-    "Filters": "Filter",
-    "not_applicable": "N/A",
-    "No": "Tidak",
-    "No items found. Try to broaden your search.": "Tidak ada data yang ditemukan. Cobalah untuk memperluas pencarian Anda.",
-    "of": "dari",
-    "Remove filter option": "Hapus opsi filter",
-    "Remove sort option": "Hapus opsi pengurutan",
-    "Reorder": "Urutkan ulang",
-    "results": "hasil",
-    "row": "baris",
-    "rows": "baris",
-    "rows, do you want to select all": "baris, apakah Anda ingin memilih semua?",
-    "Search": "Cari",
-    "Select All": "Pilih Semua",
-    "Showing": "Menampilkan",
-    "to": "ke",
-    "Yes": "Ya",
-    "You are currently selecting all": "Anda sedang memilih semua",
-    "You are not connected to the internet.": "Anda sedang tidak terhubung ke internet.",
-    "You have selected": "Anda telah memilih"
-
-}
\ No newline at end of file
diff --git a/resources/lang/id/core.php b/resources/lang/id/core.php
new file mode 100644
index 000000000..47aac75f3
--- /dev/null
+++ b/resources/lang/id/core.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'All' => 'Semua',
+    'All Columns' => 'Semua Kolom',
+    'Applied Filters' => 'Filter Diterapkan',
+    'Applied Sorting' => 'Penyortiran Diterapkan',
+    'Bulk Actions' => 'Aksi',
+    'Clear' => 'Bersihkan',
+    'Columns' => 'Kolom',
+    'Debugging Values' => 'Nilai Debug',
+    'Deselect All' => 'Batalkan Semua Pilihan',
+    'Done Reordering' => 'Selesai Mengurutkan Ulang',
+    'Filters' => 'Filter',
+    'not_applicable' => 'N/A',
+    'No' => 'Tidak',
+    'No items found, try to broaden your search' => 'Tidak ada data yang ditemukan. Cobalah untuk memperluas pencarian Anda.',
+    'of' => 'dari',
+    'Remove filter option' => 'Hapus opsi filter',
+    'Remove sort option' => 'Hapus opsi pengurutan',
+    'Reorder' => 'Urutkan ulang',
+    'results' => 'hasil',
+    'row' => 'baris',
+    'rows' => 'baris',
+    'rows, do you want to select all' => 'baris, apakah Anda ingin memilih semua?',
+    'Search' => 'Cari',
+    'Select All' => 'Pilih Semua',
+    'Showing' => 'Menampilkan',
+    'to' => 'ke',
+    'Yes' => 'Ya',
+    'You are currently selecting all' => 'Anda sedang memilih semua',
+    'You are not connected to the internet' => 'Anda sedang tidak terhubung ke internet',
+    'You have selected' => 'Anda telah memilih',
+];
diff --git a/resources/lang/it.json b/resources/lang/it.json
deleted file mode 100644
index ceaffa5fc..000000000
--- a/resources/lang/it.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "livewire-tables::All": "Tutti",
-    "livewire-tables::All Columns": "Tutte le colonne",
-    "livewire-tables::Applied Filters": "Filtri Applicati",
-    "livewire-tables::Applied Sorting": "Ordinamento Applicato",
-    "livewire-tables::Bulk Actions": "Azioni di Gruppo",
-    "livewire-tables::Bulk Actions Confirm": "Sei sicuro?",
-    "livewire-tables::Clear": "Pulisci",
-    "livewire-tables::Columns": "Colonne",
-    "livewire-tables::Debugging Values": "Valori di debug",
-    "livewire-tables::Deselect All": "Deseleziona tutto",
-    "livewire-tables::Done Reordering": "Ordinamento Terminato",
-    "livewire-tables::Filters": "Filtri",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "No",
-    "livewire-tables::No items found. Try to broaden your search.": "Nessun risultato trovato. Prova ad ampliare la tua ricerca.",
-    "livewire-tables::of": "di",
-    "livewire-tables::Remove filter option": "Rimuovi filtro",
-    "livewire-tables::Remove sort option": "Rimuovi ordinamento",
-    "livewire-tables::Reorder": "Riordina",
-    "livewire-tables::results": "risultati",
-    "livewire-tables::row": "righe",
-    "livewire-tables::rows": "righe",
-    "livewire-tables::rows, do you want to select all": "righe, vuoi selezionarle tutte",
-    "livewire-tables::Search": "Cerca",
-    "livewire-tables::Select All": "Seleziona tutto",
-    "livewire-tables::Select All On Page": "Seleziona tutto sulla pagina",
-    "livewire-tables::Showing": "Visualizzati",
-    "livewire-tables::to": "a",
-    "livewire-tables::Yes": "SÌ",
-    "livewire-tables::You are currently selecting all": "Stai selezionando tutto",
-    "livewire-tables::You are not connected to the internet.": "Non sei connesso a internet",
-    "livewire-tables::You have selected": "Hai selezionato",
-    "All": "Tutti",
-    "All Columns": "Tutte le colonne",
-    "Applied Filters": "Filtri Applicati",
-    "Applied Sorting": "Ordinamento Applicato",
-    "Bulk Actions": "Azioni di Gruppo",
-    "Bulk Actions Confirm": "Sei sicuro?",
-    "Clear": "Pulisci",
-    "Columns": "Colonne",
-    "Debugging Values": "Valori di debug",
-    "Deselect All": "Deseleziona tutto",
-    "Done Reordering": "Ordinamento Terminato",
-    "Filters": "Filtri",
-    "not_applicable": "N/A",
-    "No": "No",
-    "No items found. Try to broaden your search.": "Nessun risultato trovato. Prova ad ampliare la tua ricerca.",
-    "of": "di",
-    "Remove filter option": "Rimuovi filtro",
-    "Remove sort option": "Rimuovi ordinamento",
-    "Reorder": "Riordina",
-    "results": "risultati",
-    "row": "righe",
-    "rows": "righe",
-    "rows, do you want to select all": "righe, vuoi selezionarle tutte",
-    "Search": "Cerca",
-    "Select All": "Seleziona tutto",
-    "Select All On Page": "Seleziona tutto sulla pagina",
-    "Showing": "Visualizzati",
-    "to": "a",
-    "Yes": "SÌ",
-    "You are currently selecting all": "Stai selezionando tutto",
-    "You are not connected to the internet.": "Non sei connesso a internet",
-    "You have selected": "Hai selezionato"
-
-}
\ No newline at end of file
diff --git a/resources/lang/it/core.php b/resources/lang/it/core.php
new file mode 100644
index 000000000..b29208f25
--- /dev/null
+++ b/resources/lang/it/core.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'All' => 'Tutti',
+    'All Columns' => 'Tutte le colonne',
+    'Applied Filters' => 'Filtri Applicati',
+    'Applied Sorting' => 'Ordinamento Applicato',
+    'Bulk Actions' => 'Azioni di Gruppo',
+    'Bulk Actions Confirm' => 'Sei sicuro?',
+    'Clear' => 'Pulisci',
+    'Columns' => 'Colonne',
+    'Debugging Values' => 'Valori di debug',
+    'Deselect All' => 'Deseleziona tutto',
+    'Done Reordering' => 'Ordinamento Terminato',
+    'Filters' => 'Filtri',
+    'not_applicable' => 'N/A',
+    'No' => 'No',
+    'No items found, try to broaden your search' => 'Nessun risultato trovato. Prova ad ampliare la tua ricerca.',
+    'of' => 'di',
+    'Remove filter option' => 'Rimuovi filtro',
+    'Remove sort option' => 'Rimuovi ordinamento',
+    'Reorder' => 'Riordina',
+    'results' => 'risultati',
+    'row' => 'righe',
+    'rows' => 'righe',
+    'rows, do you want to select all' => 'righe, vuoi selezionarle tutte',
+    'Search' => 'Cerca',
+    'Select All' => 'Seleziona tutto',
+    'Select All On Page' => 'Seleziona tutto sulla pagina',
+    'Showing' => 'Visualizzati',
+    'to' => 'a',
+    'Yes' => 'SÌ',
+    'You are currently selecting all' => 'Stai selezionando tutto',
+    'You are not connected to the internet' => 'Non sei connesso a internet',
+    'You have selected' => 'Hai selezionato',
+];
diff --git a/resources/lang/ms.json b/resources/lang/ms.json
deleted file mode 100644
index e7e725fa7..000000000
--- a/resources/lang/ms.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "livewire-tables::All": "Semua",
-    "livewire-tables::All Columns": "Semua Lajur",
-    "livewire-tables::Applied Filters": "Tapisan Digunakan",
-    "livewire-tables::Applied Sorting": "Susunan Digunakan",
-    "livewire-tables::Bulk Actions": "Tindakan Pukal",
-    "livewire-tables::Clear": "Kosongkan",
-    "livewire-tables::Columns": "Kolum",
-    "livewire-tables::Debugging Values": "Menyahpepijat Nilai",
-    "livewire-tables::Deselect All": "Nyahpilih semua",
-    "livewire-tables::Done Reordering": "Selesai Menyusun Semula",
-    "livewire-tables::Filters": "Tapisan",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Tidak",
-    "livewire-tables::No items found. Try to broaden your search.": "Tiada data ditemui. Sila perluaskan carian anda",
-    "livewire-tables::of": "daripada",
-    "livewire-tables::Remove filter option": "Keluarkan pilihan tapisan",
-    "livewire-tables::Remove sort option": "Keluarkan pilihan sususan",
-    "livewire-tables::Reorder": "menyusun semula",
-    "livewire-tables::results": "keputusan",
-    "livewire-tables::row": "barisan",
-    "livewire-tables::rows": "barisan",
-    "livewire-tables::rows, do you want to select all": "barisan, adakah anda mahu pilih semua?",
-    "livewire-tables::Search": "Carian",
-    "livewire-tables::Select All": "Pilih Semua",
-    "livewire-tables::Showing": "Menunjukkan",
-    "livewire-tables::to": "ke",
-    "livewire-tables::Yes": "ya",
-    "livewire-tables::You are currently selecting all": "Anda sedang memilih semua",
-    "livewire-tables::You are not connected to the internet.": "Anda tidak disambungkan ke internet.",
-    "livewire-tables::You have selected": "Anda telah memilih",
-    "All": "Semua",
-    "All Columns": "Semua Lajur",
-    "Applied Filters": "Tapisan Digunakan",
-    "Applied Sorting": "Susunan Digunakan",
-    "Bulk Actions": "Tindakan Pukal",
-    "Clear": "Kosongkan",
-    "Columns": "Kolum",
-    "Debugging Values": "Menyahpepijat Nilai",
-    "Deselect All": "Nyahpilih semua",
-    "Done Reordering": "Selesai Menyusun Semula",
-    "Filters": "Tapisan",
-    "not_applicable": "N/A",
-    "No": "Tidak",
-    "No items found. Try to broaden your search.": "Tiada data ditemui. Sila perluaskan carian anda",
-    "of": "daripada",
-    "Remove filter option": "Keluarkan pilihan tapisan",
-    "Remove sort option": "Keluarkan pilihan sususan",
-    "Reorder": "menyusun semula",
-    "results": "keputusan",
-    "row": "barisan",
-    "rows": "barisan",
-    "rows, do you want to select all": "barisan, adakah anda mahu pilih semua?",
-    "Search": "Carian",
-    "Select All": "Pilih Semua",
-    "Showing": "Menunjukkan",
-    "to": "ke",
-    "Yes": "ya",
-    "You are currently selecting all": "Anda sedang memilih semua",
-    "You are not connected to the internet.": "Anda tidak disambungkan ke internet.",
-    "You have selected": "Anda telah memilih"
-}
\ No newline at end of file
diff --git a/resources/lang/ms/core.php b/resources/lang/ms/core.php
new file mode 100644
index 000000000..89c38f699
--- /dev/null
+++ b/resources/lang/ms/core.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'All' => 'Semua',
+    'All Columns' => 'Semua Lajur',
+    'Applied Filters' => 'Tapisan Digunakan',
+    'Applied Sorting' => 'Susunan Digunakan',
+    'Bulk Actions' => 'Tindakan Pukal',
+    'Clear' => 'Kosongkan',
+    'Columns' => 'Kolum',
+    'Debugging Values' => 'Menyahpepijat Nilai',
+    'Deselect All' => 'Nyahpilih semua',
+    'Done Reordering' => 'Selesai Menyusun Semula',
+    'Filters' => 'Tapisan',
+    'not_applicable' => 'N/A',
+    'No' => 'Tidak',
+    'No items found, try to broaden your search' => 'Tiada data ditemui. Sila perluaskan carian anda',
+    'of' => 'daripada',
+    'Remove filter option' => 'Keluarkan pilihan tapisan',
+    'Remove sort option' => 'Keluarkan pilihan sususan',
+    'Reorder' => 'menyusun semula',
+    'results' => 'keputusan',
+    'row' => 'barisan',
+    'rows' => 'barisan',
+    'rows, do you want to select all' => 'barisan, adakah anda mahu pilih semua?',
+    'Search' => 'Carian',
+    'Select All' => 'Pilih Semua',
+    'Showing' => 'Menunjukkan',
+    'to' => 'ke',
+    'Yes' => 'ya',
+    'You are currently selecting all' => 'Anda sedang memilih semua',
+    'You are not connected to the internet' => 'Anda tidak disambungkan ke internet',
+    'You have selected' => 'Anda telah memilih',
+];
diff --git a/resources/lang/nb.json b/resources/lang/nb.json
deleted file mode 100644
index b7bb83929..000000000
--- a/resources/lang/nb.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "livewire-tables::All": "Alle",
-    "livewire-tables::All Columns": "Alle kolonner",
-    "livewire-tables::Applied Filters": "Anvendte filtre",
-    "livewire-tables::Applied Sorting": "Anvendt sortering",
-    "livewire-tables::Bulk Actions": "Massehandlinger",
-    "livewire-tables::Bulk Actions Confirm": "Er du sikker?",
-    "livewire-tables::Clear": "Tøm",
-    "livewire-tables::Columns": "Kolonner",
-    "livewire-tables::Debugging Values": "Debugger Verdier",
-    "livewire-tables::Deselect All": "Opphev alle",
-    "livewire-tables::Done Reordering": "Ferdig med omorganisering",
-    "livewire-tables::Filters": "Filtre",
-    "livewire-tables::max": "Maks",
-    "livewire-tables::min": "Min",
-    "livewire-tables::not_applicable": "I/T",
-    "livewire-tables::No": "Nei",
-    "livewire-tables::No items found. Try to broaden your search.": "Ingen elementer funnet. Prøv å utvide søket.",
-    "livewire-tables::of": "av",
-    "livewire-tables::Remove filter option": "Fjern filtervalg",
-    "livewire-tables::Remove sort option": "Fjern sorteringsvalg",
-    "livewire-tables::Reorder": "Omorganiser",
-    "livewire-tables::results": "resultater",
-    "livewire-tables::row": "rad",
-    "livewire-tables::rows": "rader",
-    "livewire-tables::rows, do you want to select all": "rader, vil du velge alle",
-    "livewire-tables::Search": "Søk",
-    "livewire-tables::Select All": "Velg alle",
-    "livewire-tables::Select All On Page": "Velg alle på siden",
-    "livewire-tables::Showing": "Viser",
-    "livewire-tables::to": "til",
-    "livewire-tables::Yes": "Ja",
-    "livewire-tables::You are currently selecting all": "Du velger for øyeblikket alle",
-    "livewire-tables::You are not connected to the internet.": "Du er ikke tilkoblet internett.",
-    "livewire-tables::You have selected": "Du har valgt",
-    "All": "Alle",
-    "All Columns": "Alle kolonner",
-    "Applied Filters": "Anvendte filtre",
-    "Applied Sorting": "Anvendt sortering",
-    "Bulk Actions": "Massehandlinger",
-    "Bulk Actions Confirm": "Er du sikker?",
-    "Clear": "Tøm",
-    "Columns": "Kolonner",
-    "Debugging Values": "Debugger verdier",
-    "Deselect All": "Opphev valg for alle",
-    "Done Reordering": "Ferdig med omorganisering",
-    "Filters": "Filtre",
-    "max": "Maks",
-    "min": "Min",
-    "not_applicable": "I/T",
-    "No": "Nei",
-    "No items found. Try to broaden your search.": "Ingen elementer funnet. Prøv å utvide søket.",
-    "of": "av",
-    "Remove filter option": "Fjern filtervalg",
-    "Remove sort option": "Fjern sorteringsvalg",
-    "Reorder": "Omorganiser",
-    "results": "resultater",
-    "row": "rad",
-    "rows": "rader",
-    "rows, do you want to select all": "rader, vil du velge alle",
-    "Search": "Søk",
-    "Select All": "Velg alle",
-    "Select All On Page": "Velg alle på siden",
-    "Showing": "Viser",
-    "to": "til",
-    "Yes": "Ja",
-    "You are currently selecting all": "Du velger for øyeblikket alle",
-    "You are not connected to the internet.": "Du er ikke tilkoblet internett.",
-    "You have selected": "Du har valgt"
-}
diff --git a/resources/lang/nb/core.php b/resources/lang/nb/core.php
new file mode 100644
index 000000000..9bcef1082
--- /dev/null
+++ b/resources/lang/nb/core.php
@@ -0,0 +1,38 @@
+<?php
+
+return [
+    'All' => 'Alle',
+    'All Columns' => 'Alle kolonner',
+    'Applied Filters' => 'Anvendte filtre',
+    'Applied Sorting' => 'Anvendt sortering',
+    'Bulk Actions' => 'Massehandlinger',
+    'Bulk Actions Confirm' => 'Er du sikker?',
+    'Clear' => 'Tøm',
+    'Columns' => 'Kolonner',
+    'Debugging Values' => 'Debugger verdier',
+    'Deselect All' => 'Opphev valg for alle',
+    'Done Reordering' => 'Ferdig med omorganisering',
+    'Filters' => 'Filtre',
+    'max' => 'Maks',
+    'min' => 'Min',
+    'not_applicable' => 'I/T',
+    'No' => 'Nei',
+    'No items found, try to broaden your search' => 'Ingen elementer funnet. Prøv å utvide søket',
+    'of' => 'av',
+    'Remove filter option' => 'Fjern filtervalg',
+    'Remove sort option' => 'Fjern sorteringsvalg',
+    'Reorder' => 'Omorganiser',
+    'results' => 'resultater',
+    'row' => 'rad',
+    'rows' => 'rader',
+    'rows, do you want to select all' => 'rader, vil du velge alle',
+    'Search' => 'Søk',
+    'Select All' => 'Velg alle',
+    'Select All On Page' => 'Velg alle på siden',
+    'Showing' => 'Viser',
+    'to' => 'til',
+    'Yes' => 'Ja',
+    'You are currently selecting all' => 'Du velger for øyeblikket alle',
+    'You are not connected to the internet' => 'Du er ikke tilkoblet internett',
+    'You have selected' => 'Du har valgt',
+];
diff --git a/resources/lang/nl.json b/resources/lang/nl.json
deleted file mode 100644
index a6223018c..000000000
--- a/resources/lang/nl.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "livewire-tables::All": "Alle",
-    "livewire-tables::All Columns": "Alle kolommen",
-    "livewire-tables::Applied Filters": "Toegepaste filters",
-    "livewire-tables::Applied Sorting": "Toegepaste sortering",
-    "livewire-tables::Bulk Actions": "Bulkacties",
-    "livewire-tables::Bulk Actions Confirm": "Weet u het zeker?",
-    "livewire-tables::Clear": "Wissen",
-    "livewire-tables::Columns": "Kolommen",
-    "livewire-tables::Debugging Values": "Debugging waarden",
-    "livewire-tables::Deselect All": "Alles deselecteren",
-    "livewire-tables::Done Reordering": "Hersortering voltooid",
-    "livewire-tables::Filters": "Filters",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Nee",
-    "livewire-tables::No items found. Try to broaden your search.": "Er zijn geen items gevonden. Probeer uw zoekopdracht te verfijnen.",
-    "livewire-tables::of": "van",
-    "livewire-tables::Remove filter option": "Filteroptie verwijderen",
-    "livewire-tables::Remove sort option": "Sorteeroptie verwijderen",
-    "livewire-tables::Reorder": "Hersorteren",
-    "livewire-tables::results": "resultaten",
-    "livewire-tables::row": "rij",
-    "livewire-tables::rows": "rijen",
-    "livewire-tables::rows, do you want to select all": "rijen, wilt u alles selecteren",
-    "livewire-tables::Search": "Zoeken",
-    "livewire-tables::Select All": "Alles selecteren",
-    "livewire-tables::Showing": "Toont",
-    "livewire-tables::to": "tot",
-    "livewire-tables::Yes": "Ja",
-    "livewire-tables::You are currently selecting all": "Huidig heeft u alles geselecteerd",
-    "livewire-tables::You are not connected to the internet.": "U bent niet verbonden met het internet.",
-    "livewire-tables::You have selected": "U selecteerde",
-    "livewire-tables::Select All On Page": "Alles op deze pagina selecteren",
-    "All": "Alle",
-    "All Columns": "Alle kolommen",
-    "Applied Filters": "Toegepaste filters",
-    "Applied Sorting": "Toegepaste sortering",
-    "Bulk Actions": "Bulkacties",
-    "Bulk Actions Confirm": "Weet u het zeker?",
-    "Clear": "Wissen",
-    "Columns": "Kolommen",
-    "Debugging Values": "Debugging waarden",
-    "Deselect All": "Alles deselecteren",
-    "Done Reordering": "Hersortering voltooid",
-    "Filters": "Filters",
-    "not_applicable": "N/A",
-    "No": "Nee",
-    "No items found. Try to broaden your search.": "Er zijn geen items gevonden. Probeer uw zoekopdracht te verfijnen.",
-    "of": "van",
-    "Remove filter option": "Filteroptie verwijderen",
-    "Remove sort option": "Sorteeroptie verwijderen",
-    "Reorder": "Hersorteren",
-    "results": "resultaten",
-    "row": "rij",
-    "rows": "rijen",
-    "rows, do you want to select all": "rijen, wilt u alles selecteren",
-    "Search": "Zoeken",
-    "Select All": "Alles selecteren",
-    "Showing": "Toont",
-    "to": "tot",
-    "Yes": "Ja",
-    "You are currently selecting all": "Huidig heeft u alles geselecteerd",
-    "You are not connected to the internet.": "U bent niet verbonden met het internet.",
-    "You have selected": "U selecteerde",
-    "Select All On Page": "Alles op deze pagina selecteren"
-}
diff --git a/resources/lang/nl/core.php b/resources/lang/nl/core.php
new file mode 100644
index 000000000..ad1eb4c29
--- /dev/null
+++ b/resources/lang/nl/core.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'All' => 'Alle',
+    'All Columns' => 'Alle kolommen',
+    'Applied Filters' => 'Toegepaste filters',
+    'Applied Sorting' => 'Toegepaste sortering',
+    'Bulk Actions' => 'Bulkacties',
+    'Bulk Actions Confirm' => 'Weet u het zeker?',
+    'Clear' => 'Wissen',
+    'Columns' => 'Kolommen',
+    'Debugging Values' => 'Debugging waarden',
+    'Deselect All' => 'Alles deselecteren',
+    'Done Reordering' => 'Hersortering voltooid',
+    'Filters' => 'Filters',
+    'not_applicable' => 'N/A',
+    'No' => 'Nee',
+    'No items found, try to broaden your search' => 'Er zijn geen items gevonden. Probeer uw zoekopdracht te verfijnen',
+    'of' => 'van',
+    'Remove filter option' => 'Filteroptie verwijderen',
+    'Remove sort option' => 'Sorteeroptie verwijderen',
+    'Reorder' => 'Hersorteren',
+    'results' => 'resultaten',
+    'row' => 'rij',
+    'rows' => 'rijen',
+    'rows, do you want to select all' => 'rijen, wilt u alles selecteren',
+    'Search' => 'Zoeken',
+    'Select All' => 'Alles selecteren',
+    'Select All On Page' => 'Alles op deze pagina selecteren',
+    'Showing' => 'Toont',
+    'to' => 'tot',
+    'Yes' => 'Ja',
+    'You are currently selecting all' => 'Huidig heeft u alles geselecteerd',
+    'You are not connected to the internet' => 'U bent niet verbonden met het internet',
+    'You have selected' => 'U selecteerde',
+];
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
deleted file mode 100644
index 12469dc82..000000000
--- a/resources/lang/pl.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "livewire-tables::All": "Wszystko",
-    "livewire-tables::All Columns": "Wszystkie kolumny",
-    "livewire-tables::Applied Filters": "Użyte filtry",
-    "livewire-tables::Applied Sorting": "Użyte sortowanie",
-    "livewire-tables::Bulk Actions": "Akcje zbiorowe",
-    "livewire-tables::Bulk Actions Confirm": "Czy zastosować ?",
-    "livewire-tables::Clear": "Wyczyść",
-    "livewire-tables::Columns": "Kolumny",
-    "livewire-tables::Debugging Values": "Wartości debugowania",
-    "livewire-tables::Deselect All": "Odznacz wszystko",
-    "livewire-tables::Done Reordering": "Done Reordering",
-    "livewire-tables::Filters": "Filtry",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Nie",
-    "livewire-tables::No items found. Try to broaden your search.": "Brak rezultatów do wyświetlenia.",
-    "livewire-tables::of": "z",
-    "livewire-tables::Remove filter option": "Usuń opcję filtra",
-    "livewire-tables::Remove sort option": "Usuń opcję sortowania",
-    "livewire-tables::Reorder": "Zmień kolejność",
-    "livewire-tables::results": "wyniki",
-    "livewire-tables::row": "wiersz",
-    "livewire-tables::rows": "wiersze",
-    "livewire-tables::rows, do you want to select all": "czy chcesz zaznaczyć wszystkie wiersze",
-    "livewire-tables::Search": "Szukaj",
-    "livewire-tables::Select All": "Zaznacz wszystko",
-    "livewire-tables::Select All On Page": "Zaznacz wszystko na stronie",
-    "livewire-tables::Showing": "Pokazywanie",
-    "livewire-tables::to": "do",
-    "livewire-tables::Yes": "Tak",
-    "livewire-tables::You are currently selecting all": "Aktualnie masz wszystko zaznaczone",
-    "livewire-tables::You are not connected to the internet.": "Brak połączenia z internetem.",
-    "livewire-tables::You have selected": "Masz wybrane",
-    "All": "Wszystko",
-    "All Columns": "Wszystkie kolumny",
-    "Applied Filters": "Użyte filtry",
-    "Applied Sorting": "Użyte sortowanie",
-    "Bulk Actions": "Akcje zbiorowe",
-    "Bulk Actions Confirm": "Czy zastosować ?",
-    "Clear": "Wyczyść",
-    "Columns": "Kolumny",
-    "Debugging Values": "Wartości debugowania",
-    "Deselect All": "Odznacz wszystko",
-    "Done Reordering": "Done Reordering",
-    "Filters": "Filtry",
-    "not_applicable": "N/A",
-    "No": "Nie",
-    "No items found. Try to broaden your search.": "Brak rezultatów do wyświetlenia.",
-    "of": "z",
-    "Remove filter option": "Usuń opcję filtra",
-    "Remove sort option": "Usuń opcję sortowania",
-    "Reorder": "Zmień kolejność",
-    "results": "wyniki",
-    "row": "wiersz",
-    "rows": "wiersze",
-    "rows, do you want to select all": "czy chcesz zaznaczyć wszystkie wiersze",
-    "Search": "Szukaj",
-    "Select All": "Zaznacz wszystko",
-    "Select All On Page": "Zaznacz wszystko na stronie",
-    "Showing": "Pokazywanie",
-    "to": "do",
-    "Yes": "Tak",
-    "You are currently selecting all": "Aktualnie masz wszystko zaznaczone",
-    "You are not connected to the internet.": "Brak połączenia z internetem.",
-    "You have selected": "Masz wybrane"
-}
\ No newline at end of file
diff --git a/resources/lang/pl/core.php b/resources/lang/pl/core.php
new file mode 100644
index 000000000..144c73d8a
--- /dev/null
+++ b/resources/lang/pl/core.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'All' => 'Wszystko',
+    'All Columns' => 'Wszystkie kolumny',
+    'Applied Filters' => 'Użyte filtry',
+    'Applied Sorting' => 'Użyte sortowanie',
+    'Bulk Actions' => 'Akcje zbiorowe',
+    'Bulk Actions Confirm' => 'Czy zastosować ?',
+    'Clear' => 'Wyczyść',
+    'Columns' => 'Kolumny',
+    'Debugging Values' => 'Wartości debugowania',
+    'Deselect All' => 'Odznacz wszystko',
+    'Done Reordering' => 'Done Reordering',
+    'Filters' => 'Filtry',
+    'not_applicable' => 'N/A',
+    'No' => 'Nie',
+    'No items found, try to broaden your search' => 'Brak rezultatów do wyświetlenia',
+    'of' => 'z',
+    'Remove filter option' => 'Usuń opcję filtra',
+    'Remove sort option' => 'Usuń opcję sortowania',
+    'Reorder' => 'Zmień kolejność',
+    'results' => 'wyniki',
+    'row' => 'wiersz',
+    'rows' => 'wiersze',
+    'rows, do you want to select all' => 'czy chcesz zaznaczyć wszystkie wiersze',
+    'Search' => 'Szukaj',
+    'Select All' => 'Zaznacz wszystko',
+    'Select All On Page' => 'Zaznacz wszystko na stronie',
+    'Showing' => 'Pokazywanie',
+    'to' => 'do',
+    'Yes' => 'Tak',
+    'You are currently selecting all' => 'Aktualnie masz wszystko zaznaczone',
+    'You are not connected to the internet' => 'Brak połączenia z internetem',
+    'You have selected' => 'Masz wybrane',
+];
diff --git a/resources/lang/pt.json b/resources/lang/pt.json
deleted file mode 100644
index f38578da1..000000000
--- a/resources/lang/pt.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "livewire-tables::All": "Tudo",
-    "livewire-tables::All Columns": "Todas as colunas",
-    "livewire-tables::Applied Filters": "Filtros Aplicados",
-    "livewire-tables::Applied Sorting": "Ordenação Aplicada",
-    "livewire-tables::Bulk Actions": "Ações Massivas",
-    "livewire-tables::Clear": "Limpar",
-    "livewire-tables::Columns": "Colunas",
-    "livewire-tables::Debugging Values": "Valores de depuração",
-    "livewire-tables::Deselect All": "Desmarcar Tudo",
-    "livewire-tables::Done Reordering": "Ordeanação finalizada",
-    "livewire-tables::Filters": "Filtros",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Não",
-    "livewire-tables::No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
-    "livewire-tables::of": "de",
-    "livewire-tables::Remove filter option": "Remover opção de filtro",
-    "livewire-tables::Remove sort option": "Remover opção de ordenação",
-    "livewire-tables::Reorder": "Reordenar",
-    "livewire-tables::results": "resultados",
-    "livewire-tables::row": "linha",
-    "livewire-tables::rows": "linhas",
-    "livewire-tables::rows, do you want to select all": "linhas, pretende selecionar tudo",
-    "livewire-tables::Search": "Pesquisar",
-    "livewire-tables::Select All": "Seleccionar Tudo",
-    "livewire-tables::Select All On Page": "Selecione tudo na página",
-    "livewire-tables::Showing": "A mostrar",
-    "livewire-tables::to": "a",
-    "livewire-tables::Yes": "Sim",
-    "livewire-tables::You are currently selecting all": "Atualmente está a selecionar tudo",
-    "livewire-tables::You are not connected to the internet.": "Não está ligado à internet.",
-    "livewire-tables::You have selected": "Selecionou",
-    "All": "Tudo",
-    "All Columns": "Todas as colunas",
-    "Applied Filters": "Filtros Aplicados",
-    "Applied Sorting": "Ordenação Aplicada",
-    "Bulk Actions": "Ações Massivas",
-    "Clear": "Limpar",
-    "Columns": "Colunas",
-    "Debugging Values": "Valores de depuração",
-    "Deselect All": "Desmarcar Tudo",
-    "Done Reordering": "Ordeanação finalizada",
-    "Filters": "Filtros",
-    "not_applicable": "N/A",
-    "No": "Não",
-    "No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
-    "of": "de",
-    "Remove filter option": "Remover opção de filtro",
-    "Remove sort option": "Remover opção de ordenação",
-    "Reorder": "Reordenar",
-    "results": "resultados",
-    "row": "linha",
-    "rows": "linhas",
-    "rows, do you want to select all": "linhas, pretende selecionar tudo",
-    "Search": "Pesquisar",
-    "Select All": "Seleccionar Tudo",
-    "Select All On Page": "Selecione tudo na página",
-    "Showing": "A mostrar",
-    "to": "a",
-    "Yes": "Sim",
-    "You are currently selecting all": "Atualmente está a selecionar tudo",
-    "You are not connected to the internet.": "Não está ligado à internet.",
-    "You have selected": "Selecionou"
-}
\ No newline at end of file
diff --git a/resources/lang/pt/core.php b/resources/lang/pt/core.php
new file mode 100644
index 000000000..308f853f1
--- /dev/null
+++ b/resources/lang/pt/core.php
@@ -0,0 +1,35 @@
+<?php
+
+return [
+    'All' => 'Tudo',
+    'All Columns' => 'Todas as colunas',
+    'Applied Filters' => 'Filtros Aplicados',
+    'Applied Sorting' => 'Ordenação Aplicada',
+    'Bulk Actions' => 'Ações Massivas',
+    'Clear' => 'Limpar',
+    'Columns' => 'Colunas',
+    'Debugging Values' => 'Valores de depuração',
+    'Deselect All' => 'Desmarcar Tudo',
+    'Done Reordering' => 'Ordeanação finalizada',
+    'Filters' => 'Filtros',
+    'not_applicable' => 'N/A',
+    'No' => 'Não',
+    'No items found, try to broaden your search' => 'Nenhum resultado encontrado. Tente ampliar a sua pesquisa',
+    'of' => 'de',
+    'Remove filter option' => 'Remover opção de filtro',
+    'Remove sort option' => 'Remover opção de ordenação',
+    'Reorder' => 'Reordenar',
+    'results' => 'resultados',
+    'row' => 'linha',
+    'rows' => 'linhas',
+    'rows, do you want to select all' => 'linhas, pretende selecionar tudo',
+    'Search' => 'Pesquisar',
+    'Select All' => 'Seleccionar Tudo',
+    'Select All On Page' => 'Selecione tudo na página',
+    'Showing' => 'A mostrar',
+    'to' => 'a',
+    'Yes' => 'Sim',
+    'You are currently selecting all' => 'Atualmente está a selecionar tudo',
+    'You are not connected to the internet' => 'Não está ligado à internet',
+    'You have selected' => 'Selecionou',
+];
diff --git a/resources/lang/pt_BR.json b/resources/lang/pt_BR.json
deleted file mode 100644
index 09a0e2906..000000000
--- a/resources/lang/pt_BR.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "livewire-tables::All": "Tudo",
-    "livewire-tables::All Columns": "Todas as colunas",
-    "livewire-tables::Applied Filters": "Filtros aplicados",
-    "livewire-tables::Applied Sorting": "Ordenação aplicada",
-    "livewire-tables::Bulk Actions": "Ações em massa",
-    "livewire-tables::Bulk Actions Confirm": "Tem certeza",
-    "livewire-tables::Clear": "Limpar",
-    "livewire-tables::Columns": "Colunas",
-    "livewire-tables::Debugging Values": "Valores de depuração",
-    "livewire-tables::Deselect All": "Desmarcar Tudo",
-    "livewire-tables::Done Reordering": "Ordenação finalizada",
-    "livewire-tables::Filters": "Filtros",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Não",
-    "livewire-tables::No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
-    "livewire-tables::of": "de",
-    "livewire-tables::Reorder": "Reordenar",
-    "livewire-tables::results": "resultados",
-    "livewire-tables::Remove filter option": "Remover opção de filtro",
-    "livewire-tables::Remove sort option": "Remover opção de ordenação",
-    "livewire-tables::row": "linha",
-    "livewire-tables::rows": "linhas",
-    "livewire-tables::rows, do you want to select all": "linhas, você deseja selecionar tudo?",
-    "livewire-tables::Search": "Pesquisar",
-    "livewire-tables::Select All": "Selecionar tudo",
-    "livewire-tables::Select All On Page": "Selecione tudo na página",
-    "livewire-tables::Showing": "Exibindo",
-    "livewire-tables::to": "a",
-    "livewire-tables::Yes": "Sim",
-    "livewire-tables::You are currently selecting all": "Você selecionou tudo",
-    "livewire-tables::You are not connected to the internet.": "Você não está conectado na internet.",
-    "livewire-tables::You have selected": "Você selecionou",
-    "All": "Tudo",
-    "All Columns": "Todas as colunas",
-    "Applied Filters": "Filtros aplicados",
-    "Applied Sorting": "Ordenação aplicada",
-    "Bulk Actions": "Ações em massa",
-    "Bulk Actions Confirm": "Tem certeza",
-    "Clear": "Limpar",
-    "Columns": "Colunas",
-    "Debugging Values": "Valores de depuração",
-    "Deselect All": "Desmarcar Tudo",
-    "Done Reordering": "Ordenação finalizada",
-    "Filters": "Filtros",
-    "not_applicable": "N/A",
-    "No": "Não",
-    "No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
-    "of": "de",
-    "Reorder": "Reordenar",
-    "results": "resultados",
-    "Remove filter option": "Remover opção de filtro",
-    "Remove sort option": "Remover opção de ordenação",
-    "row": "linha",
-    "rows": "linhas",
-    "rows, do you want to select all": "linhas, você deseja selecionar tudo?",
-    "Search": "Pesquisar",
-    "Select All": "Selecionar tudo",
-    "Select All On Page": "Selecione tudo na página",
-    "Showing": "Exibindo",
-    "to": "a",
-    "Yes": "Sim",
-    "You are currently selecting all": "Você selecionou tudo",
-    "You are not connected to the internet.": "Você não está conectado na internet.",
-    "You have selected": "Você selecionou"
-}
\ No newline at end of file
diff --git a/resources/lang/pt_BR/core.php b/resources/lang/pt_BR/core.php
new file mode 100644
index 000000000..af83595e6
--- /dev/null
+++ b/resources/lang/pt_BR/core.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'All' => 'Tudo',
+    'All Columns' => 'Todas as colunas',
+    'Applied Filters' => 'Filtros aplicados',
+    'Applied Sorting' => 'Ordenação aplicada',
+    'Bulk Actions' => 'Ações em massa',
+    'Bulk Actions Confirm' => 'Tem certeza',
+    'Clear' => 'Limpar',
+    'Columns' => 'Colunas',
+    'Debugging Values' => 'Valores de depuração',
+    'Deselect All' => 'Desmarcar Tudo',
+    'Done Reordering' => 'Ordenação finalizada',
+    'Filters' => 'Filtros',
+    'not_applicable' => 'N/A',
+    'No' => 'Não',
+    'No items found, try to broaden your search' => 'Nenhum resultado encontrado. Tente ampliar a sua pesquisa',
+    'of' => 'de',
+    'Reorder' => 'Reordenar',
+    'results' => 'resultados',
+    'Remove filter option' => 'Remover opção de filtro',
+    'Remove sort option' => 'Remover opção de ordenação',
+    'row' => 'linha',
+    'rows' => 'linhas',
+    'rows, do you want to select all' => 'linhas, você deseja selecionar tudo?',
+    'Search' => 'Pesquisar',
+    'Select All' => 'Selecionar tudo',
+    'Select All On Page' => 'Selecione tudo na página',
+    'Showing' => 'Exibindo',
+    'to' => 'a',
+    'Yes' => 'Sim',
+    'You are currently selecting all' => 'Você selecionou tudo',
+    'You are not connected to the internet' => 'Você não está conectado na internet',
+    'You have selected' => 'Você selecionou',
+];
diff --git a/resources/lang/ru.json b/resources/lang/ru.json
deleted file mode 100644
index 53b9fbf1b..000000000
--- a/resources/lang/ru.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "livewire-tables::All": "Все",
-    "livewire-tables::All Columns": "Все столбцы",
-    "livewire-tables::Applied Filters": "Примененные фильтры",
-    "livewire-tables::Applied Sorting": "Примененная сортировка",
-    "livewire-tables::Bulk Actions": "Массовые действия",
-    "livewire-tables::Clear": "Очистить",
-    "livewire-tables::Columns": "Столбцы",
-    "livewire-tables::Debugging Values": "Отладочные значения",
-    "livewire-tables::Deselect All": "Снять выделение",
-    "livewire-tables::Done Reordering": "Сортировка выполнена",
-    "livewire-tables::Filters": "Фильтры",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Нет",
-    "livewire-tables::No items found. Try to broaden your search.": "Ничего не найдено. Попробуйте расширить поиск.",
-    "livewire-tables::of": "из",
-    "livewire-tables::Remove filter option": "Удалить фильтр",
-    "livewire-tables::Remove sort option": "Удалить параметр сортировки",
-    "livewire-tables::Reorder": "Переупорядочить",
-    "livewire-tables::results": "результатов",
-    "livewire-tables::row": "ряды",
-    "livewire-tables::rows": "ряды",
-    "livewire-tables::rows, do you want to select all": "ряды, вы хотите выбрать все",
-    "livewire-tables::Search": "Поиск",
-    "livewire-tables::Select All": "Выбрать все",
-    "livewire-tables::Showing": "Показано с",
-    "livewire-tables::to": "к",
-    "livewire-tables::Yes": "Да",
-    "livewire-tables::You are currently selecting all": "Вы выбираете все",
-    "livewire-tables::You are not connected to the internet.": "Вы не подключены к Интернету",
-    "livewire-tables::You have selected": "Вы выбрали",
-    "All": "Все",
-    "All Columns": "Все столбцы",
-    "Applied Filters": "Примененные фильтры",
-    "Applied Sorting": "Примененная сортировка",
-    "Bulk Actions": "Массовые действия",
-    "Clear": "Очистить",
-    "Columns": "Столбцы",
-    "Debugging Values": "Отладочные значения",
-    "Deselect All": "Снять выделение",
-    "Done Reordering": "Сортировка выполнена",
-    "Filters": "Фильтры",
-    "not_applicable": "N/A",
-    "No": "Нет",
-    "No items found. Try to broaden your search.": "Ничего не найдено. Попробуйте расширить поиск.",
-    "of": "из",
-    "Remove filter option": "Удалить фильтр",
-    "Remove sort option": "Удалить параметр сортировки",
-    "Reorder": "Переупорядочить",
-    "results": "результатов",
-    "row": "ряды",
-    "rows": "ряды",
-    "rows, do you want to select all": "ряды, вы хотите выбрать все",
-    "Search": "Поиск",
-    "Select All": "Выбрать все",
-    "Showing": "Показано с",
-    "to": "к",
-    "Yes": "Да",
-    "You are currently selecting all": "Вы выбираете все",
-    "You are not connected to the internet.": "Вы не подключены к Интернету",
-    "You have selected": "Вы выбрали"
-}
\ No newline at end of file
diff --git a/resources/lang/ru/core.php b/resources/lang/ru/core.php
new file mode 100644
index 000000000..0cf6dcbce
--- /dev/null
+++ b/resources/lang/ru/core.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'All' => 'Все',
+    'All Columns' => 'Все столбцы',
+    'Applied Filters' => 'Примененные фильтры',
+    'Applied Sorting' => 'Примененная сортировка',
+    'Bulk Actions' => 'Массовые действия',
+    'Clear' => 'Очистить',
+    'Columns' => 'Столбцы',
+    'Debugging Values' => 'Отладочные значения',
+    'Deselect All' => 'Снять выделение',
+    'Done Reordering' => 'Сортировка выполнена',
+    'Filters' => 'Фильтры',
+    'not_applicable' => 'N/A',
+    'No' => 'Нет',
+    'No items found, try to broaden your search' => 'Ничего не найдено. Попробуйте расширить поиск',
+    'of' => 'из',
+    'Remove filter option' => 'Удалить фильтр',
+    'Remove sort option' => 'Удалить параметр сортировки',
+    'Reorder' => 'Переупорядочить',
+    'results' => 'результатов',
+    'row' => 'ряды',
+    'rows' => 'ряды',
+    'rows, do you want to select all' => 'ряды, вы хотите выбрать все',
+    'Search' => 'Поиск',
+    'Select All' => 'Выбрать все',
+    'Showing' => 'Показано с',
+    'to' => 'к',
+    'Yes' => 'Да',
+    'You are currently selecting all' => 'Вы выбираете все',
+    'You are not connected to the internet' => 'Вы не подключены к Интернету',
+    'You have selected' => 'Вы выбрали',
+];
diff --git a/resources/lang/sq.json b/resources/lang/sq.json
deleted file mode 100644
index 1784fa2cc..000000000
--- a/resources/lang/sq.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "livewire-tables::All": "Të gjitha",
-    "livewire-tables::All Columns": "Të gjitha kolonat",
-    "livewire-tables::Applied Filters": "Filtrat e aplikuara",
-    "livewire-tables::Applied Sorting": "Renditja e aplikuar",
-    "livewire-tables::Bulk Actions": "Veprime në masë",
-    "livewire-tables::Bulk Actions Confirm": "A jeni i sigurt?",
-    "livewire-tables::Clear": "Pastro",
-    "livewire-tables::Columns": "Kolonat",
-    "livewire-tables::Debugging Values": "Vlerat e korrigjimit",
-    "livewire-tables::Deselect All": "Heq të gjitha",
-    "livewire-tables::Done Reordering": "Përfundoi riorganizimi",
-    "livewire-tables::Filters": "Filtrat",
-    "livewire-tables::max": "Maksimumi",
-    "livewire-tables::min": "Minimumi",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Jo",
-    "livewire-tables::No items found. Try to broaden your search.": "Nuk u gjetën artikuj. Provoni të zgjeroni kërkimin tuaj.",
-    "livewire-tables::of": "nga",
-    "livewire-tables::Remove filter option": "Hiq opsionin e filtrit",
-    "livewire-tables::Remove sort option": "Hiq opsionin e renditjes",
-    "livewire-tables::Reorder": "Riorganizo",
-    "livewire-tables::results": "rezultate",
-    "livewire-tables::row": "rreshti",
-    "livewire-tables::rows": "rreshtat",
-    "livewire-tables::rows, do you want to select all": "rreshtat, dëshironi të zgjidhni të gjitha",
-    "livewire-tables::Search": "Kërko",
-    "livewire-tables::Select All": "Zgjidh të gjitha",
-    "livewire-tables::Select All On Page": "Zgjidh të gjitha në faqe",
-    "livewire-tables::Showing": "Duke treguar",
-    "livewire-tables::to": "te",
-    "livewire-tables::Yes": "Po",
-    "livewire-tables::You are currently selecting all": "Po zgjedhni të gjitha aktualisht",
-    "livewire-tables::You are not connected to the internet.": "Nuk jeni të lidhur me internetin.",
-    "livewire-tables::You have selected": "Keni zgjedhur",
-    "All": "Të gjitha",
-    "All Columns": "Të gjitha kolonat",
-    "Applied Filters": "Filtrat e aplikuara",
-    "Applied Sorting": "Renditja e aplikuar",
-    "Bulk Actions": "Veprime në masë",
-    "Bulk Actions Confirm": "A jeni i sigurt?",
-    "Clear": "Pastro",
-    "Columns": "Kolonat",
-    "Debugging Values": "Vlerat e korrigjimit",
-    "Deselect All": "Heq të gjitha",
-    "Done Reordering": "Përfundoi riorganizimi",
-    "Filters": "Filtrat",
-    "max": "Maksimumi",
-    "min": "Minimumi",
-    "not_applicable": "N/A",
-    "No": "Jo",
-    "No items found. Try to broaden your search.": "Nuk u gjetën artikuj. Provoni të zgjeroni kërkimin tuaj.",
-    "of": "nga",
-    "Remove filter option": "Hiq opsionin e filtrit",
-    "Remove sort option": "Hiq opsionin e renditjes",
-    "Reorder": "Riorganizo",
-    "results": "rezultate",
-    "row": "rreshti",
-    "rows": "rreshtat",
-    "rows, do you want to select all": "rreshtat, dëshironi të zgjidhni të gjitha",
-    "Search": "Kërko",
-    "Select All": "Zgjidh të gjitha",
-    "Select All On Page": "Zgjidh të gjitha në faqe",
-    "Showing": "Duke treguar",
-    "to": "te",
-    "Yes": "Po",
-    "You are currently selecting all": "Po zgjedhni të gjitha aktualisht",
-    "You are not connected to the internet.": "Nuk jeni të lidhur me internetin.",
-    "You have selected": "Keni zgjedhur"
-}
diff --git a/resources/lang/sq/core.php b/resources/lang/sq/core.php
new file mode 100644
index 000000000..3ea3ea6b9
--- /dev/null
+++ b/resources/lang/sq/core.php
@@ -0,0 +1,38 @@
+<?php
+
+return [
+    'All' => 'Të gjitha',
+    'All Columns' => 'Të gjitha kolonat',
+    'Applied Filters' => 'Filtrat e aplikuara',
+    'Applied Sorting' => 'Renditja e aplikuar',
+    'Bulk Actions' => 'Veprime në masë',
+    'Bulk Actions Confirm' => 'A jeni i sigurt?',
+    'Clear' => 'Pastro',
+    'Columns' => 'Kolonat',
+    'Debugging Values' => 'Vlerat e korrigjimit',
+    'Deselect All' => 'Heq të gjitha',
+    'Done Reordering' => 'Përfundoi riorganizimi',
+    'Filters' => 'Filtrat',
+    'max' => 'Maksimumi',
+    'min' => 'Minimumi',
+    'not_applicable' => 'N/A',
+    'No' => 'Jo',
+    'No items found, try to broaden your search' => 'Nuk u gjetën artikuj. Provoni të zgjeroni kërkimin tuaj',
+    'of' => 'nga',
+    'Remove filter option' => 'Hiq opsionin e filtrit',
+    'Remove sort option' => 'Hiq opsionin e renditjes',
+    'Reorder' => 'Riorganizo',
+    'results' => 'rezultate',
+    'row' => 'rreshti',
+    'rows' => 'rreshtat',
+    'rows, do you want to select all' => 'rreshtat, dëshironi të zgjidhni të gjitha',
+    'Search' => 'Kërko',
+    'Select All' => 'Zgjidh të gjitha',
+    'Select All On Page' => 'Zgjidh të gjitha në faqe',
+    'Showing' => 'Duke treguar',
+    'to' => 'te',
+    'Yes' => 'Po',
+    'You are currently selecting all' => 'Po zgjedhni të gjitha aktualisht',
+    'You are not connected to the internet' => 'Nuk jeni të lidhur me internetin',
+    'You have selected' => 'Keni zgjedhur',
+];
diff --git a/resources/lang/sv.json b/resources/lang/sv.json
deleted file mode 100644
index 4bfd4cbfb..000000000
--- a/resources/lang/sv.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "livewire-tables::All": "Alla",
-  "livewire-tables::All Columns": "Alla Columner",
-  "livewire-tables::Applied Filters": "Valda filter",
-  "livewire-tables::Applied Sorting": "Vald sortering",
-  "livewire-tables::Bulk Actions": "Bulk Modifiering",
-  "livewire-tables::Bulk Actions Confirm": "Är du säker?",
-  "livewire-tables::Clear": "Rensa",
-  "livewire-tables::Columns": "Columner",
-  "livewire-tables::Debugging Values": "Debug Värden",
-  "livewire-tables::Deselect All": "Avmarkera alla",
-  "livewire-tables::Done Reordering": "Omordning klart",
-  "livewire-tables::Filters": "Filter",
-  "livewire-tables::max": "Max",
-  "livewire-tables::min": "Min",
-  "livewire-tables::not_applicable": "N/A",
-  "livewire-tables::No": "Nej",
-  "livewire-tables::No items found. Try to broaden your search.": "Inga föremål hittades. Försök vidga din sökning.",
-  "livewire-tables::of": "av",
-  "livewire-tables::Remove filter option": "Rensa valt filter",
-  "livewire-tables::Remove sort option": "Rensa vald sortering",
-  "livewire-tables::Reorder": "Omordna",
-  "livewire-tables::results": "resultat",
-  "livewire-tables::row": "rad",
-  "livewire-tables::rows": "rader",
-  "livewire-tables::rows, do you want to select all": "rader, vill du markera alla",
-  "livewire-tables::Search": "Sök",
-  "livewire-tables::Select All": "Markera alla",
-  "livewire-tables::Select All On Page": "Markera alla på sidan",
-  "livewire-tables::Showing": "Visar",
-  "livewire-tables::to": "till",
-  "livewire-tables::Yes": "Ja",
-  "livewire-tables::You are currently selecting all": "Du markerar för närvarande alla",
-  "livewire-tables::You are not connected to the internet.": "Du är inte uppkopplad till internet.",
-  "livewire-tables::You have selected": "Du har markerat"
-}
diff --git a/resources/lang/sv/core.php b/resources/lang/sv/core.php
new file mode 100644
index 000000000..002c64dfe
--- /dev/null
+++ b/resources/lang/sv/core.php
@@ -0,0 +1,38 @@
+<?php
+
+return [
+    'All' => 'Alla',
+    'All Columns' => 'Alla Columner',
+    'Applied Filters' => 'Valda filter',
+    'Applied Sorting' => 'Vald sortering',
+    'Bulk Actions' => 'Bulk Modifiering',
+    'Bulk Actions Confirm' => 'Är du säker?',
+    'Clear' => 'Rensa',
+    'Columns' => 'Columner',
+    'Debugging Values' => 'Debug Värden',
+    'Deselect All' => 'Avmarkera alla',
+    'Done Reordering' => 'Omordning klart',
+    'Filters' => 'Filter',
+    'max' => 'Max',
+    'min' => 'Min',
+    'not_applicable' => 'N/A',
+    'No' => 'Nej',
+    'No items found, try to broaden your search' => 'Inga föremål hittades. Försök vidga din sökning',
+    'of' => 'av',
+    'Remove filter option' => 'Rensa valt filter',
+    'Remove sort option' => 'Rensa vald sortering',
+    'Reorder' => 'Omordna',
+    'results' => 'resultat',
+    'row' => 'rad',
+    'rows' => 'rader',
+    'rows, do you want to select all' => 'rader, vill du markera alla',
+    'Search' => 'Sök',
+    'Select All' => 'Markera alla',
+    'Select All On Page' => 'Markera alla på sidan',
+    'Showing' => 'Visar',
+    'to' => 'till',
+    'Yes' => 'Ja',
+    'You are currently selecting all' => 'Du markerar för närvarande alla',
+    'You are not connected to the internet' => 'Du är inte uppkopplad till internet',
+    'You have selected' => 'Du har markerat',
+];
diff --git a/resources/lang/th.json b/resources/lang/th.json
deleted file mode 100644
index 35c21b7fd..000000000
--- a/resources/lang/th.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "livewire-tables::All": "ทั้งหมด",
-    "livewire-tables::All Columns": "คอลัมน์ทั้งหมด",
-    "livewire-tables::Applied Filters": "กรองข้อมูลตาม",
-    "livewire-tables::Applied Sorting": "เรียงลำดับตาม",
-    "livewire-tables::Bulk Actions": "เลือกการกระทำ",
-    "livewire-tables::Bulk Actions Confirm": "คุณแน่ใจ?",
-    "livewire-tables::Clear": "ล้างทั้งหมด",
-    "livewire-tables::Columns": "เลือกคอลัมน์",
-    "livewire-tables::Debugging Values": "ค่าการดีบัก",
-    "livewire-tables::Deselect All": "ไม่เลือกทั้งหมด",
-    "livewire-tables::Done Reordering": "จัดลำดับแล้ว",
-    "livewire-tables::Filters": "ตัวกรอง",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "เลขที่",
-    "livewire-tables::No items found. Try to broaden your search.": "ไม่พบรายการที่ค้นหา",
-    "livewire-tables::of": "จาก",
-    "livewire-tables::Remove filter option": "เอาตัวกรองออก",
-    "livewire-tables::Remove sort option": "เอาการเรียงลำดับออก",
-    "livewire-tables::Reorder": "จัดลำดับ",
-    "livewire-tables::results": "รายการ",
-    "livewire-tables::row": "รายการ",
-    "livewire-tables::rows": "รายการ",
-    "livewire-tables::rows, do you want to select all": "รายการ, คุณต้องการเลือกทั้งหมด",
-    "livewire-tables::Search": "ค้นหา...",
-    "livewire-tables::Select All": "เลือกทั้งหมด",
-    "livewire-tables::Select All On Page": "เลือกทั้งหมดบนหน้า",
-    "livewire-tables::Showing": "แสดง",
-    "livewire-tables::to": "-",
-    "livewire-tables::Yes": "ใช่",
-    "livewire-tables::You are currently selecting all": "ขณะนี้คุณได้เลือกทุกรายการ",
-    "livewire-tables::You are not connected to the internet.": "ขณะนี้คุณไม่ได้เชื่อมต่อกับอินเทอร์เน็ต",
-    "livewire-tables::You have selected": "คุณเลือก",
-    "All": "ทั้งหมด",
-    "All Columns": "คอลัมน์ทั้งหมด",
-    "Applied Filters": "กรองข้อมูลตาม",
-    "Applied Sorting": "เรียงลำดับตาม",
-    "Bulk Actions": "เลือกการกระทำ",
-    "Bulk Actions Confirm": "คุณแน่ใจ?",
-    "Clear": "ล้างทั้งหมด",
-    "Columns": "เลือกคอลัมน์",
-    "Debugging Values": "ค่าการดีบัก",
-    "Deselect All": "ไม่เลือกทั้งหมด",
-    "Done Reordering": "จัดลำดับแล้ว",
-    "Filters": "ตัวกรอง",
-    "not_applicable": "N/A",
-    "No": "เลขที่",
-    "No items found. Try to broaden your search.": "ไม่พบรายการที่ค้นหา",
-    "of": "จาก",
-    "Remove filter option": "เอาตัวกรองออก",
-    "Remove sort option": "เอาการเรียงลำดับออก",
-    "Reorder": "จัดลำดับ",
-    "results": "รายการ",
-    "row": "รายการ",
-    "rows": "รายการ",
-    "rows, do you want to select all": "รายการ, คุณต้องการเลือกทั้งหมด",
-    "Search": "ค้นหา...",
-    "Select All": "เลือกทั้งหมด",
-    "Select All On Page": "เลือกทั้งหมดบนหน้า",
-    "Showing": "แสดง",
-    "to": "-",
-    "Yes": "ใช่",
-    "You are currently selecting all": "ขณะนี้คุณได้เลือกทุกรายการ",
-    "You are not connected to the internet.": "ขณะนี้คุณไม่ได้เชื่อมต่อกับอินเทอร์เน็ต",
-    "You have selected": "คุณเลือก"
-}
\ No newline at end of file
diff --git a/resources/lang/th/core.php b/resources/lang/th/core.php
new file mode 100644
index 000000000..bcbe31590
--- /dev/null
+++ b/resources/lang/th/core.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'All' => 'ทั้งหมด',
+    'All Columns' => 'คอลัมน์ทั้งหมด',
+    'Applied Filters' => 'กรองข้อมูลตาม',
+    'Applied Sorting' => 'เรียงลำดับตาม',
+    'Bulk Actions' => 'เลือกการกระทำ',
+    'Bulk Actions Confirm' => 'คุณแน่ใจ?',
+    'Clear' => 'ล้างทั้งหมด',
+    'Columns' => 'เลือกคอลัมน์',
+    'Debugging Values' => 'ค่าการดีบัก',
+    'Deselect All' => 'ไม่เลือกทั้งหมด',
+    'Done Reordering' => 'จัดลำดับแล้ว',
+    'Filters' => 'ตัวกรอง',
+    'not_applicable' => 'N/A',
+    'No' => 'เลขที่',
+    'No items found, try to broaden your search' => 'ไม่พบรายการที่ค้นหา',
+    'of' => 'จาก',
+    'Remove filter option' => 'เอาตัวกรองออก',
+    'Remove sort option' => 'เอาการเรียงลำดับออก',
+    'Reorder' => 'จัดลำดับ',
+    'results' => 'รายการ',
+    'row' => 'รายการ',
+    'rows' => 'รายการ',
+    'rows, do you want to select all' => 'รายการ, คุณต้องการเลือกทั้งหมด',
+    'Search' => 'ค้นหา...',
+    'Select All' => 'เลือกทั้งหมด',
+    'Select All On Page' => 'เลือกทั้งหมดบนหน้า',
+    'Showing' => 'แสดง',
+    'to' => '-',
+    'Yes' => 'ใช่',
+    'You are currently selecting all' => 'ขณะนี้คุณได้เลือกทุกรายการ',
+    'You are not connected to the internet' => 'ขณะนี้คุณไม่ได้เชื่อมต่อกับอินเทอร์เน็ต',
+    'You have selected' => 'คุณเลือก',
+];
diff --git a/resources/lang/tk.json b/resources/lang/tk.json
deleted file mode 100644
index 2099d845f..000000000
--- a/resources/lang/tk.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "livewire-tables::All": "Hemmesi",
-    "livewire-tables::All Columns": "Colhli sütünler",
-    "livewire-tables::Applied Filters": "Ulanylýan Süzgüçler",
-    "livewire-tables::Applied Sorting": "Ulanylýan Tertipleşdirme",
-    "livewire-tables::Bulk Actions": "Köpçülikleýin Hereketler",
-    "livewire-tables::Clear": "Arassala",
-    "livewire-tables::Columns": "Sütünler",
-    "livewire-tables::Debugging Values": "Gymmatlyklary düzetmek",
-    "livewire-tables::Deselect All": "Hemmesini Aýyr",
-    "livewire-tables::Done Reordering": "Täzeden Tertiplendi",
-    "livewire-tables::Filters": "Süzgüçler",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Hayir",
-    "livewire-tables::No items found. Try to broaden your search.": "Hiç zat tapylmady. Gözlegiňizi giňeltmäge synanyşyň.",
-    "livewire-tables::of": "aralygy",
-    "livewire-tables::Remove filter option": "Süzgüç görnüşini aýyryň",
-    "livewire-tables::Remove sort option": "Tertiplemek görnüşini aýyryň",
-    "livewire-tables::Reorder": "Tertibe salmak",
-    "livewire-tables::results": "netijeler",
-    "livewire-tables::row": "hatarlar",
-    "livewire-tables::rows": "hatarlar",
-    "livewire-tables::rows, do you want to select all": "hatarlar, hemmesini saýlamak isleýärsiňizmi?",
-    "livewire-tables::Search": "Gözlemek",
-    "livewire-tables::Select All": "Hepsini seç",
-    "livewire-tables::Showing": "Görkezmek",
-    "livewire-tables::to": "-",
-    "livewire-tables::Yes": "Evet",
-    "livewire-tables::You are currently selecting all": "Häzirki wagtda hemmesini saýlap alýarsyňyz",
-    "livewire-tables::You are not connected to the internet.": "Siz internete birikmediksiňiz.",
-    "livewire-tables::You have selected": "Saýladyňyz",
-    "All": "Hemmesi",
-    "All Columns": "Colhli sütünler",
-    "Applied Filters": "Ulanylýan Süzgüçler",
-    "Applied Sorting": "Ulanylýan Tertipleşdirme",
-    "Bulk Actions": "Köpçülikleýin Hereketler",
-    "Clear": "Arassala",
-    "Columns": "Sütünler",
-    "Debugging Values": "Gymmatlyklary düzetmek",
-    "Deselect All": "Hemmesini Aýyr",
-    "Done Reordering": "Täzeden Tertiplendi",
-    "Filters": "Süzgüçler",
-    "not_applicable": "N/A",
-    "No": "Hayir",
-    "No items found. Try to broaden your search.": "Hiç zat tapylmady. Gözlegiňizi giňeltmäge synanyşyň.",
-    "of": "aralygy",
-    "Remove filter option": "Süzgüç görnüşini aýyryň",
-    "Remove sort option": "Tertiplemek görnüşini aýyryň",
-    "Reorder": "Tertibe salmak",
-    "results": "netijeler",
-    "row": "hatarlar",
-    "rows": "hatarlar",
-    "rows, do you want to select all": "hatarlar, hemmesini saýlamak isleýärsiňizmi?",
-    "Search": "Gözlemek",
-    "Select All": "Hepsini seç",
-    "Showing": "Görkezmek",
-    "to": "-",
-    "Yes": "Evet",
-    "You are currently selecting all": "Häzirki wagtda hemmesini saýlap alýarsyňyz",
-    "You are not connected to the internet.": "Siz internete birikmediksiňiz.",
-    "You have selected": "Saýladyňyz"
-}
\ No newline at end of file
diff --git a/resources/lang/tk/core.php b/resources/lang/tk/core.php
new file mode 100644
index 000000000..33eaedc68
--- /dev/null
+++ b/resources/lang/tk/core.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'All' => 'Hemmesi',
+    'All Columns' => 'Colhli sütünler',
+    'Applied Filters' => 'Ulanylýan Süzgüçler',
+    'Applied Sorting' => 'Ulanylýan Tertipleşdirme',
+    'Bulk Actions' => 'Köpçülikleýin Hereketler',
+    'Clear' => 'Arassala',
+    'Columns' => 'Sütünler',
+    'Debugging Values' => 'Gymmatlyklary düzetmek',
+    'Deselect All' => 'Hemmesini Aýyr',
+    'Done Reordering' => 'Täzeden Tertiplendi',
+    'Filters' => 'Süzgüçler',
+    'not_applicable' => 'N/A',
+    'No' => 'Hayir',
+    'No items found, try to broaden your search' => 'Hiç zat tapylmady. Gözlegiňizi giňeltmäge synanyşyň',
+    'of' => 'aralygy',
+    'Remove filter option' => 'Süzgüç görnüşini aýyryň',
+    'Remove sort option' => 'Tertiplemek görnüşini aýyryň',
+    'Reorder' => 'Tertibe salmak',
+    'results' => 'netijeler',
+    'row' => 'hatarlar',
+    'rows' => 'hatarlar',
+    'rows, do you want to select all' => 'hatarlar, hemmesini saýlamak isleýärsiňizmi?',
+    'Search' => 'Gözlemek',
+    'Select All' => 'Hepsini seç',
+    'Showing' => 'Görkezmek',
+    'to' => '-',
+    'Yes' => 'Evet',
+    'You are currently selecting all' => 'Häzirki wagtda hemmesini saýlap alýarsyňyz',
+    'You are not connected to the internet' => 'Siz internete birikmediksiňiz',
+    'You have selected' => 'Saýladyňyz',
+];
diff --git a/resources/lang/tr.json b/resources/lang/tr.json
deleted file mode 100644
index f1218ae2b..000000000
--- a/resources/lang/tr.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "livewire-tables::All": "Tümü",
-    "livewire-tables::All Columns": "Tüm Sütunlar",
-    "livewire-tables::Applied Filters": "Aktif Filtreler",
-    "livewire-tables::Applied Sorting": "Aktif Sıralamalar",
-    "livewire-tables::Bulk Actions": "Toplu İşlemler",
-    "livewire-tables::Clear": "Kaldır",
-    "livewire-tables::Columns": "Kolonlar",
-    "livewire-tables::Debugging Values": "Debug Değerleri",
-    "livewire-tables::Deselect All": "Seçimleri kaldır",
-    "livewire-tables::Done Reordering": "Sıralamayı Tamamla",
-    "livewire-tables::Filters": "Filtreler",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "HAYIR",
-    "livewire-tables::No items found. Try to broaden your search.": "Kayıt bulunamadı.",
-    "livewire-tables::of": " ",
-    "livewire-tables::Remove filter option": "Filtre seçeneğini kaldır",
-    "livewire-tables::Remove sort option": "Sıralama seçeneğini kaldır",
-    "livewire-tables::Reorder": "Yeniden Sırala",
-    "livewire-tables::results": "toplam sonuç",
-    "livewire-tables::row": "satır",
-    "livewire-tables::rows": "satır",
-    "livewire-tables::rows, do you want to select all": "satır seçtiniz. Hepsini seçmek ister misiniz?",
-    "livewire-tables::Search": "Ara",
-    "livewire-tables::Select All": "Hepsini seç",
-    "livewire-tables::Showing": "Gösterilen",
-    "livewire-tables::to": " - ",
-    "livewire-tables::Yes": "Evet",
-    "livewire-tables::You are currently selecting all": "Hepsini seçtiniz.",
-    "livewire-tables::You are not connected to the internet.": "İnternet bağlantınız kesildi.",
-    "livewire-tables::You have selected": "Siz seçildiniz",
-    "All": "Tümü",
-    "All Columns": "Tüm Sütunlar",
-    "Applied Filters": "Aktif Filtreler",
-    "Applied Sorting": "Aktif Sıralamalar",
-    "Bulk Actions": "Toplu İşlemler",
-    "Clear": "Kaldır",
-    "Columns": "Kolonlar",
-    "Debugging Values": "Debug Değerleri",
-    "Deselect All": "Seçimleri kaldır",
-    "Done Reordering": "Sıralamayı Tamamla",
-    "Filters": "Filtreler",
-    "not_applicable": "N/A",
-    "No": "HAYIR",
-    "No items found. Try to broaden your search.": "Kayıt bulunamadı.",
-    "of": " ",
-    "Remove filter option": "Filtre seçeneğini kaldır",
-    "Remove sort option": "Sıralama seçeneğini kaldır",
-    "Reorder": "Yeniden Sırala",
-    "results": "toplam sonuç",
-    "row": "satır",
-    "rows": "satır",
-    "rows, do you want to select all": "satır seçtiniz. Hepsini seçmek ister misiniz?",
-    "Search": "Ara",
-    "Select All": "Hepsini seç",
-    "Showing": "Gösterilen",
-    "to": " - ",
-    "Yes": "Evet",
-    "You are currently selecting all": "Hepsini seçtiniz.",
-    "You are not connected to the internet.": "İnternet bağlantınız kesildi.",
-    "You have selected": "Siz seçildiniz"
-}
\ No newline at end of file
diff --git a/resources/lang/tr/core.php b/resources/lang/tr/core.php
new file mode 100644
index 000000000..6bb8b12e9
--- /dev/null
+++ b/resources/lang/tr/core.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'All' => 'Tümü',
+    'All Columns' => 'Tüm Sütunlar',
+    'Applied Filters' => 'Aktif Filtreler',
+    'Applied Sorting' => 'Aktif Sıralamalar',
+    'Bulk Actions' => 'Toplu İşlemler',
+    'Clear' => 'Kaldır',
+    'Columns' => 'Kolonlar',
+    'Debugging Values' => 'Debug Değerleri',
+    'Deselect All' => 'Seçimleri kaldır',
+    'Done Reordering' => 'Sıralamayı Tamamla',
+    'Filters' => 'Filtreler',
+    'not_applicable' => 'N/A',
+    'No' => 'HAYIR',
+    'No items found, try to broaden your search' => 'Kayıt bulunamadı',
+    'of' => ' ',
+    'Remove filter option' => 'Filtre seçeneğini kaldır',
+    'Remove sort option' => 'Sıralama seçeneğini kaldır',
+    'Reorder' => 'Yeniden Sırala',
+    'results' => 'toplam sonuç',
+    'row' => 'satır',
+    'rows' => 'satır',
+    'rows, do you want to select all' => 'satır seçtiniz. Hepsini seçmek ister misiniz?',
+    'Search' => 'Ara',
+    'Select All' => 'Hepsini seç',
+    'Showing' => 'Gösterilen',
+    'to' => ' - ',
+    'Yes' => 'Evet',
+    'You are currently selecting all' => 'Hepsini seçtiniz.',
+    'You are not connected to the internet' => 'İnternet bağlantınız kesildi',
+    'You have selected' => 'Siz seçildiniz',
+];
diff --git a/resources/lang/tw.json b/resources/lang/tw.json
deleted file mode 100644
index b675a47c7..000000000
--- a/resources/lang/tw.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "livewire-tables::All": "全部",
-    "livewire-tables::All Columns": "所有專欄",
-    "livewire-tables::Applied Filters": "已套用的過濾規則",
-    "livewire-tables::Applied Sorting": "已套用的搜尋規則",
-    "livewire-tables::Bulk Actions": "批次操作",
-    "livewire-tables::Bulk Actions Confirm": "你確定嗎",
-    "livewire-tables::Clear": "清除",
-    "livewire-tables::Columns": "欄位",
-    "livewire-tables::Debugging Values": "調試值",
-    "livewire-tables::Deselect All": "取消選擇",
-    "livewire-tables::Done Reordering": "排序完成",
-    "livewire-tables::Filters": "過濾規則",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "不",
-    "livewire-tables::No items found. Try to broaden your search.": "無資料呈現。請嘗試擴大搜尋範圍。",
-    "livewire-tables::of": "筆資料，共",
-    "livewire-tables::Reorder": "重新排序",
-    "livewire-tables::Remove filter option": "移除過濾規則",
-    "livewire-tables::Remove sort option": "移除排序規則",
-    "livewire-tables::results": "筆資料",
-    "livewire-tables::row": "筆資料",
-    "livewire-tables::rows": "筆資料",
-    "livewire-tables::rows, do you want to select all": "筆資料，您是否要全選",
-    "livewire-tables::Search": "搜尋",
-    "livewire-tables::Select All": "搜尋全部",
-    "livewire-tables::Select All On Page": "选择页面上的所有内容",
-    "livewire-tables::Showing": "顯示",
-    "livewire-tables::to": "至",
-    "livewire-tables::Yes": "是的",
-    "livewire-tables::You are currently selecting all": "您目前已選擇全部資料",
-    "livewire-tables::You are not connected to the internet.": "目前為離線模式",
-    "livewire-tables::You have selected": "您已選擇",
-    "All": "全部",
-    "All Columns": "所有專欄",
-    "Applied Filters": "已套用的過濾規則",
-    "Applied Sorting": "已套用的搜尋規則",
-    "Bulk Actions": "批次操作",
-    "Bulk Actions Confirm": "你確定嗎",
-    "Clear": "清除",
-    "Columns": "欄位",
-    "Debugging Values": "調試值",
-    "Deselect All": "取消選擇",
-    "Done Reordering": "排序完成",
-    "Filters": "過濾規則",
-    "not_applicable": "N/A",
-    "No": "不",
-    "No items found. Try to broaden your search.": "無資料呈現。請嘗試擴大搜尋範圍。",
-    "of": "筆資料，共",
-    "Reorder": "重新排序",
-    "Remove filter option": "移除過濾規則",
-    "Remove sort option": "移除排序規則",
-    "results": "筆資料",
-    "row": "筆資料",
-    "rows": "筆資料",
-    "rows, do you want to select all": "筆資料，您是否要全選",
-    "Search": "搜尋",
-    "Select All": "搜尋全部",
-    "Select All On Page": "选择页面上的所有内容",
-    "Showing": "顯示",
-    "to": "至",
-    "Yes": "是的",
-    "You are currently selecting all": "您目前已選擇全部資料",
-    "You are not connected to the internet.": "目前為離線模式",
-    "You have selected": "您已選擇"
-}
\ No newline at end of file
diff --git a/resources/lang/tw/core.php b/resources/lang/tw/core.php
new file mode 100644
index 000000000..ff83d8a17
--- /dev/null
+++ b/resources/lang/tw/core.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'All' => '全部',
+    'All Columns' => '所有專欄',
+    'Applied Filters' => '已套用的過濾規則',
+    'Applied Sorting' => '已套用的搜尋規則',
+    'Bulk Actions' => '批次操作',
+    'Bulk Actions Confirm' => '你確定嗎',
+    'Clear' => '清除',
+    'Columns' => '欄位',
+    'Debugging Values' => '調試值',
+    'Deselect All' => '取消選擇',
+    'Done Reordering' => '排序完成',
+    'Filters' => '過濾規則',
+    'not_applicable' => 'N/A',
+    'No' => '不',
+    'No items found, try to broaden your search' => '無資料呈現。請嘗試擴大搜尋範圍',
+    'of' => '筆資料，共',
+    'Reorder' => '重新排序',
+    'Remove filter option' => '移除過濾規則',
+    'Remove sort option' => '移除排序規則',
+    'results' => '筆資料',
+    'row' => '筆資料',
+    'rows' => '筆資料',
+    'rows, do you want to select all' => '筆資料，您是否要全選',
+    'Search' => '搜尋',
+    'Select All' => '搜尋全部',
+    'Select All On Page' => '选择页面上的所有内容',
+    'Showing' => '顯示',
+    'to' => '至',
+    'Yes' => '是的',
+    'You are currently selecting all' => '您目前已選擇全部資料',
+    'You are not connected to the internet' => '目前為離線模式',
+    'You have selected' => '您已選擇',
+];
diff --git a/resources/lang/uk.json b/resources/lang/uk.json
deleted file mode 100644
index 540684056..000000000
--- a/resources/lang/uk.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "livewire-tables::All": "Всі",
-    "livewire-tables::All Columns": "Усі стовпці",
-    "livewire-tables::Applied Filters": "Застосовані фільтри",
-    "livewire-tables::Applied Sorting": "Застосовані сортування",
-    "livewire-tables::Bulk Actions": "Масові дії",
-    "livewire-tables::Bulk Actions Confirm": "Vy vpevneni?",
-    "livewire-tables::Clear": "Очистити",
-    "livewire-tables::Columns": "Колонки",
-    "livewire-tables::Debugging Values": "Значення налагодження",
-    "livewire-tables::Deselect All": "Зняти вибір із усіх",
-    "livewire-tables::Done Reordering": "Сортування виконанно",
-    "livewire-tables::Filters": "Фільтри",
-    "livewire-tables::not_applicable": "N/A",
-    "livewire-tables::No": "Немає",
-    "livewire-tables::No items found. Try to broaden your search.": "Немає елементів. Спробуйте розширити пошук.",
-    "livewire-tables::of": "від",
-    "livewire-tables::Remove filter option": "Видалити опцію фільтра",
-    "livewire-tables::Remove sort option": "Видалити параметр сортування",
-    "livewire-tables::Reorder": "Змінити порядок",
-    "livewire-tables::results": "результатів",
-    "livewire-tables::row": "рядки",
-    "livewire-tables::rows": "рядки",
-    "livewire-tables::rows, do you want to select all": "рядків, ви хочете вибрати всі",
-    "livewire-tables::Search": "Пошук",
-    "livewire-tables::Select All": "Вибрати все",
-    "livewire-tables::Select All On Page": "Виберіть «Усі на сторінці",
-    "livewire-tables::Showing": "Показано",
-    "livewire-tables::to": "до",
-    "livewire-tables::Unselect All": "Прибрати вибір усіх",
-    "livewire-tables::Yes": "Так",
-    "livewire-tables::You are currently selecting all": "Наразі ви вибираєте всі",
-    "livewire-tables::You are not connected to the internet.": "Ви не підключені до Інтернету.",
-    "livewire-tables::You have selected": "Ви вибрали",
-    "All": "Всі",
-    "All Columns": "Усі стовпці",
-    "Applied Filters": "Застосовані фільтри",
-    "Applied Sorting": "Застосовані сортування",
-    "Bulk Actions": "Масові дії",
-    "Bulk Actions Confirm": "Vy vpevneni?",
-    "Clear": "Очистити",
-    "Columns": "Колонки",
-    "Debugging Values": "Значення налагодження",
-    "Deselect All": "Зняти вибір із усіх",
-    "Done Reordering": "Сортування виконанно",
-    "Filters": "Фільтри",
-    "not_applicable": "N/A",
-    "No": "Немає",
-    "No items found. Try to broaden your search.": "Немає елементів. Спробуйте розширити пошук.",
-    "of": "від",
-    "Remove filter option": "Видалити опцію фільтра",
-    "Remove sort option": "Видалити параметр сортування",
-    "Reorder": "Змінити порядок",
-    "results": "результатів",
-    "row": "рядки",
-    "rows": "рядки",
-    "rows, do you want to select all": "рядків, ви хочете вибрати всі",
-    "Search": "Пошук",
-    "Select All": "Вибрати все",
-    "Select All On Page": "Виберіть «Усі на сторінці",
-    "Showing": "Показано",
-    "to": "до",
-    "Unselect All": "Прибрати вибір усіх",
-    "Yes": "Так",
-    "You are currently selecting all": "Наразі ви вибираєте всі",
-    "You are not connected to the internet.": "Ви не підключені до Інтернету.",
-    "You have selected": "Ви вибрали"
-}
\ No newline at end of file
diff --git a/resources/lang/uk/core.php b/resources/lang/uk/core.php
new file mode 100644
index 000000000..c0ea65f92
--- /dev/null
+++ b/resources/lang/uk/core.php
@@ -0,0 +1,37 @@
+<?php
+
+return [
+    'All' => 'Всі',
+    'All Columns' => 'Усі стовпці',
+    'Applied Filters' => 'Застосовані фільтри',
+    'Applied Sorting' => 'Застосовані сортування',
+    'Bulk Actions' => 'Масові дії',
+    'Bulk Actions Confirm' => 'Vy vpevneni?',
+    'Clear' => 'Очистити',
+    'Columns' => 'Колонки',
+    'Debugging Values' => 'Значення налагодження',
+    'Deselect All' => 'Зняти вибір із усіх',
+    'Done Reordering' => 'Сортування виконанно',
+    'Filters' => 'Фільтри',
+    'not_applicable' => 'N/A',
+    'No' => 'Немає',
+    'No items found, try to broaden your search' => 'Немає елементів. Спробуйте розширити пошук',
+    'of' => 'від',
+    'Remove filter option' => 'Видалити опцію фільтра',
+    'Remove sort option' => 'Видалити параметр сортування',
+    'Reorder' => 'Змінити порядок',
+    'results' => 'результатів',
+    'row' => 'рядки',
+    'rows' => 'рядки',
+    'rows, do you want to select all' => 'рядків, ви хочете вибрати всі',
+    'Search' => 'Пошук',
+    'Select All' => 'Вибрати все',
+    'Select All On Page' => 'Виберіть «Усі на сторінці',
+    'Showing' => 'Показано',
+    'to' => 'до',
+    'Unselect All' => 'Прибрати вибір усіх',
+    'Yes' => 'Так',
+    'You are currently selecting all' => 'Наразі ви вибираєте всі',
+    'You are not connected to the internet' => 'Ви не підключені до Інтернету',
+    'You have selected' => 'Ви вибрали',
+];
diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php
index 836609b67..d89a8089a 100644
--- a/resources/views/components/pagination.blade.php
+++ b/resources/views/components/pagination.blade.php
@@ -14,30 +14,30 @@
                     @if ($this->paginationIsEnabled() && $this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
                         <p class="paged-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
                             @if($this->showPaginationDetails())
-                                <span>@lang('livewire-tables::Showing')</span>
+                                <span>{{ __('livewire-tables::core.Showing') }}</span>
                                 <span class="font-medium">{{ $this->getRows->firstItem() }}</span>
-                                <span>@lang('livewire-tables::to')</span>
+                                <span>{{ __('livewire-tables::core.to') }}</span>
                                 <span class="font-medium">{{ $this->getRows->lastItem() }}</span>
-                                <span>@lang('livewire-tables::of')</span>
+                                <span>{{ __('livewire-tables::core.of') }}</span>
                                 <span class="font-medium"><span x-text="paginationTotalItemCount"></span></span>
-                                <span>@lang('livewire-tables::results')</span>
+                                <span>{{ __('livewire-tables::core.results') }}</span>
                             @endif
                         </p>
                     @elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('simple'))
                         <p class="paged-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
                             @if($this->showPaginationDetails())
-                                <span>@lang('livewire-tables::Showing')</span>
+                                <span>{{ __('livewire-tables::core.Showing') }}</span>
                                 <span class="font-medium">{{ $this->getRows->firstItem() }}</span>
-                                <span>@lang('livewire-tables::to')</span>
+                                <span>{{ __('livewire-tables::core.to') }}</span>
                                 <span class="font-medium">{{ $this->getRows->lastItem() }}</span>
                             @endif
                         </p>
                     @elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('cursor'))
                     @else
                         <p class="total-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
-                            @lang('livewire-tables::Showing')
+                            {{ __('livewire-tables::core.Showing') }}
                             <span class="font-medium">{{ $this->getRows->count() }}</span>
-                            @lang('livewire-tables::results')
+                            {{ __('livewire-tables::core.results') }}
                         </p>
                     @endif
                 </div>
@@ -59,13 +59,13 @@
 
                     <div class="col-12 col-md-6 text-center text-md-right text-muted">
                         @if($this->showPaginationDetails())
-                            <span>@lang('livewire-tables::Showing')</span>
+                            <span>{{ __('livewire-tables::core.Showing') }}</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
-                            <span>@lang('livewire-tables::to')</span>
+                            <span>{{ __('livewire-tables::core.to') }}</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
-                            <span>@lang('livewire-tables::of')</span>
+                            <span>{{ __('livewire-tables::core.of') }}</span>
                             <strong><span x-text="paginationTotalItemCount"></span></strong>
-                            <span>@lang('livewire-tables::results')</span>
+                            <span>{{ __('livewire-tables::core.results') }}</span>
                         @endif
                     </div>
                 </div>
@@ -77,9 +77,9 @@
 
                     <div class="col-12 col-md-6 text-center text-md-right text-muted">
                         @if($this->showPaginationDetails())
-                            <span>@lang('livewire-tables::Showing')</span>
+                            <span>{{ __('livewire-tables::core.Showing') }}</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
-                            <span>@lang('livewire-tables::to')</span>
+                            <span>{{ __('livewire-tables::core.to') }}</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
                         @endif
                     </div>
@@ -93,9 +93,9 @@
             @else
                 <div class="row mt-3">
                     <div class="col-12 text-muted">
-                        @lang('livewire-tables::Showing')
+                        {{ __('livewire-tables::core.Showing') }}
                         <strong>{{ $this->getRows->count() }}</strong>
-                        @lang('livewire-tables::results')
+                        {{ __('livewire-tables::core.results') }}
                     </div>
                 </div>
             @endif
@@ -111,13 +111,13 @@
                     </div>
                     <div class="col-12 col-md-6 text-center text-md-end text-muted">
                         @if($this->showPaginationDetails())
-                            <span>@lang('livewire-tables::Showing')</span>
+                            <span>{{ __('livewire-tables::core.Showing') }}</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
-                            <span>@lang('livewire-tables::to')</span>
+                            <span>{{ __('livewire-tables::core.to') }}</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
-                            <span>@lang('livewire-tables::of')</span>
+                            <span>{{ __('livewire-tables::core.of') }}</span>
                             <strong><span x-text="paginationTotalItemCount"></span></strong>
-                            <span>@lang('livewire-tables::results')</span>
+                            <span>{{ __('livewire-tables::core.results') }}</span>
                         @endif
                     </div>
                 </div>
@@ -128,9 +128,9 @@
                     </div>
                     <div class="col-12 col-md-6 text-center text-md-end text-muted">
                         @if($this->showPaginationDetails())
-                            <span>@lang('livewire-tables::Showing')</span>
+                            <span>{{ __('livewire-tables::core.Showing') }}</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
-                            <span>@lang('livewire-tables::to')</span>
+                            <span>{{ __('livewire-tables::core.to') }}</span>
                             <strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
                         @endif
                     </div>
@@ -144,9 +144,9 @@
             @else
                 <div class="row mt-3">
                     <div class="col-12 text-muted">
-                        @lang('livewire-tables::Showing')
+                        {{ __('livewire-tables::core.Showing') }}
                         <strong>{{ $this->getRows->count() }}</strong>
-                        @lang('livewire-tables::results')
+                        {{ __('livewire-tables::core.results') }}
                     </div>
                 </div>
             @endif
diff --git a/resources/views/components/table/tr/bulk-actions.blade.php b/resources/views/components/table/tr/bulk-actions.blade.php
index f9946b2b9..cd8dd4e18 100644
--- a/resources/views/components/table/tr/bulk-actions.blade.php
+++ b/resources/views/components/table/tr/bulk-actions.blade.php
@@ -17,9 +17,9 @@ class="bg-indigo-50 dark:bg-gray-900 dark:text-white"
                 <template x-if="selectedItems.length == paginationTotalItemCount || selectAllStatus">
                     <div wire:key="{{ $tableName }}-all-selected">
                         <span>
-                            @lang('livewire-tables::You are currently selecting all')
+                            {{ __('livewire-tables::core.You are currently selecting all') }}
                             @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
-                            @lang('livewire-tables::rows').
+                            {{ __('livewire-tables::core.rows') }}.
                         </span>
 
                         <button
@@ -28,7 +28,7 @@ class="bg-indigo-50 dark:bg-gray-900 dark:text-white"
                             type="button"
                             class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium focus:outline-none focus:text-gray-800 focus:underline transition duration-150 ease-in-out dark:text-white dark:hover:text-gray-400"
                         >
-                            @lang('livewire-tables::Deselect All')
+                            {{ __('livewire-tables::core.Deselect All') }}
                         </button>
                     </div>
                 </template>
@@ -36,9 +36,9 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                 <template x-if="selectedItems.length !== paginationTotalItemCount && !selectAllStatus">
                     <div wire:key="{{ $tableName }}-some-selected">
                         <span>
-                            @lang('livewire-tables::You have selected')
+                            {{ __('livewire-tables::core.You have selected') }}
                             <strong><span x-text="selectedItems.length"></span></strong>
-                            @lang('livewire-tables::rows, do you want to select all')
+                            {{ __('livewire-tables::core.rows, do you want to select all') }}
                             @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
                         </span>
 
@@ -47,8 +47,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                             wire:loading.attr="disabled"
                             type="button"
                             class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium focus:outline-none focus:text-gray-800 focus:underline transition duration-150 ease-in-out dark:text-white dark:hover:text-gray-400"
-                        >
-                            @lang('livewire-tables::Select All On Page')
+                        >{{ __('livewire-tables::core.Select All On Page') }}
                         </button>&nbsp;
 
                         <button
@@ -57,7 +56,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                             type="button"
                             class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium focus:outline-none focus:text-gray-800 focus:underline transition duration-150 ease-in-out dark:text-white dark:hover:text-gray-400"
                         >
-                            @lang('livewire-tables::Select All')
+                            {{ __('livewire-tables::core.Select All') }}
                         </button>
 
                         <button
@@ -66,7 +65,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                             type="button"
                             class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium focus:outline-none focus:text-gray-800 focus:underline transition duration-150 ease-in-out dark:text-white dark:hover:text-gray-400"
                         >
-                            @lang('livewire-tables::Deselect All')
+                            {{ __('livewire-tables::core.Deselect All') }}
                         </button>
                     </div>
                 </template>
@@ -81,9 +80,10 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                 <template x-if="selectedItems.length == paginationTotalItemCount || selectAllStatus">
                     <div wire:key="{{ $tableName }}-all-selected">
                         <span>
-                            @lang('livewire-tables::You are currently selecting all')
-                            @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
-                            @lang('livewire-tables::rows').
+                        {{ __('livewire-tables::core.You are currently selecting all') }}
+                        @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
+                            {{ __('livewire-tables::core.rows') }}.
+
                         </span>
 
                         <button
@@ -92,7 +92,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                             type="button"
                             class="btn btn-primary btn-sm"
                         >
-                            @lang('livewire-tables::Deselect All')
+                        {{ __('livewire-tables::core.Deselect All') }}
                         </button>
                     </div>
                 </template>
@@ -100,9 +100,9 @@ class="btn btn-primary btn-sm"
                 <template x-if="selectedItems.length !== paginationTotalItemCount && !selectAllStatus">
                     <div wire:key="{{ $tableName }}-some-selected">
                         <span>
-                            @lang('livewire-tables::You have selected')
+                            {{ __('livewire-tables::core.You have selected') }}
                             <strong><span x-text="selectedItems.length"></span></strong>
-                            @lang('livewire-tables::rows, do you want to select all')
+                            {{ __('livewire-tables::core.rows, do you want to select all') }}
                             @if(!$simplePagination) <strong><span x-text="paginationTotalItemCount"></span></strong> @endif
                         </span>
 
@@ -112,7 +112,7 @@ class="btn btn-primary btn-sm"
                             type="button"
                             class="btn btn-primary btn-sm"
                         >
-                            @lang('livewire-tables::Select All On Page')
+                            {{ __('livewire-tables::core.Select All On Page') }}
                         </button>&nbsp;
 
                         <button
@@ -121,7 +121,7 @@ class="btn btn-primary btn-sm"
                             type="button"
                             class="btn btn-primary btn-sm"
                         >
-                            @lang('livewire-tables::Select All')
+                            {{ __('livewire-tables::core.Select All') }}
                         </button>
 
                         <button
@@ -130,7 +130,7 @@ class="btn btn-primary btn-sm"
                             type="button"
                             class="btn btn-primary btn-sm"
                         >
-                            @lang('livewire-tables::Deselect All')
+                            {{ __('livewire-tables::core.Deselect All') }}
                         </button>
                     </div>
                 </template>
diff --git a/resources/views/components/tools/filter-pills.blade.php b/resources/views/components/tools/filter-pills.blade.php
index b55792b29..bfda747fc 100644
--- a/resources/views/components/tools/filter-pills.blade.php
+++ b/resources/views/components/tools/filter-pills.blade.php
@@ -10,7 +10,7 @@
                 'text-gray-700 dark:text-white' => $isTailwind,
                 '' =>  $isBootstrap,
             ])>
-                @lang('livewire-tables::Applied Filters'):
+                {{ __('livewire-tables::core.Applied Filters') }}:
             </small>
 
             @foreach($this->getAppliedFiltersWithValues() as $filterSelectName => $value)
diff --git a/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php b/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
index e4b6efb76..2d97619a1 100644
--- a/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
+++ b/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
@@ -9,7 +9,7 @@
             "inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium",
             "bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900"
             ])>
-            @lang('livewire-tables::Clear')
+            {{ __('livewire-tables::core.Clear') }}
         </span>
     </button>
 @else
@@ -20,6 +20,6 @@
             'badge badge-pill badge-light' => $isBootstrap4,
             'badge rounded-pill bg-light text-dark text-decoration-none' => $isBootstrap5,
         ])>
-        @lang('livewire-tables::Clear')
+        {{ __('livewire-tables::core.Clear') }}
     </a>
 @endif
diff --git a/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php b/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
index f33073b94..9dc045416 100644
--- a/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
+++ b/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
@@ -9,7 +9,7 @@
             "text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white",
         ])
     >
-        <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
+        <span class="sr-only">{{ __('livewire-tables::core.Remove filter option') }}</span>
         <x-heroicon-m-x-mark class="h-full" />
     </button>
 @else
@@ -23,8 +23,8 @@
         <span @class([
             'sr-only' => $isBootstrap4,
             'visually-hidden' => $isBootstrap5,
-        ])>
-            @lang('livewire-tables::Remove filter option')
+        ])>{{ __('livewire-tables::core.Remove filter option') }}
+        
         </span>
         <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-tiny"  />
     </a>
diff --git a/resources/views/components/tools/filters/boolean.blade.php b/resources/views/components/tools/filters/boolean.blade.php
index aeb2aa2a8..973dfa268 100644
--- a/resources/views/components/tools/filters/boolean.blade.php
+++ b/resources/views/components/tools/filters/boolean.blade.php
@@ -20,8 +20,9 @@ class="relative inline-flex h-6 py-0.5 ml-4 focus:outline-none rounded-full w-10
             wire:click="resetFilter('{{ $filter->getKey() }}')"
             type="button"
             class="flex-shrink-0 ml-1 h-6 w-6 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
-        >
-            <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
+        >                            
+
+            <span class="sr-only">{{ __('livewire-tables::core.Remove filter option') }}</span>
             <x-heroicon-m-x-mark class="h-6 w-6" />
         </button>
     </template>
diff --git a/resources/views/components/tools/filters/multi-select.blade.php b/resources/views/components/tools/filters/multi-select.blade.php
index e09772b19..4b8f11a4e 100644
--- a/resources/views/components/tools/filters/multi-select.blade.php
+++ b/resources/views/components/tools/filters/multi-select.blade.php
@@ -15,7 +15,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
                 @if ($filter->getFirstOption() != "")
                     {{ $filter->getFirstOption() }}
                 @else
-                    @lang('livewire-tables::All')
+                    {{ __('livewire-tables::core.All') }}
                 @endif
                 </label>
             </div>
@@ -42,7 +42,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
                 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">@lang('livewire-tables::All')</label>
+            <label class="form-check-label" for="{{ $tableName }}-filter-{{ $filter->getKey() }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif-select-all">{{ __('livewire-tables::core.All') }}</label>
         </div>
 
         @foreach($filter->getOptions() as $key => $value)
diff --git a/resources/views/components/tools/sorting-pills.blade.php b/resources/views/components/tools/sorting-pills.blade.php
index b633cf1d8..f84391319 100644
--- a/resources/views/components/tools/sorting-pills.blade.php
+++ b/resources/views/components/tools/sorting-pills.blade.php
@@ -4,7 +4,7 @@
     <div>
         @if ($this->sortingPillsAreEnabled() && $this->hasSorts())
             <div class="mb-4 px-4 md:p-0" x-cloak x-show="!currentlyReorderingStatus">
-                <small class="text-gray-700 dark:text-white">@lang('livewire-tables::Applied Sorting'):</small>
+                <small class="text-gray-700 dark:text-white">{{ __('livewire-tables::core.Applied Sorting') }}:</small>
 
                 @foreach($this->getSorts() as $columnSelectName => $direction)
                     @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName))
@@ -24,7 +24,7 @@ class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium l
                             type="button"
                             class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
                         >
-                            <span class="sr-only">@lang('livewire-tables::Remove sort option')</span>
+                            <span class="sr-only">{{ __('livewire-tables::core.Remove sort option') }}</span>
                             <x-heroicon-m-x-mark class="h-3 w-3" />
                         </button>
                     </span>
@@ -35,7 +35,7 @@ class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justif
                     class="focus:outline-none active:outline-none"
                 >
                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900">
-                        @lang('livewire-tables::Clear')
+                        {{ __('livewire-tables::core.Clear') }}
                     </span>
                 </button>
             </div>
@@ -45,7 +45,7 @@ class="focus:outline-none active:outline-none"
     <div>
         @if ($this->sortingPillsAreEnabled() && $this->hasSorts())
             <div class="mb-3" x-cloak x-show="!currentlyReorderingStatus">
-                <small>@lang('livewire-tables::Applied Sorting'):</small>
+                <small>{{ __('livewire-tables::core.Applied Sorting') }}:</small>
 
                 @foreach($this->getSorts() as $columnSelectName => $direction)
                     @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName))
@@ -65,7 +65,7 @@ class="badge badge-pill badge-info d-inline-flex align-items-center"
                             wire:click="clearSort('{{ $columnSelectName }}')"
                             class="text-white ml-2"
                         >
-                            <span class="sr-only">@lang('livewire-tables::Remove sort option')</span>
+                            <span class="sr-only">{{ __('livewire-tables::core.Remove sort option') }}</span>
                             <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-smaller" />
                         </a>
                     </span>
@@ -76,7 +76,7 @@ class="text-white ml-2"
                     wire:click.prevent="clearSorts"
                     class="badge badge-pill badge-light"
                 >
-                    @lang('livewire-tables::Clear')
+                    {{ __('livewire-tables::core.Clear') }}
                 </a>
             </div>
         @endif
@@ -85,7 +85,7 @@ class="badge badge-pill badge-light"
     <div>
         @if ($this->sortingPillsAreEnabled() && $this->hasSorts())
             <div class="mb-3" x-cloak x-show="!currentlyReorderingStatus">
-                <small>@lang('livewire-tables::Applied Sorting'):</small>
+                <small>{{ __('livewire-tables::core.Applied Sorting') }}:</small>
 
                 @foreach($this->getSorts() as $columnSelectName => $direction)
                     @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName))
@@ -105,7 +105,7 @@ class="badge rounded-pill bg-info d-inline-flex align-items-center"
                             wire:click="clearSort('{{ $columnSelectName }}')"
                             class="text-white ms-2"
                         >
-                            <span class="visually-hidden">@lang('livewire-tables::Remove sort option')</span>
+                            <span class="visually-hidden">{{ __('livewire-tables::core.Remove sort option') }}</span>
                             <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-smaller" />
                         </a>
                     </span>
@@ -116,7 +116,7 @@ class="text-white ms-2"
                     wire:click.prevent="clearSorts"
                     class="badge rounded-pill bg-light text-dark text-decoration-none"
                 >
-                    @lang('livewire-tables::Clear')
+                    {{ __('livewire-tables::core.Clear') }}
                 </a>
             </div>
         @endif
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 3be95e799..6e7cd4948 100644
--- a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
+++ b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
@@ -34,7 +34,8 @@
                         @endif
             aria-haspopup="true" aria-expanded="false">
 
-            @lang('livewire-tables::Bulk Actions')
+            {{ __('livewire-tables::core.Bulk Actions') }}
+
             @if($this->isTailwind)
                 <x-heroicon-m-chevron-down class="-mr-1 ml-2 h-5 w-5" />
             @endif
diff --git a/resources/views/components/tools/toolbar/items/column-select.blade.php b/resources/views/components/tools/toolbar/items/column-select.blade.php
index 24033daee..d74d71efd 100644
--- a/resources/views/components/tools/toolbar/items/column-select.blade.php
+++ b/resources/views/components/tools/toolbar/items/column-select.blade.php
@@ -18,7 +18,7 @@ class="inline-flex justify-center px-4 py-2 w-full text-sm font-medium text-gray
                     x-bind:aria-expanded="open"
                     aria-expanded="true"
                 >
-                    @lang('livewire-tables::Columns')
+                    {{ __('livewire-tables::core.Columns') }}
 
                     <x-heroicon-m-chevron-down class="-mr-1 ml-2 h-5 w-5" />
                 </button>
@@ -51,7 +51,7 @@ class="text-indigo-600 transition duration-150 ease-in-out border-gray-300 round
                                 @checked($component->getSelectableSelectedColumns()->count() == $component->getSelectableColumns()->count())
                                 @if($component->getSelectableSelectedColumns()->count() == $component->getSelectableColumns()->count())  wire:click="deselectAllColumns" @else wire:click="selectAllColumns" @endif
                             >
-                            <span class="ml-2">@lang('livewire-tables::All Columns')</span>
+                            <span class="ml-2">{{ __('livewire-tables::core.All Columns') }}</span>
                         </label>
                     </div>
 
@@ -104,7 +104,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
             type="button" id="{{ $tableName }}-columnSelect" aria-haspopup="true"
             x-bind:aria-expanded="open"
         >
-            @lang('livewire-tables::Columns')
+            {{ __('livewire-tables::core.Columns') }}
         </button>
 
         <div
@@ -124,7 +124,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
                             @if($component->getSelectableSelectedColumns()->count() == $component->getSelectableColumns()->count()) checked wire:click="deselectAllColumns" @else unchecked wire:click="selectAllColumns" @endif
                         />
 
-                        <span class="ml-2">@lang('livewire-tables::All Columns')</span>
+                        <span class="ml-2">{{ __('livewire-tables::core.All Columns') }}</span>
                         
 
                     </label>
@@ -139,7 +139,7 @@ class="form-check-input"
                     />
 
                     <label wire:loading.attr="disabled" class="form-check-label">
-                        @lang('livewire-tables::All Columns')
+                        {{ __('livewire-tables::core.All Columns') }}
                     </label>
                 </div>
             @endif
diff --git a/resources/views/components/tools/toolbar/items/filter-button.blade.php b/resources/views/components/tools/toolbar/items/filter-button.blade.php
index f3488639e..225f71dd0 100644
--- a/resources/views/components/tools/toolbar/items/filter-button.blade.php
+++ b/resources/views/components/tools/toolbar/items/filter-button.blade.php
@@ -33,7 +33,7 @@
                 @endif
                 @if ($this->isFilterLayoutSlideDown()) x-on:click="filtersOpen = !filtersOpen" @endif
             >
-                @lang('livewire-tables::Filters')
+                {{ __('livewire-tables::core.Filters') }}
 
                 @if ($count = $this->getFilterBadgeCount())
                     <span @class([
diff --git a/resources/views/components/tools/toolbar/items/filter-popover.blade.php b/resources/views/components/tools/toolbar/items/filter-popover.blade.php
index 0ff205d97..f7810e036 100644
--- a/resources/views/components/tools/toolbar/items/filter-popover.blade.php
+++ b/resources/views/components/tools/toolbar/items/filter-popover.blade.php
@@ -36,7 +36,7 @@
                     'dropdown-item text-center' => $this->isBootstrap5,
                 ])
             >
-                @lang('livewire-tables::Clear')
+                {{ __('livewire-tables::core.Clear') }}
             </button>
         @endif
     </ul>
@@ -74,7 +74,7 @@ class="block px-4 py-2 text-sm text-gray-700 space-y-1"
                     type="button"
                     class="w-full inline-flex items-center justify-center px-3 py-2 border border-gray-300 shadow-sm text-sm leading-4 font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:border-gray-600 dark:text-white dark:hover:border-gray-500 dark:hover:bg-gray-600"
                 >
-                    @lang('livewire-tables::Clear')
+                    {{ __('livewire-tables::core.Clear') }}
                 </button>
             </div>
         @endif
diff --git a/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php b/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php
index 5a2ae1845..46f2e83ff 100644
--- a/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php
+++ b/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php
@@ -21,7 +21,7 @@
                 value="{{ $item }}"
                 wire:key="{{ $tableName }}-per-page-{{ $item }}"
             >
-                {{ $item === -1 ? __('livewire-tables::All') : $item }}
+                {{ $item === -1 ? __('livewire-tables::core.All') : $item }}
             </option>
         @endforeach
     </select>
diff --git a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
index 061b2ea8c..b33ea1d86 100644
--- a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
+++ b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
@@ -14,11 +14,11 @@
         ])
     >
         <span x-cloak x-show="currentlyReorderingStatus">
-            @lang('livewire-tables::Cancel')
+         {{ __('livewire-tables::core.Cancel') }}
         </span>
 
         <span x-cloak x-show="!currentlyReorderingStatus">
-            @lang('livewire-tables::Reorder')
+        {{ __('livewire-tables::core.Reorder') }}
         </span>
 
     </button>
@@ -33,7 +33,7 @@
             ])
         >
             <span>
-                @lang('livewire-tables::Save')
+            {{ __('livewire-tables::core.Save') }}
             </span>
         </button>
     </div>
diff --git a/resources/views/includes/debug.blade.php b/resources/views/includes/debug.blade.php
index d737f6941..791a7cfbb 100644
--- a/resources/views/includes/debug.blade.php
+++ b/resources/views/includes/debug.blade.php
@@ -1,6 +1,7 @@
 <div>
     @if ($this->debugIsEnabled())
-        <p><strong>@lang('livewire-tables::Debugging Values'):</strong></p>
+        <p><strong>{{ __('livewire-tables::core.Debugging Values') }}:</strong></p>
+        
 
         @if (! app()->runningInConsole())
             <div class="mb-4">@dump((new \Rappasoft\LaravelLivewireTables\DataTransferObjects\DebuggableData($this))->toArray())</div>
diff --git a/resources/views/includes/offline.blade.php b/resources/views/includes/offline.blade.php
index ae5dc5f37..c4889608b 100644
--- a/resources/views/includes/offline.blade.php
+++ b/resources/views/includes/offline.blade.php
@@ -9,7 +9,7 @@
                     </div>
                     <div class="ml-3">
                         <h3 class="text-sm font-medium text-red-800 dark:text-white">
-                            @lang('livewire-tables::You are not connected to the internet.')
+                            {{ __('livewire-tables::core.You are not connected to the internet') }}.
                         </h3>
                     </div>
                 </div>
@@ -19,7 +19,8 @@
         <div wire:offline.class.remove="d-none" class="d-none">
             <div class="alert alert-danger d-flex align-items-center">
                 <x-heroicon-s-x-circle class="laravel-livewire-tables-btn-md" />
-                <span class="d-inline-block ml-2">@lang('livewire-tables::You are not connected to the internet.')</span>
+                <span class="d-inline-block ml-2">{{ __('livewire-tables::core.You are not connected to the internet') }}.
+                </span>
             </div>
         </div>
     @endif
diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index e10027b51..7002ae8d0 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -25,14 +25,7 @@ public function boot(): void
         );
 
         // Load Default Translations
-        $this->loadJsonTranslationsFrom(
-            __DIR__.'/../resources/lang'
-        );
-
-        // Override if Published
-        $this->loadJsonTranslationsFrom(
-            $this->app->langPath('vendor/livewire-tables')
-        );
+        $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'livewire-tables');
 
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'livewire-tables');
 
diff --git a/src/Traits/ComponentUtilities.php b/src/Traits/ComponentUtilities.php
index de24d0e72..a8aa3832e 100644
--- a/src/Traits/ComponentUtilities.php
+++ b/src/Traits/ComponentUtilities.php
@@ -34,7 +34,7 @@ trait ComponentUtilities
 
     protected bool $eagerLoadAllRelationsStatus = false;
 
-    protected string $emptyMessage = 'No items found. Try to broaden your search.';
+    protected string $emptyMessage = 'No items found, try to broaden your search';
 
     protected array $additionalSelects = [];
 
diff --git a/src/Traits/Helpers/BulkActionsHelpers.php b/src/Traits/Helpers/BulkActionsHelpers.php
index 95c116900..7093f574c 100644
--- a/src/Traits/Helpers/BulkActionsHelpers.php
+++ b/src/Traits/Helpers/BulkActionsHelpers.php
@@ -181,7 +181,7 @@ public function getBulkActionConfirmMessage(string $bulkAction): string
 
     public function getBulkActionDefaultConfirmationMessage(): string
     {
-        return isset($this->bulkActionConfirmDefaultMessage) ? $this->bulkActionConfirmDefaultMessage : __('livewire-tables::Bulk Actions Confirm');
+        return isset($this->bulkActionConfirmDefaultMessage) ? $this->bulkActionConfirmDefaultMessage : __('livewire-tables::core.Bulk Actions Confirm');
     }
 
     #[Computed]
diff --git a/src/Traits/Helpers/ComponentHelpers.php b/src/Traits/Helpers/ComponentHelpers.php
index 980d8d28e..7ddce544b 100644
--- a/src/Traits/Helpers/ComponentHelpers.php
+++ b/src/Traits/Helpers/ComponentHelpers.php
@@ -62,7 +62,11 @@ public function getModel()
      */
     public function getEmptyMessage(): string
     {
-        return __($this->emptyMessage);
+        if ($this->emptyMessage == 'No items found, try to broaden your search') {
+            return __('livewire-tables::core.No items found, try to broaden your search');
+        }
+
+        return $this->emptyMessage;
     }
 
     public function getOfflineIndicatorStatus(): bool
diff --git a/src/Traits/Helpers/LoadingPlaceholderHelpers.php b/src/Traits/Helpers/LoadingPlaceholderHelpers.php
index cd43c583f..ff3ee633e 100644
--- a/src/Traits/Helpers/LoadingPlaceholderHelpers.php
+++ b/src/Traits/Helpers/LoadingPlaceholderHelpers.php
@@ -16,7 +16,7 @@ public function getDisplayLoadingPlaceholder(): bool
 
     public function getLoadingPlaceholderContent(): string
     {
-        return $this->loadingPlaceholderContent ?? __('livewire-tables::loading');
+        return $this->loadingPlaceholderContent ?? __('livewire-tables::core.loading');
     }
 
     public function hasLoadingPlaceholderBlade(): bool
diff --git a/src/Traits/Helpers/SearchHelpers.php b/src/Traits/Helpers/SearchHelpers.php
index 059c17d32..1027778e5 100644
--- a/src/Traits/Helpers/SearchHelpers.php
+++ b/src/Traits/Helpers/SearchHelpers.php
@@ -127,7 +127,7 @@ public function getSearchPlaceholder(): string
             return $this->searchPlaceholder;
         }
 
-        return __('livewire-tables::Search');
+        return __('livewire-tables::core.Search');
     }
 
     public function hasSearchPlaceholder(): bool
diff --git a/src/Views/Filters/DateRangeFilter.php b/src/Views/Filters/DateRangeFilter.php
index 3c0d0a95e..7fae05c82 100644
--- a/src/Views/Filters/DateRangeFilter.php
+++ b/src/Views/Filters/DateRangeFilter.php
@@ -189,7 +189,7 @@ public function getFilterPillValue($value): array|string|bool|null
 
             if (($minDate instanceof Carbon) && $maxDate instanceof Carbon) {
                 return $this->outputTranslatedDate($minDate)
-                        .' '.__('livewire-tables::to').' '.
+                        .' '.__('livewire-tables::core.to').' '.
                         $this->outputTranslatedDate($maxDate);
             }
         }
diff --git a/src/Views/Filters/NumberRangeFilter.php b/src/Views/Filters/NumberRangeFilter.php
index a32a83667..ce02cb26d 100644
--- a/src/Views/Filters/NumberRangeFilter.php
+++ b/src/Views/Filters/NumberRangeFilter.php
@@ -89,7 +89,7 @@ public function getDefaultValue(): array|string
     public function getFilterPillValue($values): array|string|bool|null
     {
         if ($this->validate($values)) {
-            return __('livewire-tables::min').':'.$values['min'].', '.__('livewire-tables::max').':'.$values['max'];
+            return __('livewire-tables::core.min').':'.$values['min'].', '.__('livewire-tables::core.max').':'.$values['max'];
         }
 
         return '';
diff --git a/src/Views/Traits/Columns/IsSortable.php b/src/Views/Traits/Columns/IsSortable.php
index b53c729d8..d21916001 100644
--- a/src/Views/Traits/Columns/IsSortable.php
+++ b/src/Views/Traits/Columns/IsSortable.php
@@ -99,7 +99,7 @@ public function getCustomSortingPillDirections(string $direction, ?string $defau
             return $this->sortingPillDirectionDesc ?? $defaultLabelDesc;
         }
 
-        return __('livewire-tables::not_applicable');
+        return __('livewire-tables::core.not_applicable');
     }
 
     public function getCustomSortingPillDirectionsLabel(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string
@@ -112,7 +112,7 @@ public function getCustomSortingPillDirectionsLabel(string $direction, ?string $
             return $this->sortingPillDirectionDesc ?? $defaultLabelDesc;
         }
 
-        return __('livewire-tables::not_applicable');
+        return __('livewire-tables::core.not_applicable');
     }
 
     public function getSortingPillDirection(DataTableComponent $component, string $direction): string
diff --git a/tests/Http/Livewire/PetsTable.php b/tests/Http/Livewire/PetsTable.php
index 59b52049d..32024f7a5 100644
--- a/tests/Http/Livewire/PetsTable.php
+++ b/tests/Http/Livewire/PetsTable.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Http\Livewire;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\App;
 use Livewire\Attributes\On;
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Tests\Models\Breed;
@@ -25,6 +26,11 @@ class PetsTable extends DataTableComponent
 
     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);
diff --git a/tests/Localisations/BaseLocalisationCase.php b/tests/Localisations/BaseLocalisationCase.php
new file mode 100644
index 000000000..b95b606cc
--- /dev/null
+++ b/tests/Localisations/BaseLocalisationCase.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Localisations;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+class BaseLocalisationCase extends TestCase
+{
+    public static function getEnLocaleStrings(): array
+    {
+        $baseDir = __DIR__.'/../../resources/lang/';
+
+        $items = require $baseDir.'en/core.php';
+
+        return $items;
+    }
+
+    public static function getLocaleStrings($locale): array
+    {
+        $baseDir = __DIR__.'/../../resources/lang/';
+
+        $items = require $baseDir.$locale.'/core.php';
+
+        return $items;
+    }
+
+    public static function localisationProvider(): array
+    {
+        $baseDir = __DIR__.'/../../resources/lang/';
+
+        $localisations = [];
+
+        $availableLocales = [
+            'ar',
+            'ca',
+            'da',
+            'de',
+            'en',
+            'es',
+            'fr',
+            'id',
+            'it',
+            'ms',
+            'nb',
+            'nl',
+            'pl',
+            'pt',
+            'pt_BR',
+            'ru',
+            'sq',
+            'sv',
+            'th',
+            'tk',
+            'tr',
+            'tw',
+            'uk',
+        ];
+        //return $availableLocales;
+
+        foreach ($availableLocales as $availableLocale) {
+            //$array = require($baseDir.$availableLocale.'/core.php');
+            $localisations[] = [
+                'locale' => $availableLocale,
+                //      'localisationStrings' => $array,
+            ];
+        }
+
+        return $localisations;
+    }
+}
diff --git a/tests/Localisations/Presence/CheckKeyPresenceTest.php b/tests/Localisations/Presence/CheckKeyPresenceTest.php
new file mode 100644
index 000000000..46aedc84e
--- /dev/null
+++ b/tests/Localisations/Presence/CheckKeyPresenceTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Localisations\Presence;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rappasoft\LaravelLivewireTables\Tests\Localisations\BaseLocalisationCase;
+
+final class CheckKeyPresenceTest extends BaseLocalisationCase
+{
+    #[DataProvider('localisationProvider')]
+    public function test_can_get_localised_empty_message(string $locale): void
+    {
+        $localisedStrings = self::getLocaleStrings($locale);
+
+        $localisedString = $localisedStrings['No items found, try to broaden your search'] ?? $locale;
+        $this->basicTable->changeLocale($locale);
+        $this->assertEquals($localisedString, $this->basicTable->getEmptyMessage());
+    }
+
+    #[DataProvider('localisationProvider')]
+    public function test_can_check_presence_of_keys(string $locale): void
+    {
+        $engStrings = self::getEnLocaleStrings();
+        $localisedStrings = self::getLocaleStrings($locale);
+        foreach ($engStrings as $key => $value) {
+            $this->assertNotNull($localisedStrings[$key]);
+        }
+    }
+}
diff --git a/tests/Localisations/Unit/Component/EmptyStringTest.php b/tests/Localisations/Unit/Component/EmptyStringTest.php
new file mode 100644
index 000000000..bed7acd91
--- /dev/null
+++ b/tests/Localisations/Unit/Component/EmptyStringTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Localisations\Unit\Component;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rappasoft\LaravelLivewireTables\Tests\Localisations\BaseLocalisationCase;
+
+final class EmptyStringTest extends BaseLocalisationCase
+{
+    #[DataProvider('localisationProvider')]
+    public function test_can_get_localised_empty_message(string $locale): void
+    {
+        $localisedString = $localisationStrings['No items found, try to broaden your search'] ?? $locale;
+        $this->basicTable->changeLocale($locale);
+        $this->assertEquals($localisedString, $this->basicTable->getEmptyMessage());
+    }
+}
diff --git a/tests/Unit/Traits/Configuration/SearchConfigurationTest.php b/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
index c4704d03b..20e788849 100644
--- a/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/SearchConfigurationTest.php
@@ -170,7 +170,7 @@ public function test_cant_set_search_throttle_with_other_search_modifiers(): voi
 
     public function test_can_set_search_placeholder(): void
     {
-        $this->assertSame(__('livewire-tables::Search'), $this->basicTable->getSearchPlaceholder());
+        $this->assertSame(__('livewire-tables::core.Search'), $this->basicTable->getSearchPlaceholder());
 
         $this->basicTable->setSearchPlaceholder('Anthony');
 
diff --git a/tests/Unit/Traits/Helpers/ComponentHelpersTest.php b/tests/Unit/Traits/Helpers/ComponentHelpersTest.php
index 38be7f469..0eed6b930 100644
--- a/tests/Unit/Traits/Helpers/ComponentHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/ComponentHelpersTest.php
@@ -22,9 +22,9 @@ public function test_can_get_current_theme(): void
         $this->assertEquals('tailwind', $this->basicTable->getTheme());
     }
 
-    public function test_can_get_empty_message(): void
+    public function test_can_get_default_empty_message(): void
     {
-        $this->assertEquals('No items found. Try to broaden your search.', $this->basicTable->getEmptyMessage());
+        $this->assertEquals(__('livewire-tables::core.No items found, try to broaden your search'), $this->basicTable->getEmptyMessage());
     }
 
     public function test_can_get_offline_status(): void

From 7748021eeb323ff070c1e5b703167010cac8e1eb Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 10 Nov 2024 04:07:34 +0000
Subject: [PATCH 100/103] Add "save", "cancel" to Core Localisation (#2039)

---
 resources/lang/en/core.php                                    | 2 ++
 .../components/tools/toolbar/items/reorder-buttons.blade.php  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en/core.php b/resources/lang/en/core.php
index 3a562980d..631762dba 100644
--- a/resources/lang/en/core.php
+++ b/resources/lang/en/core.php
@@ -7,6 +7,7 @@
     'Applied Sorting' => 'Applied Sorting',
     'Bulk Actions' => 'Bulk Actions',
     'Bulk Actions Confirm' => 'Are you sure?',
+    'cancel' => 'Cancel',
     'Clear' => 'Clear',
     'Columns' => 'Columns',
     'Debugging Values' => 'Debugging Values',
@@ -27,6 +28,7 @@
     'row' => 'row',
     'rows' => 'rows',
     'rows, do you want to select all' => 'rows, do you want to select all',
+    'save' => 'Save',
     'Search' => 'Search',
     'Select All' => 'Select All',
     'Select All On Page' => 'Select All On Page',
diff --git a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
index b33ea1d86..00d89e384 100644
--- a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
+++ b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
@@ -14,7 +14,7 @@
         ])
     >
         <span x-cloak x-show="currentlyReorderingStatus">
-         {{ __('livewire-tables::core.Cancel') }}
+         {{ __('livewire-tables::core.cancel') }}
         </span>
 
         <span x-cloak x-show="!currentlyReorderingStatus">
@@ -33,7 +33,7 @@
             ])
         >
             <span>
-            {{ __('livewire-tables::core.Save') }}
+            {{ __('livewire-tables::core.save') }}
             </span>
         </button>
     </div>

From d4f62e8808d4f0c99becff9424e828d64fbfa5cb Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 10 Nov 2024 04:27:13 +0000
Subject: [PATCH 101/103] Minor Localisation Tweaks (#2042)

---
 .../filter-pills/buttons/reset-all.blade.php  | 25 +++++++++++++++++++
 .../buttons/reset-filter.blade.php            |  7 +++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php b/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
index e69de29bb..1ffec0b94 100644
--- a/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
+++ b/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
@@ -0,0 +1,25 @@
+@aware(['isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@if ($isTailwind)
+    <button
+        wire:click.prevent="setFilterDefaults"
+        @class([
+            "focus:outline-none active:outline-none"
+        ])>
+        <span @class([
+            "inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium",
+            "bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900"
+            ])>
+            {{ __('livewire-tables::core.Clear') }}
+        </span>
+    </button>
+@else
+    <a
+        href="#"
+        wire:click.prevent="setFilterDefaults"
+        @class([
+            'badge badge-pill badge-light' => $isBootstrap4,
+            'badge rounded-pill bg-light text-dark text-decoration-none' => $isBootstrap5,
+        ])>
+        {{ __('livewire-tables::core.Clear') }}
+    </a>
+@endif
diff --git a/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php b/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
index 5dfd85457..f65d13c5a 100644
--- a/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
+++ b/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
@@ -9,7 +9,7 @@
             "text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white",
         ])
     >
-        <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
+        <span class="sr-only">{{ __('livewire-tables::core.Remove filter option') }}</span>
         <x-heroicon-m-x-mark class="h-full" />
     </button>
 @else
@@ -23,9 +23,8 @@
         <span @class([
             'sr-only' => $isBootstrap4,
             'visually-hidden' => $isBootstrap5,
-        ])>
-            @lang('livewire-tables::Remove filter option')
-        </span>
+            ])>{{ __('livewire-tables::core.Remove filter option') }}
+            </span>
         <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-tiny"  />
     </a>
 @endif

From f7cd9080ef0ac1cbcf9ed57d01b9d865ab6b81bc Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 10 Nov 2024 06:25:39 +0000
Subject: [PATCH 102/103] Remove Duplicate Item (#2043)

---
 .../buttons/reset-filter.blade.php            | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php b/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
index f65d13c5a..912611188 100644
--- a/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
+++ b/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
@@ -28,34 +28,3 @@
         <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-tiny"  />
     </a>
 @endif
-@aware(['tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
-@props(['filterKey'])
-@if ($isTailwind)
-    <button
-        wire:click="resetFilter('{{ $filterKey }}')"
-        type="button"
-        @class([
-            "flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none",
-            "text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white",
-        ])
-    >
-        <span class="sr-only">{{ __('livewire-tables::core.Remove filter option') }}</span>
-        <x-heroicon-m-x-mark class="h-full" />
-    </button>
-@else
-    <a
-        href="#"
-        wire:click="resetFilter('{{ $filterKey }}')"
-        @class([
-            'text-white ml-2' => ($isBootstrap),
-        ])
-    >
-        <span @class([
-            'sr-only' => $isBootstrap4,
-            'visually-hidden' => $isBootstrap5,
-        ])>{{ __('livewire-tables::core.Remove filter option') }}
-        
-        </span>
-        <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-tiny"  />
-    </a>
-@endif
\ No newline at end of file

From 38966bf7948aef38bc8fee554024a9740c0d9c65 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 10 Nov 2024 06:37:21 +0000
Subject: [PATCH 103/103] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20254a641..d2fdcb052 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.5.2] - 2024-11-09
+## Bug Fixes
+- Migrate Localisation back to PHP Files from JSON by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2038
+
 ## [v3.5.1] - 2024-11-09
 ### Bug Fixes
 - Fix NumberFilter bug for string values by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2034