Clean up Column Component View and Slot behaviours (rappasoft#2169)

* Clean up Column Component View and Slot behaviours

* Fix styling

* Restore Trait

---------

Co-authored-by: lrljoe <[email protected]>

Author: lrljoe

src/Views/Columns/ComponentColumn.php

@@ -7,17 +7,14 @@
 use Illuminate\View\ComponentAttributeBag;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Views\Column;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\{HasComponentView, HasSlot};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\ComponentColumnConfiguration;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\ComponentColumnHelpers;
 
 class ComponentColumn extends Column
 {
-    use ComponentColumnConfiguration,
-        ComponentColumnHelpers;
-
-    protected string $componentView;
-
-    protected mixed $slotCallback = null;
+    use HasComponentView,
+        HasSlot;
 
     public function __construct(string $title, ?string $from = null)
     {
@@ -46,10 +43,7 @@ public function getContents(Model $row): null|string|HtmlString|DataTableConfigu
             }
         }
         if ($this->hasSlotCallback()) {
-            $slotContent = call_user_func($this->getSlotCallback(), $value, $row, $this);
-            if (is_string($slotContent)) {
-                $slotContent = new HtmlString($slotContent);
-            }
+            $slotContent = $this->getSlotContent($row, $value);
         }
 
         return view($this->getComponentView(), [

src/Views/Columns/ViewComponentColumn.php

@@ -6,16 +6,16 @@
 use Illuminate\Support\HtmlString;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Views\Column;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\HasComponentView;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\ViewComponentColumnConfiguration;
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\ViewComponentColumnHelpers;
 use ReflectionClass;
 
 class ViewComponentColumn extends Column
 {
     use ViewComponentColumnConfiguration,
-        ViewComponentColumnHelpers;
-
-    protected ?string $componentView;
+        ViewComponentColumnHelpers,
+        HasComponentView;
 
     protected ?string $customComponentView;
 

src/Views/Traits/Columns/HasComponentView.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Columns;
+
+trait HasComponentView
+{
+    protected string $componentView;
+
+    public function component(string $component): self
+    {
+        $this->componentView = 'components.'.$component;
+
+        return $this;
+    }
+
+    public function getComponentView(): string
+    {
+        return $this->componentView;
+    }
+
+    public function hasComponentView(): bool
+    {
+        return isset($this->componentView);
+    }
+}

src/Views/Traits/Columns/HasSlot.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Columns;
+
+use Closure;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\HtmlString;
+
+trait HasSlot
+{
+    protected ?Closure $slotCallback = null;
+
+    public function getSlotContent(Model $row, mixed $value): string|HtmlString
+    {
+        $slotContent = call_user_func($this->getSlotCallback(), $value, $row, $this);
+        if (is_string($slotContent)) {
+            $slotContent = new HtmlString($slotContent);
+        }
+
+        return $slotContent;
+    }
+
+    public function getSlotCallback(): ?callable
+    {
+        return $this->slotCallback;
+    }
+
+    public function hasSlotCallback(): bool
+    {
+        return isset($this->slotCallback) && $this->slotCallback !== null;
+    }
+
+    public function slot(callable $callback): self
+    {
+        $this->slotCallback = $callback;
+
+        return $this;
+    }
+}

src/Views/Traits/Configuration/ComponentColumnConfiguration.php

@@ -4,16 +4,6 @@
 
 trait ViewComponentColumnConfiguration
 {
-    /**
-     * Defines the View Component to be used for the Column
-     */
-    public function component(string $component): self
-    {
-        $this->componentView = $component;
-
-        return $this;
-    }
-
     public function customComponent(string $customComponentView): self
     {
         $this->customComponentView = $customComponentView;

src/Views/Traits/Configuration/ViewComponentColumnConfiguration.php

@@ -4,22 +4,6 @@
 
 trait ViewComponentColumnHelpers
 {
-    /**
-     * Retrieves the defined Component View
-     */
-    public function getComponentView(): string
-    {
-        return $this->componentView;
-    }
-
-    /**
-     * Determines whether a Component View has been set
-     */
-    public function hasComponentView(): bool
-    {
-        return isset($this->componentView);
-    }
-
     public function hasCustomComponent(): bool
     {
         return isset($this->customComponentView);