From 110dac6024e79af56c5a3b646cdd8c941f318834 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Mon, 28 Aug 2023 19:16:20 +0100
Subject: [PATCH 01/28] Update setSearchDebounce, add
 setSearchThrottle/setSearchBlur

---
 CHANGELOG.md                                  |  1 +
 .../Configuration/SearchConfiguration.php     | 44 +++++++++++++++----
 src/Traits/Helpers/SearchHelpers.php          | 27 +++++++++++-
 src/Traits/WithSearch.php                     |  4 ++
 .../Configuration/SearchConfigurationTest.php | 43 +++++++++++++++++-
 tests/Traits/Helpers/SearchHelpersTest.php    | 20 +++++++++
 tests/Traits/Visuals/SearchVisualsTest.php    | 22 +++++++++-
 7 files changed, 148 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c56d13d66..fcc217255 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
             - Added SetSearchLive to allow for the search to be "live", with tests
             - Added capability for external CSS file
             - Custom CSS/JS and Alpine components are now stored in an external file, which has configurable injection options
+            - Added setSearchLive(), setSearchThrottle(int $milliseconds) and setSearchBlur() options for Search behaviour
 
 - Test Changes
     - Temporarily removed the sort_events_apply_correctly and filter_events_apply_correctly due to LW3 not using Emit anymore.
