Additional Trait Splits

Author: lrljoe

src/Views/Columns/ComponentColumn.php

@@ -9,16 +9,15 @@
 use Rappasoft\LaravelLivewireTables\Views\Column;
 use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Configuration\ComponentColumnConfiguration;
 use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Helpers\ComponentColumnHelpers;
+use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\{HasComponentView,HasSlot};
 
 class ComponentColumn extends Column
 {
-    use ComponentColumnConfiguration,
+    use HasComponentView,
+        HasSlot,
+        ComponentColumnConfiguration,
         ComponentColumnHelpers;
 
-    protected string $componentView;
-
-    protected mixed $slotCallback = null;
-
     public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);

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

@@ -50,13 +50,6 @@ public function unclickable(): self
         return $this;
     }
 
-    public function setCustomSlug(string $customSlug): self
-    {
-        $this->customSlug = $customSlug;
-
-        return $this;
-    }
-
     public function setColumnLabelStatusDisabled(): self
     {
         $this->setColumnLabelStatus(false);

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

@@ -3,18 +3,4 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Configuration;
 
 trait ComponentColumnConfiguration
-{
-    public function component(string $component): self
-    {
-        $this->componentView = 'components.'.$component;
-
-        return $this;
-    }
-
-    public function slot(callable $callback): self
-    {
-        $this->slotCallback = $callback;
-
-        return $this;
-    }
-}
+{}

src/Views/Columns/Traits/HasCustomSlug.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits;
+
+trait HasCustomSlug
+{
+    protected ?string $customSlug = null;
+
+    public function getCustomSlug(): string
+    {
+        return $this->customSlug;
+    }
+
+    public function hasCustomSlug(): bool
+    {
+        return $this->customSlug !== null;
+    }
+
+    public function setCustomSlug(string $customSlug): self
+    {
+        $this->customSlug = $customSlug;
+
+        return $this;
+    }
+
+
+}

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

@@ -183,16 +183,6 @@ public function isClickable(): bool
             ! $this instanceof LinkColumn;
     }
 
-    public function getCustomSlug(): string
-    {
-        return $this->customSlug;
-    }
-
-    public function hasCustomSlug(): bool
-    {
-        return $this->customSlug !== null;
-    }
-
     public function getColumnLabelStatus(): bool
     {
         return $this->displayColumnLabel ?? true;

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

@@ -3,24 +3,4 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Helpers;
 
 trait ComponentColumnHelpers
-{
-    public function getSlotCallback(): ?callable
-    {
-        return $this->slotCallback;
-    }
-
-    public function hasSlotCallback(): bool
-    {
-        return $this->slotCallback !== null;
-    }
-
-    public function getComponentView(): string
-    {
-        return $this->componentView;
-    }
-
-    public function hasComponentView(): bool
-    {
-        return isset($this->componentView);
-    }
-}
+{}

src/Views/Columns/Traits/IsColumn.php

@@ -5,13 +5,13 @@
 use Rappasoft\LaravelLivewireTables\Traits\Core\HasLocalisations;
 use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Configuration\ColumnConfiguration;
 use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Helpers\{ColumnHelpers,RelationshipHelpers};
-use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\{HasColumnView, HasFooter, HasSecondaryHeader, HasVisibility, IsCollapsible, IsSearchable, IsSelectable, IsSortable};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasAttributes, HasLabelAttributes, HasTheme};
 
 trait IsColumn
 {
     use HasLocalisations,
         HasDataTableComponent,
+        HasCustomSlug,
         ColumnConfiguration,
         ColumnHelpers,
         RelationshipHelpers,
@@ -55,8 +55,6 @@ trait IsColumn
 
     protected bool $clickable = true;
 
-    protected ?string $customSlug = null;
-
     protected bool $hasTableRowUrl = false;
 
     protected bool $isReorderColumn = false;

tests/Unit/Views/Columns/ColumnTestCase.php

@@ -36,4 +36,11 @@ public function test_can_set_the_column_component(): void
 
         $this->assertSame($this->basicTable, self::$columnInstance->getComponent());
     }
+
+    public function test_can_check_if_is_reorder_column(): void
+    {
+        $this->assertFalse(self::$columnInstance->isReorderColumn());
+
+    }
+
 }