added default row-columns view, set rowViews() method to this new blade, re-added format() method on column, re-added formatted() method to column with some enhancements to make it easier to use, added asHtml() mutator to control data output, re-added support for getTableRowUrl link, flipped column and text parameters for Column constructor to improve backwards compatability, if columne parameter is missing then set it to the column text snake cased

Author: bdelamatre

resources/views/tailwind/components/table/row-columns.blade.php

@@ -0,0 +1,10 @@
+@php /** @var \Rappasoft\LaravelLivewireTables\Views\Column[] $columns **/ @endphp
+@foreach($columns as $column)
+    <td>
+        @if($column->asHtml)
+            {!! (string)$column->formatted($row) !!}
+        @else
+            {{ $column->formatted($row) }}
+        @endif
+    </td>
+@endforeach

resources/views/tailwind/components/table/row.blade.php

@@ -1,3 +1,8 @@
-<tr {{ $attributes->merge(['class' => 'bg-white']) }}>
+<tr {{ $attributes->merge(['class' => 'bg-white']) }}
+    @if ($url)
+    onclick="window.location='{{ $url }}';"
+    style="cursor:pointer"
+    @endif
+>
     {{ $slot }}
 </tr>

resources/views/tailwind/datatable.blade.php

@@ -314,6 +314,7 @@ class="ml-1 text-blue-600 underline text-cool-gray-700 text-sm leading-5 font-me
                 <x-livewire-tables::table.row
                     wire:loading.class.delay="opacity-50"
                     wire:key="table-row-{{ $row->getKey() }}"
+                    url="{{ method_exists($this, 'getTableRowUrl') ? $this->getTableRowUrl($row) : null }}"
                     class="{{ $index % 2 === 0 ? 'bg-white' : 'bg-gray-50' }}"
                 >
                     @if (count($bulkActions))
@@ -329,7 +330,7 @@ class="rounded-md shadow-sm border-cool-gray-300 block transition duration-150 e
                         </x-livewire-tables::table.cell>
                     @endif
 
-                    @include($rowsView, ['row' => $row])
+                    @include($rowsView)
                 </x-livewire-tables::table.row>
             @empty
                 <x-livewire-tables::table.row>

src/DataTableComponent.php

@@ -117,7 +117,10 @@ abstract public function query(): Builder;
      *
      * @return string
      */
-    abstract public function rowView(): string;
+    public function rowView(): string
+    {
+        return 'livewire-tables::'.config('livewire-tables.theme').'.components.table.row-columns';
+    }
 
     /**
      * TableComponent constructor.

src/Views/Column.php

@@ -2,6 +2,8 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views;
 
+use Illuminate\Support\Str;
+
 /**
  * Class Column.
  */
@@ -37,16 +39,30 @@ class Column
      */
     public bool $blank = false;
 
+    /**
+     * @var
+     */
+    public $formatCallback;
+
+    /**
+     * @var bool
+     */
+    public bool $asHtml = false;
+
     /**
      * Column constructor.
      *
      * @param string|null $column
      * @param string|null $text
      */
-    public function __construct(string $column = null, string $text = null)
+    public function __construct(string $text = null, string $column = null)
     {
-        $this->column = $column;
         $this->text = $text;
+        if (!$column) {
+            $this->column = Str::snake($text);
+        }else{
+            $this->column = $column;
+        }
 
         if (! $this->column && ! $this->text) {
             $this->blank = true;
@@ -59,9 +75,9 @@ public function __construct(string $column = null, string $text = null)
      *
      * @return Column
      */
-    public static function make(string $column = null, string $text = null): Column
+    public static function make(string $text = null, string $column = null): Column
     {
-        return new static($column, $text);
+        return new static($text, $column);
     }
 
     /**
@@ -151,4 +167,51 @@ public function text(): ?string
     {
         return $this->text;
     }
+
+    /**
+     * @param  callable  $callable
+     *
+     * @return $this
+     */
+    public function format(callable $callable): Column
+    {
+        $this->formatCallback = $callable;
+
+        return $this;
+    }
+
+    /**
+     * @param $model
+     * @param $column
+     *
+     * @return mixed
+     */
+    public function formatted($row, $column = null)
+    {
+        if ($column && $column instanceof Column) {
+            $columnName = $column->column();
+        } elseif ( is_string($column) ) {
+            $columnName = $column;
+        } else {
+            $columnName = $this->column();
+        }
+
+        $value = data_get($row, $columnName) ?? null;
+
+        if ($this->formatCallback) {
+            return app()->call($this->formatCallback, ['value' => $value, 'column' => $column, 'row' => $row]);
+        }else{
+            return $value;
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function asHtml(): self
+    {
+        $this->asHtml = true;
+
+        return $this;
+    }
 }