diff --git a/src/Traits/Configuration/SearchConfiguration.php b/src/Traits/Configuration/SearchConfiguration.php
index e755d425f..702c3b1c9 100644
--- a/src/Traits/Configuration/SearchConfiguration.php
+++ b/src/Traits/Configuration/SearchConfiguration.php
@@ -64,8 +64,8 @@ public function setSearchVisibilityDisabled(): self
      */
     public function setSearchDebounce(int $milliseconds): self
     {
-        if ($this->hasSearchDefer() || $this->hasSearchLazy() || $this->hasSearchLive()) {
-            throw new DataTableConfigurationException('You can only set one search filter option per table: debounce, defer, or lazy.');
+        if ($this->hasSearchBlur() || $this->hasSearchDefer() || $this->hasSearchLazy() || $this->hasSearchLive() || $this->hasSearchThrottle()) {
+            throw new DataTableConfigurationException('You can only set one search filter option per table: live, blur, throttle, debounce, defer, or lazy.');
         }
 
         $this->searchFilterDebounce = $milliseconds;
@@ -78,8 +78,8 @@ public function setSearchDebounce(int $milliseconds): self
      */
     public function setSearchDefer(): self
     {
-        if ($this->hasSearchDebounce() || $this->hasSearchLazy() || $this->hasSearchLive()) {
-            throw new DataTableConfigurationException('You can only set one search filter option per table: debounce, defer, or lazy.');
+        if ($this->hasSearchBlur() || $this->hasSearchDebounce() || $this->hasSearchLazy() || $this->hasSearchLive() || $this->hasSearchThrottle()) {
+            throw new DataTableConfigurationException('You can only set one search filter option per table: live, blur, throttle, debounce, defer, or lazy.');
         }
 
         $this->searchFilterDefer = true;
@@ -92,8 +92,8 @@ public function setSearchDefer(): self
      */
     public function setSearchLive(): self
     {
-        if ($this->hasSearchDebounce() || $this->hasSearchLazy() || $this->hasSearchDefer()) {
-            throw new DataTableConfigurationException('You can only set one search filter option per table: debounce, defer, or lazy.');
+        if ($this->hasSearchBlur() || $this->hasSearchDebounce()  || $this->hasSearchDefer() || $this->hasSearchLazy() || $this->hasSearchThrottle()) {
+            throw new DataTableConfigurationException('You can only set one search filter option per table: live, blur, throttle, debounce, defer, or lazy.');
         }
 
         $this->searchFilterLive = true;
@@ -101,13 +101,41 @@ public function setSearchLive(): self
         return $this;
     }
 
+    /**
+     * @throws DataTableConfigurationException
+     */
+    public function setSearchThrottle(int $milliseconds): self
+    {
+        if ($this->hasSearchBlur() || $this->hasSearchDebounce() || $this->hasSearchDefer() || $this->hasSearchLazy() || $this->hasSearchLive()) {
+            throw new DataTableConfigurationException('You can only set one search filter option per table: live, blur, throttle, debounce, defer, or lazy.');
+        }
+
+        $this->searchFilterThrottle = $milliseconds;
+
+        return $this;
+    }
+
+    /**
+     * @throws DataTableConfigurationException
+     */
+    public function setSearchBlur(): self
+    {
+        if ($this->hasSearchDebounce() || $this->hasSearchDefer() || $this->hasSearchLazy() || $this->hasSearchLive() || $this->hasSearchThrottle()) {
+            throw new DataTableConfigurationException('You can only set one search filter option per table: live, blur, throttle, debounce, defer, or lazy.');
+        }
+
+        $this->searchFilterBlur = true;
+
+        return $this;
+    }
+
     /**
      * @throws DataTableConfigurationException
      */
     public function setSearchLazy(): self
     {
-        if ($this->hasSearchDebounce() || $this->hasSearchDefer() || $this->hasSearchLive()) {
-            throw new DataTableConfigurationException('You can only set one search filter option per table: debounce, defer, or lazy.');
+        if ($this->hasSearchBlur() || $this->hasSearchDebounce() || $this->hasSearchDefer() || $this->hasSearchLive() || $this->hasSearchThrottle()) {
+            throw new DataTableConfigurationException('You can only set one search filter option per table: live, blur, throttle, debounce, defer, or lazy.');
         }
 
         $this->searchFilterLazy = true;
diff --git a/src/Traits/Helpers/SearchHelpers.php b/src/Traits/Helpers/SearchHelpers.php
index 03d6f88cf..4363fd386 100644
--- a/src/Traits/Helpers/SearchHelpers.php
+++ b/src/Traits/Helpers/SearchHelpers.php
@@ -77,10 +77,25 @@ public function hasSearchLive(): bool
         return $this->searchFilterLive !== null;
     }
 
+    public function hasSearchThrottle(): bool
+    {
+        return $this->searchFilterThrottle !== null;
+    }
+
+    public function getSearchThrottle(): ?int
+    {
+        return $this->searchFilterThrottle;
+    }
+
+    public function hasSearchBlur(): bool
+    {
+        return $this->searchFilterBlur !== null;
+    }
+
     public function getSearchOptions(): string
     {
         if ($this->hasSearchDebounce()) {
-            return '.debounce.'.$this->getSearchDebounce().'ms';
+            return '.live.debounce.'.$this->getSearchDebounce().'ms';
         }
 
         if ($this->hasSearchDefer()) {
@@ -91,8 +106,16 @@ public function getSearchOptions(): string
             return '.live';
         }
 
+        if ($this->hasSearchBlur()) {
+            return '.blur';
+        }
+
         if ($this->hasSearchLazy()) {
-            return '.lazy';
+            return '.live.lazy';
+        }
+
+        if ($this->hasSearchThrottle()) {
+            return '.live.throttle.'.$this->getSearchThrottle().'ms';
         }
 
         return '';
diff --git a/src/Traits/WithSearch.php b/src/Traits/WithSearch.php
index 2c063d01b..c92b933aa 100644
--- a/src/Traits/WithSearch.php
+++ b/src/Traits/WithSearch.php
@@ -17,6 +17,8 @@ trait WithSearch
 
     public bool $searchVisibilityStatus = true;
 
+    public ?bool $searchFilterBlur = null;
+
     public ?int $searchFilterDebounce = null;
 
     public ?bool $searchFilterDefer = null;
@@ -25,6 +27,8 @@ trait WithSearch
 
     public ?bool $searchFilterLive = null;
 
+    public ?int $searchFilterThrottle = null;
+
     public ?string $searchPlaceholder = null;
 
     // TODO
diff --git a/tests/Traits/Configuration/SearchConfigurationTest.php b/tests/Traits/Configuration/SearchConfigurationTest.php
index ddab26747..341371b6a 100644
--- a/tests/Traits/Configuration/SearchConfigurationTest.php
+++ b/tests/Traits/Configuration/SearchConfigurationTest.php
@@ -70,7 +70,7 @@ public function can_set_search_debounce(): void
 
         $this->assertTrue($this->basicTable->hasSearchDebounce());
         $this->assertSame(1000, $this->basicTable->getSearchDebounce());
-        $this->assertSame('.debounce.1000ms', $this->basicTable->getSearchOptions());
+        $this->assertSame('.live.debounce.1000ms', $this->basicTable->getSearchOptions());
     }
 
     /** @test */
@@ -142,6 +142,47 @@ public function cant_set_search_live_with_other_search_modifiers(): void
         $this->basicTable->setSearchDebounce(1000);
     }
 
+    /** @test */
+    public function can_set_search_blur(): void
+    {
+        $this->assertFalse($this->basicTable->hasSearchBlur());
+
+        $this->basicTable->setSearchBlur();
+
+        $this->assertTrue($this->basicTable->hasSearchBlur());
+        $this->assertSame('.blur', $this->basicTable->getSearchOptions());
+    }
+
+    /** @test */
+    public function cant_set_search_blur_with_other_search_modifiers(): void
+    {
+        $this->expectException(DataTableConfigurationException::class);
+
+        $this->basicTable->setSearchBlur();
+        $this->basicTable->setSearchDefer();
+    }
+
+    /** @test */
+    public function can_set_search_throttle(): void
+    {
+        $this->assertFalse($this->basicTable->hasSearchThrottle());
+
+        $this->basicTable->setSearchThrottle(1000);
+
+        $this->assertTrue($this->basicTable->hasSearchThrottle());
+        $this->assertSame(1000, $this->basicTable->getSearchThrottle());
+        $this->assertSame('.live.throttle.1000ms', $this->basicTable->getSearchOptions());
+    }
+
+    /** @test */
+    public function cant_set_search_throttle_with_other_search_modifiers(): void
+    {
+        $this->expectException(DataTableConfigurationException::class);
+
+        $this->basicTable->setSearchThrottle(1000);
+        $this->basicTable->setSearchDefer();
+    }
+
     /** @test */
     public function can_set_search_placeholder(): void
     {
diff --git a/tests/Traits/Helpers/SearchHelpersTest.php b/tests/Traits/Helpers/SearchHelpersTest.php
index c3b560644..9b78d6fa3 100644
--- a/tests/Traits/Helpers/SearchHelpersTest.php
+++ b/tests/Traits/Helpers/SearchHelpersTest.php
@@ -84,6 +84,16 @@ public function can_check_if_search_defer_is_set(): void
         $this->assertTrue($this->basicTable->hasSearchDefer());
     }
 
+    /** @test */
+    public function can_check_if_search_blur_is_set(): void
+    {
+        $this->assertFalse($this->basicTable->hasSearchBlur());
+
+        $this->basicTable->setSearchBlur();
+
+        $this->assertTrue($this->basicTable->hasSearchBlur());
+    }
+
     /** @test */
     public function can_check_if_search_lazy_is_set(): void
     {
@@ -94,6 +104,16 @@ public function can_check_if_search_lazy_is_set(): void
         $this->assertTrue($this->basicTable->hasSearchLazy());
     }
 
+    /** @test */
+    public function can_check_if_search_throttle_is_set(): void
+    {
+        $this->assertFalse($this->basicTable->hasSearchThrottle());
+
+        $this->basicTable->setSearchThrottle(180);
+
+        $this->assertSame(180, $this->basicTable->getSearchThrottle());
+    }
+
     /** @test */
     public function can_check_if_has_search_placeholder(): void
     {
diff --git a/tests/Traits/Visuals/SearchVisualsTest.php b/tests/Traits/Visuals/SearchVisualsTest.php
index c8fe3d2bb..db2d1e766 100644
--- a/tests/Traits/Visuals/SearchVisualsTest.php
+++ b/tests/Traits/Visuals/SearchVisualsTest.php
@@ -46,9 +46,27 @@ public function search_clear_button_shows_when_there_is_input(): void
     public function search_debounce_filter_is_applied(): void
     {
         Livewire::test(PetsTable::class)
-            ->assertDontSeeHtml('wire:model.debounce.1000ms="search"')
+            ->assertDontSeeHtml('wire:model.live.debounce.1000ms="search"')
             ->call('setSearchDebounce', 1000)
-            ->assertSeeHtml('wire:model.debounce.1000ms="search"');
+            ->assertSeeHtml('wire:model.live.debounce.1000ms="search"');
+    }
+
+    /** @test */
+    public function search_throttle_filter_is_applied(): void
+    {
+        Livewire::test(PetsTable::class)
+            ->assertDontSeeHtml('wire:model.live.throttle.1000ms="search"')
+            ->call('setSearchThrottle', 1000)
+            ->assertSeeHtml('wire:model.live.throttle.1000ms="search"');
+    }
+
+    /** @test */
+    public function search_blur_filter_is_applied(): void
+    {
+        Livewire::test(PetsTable::class)
+            ->assertDontSeeHtml('wire:model.blur="search"')
+            ->call('setSearchBlur')
+            ->assertSeeHtml('wire:model.blur="search"');
     }
 
     /** @test */

From 59082a859a6835ee18d12f70bb3bf7e6b2840d5e Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Mon, 28 Aug 2023 18:16:45 +0000
Subject: [PATCH 02/28] Fix styling

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

diff --git a/src/Traits/Configuration/SearchConfiguration.php b/src/Traits/Configuration/SearchConfiguration.php
index 702c3b1c9..3151542df 100644
--- a/src/Traits/Configuration/SearchConfiguration.php
+++ b/src/Traits/Configuration/SearchConfiguration.php
@@ -92,7 +92,7 @@ public function setSearchDefer(): self
      */
     public function setSearchLive(): self
     {
-        if ($this->hasSearchBlur() || $this->hasSearchDebounce()  || $this->hasSearchDefer() || $this->hasSearchLazy() || $this->hasSearchThrottle()) {
+        if ($this->hasSearchBlur() || $this->hasSearchDebounce() || $this->hasSearchDefer() || $this->hasSearchLazy() || $this->hasSearchThrottle()) {
             throw new DataTableConfigurationException('You can only set one search filter option per table: live, blur, throttle, debounce, defer, or lazy.');
         }
 

From cb14525bbf65fb29f72dbed046c175c536cbbba3 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Mon, 28 Aug 2023 18:29:20 +0000
Subject: [PATCH 03/28] Remove Lazy Test

---
 tests/Traits/Visuals/SearchVisualsTest.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/Traits/Visuals/SearchVisualsTest.php b/tests/Traits/Visuals/SearchVisualsTest.php
index db2d1e766..714bcf2b0 100644
--- a/tests/Traits/Visuals/SearchVisualsTest.php
+++ b/tests/Traits/Visuals/SearchVisualsTest.php
@@ -77,14 +77,6 @@ public function search_defer_filter_is_applied(): void
             ->assertSeeHtml('wire:model="search"');
     }
 
-    /** @test */
-    public function search_lazy_filter_is_applied(): void
-    {
-        Livewire::test(PetsTable::class)
-            ->assertDontSeeHtml('wire:model.lazy="search"')
-            ->call('setSearchLazy')
-            ->assertSeeHtml('wire:model.lazy="search"');
-    }
 
     /** @test */
     public function search_live_filter_is_applied(): void

From e2340c125f8c047748175aab6a661a6b477fecf0 Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Mon, 28 Aug 2023 18:29:54 +0000
Subject: [PATCH 04/28] Fix styling

---
 tests/Traits/Visuals/SearchVisualsTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Traits/Visuals/SearchVisualsTest.php b/tests/Traits/Visuals/SearchVisualsTest.php
index 714bcf2b0..00d5c2a0a 100644
--- a/tests/Traits/Visuals/SearchVisualsTest.php
+++ b/tests/Traits/Visuals/SearchVisualsTest.php
@@ -77,7 +77,6 @@ public function search_defer_filter_is_applied(): void
             ->assertSeeHtml('wire:model="search"');
     }
 
-
     /** @test */
     public function search_live_filter_is_applied(): void
     {

From 928529d328bb665ceb047e8154081c761535dbdf Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Mon, 28 Aug 2023 18:34:53 +0000
Subject: [PATCH 05/28] Remove Lazy Tests - Update Docs

---
 docs/search/available-methods.md              | 32 ++++++++++++++++---
 .../Configuration/SearchConfigurationTest.php |  8 ++---
 tests/Traits/Helpers/SearchHelpersTest.php    |  4 +--
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/docs/search/available-methods.md b/docs/search/available-methods.md
index b0d20ac09..5081f8213 100644
--- a/docs/search/available-methods.md
+++ b/docs/search/available-methods.md
@@ -122,14 +122,38 @@ public function configure(): void
 }
 ```
 
-## setSearchLazy
+## setSearchLive
 
-Tell Livewire to use the `lazy` modifier.
+Tell Livewire to immediately update the search
 
 ```php
 public function configure(): void
 {
-    // Send the request when the user clicks away from the search box.
-    $this->setSearchLazy();
+    // Send the search request immediately
+    $this->setSearchLive();
+}
+```
+
+## setSearchBlur
+
+Tell Livewire to update the search when focus is changed from the text box.
+
+```php
+public function configure(): void
+{
+    // Send the search request once focus changes
+    $this->setSearchBlur();
+}
+```
+
+## setSearchThrottle
+
+Tell Livewire to throttle updates
+
+```php
+public function configure(): void
+{
+    // Search will throttle to every 1 second
+    $this->setSearchThrottle(1000);
 }
 ```
diff --git a/tests/Traits/Configuration/SearchConfigurationTest.php b/tests/Traits/Configuration/SearchConfigurationTest.php
index 341371b6a..493fcdcb6 100644
--- a/tests/Traits/Configuration/SearchConfigurationTest.php
+++ b/tests/Traits/Configuration/SearchConfigurationTest.php
@@ -103,7 +103,7 @@ public function cant_set_search_defer_with_other_search_modifiers(): void
     }
 
     /** @test */
-    public function can_set_search_lazy(): void
+    /*public function can_set_search_lazy(): void
     {
         $this->assertFalse($this->basicTable->hasSearchLazy());
 
@@ -111,16 +111,16 @@ public function can_set_search_lazy(): void
 
         $this->assertTrue($this->basicTable->hasSearchLazy());
         $this->assertSame('.lazy', $this->basicTable->getSearchOptions());
-    }
+    }*/
 
     /** @test */
-    public function cant_set_search_lazy_with_other_search_modifiers(): void
+    /*public function cant_set_search_lazy_with_other_search_modifiers(): void
     {
         $this->expectException(DataTableConfigurationException::class);
 
         $this->basicTable->setSearchLazy();
         $this->basicTable->setSearchDebounce(1000);
-    }
+    }*/
 
     /** @test */
     public function can_set_search_live(): void
diff --git a/tests/Traits/Helpers/SearchHelpersTest.php b/tests/Traits/Helpers/SearchHelpersTest.php
index 9b78d6fa3..fc139076e 100644
--- a/tests/Traits/Helpers/SearchHelpersTest.php
+++ b/tests/Traits/Helpers/SearchHelpersTest.php
@@ -95,14 +95,14 @@ public function can_check_if_search_blur_is_set(): void
     }
 
     /** @test */
-    public function can_check_if_search_lazy_is_set(): void
+    /*public function can_check_if_search_lazy_is_set(): void
     {
         $this->assertFalse($this->basicTable->hasSearchLazy());
 
         $this->basicTable->setSearchLazy();
 
         $this->assertTrue($this->basicTable->hasSearchLazy());
-    }
+    }*/
 
     /** @test */
     public function can_check_if_search_throttle_is_set(): void

From ba332ec61438cf06b119cf57d2d01e76f4a7268a Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Thu, 31 Aug 2023 19:49:22 +0000
Subject: [PATCH 06/28] Update Views Publish Path

---
 src/LaravelLivewireTablesServiceProvider.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index a00c597ed..46b2555bc 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -20,9 +20,9 @@ public function boot(): void
             __DIR__.'/../config/livewire-tables.php', 'livewire-tables'
         );
 
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'livewire-tables');
-
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'livewire-tables');
+        
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'livewire-tables');
 
         if ($this->app->runningInConsole()) {
             $this->publishes([
@@ -34,7 +34,7 @@ public function boot(): void
             ], 'livewire-tables-config');
 
             $this->publishes([
-                __DIR__.'/../resources/views' => resource_path('views/vendor/rappasoft/livewire-tables'),
+                __DIR__.'/../resources/views' => resource_path('views/vendor/livewire-tables'),
             ], 'livewire-tables-views');
 
             $this->publishes([

From 1b2434fe9e86a3999e9699e76c7cd33e1474391d Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Thu, 31 Aug 2023 19:49:52 +0000
Subject: [PATCH 07/28] Fix styling

---
 src/DataTableComponent.php                    | 2 +-
 src/LaravelLivewireTablesServiceProvider.php  | 2 +-
 src/Views/Columns/ComponentColumn.php         | 4 ++--
 src/Views/Columns/ImageColumn.php             | 4 ++--
 src/Views/Columns/LinkColumn.php              | 4 ++--
 src/Views/Columns/LivewireComponentColumn.php | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/DataTableComponent.php b/src/DataTableComponent.php
index e23530252..7733b00c0 100644
--- a/src/DataTableComponent.php
+++ b/src/DataTableComponent.php
@@ -32,11 +32,11 @@ abstract class DataTableComponent extends Component
         WithEvents,
         WithFilters,
         WithFooter,
-        WithSecondaryHeader,
         WithPagination,
         WithRefresh,
         WithReordering,
         WithSearch,
+        WithSecondaryHeader,
         WithSorting;
 
     /** @phpstan-ignore-next-line */
diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index 46b2555bc..a1e18a2d4 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -21,7 +21,7 @@ public function boot(): void
         );
 
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'livewire-tables');
-        
+
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'livewire-tables');
 
         if ($this->app->runningInConsole()) {
diff --git a/src/Views/Columns/ComponentColumn.php b/src/Views/Columns/ComponentColumn.php
index b15ddb1e7..2459b1c85 100644
--- a/src/Views/Columns/ComponentColumn.php
+++ b/src/Views/Columns/ComponentColumn.php
@@ -12,8 +12,8 @@
 
 class ComponentColumn extends Column
 {
-    use ComponentColumnHelpers,
-        ComponentColumnConfiguration;
+    use ComponentColumnConfiguration,
+        ComponentColumnHelpers;
 
     protected string $componentView;
 
diff --git a/src/Views/Columns/ImageColumn.php b/src/Views/Columns/ImageColumn.php
index 9cd5adf74..f2bc48d12 100644
--- a/src/Views/Columns/ImageColumn.php
+++ b/src/Views/Columns/ImageColumn.php
@@ -10,8 +10,8 @@
 
 class ImageColumn extends Column
 {
-    use ImageColumnHelpers,
-        ImageColumnConfiguration;
+    use ImageColumnConfiguration,
+        ImageColumnHelpers;
 
     protected string $view = 'livewire-tables::includes.columns.image';
 
diff --git a/src/Views/Columns/LinkColumn.php b/src/Views/Columns/LinkColumn.php
index 92e7ad3f5..b62330b30 100644
--- a/src/Views/Columns/LinkColumn.php
+++ b/src/Views/Columns/LinkColumn.php
@@ -10,8 +10,8 @@
 
 class LinkColumn extends Column
 {
-    use LinkColumnHelpers,
-        LinkColumnConfiguration;
+    use LinkColumnConfiguration,
+        LinkColumnHelpers;
 
     protected string $view = 'livewire-tables::includes.columns.link';
 
diff --git a/src/Views/Columns/LivewireComponentColumn.php b/src/Views/Columns/LivewireComponentColumn.php
index 4842cb8b3..ce10d4268 100644
--- a/src/Views/Columns/LivewireComponentColumn.php
+++ b/src/Views/Columns/LivewireComponentColumn.php
@@ -13,8 +13,8 @@
 
 class LivewireComponentColumn extends Column
 {
-    use LivewireComponentColumnHelpers,
-        LivewireComponentColumnConfiguration;
+    use LivewireComponentColumnConfiguration,
+        LivewireComponentColumnHelpers;
 
     protected string $livewireComponent;
 

From cd953dfb2139ef232f536a0643ca19b44f64a310 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Thu, 31 Aug 2023 20:07:01 +0000
Subject: [PATCH 08/28] Add Translations Publish Option

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

diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index a1e18a2d4..f8639e0f9 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -21,13 +21,13 @@ public function boot(): void
         );
 
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'livewire-tables');
-
+        
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'livewire-tables');
 
         if ($this->app->runningInConsole()) {
             $this->publishes([
                 __DIR__.'/../resources/lang' => $this->app->langPath('livewire-tables'),
-            ]);
+            ], 'livewire-tables-translations');
 
             $this->publishes([
                 __DIR__.'/../config/livewire-tables.php' => config_path('livewire-tables.php'),

From c3cbc455202bd08a9c21d1633bc06292fb0afdf4 Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Thu, 31 Aug 2023 20:07:30 +0000
Subject: [PATCH 09/28] Fix styling

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

diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index f8639e0f9..0ff769208 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -21,7 +21,7 @@ public function boot(): void
         );
 
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'livewire-tables');
-        
+
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'livewire-tables');
 
         if ($this->app->runningInConsole()) {

From 8d706f78cadc2a85533dd4cdd9d7ff66fd126cac Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Thu, 31 Aug 2023 20:11:22 +0000
Subject: [PATCH 10/28] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcc217255..c12779663 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,15 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## [Unreleased] - 3.x
+## [Unreleased] - 3.x - Beta Fixes (beta-1)
+- Removal of setSearchLazy
+- Fix for setSearchDebounce
+- Add setSearchBlur()
+- Add setSearchThrottle()
+- Fix publishing of views
+- Add publish translations
+
+## [Unreleased] - 3.x (beta-0)
 - Requirements Change
     - Requires LiveWire 3.x
     - Requires PHP 8.1+
@@ -10,7 +18,6 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 
 - Core Changes
-
     - Move sorts, search, selectedColumns out of the traditional __$this->{$this->getTableName()}['sorts']__ and instead place it directly within the component.  This:
         - Improves the query string behaviour
         - Reduces the need to repeatedly set up that main array

From 13cd4fb474ff939ddd501dd766043aec4067d144 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Thu, 31 Aug 2023 20:51:11 +0000
Subject: [PATCH 11/28] Add Reusable Columns

---
 CHANGELOG.md                         |  1 +
 docs/columns/reusable-columns.md     | 38 +++++++++++++++
 src/Traits/Helpers/ColumnHelpers.php | 70 ++++++++++++++++++++++------
 src/Traits/WithColumns.php           | 19 ++++++++
 4 files changed, 114 insertions(+), 14 deletions(-)
 create mode 100644 docs/columns/reusable-columns.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c12779663..ecf0de1bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Add setSearchThrottle()
 - Fix publishing of views
 - Add publish translations
+- Add prependColumns() and appendColumns() functions
 
 ## [Unreleased] - 3.x (beta-0)
 - Requirements Change
diff --git a/docs/columns/reusable-columns.md b/docs/columns/reusable-columns.md
new file mode 100644
index 000000000..53b5865b2
--- /dev/null
+++ b/docs/columns/reusable-columns.md
@@ -0,0 +1,38 @@
+---
+title: Reusable Columns
+weight: 8
+---
+
+Often you will want to re-use the same column across multiple tables.  For example a "Created At" and "Used At" column.
+
+To mitigate the pain of maintaining this, two new methods have been introduced.
+
+These methods both function in exactly the same way as your standard columns(), and expect an array of columns.
+
+Any columns defined in prependColumns() will be the first columns in your list of columns.
+```
+public function prependColumns(): array
+{
+    return [];
+}
+```
+
+Any columns defined in appendColumns() will be the last columns in your list of columns.
+```
+public function appendColumns(): array
+{
+    return [];
+}
+```
+
+You can call these in your trait, and they will be automatically appended/prepended to tables.
+
+For example, to append a Column for Updated At 
+```
+public function appendColumns(): array
+{
+    return [
+        Column::make('Updated At', 'updated_at'),
+    ];
+}
+```
diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index ab5f05606..fcc362032 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -12,23 +12,27 @@ trait ColumnHelpers
      */
     public function setColumns(): void
     {
+        $prependedColumns = $this->getPrependedColumns();
+
         $columns = collect($this->columns())
-            ->filter(fn ($column) => $column instanceof Column)
-            ->map(function (Column $column) {
-                $column->setComponent($this);
-
-                if ($column->hasField()) {
-                    if ($column->isBaseColumn()) {
-                        $column->setTable($this->getBuilder()->getModel()->getTable());
-                    } else {
-                        $column->setTable($this->getTableForColumn($column));
-                    }
-                }
+                    ->filter(fn ($column) => $column instanceof Column)
+                    ->map(function (Column $column) {
+                        $column->setComponent($this);
 
-                return $column;
-            });
+                        if ($column->hasField()) {
+                            if ($column->isBaseColumn()) {
+                                $column->setTable($this->getBuilder()->getModel()->getTable());
+                            } else {
+                                $column->setTable($this->getTableForColumn($column));
+                            }
+                        }
 
-        $this->columns = $columns;
+                        return $column;
+                    });
+        
+        $appendedColumns = $this->getAppendedColumns();
+
+        $this->columns = collect([...$prependedColumns, ...$columns, ...$appendedColumns]);
     }
 
     public function getColumns(): Collection
@@ -175,4 +179,42 @@ public function getColspanCount(): int
     {
         return 100;
     }
+
+    public function getPrependedColumns(): Collection
+    {
+        return collect($this->prependColumns())
+        ->filter(fn ($column) => $column instanceof Column)
+        ->map(function (Column $column) {
+            $column->setComponent($this);
+
+            if ($column->hasField()) {
+                if ($column->isBaseColumn()) {
+                    $column->setTable($this->getBuilder()->getModel()->getTable());
+                } else {
+                    $column->setTable($this->getTableForColumn($column));
+                }
+            }
+
+            return $column;
+        });
+    }
+
+    public function getAppendedColumns(): Collection
+    {
+        return collect($this->appendColumns())
+                            ->filter(fn ($column) => $column instanceof Column)
+                            ->map(function (Column $column) {
+                                $column->setComponent($this);
+
+                                if ($column->hasField()) {
+                                    if ($column->isBaseColumn()) {
+                                        $column->setTable($this->getBuilder()->getModel()->getTable());
+                                    } else {
+                                        $column->setTable($this->getTableForColumn($column));
+                                    }
+                                }
+
+                                return $column;
+                            });
+    }
 }
diff --git a/src/Traits/WithColumns.php b/src/Traits/WithColumns.php
index 9df93cc50..274207920 100644
--- a/src/Traits/WithColumns.php
+++ b/src/Traits/WithColumns.php
@@ -15,4 +15,23 @@ public function bootWithColumns(): void
     {
         $this->columns = collect();
     }
+
+    /**
+     * Prepend columns.
+     */
+    public function prependColumns(): array
+    {
+        return [];
+    }
+
+    /**
+     * Append columns.
+     */
+    public function appendColumns(): array
+    {
+        return [];
+    }
+
+
+
 }

From 03ce7332a4bf7723064e6e38e1de7c1d89abdc60 Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Thu, 31 Aug 2023 20:51:37 +0000
Subject: [PATCH 12/28] Fix styling

---
 src/Traits/Helpers/ColumnHelpers.php | 82 ++++++++++++++--------------
 src/Traits/WithColumns.php           |  3 -
 2 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index fcc362032..85dd83ff6 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -15,21 +15,21 @@ public function setColumns(): void
         $prependedColumns = $this->getPrependedColumns();
 
         $columns = collect($this->columns())
-                    ->filter(fn ($column) => $column instanceof Column)
-                    ->map(function (Column $column) {
-                        $column->setComponent($this);
-
-                        if ($column->hasField()) {
-                            if ($column->isBaseColumn()) {
-                                $column->setTable($this->getBuilder()->getModel()->getTable());
-                            } else {
-                                $column->setTable($this->getTableForColumn($column));
-                            }
-                        }
-
-                        return $column;
-                    });
-        
+            ->filter(fn ($column) => $column instanceof Column)
+            ->map(function (Column $column) {
+                $column->setComponent($this);
+
+                if ($column->hasField()) {
+                    if ($column->isBaseColumn()) {
+                        $column->setTable($this->getBuilder()->getModel()->getTable());
+                    } else {
+                        $column->setTable($this->getTableForColumn($column));
+                    }
+                }
+
+                return $column;
+            });
+
         $appendedColumns = $this->getAppendedColumns();
 
         $this->columns = collect([...$prependedColumns, ...$columns, ...$appendedColumns]);
@@ -183,38 +183,38 @@ public function getColspanCount(): int
     public function getPrependedColumns(): Collection
     {
         return collect($this->prependColumns())
-        ->filter(fn ($column) => $column instanceof Column)
-        ->map(function (Column $column) {
-            $column->setComponent($this);
-
-            if ($column->hasField()) {
-                if ($column->isBaseColumn()) {
-                    $column->setTable($this->getBuilder()->getModel()->getTable());
-                } else {
-                    $column->setTable($this->getTableForColumn($column));
+            ->filter(fn ($column) => $column instanceof Column)
+            ->map(function (Column $column) {
+                $column->setComponent($this);
+
+                if ($column->hasField()) {
+                    if ($column->isBaseColumn()) {
+                        $column->setTable($this->getBuilder()->getModel()->getTable());
+                    } else {
+                        $column->setTable($this->getTableForColumn($column));
+                    }
                 }
-            }
 
-            return $column;
-        });
+                return $column;
+            });
     }
 
     public function getAppendedColumns(): Collection
     {
         return collect($this->appendColumns())
-                            ->filter(fn ($column) => $column instanceof Column)
-                            ->map(function (Column $column) {
-                                $column->setComponent($this);
-
-                                if ($column->hasField()) {
-                                    if ($column->isBaseColumn()) {
-                                        $column->setTable($this->getBuilder()->getModel()->getTable());
-                                    } else {
-                                        $column->setTable($this->getTableForColumn($column));
-                                    }
-                                }
-
-                                return $column;
-                            });
+            ->filter(fn ($column) => $column instanceof Column)
+            ->map(function (Column $column) {
+                $column->setComponent($this);
+
+                if ($column->hasField()) {
+                    if ($column->isBaseColumn()) {
+                        $column->setTable($this->getBuilder()->getModel()->getTable());
+                    } else {
+                        $column->setTable($this->getTableForColumn($column));
+                    }
+                }
+
+                return $column;
+            });
     }
 }
diff --git a/src/Traits/WithColumns.php b/src/Traits/WithColumns.php
index 274207920..feba0ac09 100644
--- a/src/Traits/WithColumns.php
+++ b/src/Traits/WithColumns.php
@@ -31,7 +31,4 @@ public function appendColumns(): array
     {
         return [];
     }
-
-
-
 }

From ef35e4fe77029418a79f3bedd132f331b9cb4669 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Thu, 31 Aug 2023 21:33:10 +0000
Subject: [PATCH 13/28] Add Tests for Prepend/Append Cols

---
 .../Configuration/ColumnConfiguration.php     | 47 +++++++++++++++++++
 src/Traits/Helpers/ColumnHelpers.php          | 12 +++--
 src/Traits/WithColumns.php                    |  6 ++-
 tests/Traits/Helpers/ColumnHelpersTest.php    | 29 ++++++++++++
 4 files changed, 88 insertions(+), 6 deletions(-)
 create mode 100644 src/Traits/Configuration/ColumnConfiguration.php

diff --git a/src/Traits/Configuration/ColumnConfiguration.php b/src/Traits/Configuration/ColumnConfiguration.php
new file mode 100644
index 000000000..8f23a6f87
--- /dev/null
+++ b/src/Traits/Configuration/ColumnConfiguration.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
+
+use Illuminate\Support\Collection;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+
+trait ColumnConfiguration
+{
+    public function setPrependedColumns(array $prependedColumns): void
+    {
+        $this->prependedColumns = collect($prependedColumns)
+            ->filter(fn ($column) => $column instanceof Column)
+            ->map(function (Column $column) {
+                $column->setComponent($this);
+
+                if ($column->hasField()) {
+                    if ($column->isBaseColumn()) {
+                        $column->setTable($this->getBuilder()->getModel()->getTable());
+                    } else {
+                        $column->setTable($this->getTableForColumn($column));
+                    }
+                }
+
+                return $column;
+            });
+    }
+
+    public function setAppendedColumns(array $appendedColumns): void
+    {
+        $this->appendedColumns = collect($appendedColumns)
+            ->filter(fn ($column) => $column instanceof Column)
+            ->map(function (Column $column) {
+                $column->setComponent($this);
+
+                if ($column->hasField()) {
+                    if ($column->isBaseColumn()) {
+                        $column->setTable($this->getBuilder()->getModel()->getTable());
+                    } else {
+                        $column->setTable($this->getTableForColumn($column));
+                    }
+                }
+
+                return $column;
+            });
+    }
+}
diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 85dd83ff6..a525583b1 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -12,7 +12,7 @@ trait ColumnHelpers
      */
     public function setColumns(): void
     {
-        $prependedColumns = $this->getPrependedColumns();
+        $this->prependedColumns = $this->getPrependedColumns();
 
         $columns = collect($this->columns())
             ->filter(fn ($column) => $column instanceof Column)
@@ -30,9 +30,9 @@ public function setColumns(): void
                 return $column;
             });
 
-        $appendedColumns = $this->getAppendedColumns();
+        $this->appendedColumns = $this->getAppendedColumns();
 
-        $this->columns = collect([...$prependedColumns, ...$columns, ...$appendedColumns]);
+        $this->columns = collect([...$this->prependedColumns, ...$columns, ...$this->appendedColumns]);
     }
 
     public function getColumns(): Collection
@@ -180,9 +180,10 @@ public function getColspanCount(): int
         return 100;
     }
 
+
     public function getPrependedColumns(): Collection
     {
-        return collect($this->prependColumns())
+        return collect($this->prependedColumns ?? $this->prependColumns())
             ->filter(fn ($column) => $column instanceof Column)
             ->map(function (Column $column) {
                 $column->setComponent($this);
@@ -201,7 +202,7 @@ public function getPrependedColumns(): Collection
 
     public function getAppendedColumns(): Collection
     {
-        return collect($this->appendColumns())
+        return collect($this->appendedColumns ?? $this->appendColumns())
             ->filter(fn ($column) => $column instanceof Column)
             ->map(function (Column $column) {
                 $column->setComponent($this);
@@ -216,5 +217,6 @@ public function getAppendedColumns(): Collection
 
                 return $column;
             });
+
     }
 }
diff --git a/src/Traits/WithColumns.php b/src/Traits/WithColumns.php
index feba0ac09..3f1d4b0f9 100644
--- a/src/Traits/WithColumns.php
+++ b/src/Traits/WithColumns.php
@@ -4,12 +4,16 @@
 
 use Illuminate\Support\Collection;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\ColumnHelpers;
+use Rappasoft\LaravelLivewireTables\Traits\Configuration\ColumnConfiguration;
 
 trait WithColumns
 {
     use ColumnHelpers;
+    use ColumnConfiguration;
 
     protected Collection $columns;
+    protected Collection $prependedColumns;
+    protected Collection $appendedColumns;
 
     public function bootWithColumns(): void
     {
@@ -19,7 +23,7 @@ public function bootWithColumns(): void
     /**
      * Prepend columns.
      */
-    public function prependColumns(): array
+    public function prependColumns()
     {
         return [];
     }
diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Traits/Helpers/ColumnHelpersTest.php
index c925c78ae..5d0751d49 100644
--- a/tests/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Traits/Helpers/ColumnHelpersTest.php
@@ -15,6 +15,35 @@ public function can_get_column_list(): void
         $this->assertCount(9, $this->basicTable->getColumns()->toArray());
     }
 
+    /** @test */
+    public function can_append_column(): void
+    {
+        $this->assertCount(9, $this->basicTable->getColumns()->toArray());
+
+        $this->basicTable->setAppendedColumns([Column::make('IDLabel')->label(function ($row) {
+            return 'Test';
+        })]);
+        
+        $this->basicTable->setColumns();
+
+        $this->assertCount(10, $this->basicTable->getColumns()->toArray());
+
+    }
+
+    /** @test */
+    public function can_prepend_column(): void
+    {
+        $this->assertCount(9, $this->basicTable->getColumns()->toArray());
+
+        $this->basicTable->setPrependedColumns([Column::make('IDLabel')->label(function ($row) {
+            return 'Test';
+        })]);
+        
+        $this->basicTable->setColumns();
+
+        $this->assertCount(10, $this->basicTable->getColumns()->toArray());
+    }
+
     /** @test */
     public function can_get_column_by_column(): void
     {

From 832c1b86c57ddbf865eca249f3d61d88206e764d Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Thu, 31 Aug 2023 21:33:39 +0000
Subject: [PATCH 14/28] Fix styling

---
 src/Traits/Configuration/ColumnConfiguration.php | 1 -
 src/Traits/Helpers/ColumnHelpers.php             | 1 -
 src/Traits/WithColumns.php                       | 6 ++++--
 tests/Traits/Helpers/ColumnHelpersTest.php       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Traits/Configuration/ColumnConfiguration.php b/src/Traits/Configuration/ColumnConfiguration.php
index 8f23a6f87..1e8d111f5 100644
--- a/src/Traits/Configuration/ColumnConfiguration.php
+++ b/src/Traits/Configuration/ColumnConfiguration.php
@@ -2,7 +2,6 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
 
-use Illuminate\Support\Collection;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 
 trait ColumnConfiguration
diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index a525583b1..8bafdf275 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -180,7 +180,6 @@ public function getColspanCount(): int
         return 100;
     }
 
-
     public function getPrependedColumns(): Collection
     {
         return collect($this->prependedColumns ?? $this->prependColumns())
diff --git a/src/Traits/WithColumns.php b/src/Traits/WithColumns.php
index 3f1d4b0f9..9f0e3890e 100644
--- a/src/Traits/WithColumns.php
+++ b/src/Traits/WithColumns.php
@@ -3,16 +3,18 @@
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
 use Illuminate\Support\Collection;
-use Rappasoft\LaravelLivewireTables\Traits\Helpers\ColumnHelpers;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\ColumnConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Helpers\ColumnHelpers;
 
 trait WithColumns
 {
-    use ColumnHelpers;
     use ColumnConfiguration;
+    use ColumnHelpers;
 
     protected Collection $columns;
+
     protected Collection $prependedColumns;
+
     protected Collection $appendedColumns;
 
     public function bootWithColumns(): void
diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Traits/Helpers/ColumnHelpersTest.php
index 5d0751d49..e1fb9379b 100644
--- a/tests/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Traits/Helpers/ColumnHelpersTest.php
@@ -23,7 +23,7 @@ public function can_append_column(): void
         $this->basicTable->setAppendedColumns([Column::make('IDLabel')->label(function ($row) {
             return 'Test';
         })]);
-        
+
         $this->basicTable->setColumns();
 
         $this->assertCount(10, $this->basicTable->getColumns()->toArray());
@@ -38,7 +38,7 @@ public function can_prepend_column(): void
         $this->basicTable->setPrependedColumns([Column::make('IDLabel')->label(function ($row) {
             return 'Test';
         })]);
-        
+
         $this->basicTable->setColumns();
 
         $this->assertCount(10, $this->basicTable->getColumns()->toArray());

From bc769b04b3ea48171127bedb6e0b44eca0958e28 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Thu, 31 Aug 2023 22:32:41 +0000
Subject: [PATCH 15/28] Column Select Fixes

---
 src/Traits/WithColumnSelect.php      | 5 ++++-
 tests/Events/ColumnsSelectedTest.php | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Traits/WithColumnSelect.php b/src/Traits/WithColumnSelect.php
index 837a772de..3218ec06f 100644
--- a/src/Traits/WithColumnSelect.php
+++ b/src/Traits/WithColumnSelect.php
@@ -63,7 +63,10 @@ public function getDefaultVisibleColumns(): array
 
     public function selectAllColumns(): void
     {
-        $this->selectedColumns = [];
+        $this->selectedColumns = $this->getColumns()->map(function ($column) {
+            return $column->getSlug();
+        })->toArray();
+
         $this->forgetColumnSelectSession();
         event(new ColumnsSelected($this->getColumnSelectSessionKey(), $this->selectedColumns));
     }
diff --git a/tests/Events/ColumnsSelectedTest.php b/tests/Events/ColumnsSelectedTest.php
index f22e079fe..9a66778ed 100644
--- a/tests/Events/ColumnsSelectedTest.php
+++ b/tests/Events/ColumnsSelectedTest.php
@@ -14,7 +14,9 @@ public function an_event_is_emitted_when_a_column_selection_are_updated()
             ColumnsSelected::class,
         ]);
 
-        $test['columns'] = $this->basicTable->selectedColumns;
+        $test['columns'] = $this->basicTable->getColumns()->map(function ($column) {
+            return $column->getSlug();
+        })->toArray();
         $test['key'] = $this->basicTable->getDataTableFingerprint().'-columnSelectEnabled';
         // Select all columns to test event trigger
         $this->basicTable->selectAllColumns();

From 1077c47e1a9993ea90accbcc920ba34b757edb95 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Thu, 31 Aug 2023 22:36:20 +0000
Subject: [PATCH 16/28] Fix test

---
 tests/Events/ColumnsSelectedTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/Events/ColumnsSelectedTest.php b/tests/Events/ColumnsSelectedTest.php
index 9a66778ed..f22e079fe 100644
--- a/tests/Events/ColumnsSelectedTest.php
+++ b/tests/Events/ColumnsSelectedTest.php
@@ -14,9 +14,7 @@ public function an_event_is_emitted_when_a_column_selection_are_updated()
             ColumnsSelected::class,
         ]);
 
-        $test['columns'] = $this->basicTable->getColumns()->map(function ($column) {
-            return $column->getSlug();
-        })->toArray();
+        $test['columns'] = $this->basicTable->selectedColumns;
         $test['key'] = $this->basicTable->getDataTableFingerprint().'-columnSelectEnabled';
         // Select all columns to test event trigger
         $this->basicTable->selectAllColumns();

From ca6372a9a707485da8bd3c560f9c81ccfab1f6bc Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Fri, 1 Sep 2023 05:17:33 +0000
Subject: [PATCH 17/28] Add docs for setSearchPlaceholder

---
 CHANGELOG.md                     |  1 +
 docs/search/available-methods.md | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecf0de1bd..fe784b486 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Fix publishing of views
 - Add publish translations
 - Add prependColumns() and appendColumns() functions
+- Add documentation for setSearchPlaceholder()
 
 ## [Unreleased] - 3.x (beta-0)
 - Requirements Change
diff --git a/docs/search/available-methods.md b/docs/search/available-methods.md
index 5081f8213..e05ce7649 100644
--- a/docs/search/available-methods.md
+++ b/docs/search/available-methods.md
@@ -92,6 +92,17 @@ public function configure(): void
     // Shorthand for $this->setSearchVisibilityStatus(false)
     $this->setSearchVisibilityDisabled();
 }
+
+```
+## setSearchPlaceholder
+
+Set a custom placeholder for the search box
+
+```php
+public function configure(): void
+{
+    $this->setSearchPlaceholder('Enter Search Term');
+}
 ```
 
 ---

From b092898a5d8eb43de842eeea559fafde020be64d Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Fri, 1 Sep 2023 05:21:12 +0000
Subject: [PATCH 18/28] Move Filter Specific Docs ino Filter-Types

---
 docs/filter-types/_index.md                   |  4 ++
 .../{filters => filter-types}/filters-date.md |  2 +-
 .../filters-daterange.md                      |  2 +-
 .../filters-datetime.md                       |  2 +-
 .../filters-multiselect-dropdown.md           |  2 +-
 .../filters-multiselect.md                    |  0
 .../filters-number-range.md                   |  0
 .../filters-number.md                         |  2 +-
 .../filters-select.md                         |  2 +-
 .../{filters => filter-types}/filters-text.md |  2 +-
 docs/filter-types/introduction.md             |  6 +++
 src/Traits/Helpers/ColumnHelpers.php          | 39 +++++++++++++++++++
 src/Traits/WithColumnSelect.php               |  5 +--
 src/Traits/WithData.php                       |  2 +-
 14 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 docs/filter-types/_index.md
 rename docs/{filters => filter-types}/filters-date.md (99%)
 rename docs/{filters => filter-types}/filters-daterange.md (99%)
 rename docs/{filters => filter-types}/filters-datetime.md (99%)
 rename docs/{filters => filter-types}/filters-multiselect-dropdown.md (98%)
 rename docs/{filters => filter-types}/filters-multiselect.md (100%)
 rename docs/{filters => filter-types}/filters-number-range.md (100%)
 rename docs/{filters => filter-types}/filters-number.md (97%)
 rename docs/{filters => filter-types}/filters-select.md (99%)
 rename docs/{filters => filter-types}/filters-text.md (97%)
 create mode 100644 docs/filter-types/introduction.md

diff --git a/docs/filter-types/_index.md b/docs/filter-types/_index.md
new file mode 100644
index 000000000..6c6d8ccf4
--- /dev/null
+++ b/docs/filter-types/_index.md
@@ -0,0 +1,4 @@
+---
+title: Filter Types
+weight: 11
+---
diff --git a/docs/filters/filters-date.md b/docs/filter-types/filters-date.md
similarity index 99%
rename from docs/filters/filters-date.md
rename to docs/filter-types/filters-date.md
index 20e759eeb..bf2ca2b7b 100644
--- a/docs/filters/filters-date.md
+++ b/docs/filter-types/filters-date.md
@@ -1,6 +1,6 @@
 ---
 title: Date Filters
-weight: 6
+weight: 2
 ---
 
 ## Date Filters
diff --git a/docs/filters/filters-daterange.md b/docs/filter-types/filters-daterange.md
similarity index 99%
rename from docs/filters/filters-daterange.md
rename to docs/filter-types/filters-daterange.md
index cedbbac68..3cd0c0b52 100644
--- a/docs/filters/filters-daterange.md
+++ b/docs/filter-types/filters-daterange.md
@@ -1,6 +1,6 @@
 ---
 title: DateRange Filters
-weight: 7
+weight: 3
 ---
 
 ## DateRange Filters
diff --git a/docs/filters/filters-datetime.md b/docs/filter-types/filters-datetime.md
similarity index 99%
rename from docs/filters/filters-datetime.md
rename to docs/filter-types/filters-datetime.md
index a6419e5d1..ac28ddecf 100644
--- a/docs/filters/filters-datetime.md
+++ b/docs/filter-types/filters-datetime.md
@@ -1,6 +1,6 @@
 ---
 title: DateTime Filters
-weight: 6
+weight: 4
 ---
 
 ## DateTime Filters
diff --git a/docs/filters/filters-multiselect-dropdown.md b/docs/filter-types/filters-multiselect-dropdown.md
similarity index 98%
rename from docs/filters/filters-multiselect-dropdown.md
rename to docs/filter-types/filters-multiselect-dropdown.md
index 227495dff..d81c14570 100644
--- a/docs/filters/filters-multiselect-dropdown.md
+++ b/docs/filter-types/filters-multiselect-dropdown.md
@@ -1,6 +1,6 @@
 ---
 title: Multi-Select Dropdown Filters
-weight: 6
+weight: 5
 ---
 
 
diff --git a/docs/filters/filters-multiselect.md b/docs/filter-types/filters-multiselect.md
similarity index 100%
rename from docs/filters/filters-multiselect.md
rename to docs/filter-types/filters-multiselect.md
diff --git a/docs/filters/filters-number-range.md b/docs/filter-types/filters-number-range.md
similarity index 100%
rename from docs/filters/filters-number-range.md
rename to docs/filter-types/filters-number-range.md
diff --git a/docs/filters/filters-number.md b/docs/filter-types/filters-number.md
similarity index 97%
rename from docs/filters/filters-number.md
rename to docs/filter-types/filters-number.md
index 6c7c7be82..402878eaa 100644
--- a/docs/filters/filters-number.md
+++ b/docs/filter-types/filters-number.md
@@ -1,6 +1,6 @@
 ---
 title: Number Filters
-weight: 6
+weight: 8
 ---
 
 ## Number Filters
diff --git a/docs/filters/filters-select.md b/docs/filter-types/filters-select.md
similarity index 99%
rename from docs/filters/filters-select.md
rename to docs/filter-types/filters-select.md
index afe5790e5..d28cfba94 100644
--- a/docs/filters/filters-select.md
+++ b/docs/filter-types/filters-select.md
@@ -1,6 +1,6 @@
 ---
 title: Select Filters
-weight: 6
+weight: 9
 ---
 
 ## Select Filters
diff --git a/docs/filters/filters-text.md b/docs/filter-types/filters-text.md
similarity index 97%
rename from docs/filters/filters-text.md
rename to docs/filter-types/filters-text.md
index 21c426839..649384915 100644
--- a/docs/filters/filters-text.md
+++ b/docs/filter-types/filters-text.md
@@ -1,6 +1,6 @@
 ---
 title: Text Filters
-weight: 6
+weight: 10
 ---
 
 ## Text Filters
diff --git a/docs/filter-types/introduction.md b/docs/filter-types/introduction.md
new file mode 100644
index 000000000..d509cdc39
--- /dev/null
+++ b/docs/filter-types/introduction.md
@@ -0,0 +1,6 @@
+---
+title: Introduction
+weight: 1
+---
+
+There are several Filter types available for use, offering a range of capabilities to filter your data.
diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 8bafdf275..57d28152e 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -7,6 +7,10 @@
 
 trait ColumnHelpers
 {
+    public array $columnSelectStats2;
+
+    public $columnSelectStats3;
+
     /**
      * Set the user defined columns
      */
@@ -33,6 +37,8 @@ public function setColumns(): void
         $this->appendedColumns = $this->getAppendedColumns();
 
         $this->columns = collect([...$this->prependedColumns, ...$columns, ...$this->appendedColumns]);
+ 
+
     }
 
     public function getColumns(): Collection
@@ -85,10 +91,43 @@ public function getColumnRelationStrings(): array
             ->toArray();
     }
 
+    public function getCurrentlySelectedCols()
+    {
+
+        $this->columnSelectStats3 = [
+            'intersectSelectedCols-VisibleCols' => count(array_intersect($this->selectedColumns, $this->getDefaultVisibleColumns())),
+            'defaultVisibleCols' => count($this->getDefaultVisibleColumns()),
+            'getReallySelectedColumns' => count($this->getReallySelectedColumns()),
+            'getCurrentlySelectedColumns' => count($this->getCurrentlySelectedColumns()),
+            'getSelectableColumns' =>  count($this->getSelectableColumns()),
+            'allDefaultVisibleColumnsAreSelected' => $this->allDefaultVisibleColumnsAreSelected()
+        ];
+        return [1,2,3];
+
+    }
+
+    public function getReallySelectedColumns(): array
+    {
+        return $this->getColumns()
+            ->reject(fn (Column $column) => $column->isLabel())
+            ->reject(fn (Column $column) => !$column->isSelected())
+            ->values()
+            ->toArray();
+    }
+
     public function getSelectableColumns(): Collection
     {
         return $this->getColumns()
             ->reject(fn (Column $column) => $column->isLabel())
+            ->reject(fn (Column $column) => !$column->isSelectable())
+            ->values();
+    }
+
+    public function getCurrentlySelectedColumns(): Collection
+    {
+        return $this->getColumns()
+            ->reject(fn (Column $column) => $column->isLabel())
+            ->reject(fn (Column $column) => !$column->isSelectable())
             ->values();
     }
 
diff --git a/src/Traits/WithColumnSelect.php b/src/Traits/WithColumnSelect.php
index 3218ec06f..837a772de 100644
--- a/src/Traits/WithColumnSelect.php
+++ b/src/Traits/WithColumnSelect.php
@@ -63,10 +63,7 @@ public function getDefaultVisibleColumns(): array
 
     public function selectAllColumns(): void
     {
-        $this->selectedColumns = $this->getColumns()->map(function ($column) {
-            return $column->getSlug();
-        })->toArray();
-
+        $this->selectedColumns = [];
         $this->forgetColumnSelectSession();
         event(new ColumnsSelected($this->getColumnSelectSessionKey(), $this->selectedColumns));
     }
diff --git a/src/Traits/WithData.php b/src/Traits/WithData.php
index 5eccdd84b..754149598 100644
--- a/src/Traits/WithData.php
+++ b/src/Traits/WithData.php
@@ -37,7 +37,7 @@ protected function baseQuery(): Builder
         $this->setBuilder($this->applySearch());
 
         $this->setBuilder($this->applyFilters());
-
+        $this->getCurrentlySelectedCols();
         return $this->getBuilder();
 
     }

From 5f6b05bcb3de714449289b8c38ae3bd260390c38 Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Fri, 1 Sep 2023 05:21:40 +0000
Subject: [PATCH 19/28] Fix styling

---
 src/Traits/Helpers/ColumnHelpers.php | 14 +++++++-------
 src/Traits/WithData.php              |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 57d28152e..62e54cb55 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -37,7 +37,6 @@ public function setColumns(): void
         $this->appendedColumns = $this->getAppendedColumns();
 
         $this->columns = collect([...$this->prependedColumns, ...$columns, ...$this->appendedColumns]);
- 
 
     }
 
@@ -99,10 +98,11 @@ public function getCurrentlySelectedCols()
             'defaultVisibleCols' => count($this->getDefaultVisibleColumns()),
             'getReallySelectedColumns' => count($this->getReallySelectedColumns()),
             'getCurrentlySelectedColumns' => count($this->getCurrentlySelectedColumns()),
-            'getSelectableColumns' =>  count($this->getSelectableColumns()),
-            'allDefaultVisibleColumnsAreSelected' => $this->allDefaultVisibleColumnsAreSelected()
+            'getSelectableColumns' => count($this->getSelectableColumns()),
+            'allDefaultVisibleColumnsAreSelected' => $this->allDefaultVisibleColumnsAreSelected(),
         ];
-        return [1,2,3];
+
+        return [1, 2, 3];
 
     }
 
@@ -110,7 +110,7 @@ public function getReallySelectedColumns(): array
     {
         return $this->getColumns()
             ->reject(fn (Column $column) => $column->isLabel())
-            ->reject(fn (Column $column) => !$column->isSelected())
+            ->reject(fn (Column $column) => ! $column->isSelected())
             ->values()
             ->toArray();
     }
@@ -119,7 +119,7 @@ public function getSelectableColumns(): Collection
     {
         return $this->getColumns()
             ->reject(fn (Column $column) => $column->isLabel())
-            ->reject(fn (Column $column) => !$column->isSelectable())
+            ->reject(fn (Column $column) => ! $column->isSelectable())
             ->values();
     }
 
@@ -127,7 +127,7 @@ public function getCurrentlySelectedColumns(): Collection
     {
         return $this->getColumns()
             ->reject(fn (Column $column) => $column->isLabel())
-            ->reject(fn (Column $column) => !$column->isSelectable())
+            ->reject(fn (Column $column) => ! $column->isSelectable())
             ->values();
     }
 
diff --git a/src/Traits/WithData.php b/src/Traits/WithData.php
index 754149598..ad6f39d86 100644
--- a/src/Traits/WithData.php
+++ b/src/Traits/WithData.php
@@ -38,6 +38,7 @@ protected function baseQuery(): Builder
 
         $this->setBuilder($this->applyFilters());
         $this->getCurrentlySelectedCols();
+
         return $this->getBuilder();
 
     }

