Improve ColumnDefs

Author: yajra

src/Html/Column.php

@@ -140,7 +140,7 @@ public function orderable(bool $flag = true): static
      * @param  string  $name
      * @return static
      */
-    public static function make(array|string $data, string $name = ''): static
+    public static function make(array|string $data = [], string $name = ''): static
     {
         $attr = $data;
         if (is_string($data)) {
@@ -404,7 +404,7 @@ public function orderSequence(array $value): static
      * @return $this
      * @see https://datatables.net/reference/option/columns.cellType
      */
-    public function cellType(string $value): static
+    public function cellType(string $value = 'th'): static
     {
         $this->attributes['cellType'] = $value;
 

src/Html/ColumnDefinition.php

@@ -2,15 +2,54 @@
 
 namespace Yajra\DataTables\Html;
 
-use Illuminate\Support\Fluent;
-
-// TODO: Review class implementation
-class ColumnDefinition extends Fluent
+/**
+ * @see https://datatables.net/reference/option/columnDefs
+ */
+class ColumnDefinition extends Column
 {
-    public function targets(array $value): static
+    /**
+     * @param  array  $attributes
+     */
+    public function __construct($attributes = [])
+    {
+        parent::__construct($attributes);
+
+        $this->attributes = $attributes;
+    }
+
+    /**
+     * @param  array|string|int  $value
+     * @return $this
+     * @see https://datatables.net/reference/option/columnDefs.targets
+     */
+    public function targets(array|string|int $value): static
     {
         $this->attributes['targets'] = $value;
 
         return $this;
     }
+
+    /**
+     * @param  array  $value
+     * @return $this
+     * @see https://datatables.net/reference/option/columns
+     */
+    public function columns(array $value): static
+    {
+        $this->attributes['columns'] = $value;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray(): array
+    {
+        $array = parent::toArray();
+
+        unset($array['attributes']);
+
+        return $array;
+    }
 }

src/Html/Options/HasColumns.php

@@ -30,6 +30,14 @@ public function columnDefs(array|Arrayable|callable $value): static
             $value = $value->toArray();
         }
 
+        if (is_array($value)) {
+            foreach ($value as $key => $def) {
+                if ($def instanceof Arrayable) {
+                    $value[$key] = $def->toArray();
+                }
+            }
+        }
+
         $this->attributes['columnDefs'] = $value;
 
         return $this;

tests/BuilderTest.php

@@ -4,6 +4,8 @@
 
 use Yajra\DataTables\Html\Builder;
 use Yajra\DataTables\Html\Column;
+use Yajra\DataTables\Html\ColumnDefinition;
+use Yajra\DataTables\Html\ColumnDefinitions;
 
 class BuilderTest extends TestCase
 {
@@ -184,4 +186,27 @@ public function it_can_add_action_column()
         $this->assertEquals(false, $column->exportable);
         $this->assertEquals(true, $column->printable);
     }
+
+    /** @test */
+    public function it_has_column_defs()
+    {
+        $builder = $this->getHtmlBuilder();
+        $builder->columnDefs([['targets' => '_all']]);
+
+        $this->assertEquals([['targets' => '_all']], $builder->getAttribute('columnDefs'));
+        $this->assertCount(1, $builder->getAttribute('columnDefs'));
+
+        $builder->columnDefs([ColumnDefinition::make()->targets('_all')->visible()]);
+
+        $this->assertEquals([['targets' => '_all', 'visible' => true]], $builder->getAttribute('columnDefs'));
+        $this->assertCount(1, $builder->getAttribute('columnDefs'));
+
+        $builder->addColumnDef(ColumnDefinition::make()->targets([1]));
+        $this->assertEquals(['targets' => [1]], $builder->getAttribute('columnDefs')[1]);
+        $this->assertCount(2, $builder->getAttribute('columnDefs'));
+
+        $builder->columnDefs(ColumnDefinitions::make()->push(ColumnDefinition::make()->targets(1)));
+        $this->assertEquals([['targets' => 1]], $builder->getAttribute('columnDefs'));
+        $this->assertCount(1, $builder->getAttribute('columnDefs'));
+    }
 }

tests/ColumnDefinitionTest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Yajra\DataTables\Html\Tests;
+
+use Yajra\DataTables\Html\ColumnDefinition;
+
+class ColumnDefinitionTest extends TestCase
+{
+    /** @test */
+    public function it_has_property_setters()
+    {
+        $def = ColumnDefinition::make()
+                               ->targets([1])
+                               ->columns([])
+                               ->cellType()
+                               ->className('my-class')
+                               ->contentPadding('mmm')
+                               ->createdCell('fn');
+
+        $this->assertEquals([1], $def->targets);
+        $this->assertEquals([], $def->columns);
+        $this->assertEquals('th', $def->cellType);
+        $this->assertEquals('my-class', $def->className);
+        $this->assertEquals('mmm', $def->contentPadding);
+        $this->assertEquals('fn', $def->createdCell);
+    }
+
+}