v3.5.10 - Development To Master

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.5.10] - 2024-12-11
+### Tweaks
+- Migrate additional Styling into separate traits by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2127
+
 ## [v3.5.9] - 2024-12-11
 ### Tweaks
 - Optimize Imports by @edwinvdpol in https://github.com/rappasoft/laravel-livewire-tables/pull/2124

src/Traits/Configuration/ActionsConfiguration.php

@@ -4,13 +4,6 @@
 
 trait ActionsConfiguration
 {
-    public function setActionWrapperAttributes(array $actionWrapperAttributes): self
-    {
-        $this->actionWrapperAttributes = [...$this->actionWrapperAttributes, ...$actionWrapperAttributes];
-
-        return $this;
-    }
-
     public function setActionsInToolbar(bool $status): self
     {
         $this->displayActionsInToolbar = $status;

src/Traits/Configuration/CollapsingColumnConfiguration.php

@@ -24,28 +24,4 @@ public function setCollapsingColumnsDisabled(): self
 
         return $this;
     }
-
-    /**
-     * Used to set attributes for the Collapsed Column Collapse Button
-     *
-     * @param  array<mixed>  $collapsingColumnButtonCollapseAttributes
-     */
-    public function setCollapsingColumnButtonCollapseAttributes(array $collapsingColumnButtonCollapseAttributes): self
-    {
-        $this->collapsingColumnButtonCollapseAttributes = [...['default-colors' => false, 'default-styling' => false], ...$collapsingColumnButtonCollapseAttributes];
-
-        return $this;
-    }
-
-    /**
-     * Used to set attributes for the Collapsed Column Expand Button
-     *
-     * @param  array<mixed>  $collapsingColumnButtonExpandAttributes
-     */
-    public function setCollapsingColumnButtonExpandAttributes(array $collapsingColumnButtonExpandAttributes): self
-    {
-        $this->collapsingColumnButtonExpandAttributes = [...['default-colors' => false, 'default-styling' => false], ...$collapsingColumnButtonExpandAttributes];
-
-        return $this;
-    }
 }

src/Traits/Configuration/FooterConfiguration.php

@@ -47,18 +47,4 @@ public function setUseHeaderAsFooterDisabled(): self
 
         return $this;
     }
-
-    public function setFooterTrAttributes(Closure $callback): self
-    {
-        $this->footerTrAttributesCallback = $callback;
-
-        return $this;
-    }
-
-    public function setFooterTdAttributes(Closure $callback): self
-    {
-        $this->footerTdAttributesCallback = $callback;
-
-        return $this;
-    }
 }

src/Traits/Configuration/PaginationConfiguration.php

@@ -154,13 +154,6 @@ public function setDefaultPerPage(int $defaultPerPage): self
         return $this;
     }
 
-    public function setPerPageFieldAttributes(array $attributes = []): self
-    {
-        $this->perPageFieldAttributes = [...$this->perPageFieldAttributes, ...$attributes];
-
-        return $this;
-    }
-
     public function setShouldRetrieveTotalItemCountStatus(bool $status): self
     {
         $this->shouldRetrieveTotalItemCount = $status;
@@ -182,11 +175,4 @@ public function setShouldRetrieveTotalItemCountDisabled(): self
 
         return $this;
     }
-
-    public function setPaginationWrapperAttributes(array $paginationWrapperAttributes): self
-    {
-        $this->paginationWrapperAttributes = array_merge(['class' => ''], $paginationWrapperAttributes);
-
-        return $this;
-    }
 }

src/Traits/Configuration/ReorderingConfiguration.php

@@ -81,14 +81,4 @@ public function setDefaultReorderSort(string $field, string $direction = 'asc'):
 
         return $this;
     }
-
-    /**
-     * Used to set attributes for the <th> for Reorder Column
-     */
-    public function setReorderThAttributes(array $reorderThAttributes): self
-    {
-        $this->reorderThAttributes = [...$this->reorderThAttributes, ...$reorderThAttributes];
-
-        return $this;
-    }
 }

src/Traits/Configuration/SecondaryHeaderConfiguration.php

@@ -2,8 +2,6 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Configuration;
 
-use Closure;
-
 trait SecondaryHeaderConfiguration
 {
     public function setSecondaryHeaderStatus(bool $status): self
@@ -26,18 +24,4 @@ public function setSecondaryHeaderDisabled(): self
 
         return $this;
     }
