Add definitions to LivewireComponentColumn - use str random

Author: lrljoe

src/Traits/Helpers/TableAttributeHelpers.php

@@ -148,7 +148,7 @@ public function getTopLevelAttributesArray(): array
         return [
             'x-data' => 'laravellivewiretable($wire)',
             'x-init' => "setTableId('".$this->getTableAttributes()['id']."'); setAlpineBulkActions('".$this->showBulkActionsDropdownAlpine()."'); setPrimaryKeyName('".$this->getPrimaryKey()."');",
-            'x-cloak',
+            'x-cloak' => '',
             'x-show' => 'shouldBeDisplayed',
             'x-on:show-table.window' => 'showTable(event)',
             'x-on:hide-table.window' => 'hideTable(event)',

src/Views/Columns/LivewireComponentColumn.php

@@ -16,40 +16,24 @@ class LivewireComponentColumn extends Column
     use LivewireComponentColumnConfiguration,
         LivewireComponentColumnHelpers;
 
+    /**
+     * The Livewire Component assigned to this Column
+     */
     protected ?string $livewireComponent;
 
+     /**
+      * Gets the contents for current row
+      *
+      * @param Model $row
+      * @return null|string|HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
+      */
     public function getContents(Model $row): null|string|HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
     {
-        if (! $this->hasLivewireComponent()) {
-            throw new DataTableConfigurationException('You must define a Livewire Component for this column');
-        }
-
-        if ($this->isLabel()) {
-            throw new DataTableConfigurationException('You can not use a label column with a Livewire Component column');
-        }
-
-        $attributes = [];
-        $value = $this->getValue($row);
-
-        if ($this->hasAttributesCallback()) {
-            $attributes = call_user_func($this->getAttributesCallback(), $value, $row, $this);
-
-            if (! is_array($attributes)) {
-                throw new DataTableConfigurationException('The return type of callback must be an array');
-            }
-        }
-
-        $implodedAttributes = collect($attributes)->map(function ($value, $key) {
-            return ':'.$key.'="$'.$key.'"';
-        })->implode(' ');
-
-        return new HtmlString(Blade::render(
-            '<livewire:dynamic-component :component="$component" '.$implodedAttributes.' :wire:key="'.$row->{$row->getKeyName()}.'" />',
-            [
-                'component' => $this->getLivewireComponent(),
-                ...$attributes,
-            ],
-        ));
+        $this->runPreChecks();
+
+        $attributes = $this->retrieveAttributes($row);
+
+        return $this->getHtmlString($attributes, $this->getTable().'-'.$row->{$row->getKeyName()});
 
     }
 }

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

@@ -6,6 +6,13 @@
 
 trait LivewireComponentColumnConfiguration
 {
+
+    /**
+     * Defines which component to use
+     *
+     * @param string $livewireComponent
+     * @return self
+     */
     public function component(string $livewireComponent): self
     {
         $this->livewireComponent = (Str::startsWith($livewireComponent, 'livewire:')) ? substr($livewireComponent, 9) : $livewireComponent;

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

@@ -2,21 +2,123 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Helpers;
 
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\HtmlString;
+use Illuminate\Support\Str;
+use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
+
 trait LivewireComponentColumnHelpers
 {
+
     /**
      * Retrieves the defined Component View
-     */
+     *
+     * @return string|null
+     */ 
     public function getLivewireComponent(): ?string
     {
         return $this->livewireComponent ?? null;
     }
 
     /**
-     * Determines whether a Component View has been set
+     * Determines whether a Livewire Component has been set
+     *
+     * @return boolean
      */
     public function hasLivewireComponent(): bool
     {
         return isset($this->livewireComponent);
     }
+
+    /**
+     * Retrieves attributes based on callback
+     *
+     * @param Model $row
+     * @return array
+     */
+    protected function retrieveAttributes(Model $row): array
+    {
+        $value = $this->getValue($row);
+
+        $attributes = ['value' => $value];
+
+        if ($this->hasAttributesCallback()) {
+            $attributes = call_user_func($this->getAttributesCallback(), $value, $row, $this);
+
+            if (! is_array($attributes)) {
+                throw new DataTableConfigurationException('The return type of callback must be an array');
+            }
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * Runs pre-checks
+     *
+     * @return boolean
+     */
+    protected function runPreChecks(): bool
+    {
+        if (! $this->hasLivewireComponent()) {
+            throw new DataTableConfigurationException('You must define a Livewire Component for this column');
+
+            return false;
+        }
+
+        if ($this->isLabel()) {
+            throw new DataTableConfigurationException('You can not use a label column with a Livewire Component column');
+
+            return false;
+        }
+
+        return true;
+    }
+
+    
+    /**
+     * Implodes defined attributes to be used
+     *
+     * @param array $attributes
+     * @return string
+     */
+    protected function implodeAttributes(array $attributes): string
+    {
+        return collect($attributes)->map(function ($value, $key) {
+            return ':'.$key.'="$'.$key.'"';
+        })->implode(' ');
+    }
+
+    /**
+     * getBlade Render
+     *
+     * @param array $attributes
+     * @param string $key
+     * @return string
+     */
+    protected function getBlade(array $attributes, string $key): string
+    {
+        return Blade::render(
+            '<livewire:dynamic-component :component="$component" :key="$key" '.$this->implodeAttributes($attributes).' />',
+            [
+                'component' => $this->getLivewireComponent(),
+                'key' => $key.Str::random(),
+                ...$attributes,
+            ],
+        );
+    }
+    
+    /**
+     * Gets HTML String
+     *
+     * @param array $attributes
+     * @param string $key
+     * @return HtmlString
+     */
+    protected function getHtmlString(array $attributes, string $key): HtmlString
+    {
+        return new HtmlString($this->getBlade($attributes, $key));
+
+    }
 }