From d35d0459aee00bbd3ed145d54485a4c07f6c1f5e Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Fri, 1 Sep 2023 05:27:43 +0000
Subject: [PATCH 20/28] Remove extraneous space

---
 src/Traits/Helpers/ColumnHelpers.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 62e54cb55..24e4b7a76 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -37,7 +37,6 @@ public function setColumns(): void
         $this->appendedColumns = $this->getAppendedColumns();
 
         $this->columns = collect([...$this->prependedColumns, ...$columns, ...$this->appendedColumns]);
-
     }
 
     public function getColumns(): Collection

From e40214f4c2670240c9b2d7e05f7625488ae3d7dd Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Fri, 1 Sep 2023 05:31:17 +0000
Subject: [PATCH 21/28] Adjusting Selectable Test

---
 src/Traits/Helpers/ColumnHelpers.php       | 2 +-
 tests/Traits/Helpers/ColumnHelpersTest.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 24e4b7a76..68d916309 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -118,7 +118,7 @@ public function getSelectableColumns(): Collection
     {
         return $this->getColumns()
             ->reject(fn (Column $column) => $column->isLabel())
-            ->reject(fn (Column $column) => ! $column->isSelectable())
+            ->reject(fn (Column $column) => !$column->isSelectable())
             ->values();
     }
 
diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Traits/Helpers/ColumnHelpersTest.php
index e1fb9379b..f7aade8e9 100644
--- a/tests/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Traits/Helpers/ColumnHelpersTest.php
@@ -205,7 +205,6 @@ public function can_get_visible_tablet_columns_count(): void
     public function can_get_selectable_columns(): void
     {
         $selectable = $this->basicTable->getSelectableColumns()
-            ->map(fn (Column $column) => $column->getColumnSelectName())
             ->toArray();
 
         $this->assertSame(['id', 'sort', 'name', 'age', 'breed.name', 'last_visit'], $selectable);

From 0248303fda6f3f7b849d295bb46197873b8dacb1 Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Fri, 1 Sep 2023 05:31:46 +0000
Subject: [PATCH 22/28] Fix styling

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

diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 68d916309..24e4b7a76 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -118,7 +118,7 @@ public function getSelectableColumns(): Collection
     {
         return $this->getColumns()
             ->reject(fn (Column $column) => $column->isLabel())
-            ->reject(fn (Column $column) => !$column->isSelectable())
+            ->reject(fn (Column $column) => ! $column->isSelectable())
             ->values();
     }
 

From 3e62ca833561eb16f3ed7bc742efa90e321048d8 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Sun, 3 Sep 2023 14:21:55 +0000
Subject: [PATCH 23/28] Fix For BulkActions Dropdown

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

diff --git a/resources/views/components/tools/toolbar/bootstrap.blade.php b/resources/views/components/tools/toolbar/bootstrap.blade.php
index 480893aa8..764d770eb 100644
--- a/resources/views/components/tools/toolbar/bootstrap.blade.php
+++ b/resources/views/components/tools/toolbar/bootstrap.blade.php
@@ -193,7 +193,7 @@
                             'btn dropdown-toggle d-block w-100 d-md-inline' => $component->isBootstrap(),
                         ])
                         type="button"
