Further Cleanup

Author: lrljoe

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

@@ -10,6 +10,8 @@
         ->except(['default','default-styling','default-colors'])
     }}
 >
+    @includeWhen(!$this->showActionsInToolbar(), 'livewire-tables::includes.toolbar.items.actions', $this->getToolbarActionAttributes())
+
     @if(method_exists($this, 'showSortPillsSection') ? $this->showSortPillsSection() : false)
         <x-livewire-tables::tools.sorting-pills />
     @endif

resources/views/components/wrapper.blade.php

@@ -2,5 +2,6 @@
 <div {{ $attributes->merge($this->getComponentWrapperAttributes()) }}>
     @includeWhen($this->debugIsEnabled(),'livewire-tables::includes.debug')
     @includeWhen($this->offlineIndicatorIsEnabled(),'livewire-tables::includes.offline')
+
     {{ $slot }}
 </div>

resources/views/datatable.blade.php

@@ -9,9 +9,6 @@
         )
 
         <x-livewire-tables::wrapper :$tableName :$primaryKey :$isTailwind :$isTailwind4 :$isBootstrap :$isBootstrap4 :$isBootstrap5 :$localisationPath :$collapsingColumnDetails  :$collapsingColumnButtonExpandAttributes :$collapsingColumnButtonCollapseAttributes :$hasCollapsingColumns :$currentlyReorderingStatus :$hasDisplayLoadingPlaceholder :$coreTableAttributes :$selectedVisibleColumns :$showBulkActionsSections :$showCollapsingColumnSections :$hasTrAttributes :$collapsingColumnInfo :$filterGenericData :$hasTdAttributes >
-            @if($this->hasActions() && !$this->showActionsInToolbar())
-                <x-livewire-tables::actions />
-            @endif
 
             @if($this->shouldShowTools())
 

src/Features/Actions/Core/Helpers/ActionsHelpers.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Livewire\Attributes\Computed;
-use Rappasoft\LaravelLivewireTables\Views\Action;
+use Rappasoft\LaravelLivewireTables\Features\Actions\Views\Action;
 
 trait ActionsHelpers
 {

src/Features/Actions/Core/WithActions.php

@@ -32,7 +32,7 @@ trait WithActions
     /**
      * Undocumented variable
      *
-     * @var Collection<int,\Rappasoft\LaravelLivewireTables\Views\Action>|null
+     * @var Collection<int,\Rappasoft\LaravelLivewireTables\Features\Actions\Views>|null
      */
     protected ?Collection $validActions;
 

src/Features/Tools/Helpers/ToolBarHelpers.php

@@ -72,7 +72,7 @@ protected function hasToolbarReorder(): bool
 
     protected function hasToolbarConfigurableAreas(): bool
     {
-        return $this->hasConfigurableAreaFor('toolbar-left-end') || $this->hasConfigurableAreaFor('toolbar-left-start') || $this->hasConfigurableAreaFor('toolbar-right-start') || $this->hasConfigurableAreaFor('toolbar-right-end');
+        return $this->hasConfigurableAreaFor('toolbar-left-start') || $this->hasConfigurableAreaFor('toolbar-left-end') || $this->hasConfigurableAreaFor('toolbar-right-start') || $this->hasConfigurableAreaFor('toolbar-right-end');
     }
 
     protected function hasToolbarActions(): bool

src/Features/Tools/Helpers/ToolBarItemHelpers.php

@@ -100,6 +100,17 @@ protected function getToolbarItemForFilters()
         }
         return [];
     }
+    public function getToolbarActionAttributes()
+    {
+        return [
+                'actionWrapperAttributes' => $this->getActionWrapperAttributes(),
+                'actionButtonAttributes' => $this->getActionsButtonAttributes(),
+                'actionsMenuAttributes' => $this->getActionsMenuAttributes(),
+                'actionsPosition' => $this->getActionsPosition(),
+                'showActionsAsDropdown' => $this->showActionsAsDropdown(),
+                'showActionsInToolbar' => $this->showActionsInToolbar(),
+        ];
+    }
 
     protected function getToolbarItemForActions()
     {