Merge branch 'v2-query-rework' into develop

Author: rappasoft

.gitignore

@@ -9,3 +9,4 @@ phpunit.xml
 psalm.xml
 testbench.yaml
 vendor
+output.txt

CHANGELOG.md

@@ -11,6 +11,11 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Added $row as second parameter to BooleanColumn `setCallback()`.
 - Added `setThSortButtonAttributes()` to set attributes for th sort button.
 
+### Changed
+
+- Rework builder to fix passed parameters in `builder()` and `columns()` methods.
+- Fixed possible bug with bulk actions dropdown on Tailwind when bulk actions are hidden until a selection is made.
+
 ## [2.3.0] - 2022-04-28
 
 ### Added

resources/views/components/tools/toolbar.blade.php

@@ -152,7 +152,6 @@ class="w-full inline-flex items-center justify-center px-3 py-2 border border-gr
                         @keydown.window.escape="open = false"
                         x-on:click.away="open = false"
                         class="relative inline-block text-left z-10 w-full md:w-auto"
-                        wire:key="bulk-actions-button-{{ $component->getTableName() }}"
                     >
                         <div>
                             <span class="rounded-md shadow-sm">

src/DataTableComponent.php

@@ -59,9 +59,6 @@ public function boot(): void
 
         // Set the filter defaults based on the filter type
         $this->setFilterDefaults();
-        
-        // Set the user defined columns to work with
-        $this->setColumns();
 
         // Call the child configuration, if any
         $this->configure();
@@ -78,6 +75,8 @@ public function boot(): void
     public function booted(): void
     {
         $this->setTheme();
+        $this->setBuilder($this->builder());
+        $this->setColumns();
     }
 
     /**
@@ -119,6 +118,14 @@ public function customView(): string
      */
     public function render()
     {
+        $this->setBuilder($this->builder());
+        $this->setColumns();
+        $this->setupColumnSelect();
+        $this->setupPagination();
+        $this->setupSecondaryHeader();
+        $this->setupFooter();
+        $this->setupReordering();
+
         return view('livewire-tables::datatable')
             ->with([
                 'columns' => $this->getColumns(),

src/Traits/ComponentUtilities.php

@@ -2,6 +2,7 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Str;
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\ComponentConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\ComponentHelpers;
@@ -13,6 +14,7 @@ trait ComponentUtilities
 
     public array $table = [];
     public $theme = null;
+    protected Builder $builder;
     protected $model;
     protected $primaryKey;
     protected string $tableName = 'table';

src/Traits/Helpers/BulkActionsHelpers.php

@@ -172,7 +172,7 @@ public function updatedSelected(): void
      */
     public function updatedSelectAll(): void
     {
-        if (count($this->getSelected()) === $this->baseQuery()->pluck($this->getPrimaryKey())->count()) {
+        if (count($this->getSelected()) === (clone $this->baseQuery())->pluck($this->getPrimaryKey())->count()) {
             $this->clearSelected();
         } else {
             $this->setAllSelected();
@@ -185,6 +185,6 @@ public function updatedSelectAll(): void
     public function setAllSelected(): void
     {
         $this->setSelectAllEnabled();
-        $this->setSelected($this->baseQuery()->pluck($this->getPrimaryKey())->map(fn ($item) => (string)$item)->toArray());
+        $this->setSelected((clone $this->baseQuery())->pluck($this->getPrimaryKey())->map(fn ($item) => (string)$item)->toArray());
     }
 }

src/Traits/Helpers/ColumnHelpers.php

@@ -19,7 +19,7 @@ public function setColumns(): void
 
                 if ($column->hasField()) {
                     if ($column->isBaseColumn()) {
-                        $column->setTable($this->builder()->getModel()->getTable());
+                        $column->setTable($this->getBuilder()->getModel()->getTable());
                     } else {
                         $column->setTable($this->getTableForColumn($column));
                     }

src/Traits/Helpers/ComponentHelpers.php

@@ -2,11 +2,28 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 
 trait ComponentHelpers
 {
+    /**
+     * @param Builder
+     */
+    public function setBuilder(Builder $builder): void
+    {
+        $this->builder = $builder;
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getBuilder(): Builder
+    {
+        return $this->builder;
+    }
+
     /**
      * @return bool
      */

src/Traits/WithColumnSelect.php

@@ -14,7 +14,7 @@ trait WithColumnSelect
     protected bool $columnSelectStatus = true;
     protected bool $rememberColumnSelectionStatus = true;
 
-    public function mountWithColumnSelect(): void
+    public function setupColumnSelect(): void
     {
         // If remember selection is off, then clear the session
         if ($this->rememberColumnSelectionIsDisabled()) {

src/Traits/WithColumns.php

@@ -10,4 +10,9 @@ trait WithColumns
     use ColumnHelpers;
 
     protected Collection $columns;
+
+    public function bootWithColumns(): void
+    {
+        $this->columns = collect();
+    }
 }