Further Column Trait Tidy Up

Author: lrljoe

src/Views/Column.php

@@ -9,8 +9,6 @@ class Column
 {
     use IsColumn;
 
-    protected bool $displayColumnLabel = true;
-
     protected string $view = '';
 
     public function __construct(string $title, ?string $from = null)

src/Views/Columns/Traits/Configuration/ColumnConfiguration.php

@@ -18,45 +18,6 @@ public function setTable(string $table): self
         return $this;
     }
 
-    public function unclickable(): self
-    {
-        $this->clickable = false;
-
-        return $this;
-    }
-
-    public function setColumnLabelStatusDisabled(): self
-    {
-        $this->setColumnLabelStatus(false);
-
-        return $this;
-    }
-
-    public function setColumnLabelStatusEnabled(): self
-    {
-        $this->setColumnLabelStatus(true);
-
-        return $this;
-    }
-
-    public function setColumnLabelStatus(bool $status): void
-    {
-        $this->displayColumnLabel = $status;
-    }
-
-    public function setHasTableRowUrl(bool $hasTableRowUrl): self
-    {
-        $this->hasTableRowUrl = $hasTableRowUrl;
-
-        return $this;
-    }
-
-    public function setIsReorderColumn(bool $isReorderColumn): self
-    {
-        $this->isReorderColumn = $isReorderColumn;
-
-        return $this;
-    }
 
     public function setIndexes(int $rowIndex, int $columnIndex): self
     {

src/Views/Columns/Traits/HasClickable.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits;
+
+use Rappasoft\LaravelLivewireTables\Views\Columns\LinkColumn;
+
+trait HasClickable
+{
+    protected bool $clickable = true;
+
+    protected bool $hasTableRowUrl = false;
+
+    public function isClickable(): bool
+    {
+        return $this->clickable &&
+            $this->getHasTableRowUrl() &&
+            ! $this instanceof LinkColumn;
+    }
+
+    public function getHasTableRowUrl(): bool
+    {
+        return $this->hasTableRowUrl;
+    }
+    
+    public function unclickable(): self
+    {
+        $this->clickable = false;
+
+        return $this;
+    }
+
+    public function setHasTableRowUrl(bool $hasTableRowUrl): self
+    {
+        $this->hasTableRowUrl = $hasTableRowUrl;
+
+        return $this;
+    }
+
+
+}

src/Views/Columns/Traits/HasColumnLabelStatus.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits;
+
+trait HasColumnLabelStatus
+{
+    protected bool $displayColumnLabel = true;
+
+    public function getColumnLabelStatus(): bool
+    {
+        return $this->displayColumnLabel ?? true;
+    }
+
+    public function setColumnLabelStatus(bool $status): self
+    {
+        $this->displayColumnLabel = $status;
+
+        return $this;
+    }
+
+    public function setColumnLabelStatusEnabled(): self
+    {
+        return $this->setColumnLabelStatus(true);
+    }
+
+    public function setColumnLabelStatusDisabled(): self
+    {
+        return $this->setColumnLabelStatus(false);
+    }
+
+}

src/Views/Columns/Traits/Helpers/ColumnHelpers.php

@@ -6,7 +6,6 @@
 use Illuminate\Support\HtmlString;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Views\Column;
-use Rappasoft\LaravelLivewireTables\Views\Columns\LinkColumn;
 
 trait ColumnHelpers
 {
@@ -122,11 +121,6 @@ public function getValue(Model $row): mixed
         return $row->{$this->getRelationString().'.'.$this->getField()};
     }
 
-    public function isReorderColumn(): bool
-    {
-        return $this->isReorderColumn;
-    }
-
     public function isHtml(): bool
     {
         return $this->html === true;
@@ -145,28 +139,6 @@ public function view(string $view): self
         return $this;
     }
 
-    public function isClickable(): bool
-    {
-        return $this->clickable &&
-            $this->getHasTableRowUrl() &&
-            ! $this instanceof LinkColumn;
-    }
-
-    public function getColumnLabelStatus(): bool
-    {
-        return $this->displayColumnLabel ?? true;
-    }
-
-    public function getHasTableRowUrl(): bool
-    {
-        return $this->hasTableRowUrl;
-    }
-
-    public function getIsReorderColumn(): bool
-    {
-        return $this->isReorderColumn;
-    }
-
     public function getColumnIndex(): int
     {
         return $this->columnIndex;

src/Views/Columns/Traits/IsColumn.php

@@ -11,8 +11,11 @@ trait IsColumn
 {
     use HasLocalisations,
         HasDataTableComponent,
+        IsReorderColumn,
+        HasColumnLabelStatus,
         HasRelations,
         HasLabelFormat,
+        HasClickable,
         HasSlug,
         ColumnConfiguration,
         ColumnHelpers,
@@ -45,12 +48,6 @@ trait IsColumn
 
     protected bool $html = false;
 
-    protected bool $clickable = true;
-
-    protected bool $hasTableRowUrl = false;
-
-    protected bool $isReorderColumn = false;
-
     protected ?int $columnIndex;
 
     protected ?int $rowIndex;

src/Views/Columns/Traits/IsReorderColumn.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits;
+
+trait IsReorderColumn
+{
+    protected bool $isReorderColumn = false;
+
+    public function isReorderColumn(): bool
+    {
+        return $this->isReorderColumn;
+    }
+
+    public function getIsReorderColumn(): bool
+    {
+        return $this->isReorderColumn;
+    }    
+    
+    public function setIsReorderColumn(bool $isReorderColumn): self
+    {
+        $this->isReorderColumn = $isReorderColumn;
+
+        return $this;
+    }
+
+}