Merge pull request #370 from rappasoft/develop

v1.10.4

Author: rappasoft

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
+## [1.10.4] - 2021-06-23
+
+### Added
+
+- Added $hideBulkActionsOnEmpty to hide the bulk actions dropdown until something is selected.
+
 ## [1.10.3] - 2021-06-22
 
 ### Added
@@ -408,7 +414,8 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 - Initial release
 
-[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.3...development
+[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.4...development
+[1.10.4]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.3...v1.10.4
 [1.10.3]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.2...v1.10.3
 [1.10.2]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.1...v1.10.2
 [1.10.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.0...v1.10.1

resources/views/bootstrap-4/includes/bulk-actions.blade.php

@@ -1,4 +1,4 @@
-@if ($bulkActionsEnabled && count($bulkActions))
+@if ($this->showBulkActionsDropdown)
     <div class="mb-3 mb-md-0">
         <div class="dropdown d-block d-md-inline">
             <button class="btn dropdown-toggle d-block w-100 d-md-inline" type="button" id="bulkActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

resources/views/bootstrap-5/includes/bulk-actions.blade.php

@@ -1,4 +1,4 @@
-@if ($bulkActionsEnabled && count($bulkActions))
+@if ($this->showBulkActionsDropdown)
     <div class="mb-3 mb-md-0">
         <div class="dropdown d-block d-md-inline">
             <button class="btn dropdown-toggle d-block w-100 d-md-inline" type="button" id="bulkActions" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

resources/views/tailwind/includes/bulk-actions.blade.php

@@ -1,4 +1,4 @@
-@if ($bulkActionsEnabled && count($bulkActions))
+@if ($this->showBulkActionsDropdown)
     <div class="w-full md:w-auto mb-4 md:mb-0">
         <div
             x-data="{ open: false }"

src/Traits/WithBulkActions.php

@@ -16,6 +16,7 @@ trait WithBulkActions
     public bool $selectAll = false;
     public $selected = [];
     public array $bulkActions = [];
+    public bool $hideBulkActionsOnEmpty = false;
 
     public function renderingWithBulkActions(): void
     {
@@ -89,4 +90,25 @@ public function getSelectedKeysProperty(): array
     {
         return $this->selectedKeys();
     }
+
+    public function getShowBulkActionsDropdownProperty(): bool
+    {
+        $showBulkActions = false;
+
+        if ($this->bulkActionsEnabled) {
+            if (count($this->bulkActions)) {
+                $showBulkActions = true;
+            }
+
+            if ($this->hideBulkActionsOnEmpty) {
+                if (count($this->selected)) {
+                    $showBulkActions = true;
+                } else {
+                    $showBulkActions = false;
+                }
+            }
+        }
+
+        return $showBulkActions;
+    }
 }

src/Traits/WithColumnSelect.php

@@ -15,8 +15,8 @@ trait WithColumnSelect
     public function mountWithColumnSelect(): void
     {
         // If the column select is off, make sure to clear the session
-        if (! $this->columnSelect && session()->has($this->tableName.'-columnSelectEnabled')) {
-            session()->forget($this->tableName.'-columnSelectEnabled');
+        if (! $this->columnSelect && session()->has($this->getColumnSelectSessionKey())) {
+            session()->forget($this->getColumnSelectSessionKey());
         }
 
         // Get a list of visible default columns that are not excluded
@@ -27,24 +27,29 @@ public function mountWithColumnSelect(): void
             ->toArray();
 
         // Set to either the default set or what is stored in the session
-        $this->columnSelectEnabled = session()->get($this->tableName.'-columnSelectEnabled', $columns);
+        $this->columnSelectEnabled = session()->get($this->getColumnSelectSessionKey(), $columns);
 
         // Check to see if there are any excluded that are already stored in the enabled and remove them
         foreach ($this->columns() as $column) {
             if (! $column->isSelectable() && ! in_array($column->column(), $this->columnSelectEnabled, true)) {
                 $this->columnSelectEnabled[] = $column->column();
-                session([$this->tableName.'-columnSelectEnabled' => $this->columnSelectEnabled]);
+                session([$this->getColumnSelectSessionKey() => $this->columnSelectEnabled]);
             }
         }
     }
 
     public function updatedColumnSelectEnabled(): void
     {
-        session([$this->tableName.'-columnSelectEnabled' => $this->columnSelectEnabled]);
+        session([$this->getColumnSelectSessionKey() => $this->columnSelectEnabled]);
     }
 
     public function isColumnSelectEnabled($column): bool
     {
         return in_array($column instanceof Column ? $column->column() : $column, $this->columnSelectEnabled, true);
     }
+
+    private function getColumnSelectSessionKey(): string
+    {
+        return $this->tableName.'-columnSelectEnabled';
+    }
 }

src/Traits/WithPerPagePagination.php

@@ -20,33 +20,31 @@ public function mountWithPerPagePagination(): void
             $this->perPageAccepted[] = -1;
         }
 
-        if (in_array(session()->get($this->tableName.'-perPage', $this->perPage), $this->perPageAccepted, true)) {
-            $this->perPage = session()->get($this->tableName.'-perPage', $this->perPage);
+        if (in_array(session()->get($this->getPerPagePaginationSessionKey(), $this->perPage), $this->perPageAccepted, true)) {
+            $this->perPage = session()->get($this->getPerPagePaginationSessionKey(), $this->perPage);
         } else {
             $this->perPage = $this->perPageAccepted[0] ?? 10;
         }
     }
 
-    /**
-     * @param $value
-     */
     public function updatedPerPage($value): void
     {
-        if (in_array(session()->get($this->tableName.'-perPage', $this->perPage), $this->perPageAccepted, true)) {
-            session()->put($this->tableName.'-perPage', (int) $value);
+        if (in_array(session()->get($this->getPerPagePaginationSessionKey(), $this->perPage), $this->perPageAccepted, true)) {
+            session()->put($this->getPerPagePaginationSessionKey(), (int) $value);
         } else {
-            session()->put($this->tableName.'-perPage', $this->perPageAccepted[0] ?? 10);
+            session()->put($this->getPerPagePaginationSessionKey(), $this->perPageAccepted[0] ?? 10);
         }
 
         $this->resetPage();
     }
 
-    /**
-     * @param $query
-     * @return mixed
-     */
     public function applyPagination($query)
     {
         return $query->paginate($this->perPage === -1 ? $query->count() : $this->perPage, ['*'], $this->pageName());
     }
+
+    private function getPerPagePaginationSessionKey(): string
+    {
+        return $this->tableName.'-perPage';
+    }
 }