-
-    public function setSecondaryHeaderTrAttributes(Closure $callback): self
-    {
-        $this->secondaryHeaderTrAttributesCallback = $callback;
-
-        return $this;
-    }
-
-    public function setSecondaryHeaderTdAttributes(Closure $callback): self
-    {
-        $this->secondaryHeaderTdAttributesCallback = $callback;
-
-        return $this;
-    }
 }

src/Traits/Helpers/ActionsHelpers.php

@@ -20,12 +20,6 @@ public function getActionsPosition(): string
         return $this->actionsPosition ?? 'right';
     }
 
-    #[Computed]
-    public function getActionWrapperAttributes(): array
-    {
-        return [...['class' => '', 'default-styling' => true, 'default-colors' => true], ...$this->actionWrapperAttributes];
-    }
-
     #[Computed]
     public function hasActions(): bool
     {

src/Traits/Helpers/CollapsingColumnHelpers.php

@@ -26,28 +26,6 @@ public function collapsingColumnsAreDisabled(): bool
         return $this->getCollapsingColumnsStatus() === false;
     }
 
-    /**
-     * Retrieves attributes for the Collapsed Column Collapse Button
-     *
-     * @return array<mixed>
-     */
-    #[Computed]
-    public function getCollapsingColumnButtonCollapseAttributes(): array
-    {
-        return [...['default-styling' => true, 'default-colors' => true], ...$this->collapsingColumnButtonCollapseAttributes];
-    }
-
-    /**
-     * Retrieves attributes for the Collapsed Column Expand Button
-     *
-     * @return array<mixed>
-     */
-    #[Computed]
-    public function getCollapsingColumnButtonExpandAttributes(): array
-    {
-        return [...['default-styling' => true, 'default-colors' => true], ...$this->collapsingColumnButtonExpandAttributes];
-    }
-
     #[Computed]
     public function showCollapsingColumnSections(): bool
     {

src/Traits/Helpers/FooterHelpers.php

@@ -40,22 +40,4 @@ public function useHeaderAsFooterIsDisabled(): bool
     {
         return $this->getUseHeaderAsFooterStatus() === false;
     }
-
-    /**
-     * @param  mixed  $rows
-     * @return array<mixed>
-     */
-    public function getFooterTrAttributes($rows): array
-    {
-        return isset($this->footerTrAttributesCallback) ? call_user_func($this->footerTrAttributesCallback, $rows) : ['default' => true];
-    }
-
-    /**
-     * @param  mixed  $rows
-     * @return array<mixed>
-     */
-    public function getFooterTdAttributes(Column $column, $rows, int $index): array
-    {
-        return isset($this->footerTdAttributesCallback) ? call_user_func($this->footerTdAttributesCallback, $column, $rows, $index) : ['default' => true];
-    }
 }

src/Traits/Helpers/PaginationHelpers.php

@@ -152,26 +152,9 @@ private function getPerPagePaginationSessionKey(): string
         return $this->tableName.'-perPage';
     }
 
-    #[Computed]
-    public function getPerPageFieldAttributes(): array
-    {
-        return $this->perPageFieldAttributes;
-    }
-
     #[Computed]
     public function getShouldRetrieveTotalItemCount(): bool
     {
         return $this->shouldRetrieveTotalItemCount;
     }
-
-    public function getPaginationWrapperAttributes(): array
-    {
-        return $this->paginationWrapperAttributes ?? ['class' => ''];
-    }
-
-    #[Computed]
-    public function getPaginationWrapperAttributesBag(): ComponentAttributeBag
-    {
-        return new ComponentAttributeBag($this->getPaginationWrapperAttributes());
-    }
 }

src/Traits/Helpers/ReorderingHelpers.php

@@ -93,23 +93,6 @@ public function getReorderingBackupSessionKey(): string
         return $this->getTableName().'-reordering-backup';
     }
 
