Fix hide bulk actions when empty not reflecting in frontend (#1747)

* Fix issue with Hide Bulk Actions When Empty not reflecting in frontend * Fix styling * Add development branch into tests --------- Co-authored-by: lrljoe <[email protected]>
rappasoft · Jun 29, 2024 · 52ad60b · 52ad60b
1 parent f5dba56
commit 52ad60b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - 'develop'
+      - 'development'
       - 'master'
 
 jobs:

diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - 'develop'
+      - 'development'
       - 'master'
 
 jobs:

diff --git a/resources/js/laravel-livewire-tables.js b/resources/js/laravel-livewire-tables.js
@@ -8,7 +8,7 @@ document.addEventListener('alpine:init', () => {
         paginationTotalItemCount: wire.entangle('paginationTotalItemCount'),
         paginationCurrentItems: wire.entangle('paginationCurrentItems'),
         selectedItems: wire.entangle('selected'),
-        alwaysShowBulkActions: !wire.entangle('hideBulkActionsWhenEmpty'),
+        hideBulkActionsWhenEmpty: wire.entangle('hideBulkActionsWhenEmpty'),
         toggleSelectAll() {
             if (!showBulkActionsAlpine) {
                 return;

diff --git a/resources/js/laravel-livewire-tables.min.js b/resources/js/laravel-livewire-tables.min.js
diff --git a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
@@ -1,7 +1,7 @@
 @aware(['component', 'tableName'])
 <div
     x-data="{ open: false, childElementOpen: false, isTailwind: @js($component->isTailwind()), isBootstrap: @js($component->isBootstrap()) }"
-    x-cloak x-show="(selectedItems.length > 0 || alwaysShowBulkActions)"
+    x-cloak x-show="(selectedItems.length > 0 || hideBulkActionsWhenEmpty == false)"
     @class([
         'mb-3 mb-md-0' => $component->isBootstrap(),
         'w-full md:w-auto mb-4 md:mb-0' => $component->isTailwind(),