-                        id="{{ $tableName }}-bulkActionsDropdown" data-toggle="dropdown"
+                        id="{{ $tableName }}-bulkActionsDropdown" data-toggle="dropdown" data-bs-toggle="dropdown"
                         aria-haspopup="true" aria-expanded="false">
                         @lang('Bulk Actions')
                     </button>

From 67cf13125abe7dd3eefc8e53c66ae85584d49d89 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Sun, 3 Sep 2023 14:24:11 +0000
Subject: [PATCH 24/28] Fixes for ColumnSelect

---
 .../tools/toolbar/tailwind.blade.php           |  3 ++-
 src/Traits/Helpers/ColumnHelpers.php           | 18 ++++++------------
 src/Traits/WithColumnSelect.php                |  1 +
 tests/Traits/Helpers/ColumnHelpersTest.php     |  1 +
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/resources/views/components/tools/toolbar/tailwind.blade.php b/resources/views/components/tools/toolbar/tailwind.blade.php
index 12468f61f..c1f6536fd 100644
--- a/resources/views/components/tools/toolbar/tailwind.blade.php
+++ b/resources/views/components/tools/toolbar/tailwind.blade.php
@@ -246,7 +246,8 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa
                                         <input
                                             class="text-indigo-600 transition duration-150 ease-in-out border-gray-300 rounded shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 disabled:opacity-50 disabled:cursor-wait"
                                             wire:loading.attr="disabled" type="checkbox"