-    /**
-     * Used to get attributes for the <th> for Bulk Actions
-     *
-     * @return array<mixed>
-     */
-    #[Computed]
-    public function getReorderThAttributes(): array
-    {
-        return $this->reorderThAttributes ?? ['default' => true];
-    }
-
-    #[Computed]
-    public function hasReorderThAttributes(): bool
-    {
-        return $this->getReorderThAttributes() != ['default' => true];
-    }
-
     public function getReorderColumn(): Column
     {
         return Column::make('reorder')->label(fn () => null);

src/Traits/Helpers/SecondaryHeaderHelpers.php

@@ -2,8 +2,6 @@
 
 namespace Rappasoft\LaravelLivewireTables\Traits\Helpers;
 
-use Rappasoft\LaravelLivewireTables\Views\Column;
-
 trait SecondaryHeaderHelpers
 {
     public function hasColumnsWithSecondaryHeader(): bool
@@ -25,22 +23,4 @@ public function secondaryHeaderIsDisabled(): bool
     {
         return $this->getSecondaryHeaderStatus() === false;
     }
-
-    /**
-     * @param  mixed  $rows
-     * @return array<mixed>
-     */
-    public function getSecondaryHeaderTrAttributes($rows): array
-    {
-        return isset($this->secondaryHeaderTrAttributesCallback) ? call_user_func($this->secondaryHeaderTrAttributesCallback, $rows) : ['default' => true];
-    }
-
-    /**
-     * @param  mixed  $rows
-     * @return array<mixed>
-     */
-    public function getSecondaryHeaderTdAttributes(Column $column, $rows, int $index): array
-    {
-        return isset($this->secondaryHeaderTdAttributesCallback) ? call_user_func($this->secondaryHeaderTdAttributesCallback, $column, $rows, $index) : ['default' => true];
-    }
 }

src/Traits/Styling/Configuration/ActionsStylingConfiguration.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
+
+trait ActionsStylingConfiguration
+{
+    public function setActionWrapperAttributes(array $actionWrapperAttributes): self
+    {
+        $this->actionWrapperAttributes = [...$this->actionWrapperAttributes, ...$actionWrapperAttributes];
+
+        return $this;
+    }
+}

src/Traits/Styling/Configuration/CollapsingColumnsStylingConfiguration.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
+
+trait CollapsingColumnsStylingConfiguration
+{
+    /**
+     * Used to set attributes for the Collapsed Column Collapse Button
+     *
+     * @param  array<mixed>  $collapsingColumnButtonCollapseAttributes
+     */
+    public function setCollapsingColumnButtonCollapseAttributes(array $collapsingColumnButtonCollapseAttributes): self
+    {
+        $this->collapsingColumnButtonCollapseAttributes = [...['default-colors' => false, 'default-styling' => false], ...$collapsingColumnButtonCollapseAttributes];
+
+        return $this;
+    }
+
+    /**
+     * Used to set attributes for the Collapsed Column Expand Button
+     *
+     * @param  array<mixed>  $collapsingColumnButtonExpandAttributes
+     */
+    public function setCollapsingColumnButtonExpandAttributes(array $collapsingColumnButtonExpandAttributes): self
+    {
+        $this->collapsingColumnButtonExpandAttributes = [...['default-colors' => false, 'default-styling' => false], ...$collapsingColumnButtonExpandAttributes];
+
+        return $this;
+    }
+}

src/Traits/Styling/Configuration/FooterStylingConfiguration.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
+
+use Closure;
+
+trait FooterStylingConfiguration
+{
+    public function setFooterTrAttributes(Closure $callback): self
+    {
+        $this->footerTrAttributesCallback = $callback;
+
+        return $this;
+    }
+
+    public function setFooterTdAttributes(Closure $callback): self
+    {
+        $this->footerTdAttributesCallback = $callback;
+
+        return $this;
+    }
+}

src/Traits/Styling/Configuration/PaginationStylingConfiguration.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
+
+trait PaginationStylingConfiguration
+{
+    public function setPerPageFieldAttributes(array $attributes = []): self
+    {
+        $this->perPageFieldAttributes = [...$this->perPageFieldAttributes, ...$attributes];
+
+        return $this;
+    }
+
+    public function setPaginationWrapperAttributes(array $paginationWrapperAttributes): self
+    {
+        $this->paginationWrapperAttributes = array_merge(['class' => ''], $paginationWrapperAttributes);
+
+        return $this;
+    }
+}

src/Traits/Styling/Configuration/ReorderStylingConfiguration.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
+
+trait ReorderStylingConfiguration
+{
+    /**
+     * Used to set attributes for the <th> for Reorder Column
+     */
+    public function setReorderThAttributes(array $reorderThAttributes): self
+    {
+        $this->reorderThAttributes = [...$this->reorderThAttributes, ...$reorderThAttributes];
+
+        return $this;
+    }
+}