Merge branch 'CristhoferMF-fix-bulk-actions-dropdown' into develop

Author: rappasoft

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

@@ -1,11 +1,11 @@
 @if ($this->showBulkActionsDropdown)
-    <div class="mb-3 mb-md-0">
+    <div class="mb-3 mb-md-0" id="{{ $tableName }}-bulkActionsWrapper">
         <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">
+            <button class="btn dropdown-toggle d-block w-100 d-md-inline" type="button" id="{{ $tableName }}-bulkActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 @lang('Bulk Actions')
             </button>
 
-            <div class="dropdown-menu dropdown-menu-right w-100" aria-labelledby="bulkActions">
+            <div class="dropdown-menu dropdown-menu-right w-100" aria-labelledby="{{ $tableName }}-bulkActions">
                 @foreach($this->bulkActions as $action => $title)
                     <a
                         href="#"

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

@@ -1,11 +1,11 @@
 @if ($this->showBulkActionsDropdown)
-    <div class="mb-3 mb-md-0">
+    <div class="mb-3 mb-md-0" id="{{ $tableName }}-bulkActionsWrapper">
         <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">
+            <button class="btn dropdown-toggle d-block w-100 d-md-inline" type="button" id="{{ $tableName }}-bulkActions" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 @lang('Bulk Actions')
             </button>
 
-            <div class="dropdown-menu dropdown-menu-end w-100" aria-labelledby="bulkActions">
+            <div class="dropdown-menu dropdown-menu-end w-100" aria-labelledby="{{ $tableName }}-bulkActions">
                 @foreach($this->bulkActions as $action => $title)
                     <a
                         href="#"

src/DataTableComponent.php

@@ -80,22 +80,22 @@ abstract class DataTableComponent extends Component
     public bool $responsive = true;
 
     /**
-     * Name of the page parameter for pagination
-     * Good to change the default if you have more than one datatable on a page.
+     * Unique name to use for this table if you want the 'per page' options to be remembered on a per table basis.
+     * If not, all 'per page' stored in the session will default to the same option for every table with this default name.
+     *
+     * I.e. If the users changes it to 25 on the users table, the roles table will also default to 25, unless they have unique tableName's
      *
      * @var string
      */
-    protected string $pageName = 'page';
+    public string $tableName = 'table';
 
     /**
-     * Unique name to use for this table if you want the 'per page' options to be remembered on a per table basis.
-     * If not, all 'per page' stored in the session will default to the same option for every table with this default name.
-     *
-     * I.e. If the users changes it to 25 on the users table, the roles table will also default to 25, unless they have unique tableName's
+     * Name of the page parameter for pagination
+     * Good to change the default if you have more than one datatable on a page.
      *
      * @var string
      */
-    protected string $tableName = 'table';
+    protected string $pageName = 'page';
 
     /**
      * @var \null[][]