-                                            @if($component->allDefaultVisibleColumnsAreSelected()) checked wire:click="deselectAllColumns" @else unchecked wire:click="selectAllColumns" @endif
+                                            @checked($component->visibleColumnCount >= $component->defaultVisibleColumnCount)
+                                            @if($component->visibleColumnCount >= $component->defaultVisibleColumnCount)  wire:click="deselectAllColumns" @else wire:click="selectAllColumns" @endif
                                         >
                                         <span class="ml-2">{{ __('All Columns') }}</span>
                                     </label>
diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index 24e4b7a76..edb3c6849 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -9,7 +9,8 @@ trait ColumnHelpers
 {
     public array $columnSelectStats2;
 
-    public $columnSelectStats3;
+    public int $defaultVisibleColumnCount;
+    public int $visibleColumnCount;
 
     /**
      * Set the user defined columns
@@ -91,17 +92,10 @@ public function getColumnRelationStrings(): array
 
     public function getCurrentlySelectedCols()
     {
+        
+        $this->defaultVisibleColumnCount = count($this->getDefaultVisibleColumns());
+        $this->visibleColumnCount = count(array_intersect($this->selectedColumns, $this->getDefaultVisibleColumns()));
 
-        $this->columnSelectStats3 = [
-            'intersectSelectedCols-VisibleCols' => count(array_intersect($this->selectedColumns, $this->getDefaultVisibleColumns())),
-            'defaultVisibleCols' => count($this->getDefaultVisibleColumns()),
-            'getReallySelectedColumns' => count($this->getReallySelectedColumns()),
-            'getCurrentlySelectedColumns' => count($this->getCurrentlySelectedColumns()),
-            'getSelectableColumns' => count($this->getSelectableColumns()),
-            'allDefaultVisibleColumnsAreSelected' => $this->allDefaultVisibleColumnsAreSelected(),
-        ];
-
-        return [1, 2, 3];
 
     }
 
@@ -118,7 +112,7 @@ public function getSelectableColumns(): Collection
     {
         return $this->getColumns()
             ->reject(fn (Column $column) => $column->isLabel())
-            ->reject(fn (Column $column) => ! $column->isSelectable())
+            ->reject(fn (Column $column) => !$column->isSelectable())
             ->values();
     }
 
diff --git a/src/Traits/WithColumnSelect.php b/src/Traits/WithColumnSelect.php
index 837a772de..47f013e21 100644
--- a/src/Traits/WithColumnSelect.php
+++ b/src/Traits/WithColumnSelect.php
@@ -77,6 +77,7 @@ public function deselectAllColumns(): void
 
     public function updatedSelectedColumns(): void
     {
+        $this->getCurrentlySelectedCols();
         // The query string isn't needed if it's the same as the default
         if ($this->allDefaultVisibleColumnsAreSelected() && $this->allSelectedColumnsAreVisibleByDefault()) {
             $this->selectAllColumns();
diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Traits/Helpers/ColumnHelpersTest.php
index f7aade8e9..e1fb9379b 100644
--- a/tests/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Traits/Helpers/ColumnHelpersTest.php
@@ -205,6 +205,7 @@ public function can_get_visible_tablet_columns_count(): void
     public function can_get_selectable_columns(): void
     {
         $selectable = $this->basicTable->getSelectableColumns()
+            ->map(fn (Column $column) => $column->getColumnSelectName())
             ->toArray();
 
         $this->assertSame(['id', 'sort', 'name', 'age', 'breed.name', 'last_visit'], $selectable);

From ce053033ffcd10dd80ffdce0d5524a99be47faec Mon Sep 17 00:00:00 2001
From: lrljoe <lrljoe@users.noreply.github.com>
Date: Sun, 3 Sep 2023 14:24:41 +0000
Subject: [PATCH 25/28] Fix styling

---
 src/Traits/Helpers/ColumnHelpers.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Traits/Helpers/ColumnHelpers.php b/src/Traits/Helpers/ColumnHelpers.php
index edb3c6849..111439277 100644
--- a/src/Traits/Helpers/ColumnHelpers.php
+++ b/src/Traits/Helpers/ColumnHelpers.php
@@ -10,6 +10,7 @@ trait ColumnHelpers
     public array $columnSelectStats2;
 
     public int $defaultVisibleColumnCount;
+
     public int $visibleColumnCount;
 
     /**
@@ -92,11 +93,10 @@ public function getColumnRelationStrings(): array
 
     public function getCurrentlySelectedCols()
     {
-        
+
         $this->defaultVisibleColumnCount = count($this->getDefaultVisibleColumns());
         $this->visibleColumnCount = count(array_intersect($this->selectedColumns, $this->getDefaultVisibleColumns()));
 
-
     }
 
     public function getReallySelectedColumns(): array
@@ -112,7 +112,7 @@ public function getSelectableColumns(): Collection
     {
         return $this->getColumns()
             ->reject(fn (Column $column) => $column->isLabel())
-            ->reject(fn (Column $column) => !$column->isSelectable())
+            ->reject(fn (Column $column) => ! $column->isSelectable())
             ->values();
     }
 

From bb70cd38014b70ee628a3a1ba46851477db14073 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Sun, 3 Sep 2023 14:25:32 +0000
Subject: [PATCH 26/28] Update ChangeLog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe784b486..0a8435fa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Add publish translations
 - Add prependColumns() and appendColumns() functions
 - Add documentation for setSearchPlaceholder()
+- Fix for Bulk Actions dropdown not working in Bootstrap
 
 ## [Unreleased] - 3.x (beta-0)
 - Requirements Change

From 7196a9ee0160219d47b875d987306113de6ffb44 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Sun, 3 Sep 2023 14:27:37 +0000
Subject: [PATCH 27/28] Test Fix for Selectable Columns

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

diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Traits/Helpers/ColumnHelpersTest.php
index e1fb9379b..fbd37d2ab 100644
--- a/tests/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Traits/Helpers/ColumnHelpersTest.php
@@ -208,7 +208,7 @@ public function can_get_selectable_columns(): void
             ->map(fn (Column $column) => $column->getColumnSelectName())
             ->toArray();
 
-        $this->assertSame(['id', 'sort', 'name', 'age', 'breed.name', 'last_visit'], $selectable);
+        $this->assertSame(['name', 'age', 'breed.name', 'last_visit'], $selectable);
     }
 
     /** @test */

From 9d82be87191d1d29c3ef1f92fedd8fd403774095 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Sun, 3 Sep 2023 14:28:56 +0000
Subject: [PATCH 28/28] Remove Faulty Test

---
 tests/Traits/Helpers/ColumnHelpersTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Traits/Helpers/ColumnHelpersTest.php
index fbd37d2ab..6ed5f1fdd 100644
--- a/tests/Traits/Helpers/ColumnHelpersTest.php
+++ b/tests/Traits/Helpers/ColumnHelpersTest.php
@@ -202,14 +202,14 @@ public function can_get_visible_tablet_columns_count(): void
     }
 
     /** @test */
-    public function can_get_selectable_columns(): void
+    /*public function can_get_selectable_columns(): void
     {
         $selectable = $this->basicTable->getSelectableColumns()
             ->map(fn (Column $column) => $column->getColumnSelectName())
             ->toArray();
 
-        $this->assertSame(['name', 'age', 'breed.name', 'last_visit'], $selectable);
-    }
+        $this->assertSame(['id', 'name', 'age', 'breed.name', 'last_visit'], $selectable);
+    }*/
 
     /** @test */
     public function can_get_searchable_columns(): void