Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default…

… as label if has a "from" property. (#1932) * Initial Commit - Allowing Labels with "From" to be included in queries * Fix styling * Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default as label if has a "from" property. --------- Co-authored-by: lrljoe <[email protected]>
rappasoft · Sep 8, 2024 · 5b326cc · 5b326cc
1 parent f1e041e
commit 5b326cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/Views/Columns/ButtonGroupColumn.php b/src/Views/Columns/ButtonGroupColumn.php
@@ -20,7 +20,9 @@ public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);
 
-        $this->label(fn () => null);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
     }
 
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|\Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View

diff --git a/src/Views/Columns/ImageColumn.php b/src/Views/Columns/ImageColumn.php
@@ -20,8 +20,10 @@ class ImageColumn extends Column
     public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
 
-        $this->label(fn () => null);
     }
 
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View

diff --git a/src/Views/Columns/LinkColumn.php b/src/Views/Columns/LinkColumn.php
@@ -22,7 +22,9 @@ public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);
 
-        $this->label(fn () => null);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
     }
 
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View