Merge pull request #2128 from rappasoft/development

v3.5.10 - Development To Master

Author: lrljoe

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];
-    }
 }