Merge branch 'DeltaSystems-patch-bulk-action-random-wire-key' into develop

Author: rappasoft

resources/views/bootstrap-4/includes/table.blade.php

@@ -93,7 +93,7 @@
         @forelse ($rows as $index => $row)
             <x-livewire-tables::bs4.table.row
                 wire:loading.class.delay="text-muted"
-                wire:key="table-row-{{ $row->{$primaryKey} }}"
+                wire:key="table-row-{{ md5(mt_rand()) }}-{{ $row->{$this->parseField($primaryKey)} }}"
                 wire:sortable.item="{{ $row->{$primaryKey} }}"
                 :reordering="$reordering"
                 :url="method_exists($this, 'getTableRowUrl') ? $this->getTableRowUrl($row) : ''"
@@ -115,7 +115,7 @@
                         <input
                             wire:model="selected"
                             wire:loading.attr.delay="disabled"
-                            value="{{ $row->{\Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities::parseField($primaryKey)} }}"
+                            value="{{ $row->{$this->parseField($primaryKey)} }}"
                             onclick="event.stopPropagation();return true;"
                             type="checkbox"
                         />

resources/views/bootstrap-5/includes/table.blade.php

@@ -94,7 +94,7 @@ class="form-check-input"
         @forelse ($rows as $index => $row)
             <x-livewire-tables::bs5.table.row
                 wire:loading.class.delay="text-muted"
-                wire:key="table-row-{{ $row->{$primaryKey} }}"
+                wire:key="table-row-{{ md5(mt_rand()) }}-{{ $row->{$this->parseField($primaryKey)} }}"
                 wire:sortable.item="{{ $row->{$primaryKey} }}"
                 :reordering="$reordering"
                 :url="method_exists($this, 'getTableRowUrl') ? $this->getTableRowUrl($row) : ''"
@@ -116,7 +116,7 @@ class="form-check-input"
                         <input
                             wire:model="selected"
                             wire:loading.attr.delay="disabled"
-                            value="{{ $row->{\Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities::parseField($primaryKey)} }}"
+                            value="{{ $row->{$this->parseField($primaryKey)} }}"
                             onclick="event.stopPropagation();return true;"
                             class="form-check-input"
                             type="checkbox"

resources/views/tailwind/includes/table.blade.php

@@ -96,7 +96,7 @@ class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150
         @forelse ($rows as $index => $row)
             <x-livewire-tables::table.row
                 wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
-                wire:key="table-row-{{ $row->{$primaryKey} }}"
+                wire:key="table-row-{{ md5(mt_rand()) }}-{{ $row->{$this->parseField($primaryKey)} }}"
                 wire:sortable.item="{{ $row->{$primaryKey} }}"
                 :reordering="$reordering"
                 :url="method_exists($this, 'getTableRowUrl') ? $this->getTableRowUrl($row) : ''"
@@ -125,7 +125,7 @@ class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150
                             <input
                                 wire:model="selected"
                                 wire:loading.attr.delay="disabled"
-                                value="{{ $row->{\Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities::parseField($primaryKey)} }}"
+                                value="{{ $row->{$this->parseField($primaryKey)} }}"
                                 onclick="event.stopPropagation();return true;"
                                 type="checkbox"
                                 class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600"

src/DataTableComponent.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Livewire\Component;
+use Rappasoft\LaravelLivewireTables\Traits\ComponentHelpers;
 use Rappasoft\LaravelLivewireTables\Traits\WithBulkActions;
 use Rappasoft\LaravelLivewireTables\Traits\WithColumnSelect;
 use Rappasoft\LaravelLivewireTables\Traits\WithCustomPagination;
@@ -23,6 +24,7 @@
  */
 abstract class DataTableComponent extends Component
 {
+    use ComponentHelpers;
     use WithBulkActions;
     use WithColumnSelect;
     use WithCustomPagination;
@@ -226,18 +228,4 @@ public function render()
                 'bulkActions' => $this->bulkActions,
             ]);
     }
-
-    /**
-     * Get a column object by its field
-     *
-     * @param  string  $column
-     *
-     * @return mixed
-     */
-    protected function getColumn(string $column)
-    {
-        return collect($this->columns())
-            ->where('column', $column)
-            ->first();
-    }
 }

src/Traits/ComponentHelpers.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits;
+
+use Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities;
+
+/**
+ * Trait ComponentHelpers.
+ */
+trait ComponentHelpers
+{
+    /**
+     * Get a column object by its field
+     *
+     * @param  string  $column
+     *
+     * @return mixed
+     */
+    protected function getColumn(string $column)
+    {
+        return collect($this->columns())
+            ->where('column', $column)
+            ->first();
+    }
+
+    /**
+     * @param  string  $field
+     *
+     * @return string
+     */
+    protected function parseField(string $field): string
+    {
+        return ColumnUtilities::parseField($field);
+    }
+}