From c241228472ecf0a2d70df1f2ddf32b23afd4dd9d Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Thu, 1 May 2025 23:53:45 +0100
Subject: [PATCH 01/11] Add Output Wrappers to ArrayColumn
---
src/Views/Columns/ArrayColumn.php | 12 ++++++-
.../ArrayColumnConfiguration.php | 32 +++++++++++++++++++
.../Traits/Helpers/ArrayColumnHelpers.php | 22 +++++++++++++
3 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/src/Views/Columns/ArrayColumn.php b/src/Views/Columns/ArrayColumn.php
index 26d39dbfd..ff4096fd0 100644
--- a/src/Views/Columns/ArrayColumn.php
+++ b/src/Views/Columns/ArrayColumn.php
@@ -24,6 +24,10 @@ class ArrayColumn extends Column
protected mixed $outputFormat = null;
+ public ?string $outputWrapperStart = null;
+
+ public ?string $outputWrapperEnd = null;
+
public function __construct(string $title, ?string $from = null)
{
parent::__construct($title, $from);
@@ -49,6 +53,12 @@ public function getContents(Model $row): null|string|\BackedEnum|HtmlString|Data
$outputValues[] = call_user_func($this->getOutputFormatCallback(), $i, $v);
}
- return new HtmlString((! empty($outputValues) ? implode($this->getSeparator(), $outputValues) : $this->getEmptyValue()));
+ $returnedValue = (! empty($outputValues) ? implode($this->getSeparator(), $outputValues) : $this->getEmptyValue());
+
+ if ($this->hasOutputWrapperStart() && $this->hasOutputWrapperEnd())
+ {
+ $returnedValue = $this->getOutputWrapperStart() . $returnedValue . $this->getOutputWrapperEnd();
+ }
+ return new HtmlString($returnedValue);
}
}
diff --git a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
index 3cab2b52d..3919b652e 100644
--- a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
+++ b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
@@ -34,4 +34,36 @@ public function emptyValue(string $emptyValue): self
return $this;
}
+
+
+ public function wrapperStart(string $value): self
+ {
+ $this->outputWrapperStart = $value;
+
+ return $this;
+ }
+
+ public function wrapperEnd(string $value): self
+ {
+ $this->outputWrapperEnd = $value;
+
+ return $this;
+ }
+
+ public function flexCol(array $attribs = []): self
+ {
+ $bag = new ComponentAttributeBag(['class' => $this->isTailwind() ? 'flex flex-col' : 'd-flex d-flex-col']);
+
+ return $this->wrapperStart('merge($attribs).'>')
+ ->wrapperEnd('
');
+ }
+
+ public function flexRow(array $attribs = []): self
+ {
+ $bag = new ComponentAttributeBag(['class' => $this->isTailwind() ? 'flex flex-row' : 'd-flex d-flex-row']);
+
+ return $this->wrapperStart('merge($attribs).'>')
+ ->wrapperEnd('
');
+ }
+
}
diff --git a/src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php b/src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
index 97b598a93..61488bac8 100644
--- a/src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
+++ b/src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
@@ -38,4 +38,26 @@ public function getOutputFormatCallback(): ?callable
{
return $this->outputFormat;
}
+
+
+
+ public function hasOutputWrapperStart(): bool
+ {
+ return $this->outputWrapperStart !== null && is_string($this->outputWrapperStart);
+ }
+
+ public function getOutputWrapperStart(): string
+ {
+ return $this->outputWrapperStart;
+ }
+
+ public function hasOutputWrapperEnd(): bool
+ {
+ return $this->outputWrapperEnd !== null && is_string($this->outputWrapperEnd);
+ }
+
+ public function getOutputWrapperEnd(): string
+ {
+ return $this->outputWrapperEnd;
+ }
}
From c4bd81b38491f949d066f0b3faf13ae990695c4b Mon Sep 17 00:00:00 2001
From: lrljoe <104938042+lrljoe@users.noreply.github.com>
Date: Thu, 1 May 2025 22:54:08 +0000
Subject: [PATCH 02/11] Fix styling
---
src/Views/Columns/ArrayColumn.php | 6 +++---
.../Traits/Configuration/ArrayColumnConfiguration.php | 6 ++----
src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php | 2 --
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/Views/Columns/ArrayColumn.php b/src/Views/Columns/ArrayColumn.php
index ff4096fd0..c1470aaab 100644
--- a/src/Views/Columns/ArrayColumn.php
+++ b/src/Views/Columns/ArrayColumn.php
@@ -55,10 +55,10 @@ public function getContents(Model $row): null|string|\BackedEnum|HtmlString|Data
$returnedValue = (! empty($outputValues) ? implode($this->getSeparator(), $outputValues) : $this->getEmptyValue());
- if ($this->hasOutputWrapperStart() && $this->hasOutputWrapperEnd())
- {
- $returnedValue = $this->getOutputWrapperStart() . $returnedValue . $this->getOutputWrapperEnd();
+ if ($this->hasOutputWrapperStart() && $this->hasOutputWrapperEnd()) {
+ $returnedValue = $this->getOutputWrapperStart().$returnedValue.$this->getOutputWrapperEnd();
}
+
return new HtmlString($returnedValue);
}
}
diff --git a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
index 3919b652e..cb5299a0e 100644
--- a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
+++ b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
@@ -35,7 +35,6 @@ public function emptyValue(string $emptyValue): self
return $this;
}
-
public function wrapperStart(string $value): self
{
$this->outputWrapperStart = $value;
@@ -55,7 +54,7 @@ public function flexCol(array $attribs = []): self
$bag = new ComponentAttributeBag(['class' => $this->isTailwind() ? 'flex flex-col' : 'd-flex d-flex-col']);
return $this->wrapperStart('merge($attribs).'>')
- ->wrapperEnd('
');
+ ->wrapperEnd('');
}
public function flexRow(array $attribs = []): self
@@ -63,7 +62,6 @@ public function flexRow(array $attribs = []): self
$bag = new ComponentAttributeBag(['class' => $this->isTailwind() ? 'flex flex-row' : 'd-flex d-flex-row']);
return $this->wrapperStart('merge($attribs).'>')
- ->wrapperEnd('
');
+ ->wrapperEnd('');
}
-
}
diff --git a/src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php b/src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
index 61488bac8..99939f5c5 100644
--- a/src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
+++ b/src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
@@ -39,8 +39,6 @@ public function getOutputFormatCallback(): ?callable
return $this->outputFormat;
}
-
-
public function hasOutputWrapperStart(): bool
{
return $this->outputWrapperStart !== null && is_string($this->outputWrapperStart);
From 9a12b517942b95e4fff3d8aa07c7bc6e6e0fdd03 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Thu, 1 May 2025 23:57:05 +0100
Subject: [PATCH 03/11] Adjust Separator for flexCol
---
.../Traits/Configuration/ArrayColumnConfiguration.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
index cb5299a0e..ec2a0a521 100644
--- a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
+++ b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
@@ -54,7 +54,8 @@ public function flexCol(array $attribs = []): self
$bag = new ComponentAttributeBag(['class' => $this->isTailwind() ? 'flex flex-col' : 'd-flex d-flex-col']);
return $this->wrapperStart('merge($attribs).'>')
- ->wrapperEnd('
');
+ ->wrapperEnd('')
+ ->separator("");
}
public function flexRow(array $attribs = []): self
@@ -62,6 +63,7 @@ public function flexRow(array $attribs = []): self
$bag = new ComponentAttributeBag(['class' => $this->isTailwind() ? 'flex flex-row' : 'd-flex d-flex-row']);
return $this->wrapperStart('merge($attribs).'>')
- ->wrapperEnd('
');
+ ->wrapperEnd('')
+ ->separator("");
}
}
From cf8808c46c3f91c109fc7267f6005f168b7c9709 Mon Sep 17 00:00:00 2001
From: lrljoe <104938042+lrljoe@users.noreply.github.com>
Date: Thu, 1 May 2025 22:57:31 +0000
Subject: [PATCH 04/11] Fix styling
---
.../Columns/Traits/Configuration/ArrayColumnConfiguration.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
index ec2a0a521..b1444faec 100644
--- a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
+++ b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
@@ -55,7 +55,7 @@ public function flexCol(array $attribs = []): self
return $this->wrapperStart('merge($attribs).'>')
->wrapperEnd('
')
- ->separator("");
+ ->separator('');
}
public function flexRow(array $attribs = []): self
@@ -64,6 +64,6 @@ public function flexRow(array $attribs = []): self
return $this->wrapperStart('merge($attribs).'>')
->wrapperEnd('
')
- ->separator("");
+ ->separator('');
}
}
From cac45e75bcd5d15b99f15fa9a3fe43f699dfc2be Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 2 May 2025 00:09:36 +0100
Subject: [PATCH 05/11] Add FlexCol and FlexRow Tests
---
tests/Unit/Views/Columns/ArrayColumnTest.php | 46 ++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/tests/Unit/Views/Columns/ArrayColumnTest.php b/tests/Unit/Views/Columns/ArrayColumnTest.php
index 6c6a55472..1768f2e54 100644
--- a/tests/Unit/Views/Columns/ArrayColumnTest.php
+++ b/tests/Unit/Views/Columns/ArrayColumnTest.php
@@ -80,4 +80,50 @@ public function test_can_get_empty_value(): void
$this->assertSame('Unknown', self::$columnInstance->getEmptyValue());
}
+
+
+ public function test_can_use_flexcol(): void
+ {
+ self::$columnInstance
+ ->data(fn ($value, $row) => ($row->pets))
+ ->outputFormat(fn ($index, $value) => ''.$value->name."")
+ ->flexCol();
+
+ $contents = self::$columnInstance->getContents(Veterinary::find(1));
+ $this->assertSame('',$contents->toHtml());
+ }
+
+ public function test_can_use_flexcol_with_attributes(): void
+ {
+ self::$columnInstance
+ ->data(fn ($value, $row) => ($row->pets))
+ ->outputFormat(fn ($index, $value) => ''.$value->name."")
+ ->flexCol(['class' => 'bg-red-500']);
+
+ $contents = self::$columnInstance->getContents(Veterinary::find(1));
+ $this->assertSame('',$contents->toHtml());
+ }
+
+ public function test_can_use_flexrow(): void
+ {
+ self::$columnInstance
+ ->data(fn ($value, $row) => ($row->pets))
+ ->outputFormat(fn ($index, $value) => ''.$value->name."")
+ ->flexRow();
+
+ $contents = self::$columnInstance->getContents(Veterinary::find(1));
+ $this->assertSame('',$contents->toHtml());
+ }
+
+ public function test_can_use_flexrow_with_attributes(): void
+ {
+ self::$columnInstance
+ ->data(fn ($value, $row) => ($row->pets))
+ ->outputFormat(fn ($index, $value) => ''.$value->name."")
+ ->flexRow(['class' => 'bg-blue-500']);
+
+ $contents = self::$columnInstance->getContents(Veterinary::find(1));
+ $this->assertSame('',$contents->toHtml());
+ }
+
}
From d0af880a89a06ff3fe2e3e05dfb752ebf13bb3c9 Mon Sep 17 00:00:00 2001
From: lrljoe <104938042+lrljoe@users.noreply.github.com>
Date: Thu, 1 May 2025 23:10:01 +0000
Subject: [PATCH 06/11] Fix styling
---
tests/Unit/Views/Columns/ArrayColumnTest.php | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/tests/Unit/Views/Columns/ArrayColumnTest.php b/tests/Unit/Views/Columns/ArrayColumnTest.php
index 1768f2e54..cc3aa537c 100644
--- a/tests/Unit/Views/Columns/ArrayColumnTest.php
+++ b/tests/Unit/Views/Columns/ArrayColumnTest.php
@@ -81,49 +81,47 @@ public function test_can_get_empty_value(): void
}
-
public function test_can_use_flexcol(): void
{
self::$columnInstance
->data(fn ($value, $row) => ($row->pets))
- ->outputFormat(fn ($index, $value) => ''.$value->name."")
+ ->outputFormat(fn ($index, $value) => ''.$value->name.'')
->flexCol();
$contents = self::$columnInstance->getContents(Veterinary::find(1));
- $this->assertSame('',$contents->toHtml());
+ $this->assertSame('', $contents->toHtml());
}
public function test_can_use_flexcol_with_attributes(): void
{
self::$columnInstance
->data(fn ($value, $row) => ($row->pets))
- ->outputFormat(fn ($index, $value) => ''.$value->name."")
+ ->outputFormat(fn ($index, $value) => ''.$value->name.'')
->flexCol(['class' => 'bg-red-500']);
$contents = self::$columnInstance->getContents(Veterinary::find(1));
- $this->assertSame('',$contents->toHtml());
+ $this->assertSame('', $contents->toHtml());
}
public function test_can_use_flexrow(): void
{
self::$columnInstance
->data(fn ($value, $row) => ($row->pets))
- ->outputFormat(fn ($index, $value) => ''.$value->name."")
+ ->outputFormat(fn ($index, $value) => ''.$value->name.'')
->flexRow();
$contents = self::$columnInstance->getContents(Veterinary::find(1));
- $this->assertSame('',$contents->toHtml());
+ $this->assertSame('', $contents->toHtml());
}
public function test_can_use_flexrow_with_attributes(): void
{
self::$columnInstance
->data(fn ($value, $row) => ($row->pets))
- ->outputFormat(fn ($index, $value) => ''.$value->name."")
+ ->outputFormat(fn ($index, $value) => ''.$value->name.'')
->flexRow(['class' => 'bg-blue-500']);
$contents = self::$columnInstance->getContents(Veterinary::find(1));
- $this->assertSame('',$contents->toHtml());
+ $this->assertSame('', $contents->toHtml());
}
-
}
From e21abaa97905ba08299088d5e344b42c1922275f Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 2 May 2025 00:12:05 +0100
Subject: [PATCH 07/11] Add ComponentAttributeBag
---
.../Columns/Traits/Configuration/ArrayColumnConfiguration.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
index b1444faec..19891bbf2 100644
--- a/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
+++ b/src/Views/Columns/Traits/Configuration/ArrayColumnConfiguration.php
@@ -2,6 +2,8 @@
namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Configuration;
+use Illuminate\View\ComponentAttributeBag;
+
trait ArrayColumnConfiguration
{
public function separator(string $value): self
From 5b4950ae92840bcee28167f972c41ba6fb2b4341 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 2 May 2025 00:18:51 +0100
Subject: [PATCH 08/11] Add Veterinary into ArrayColumnTest instance
---
tests/Unit/Views/Columns/ArrayColumnTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Unit/Views/Columns/ArrayColumnTest.php b/tests/Unit/Views/Columns/ArrayColumnTest.php
index cc3aa537c..2226f4057 100644
--- a/tests/Unit/Views/Columns/ArrayColumnTest.php
+++ b/tests/Unit/Views/Columns/ArrayColumnTest.php
@@ -4,8 +4,8 @@
use PHPUnit\Framework\Attributes\Group;
use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
-use Rappasoft\LaravelLivewireTables\Tests\Models\Pet;
use Rappasoft\LaravelLivewireTables\Views\Columns\ArrayColumn;
+use Rappasoft\LaravelLivewireTables\Tests\Models\{Pet,Veterinary};
#[Group('Columns')]
final class ArrayColumnTest extends ColumnTestCase
From cf82a2038d22c095dfc1cccb4a4e990241630e65 Mon Sep 17 00:00:00 2001
From: lrljoe <104938042+lrljoe@users.noreply.github.com>
Date: Thu, 1 May 2025 23:19:14 +0000
Subject: [PATCH 09/11] Fix styling
---
tests/Unit/Views/Columns/ArrayColumnTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Unit/Views/Columns/ArrayColumnTest.php b/tests/Unit/Views/Columns/ArrayColumnTest.php
index 2226f4057..c31e44507 100644
--- a/tests/Unit/Views/Columns/ArrayColumnTest.php
+++ b/tests/Unit/Views/Columns/ArrayColumnTest.php
@@ -4,8 +4,8 @@
use PHPUnit\Framework\Attributes\Group;
use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
-use Rappasoft\LaravelLivewireTables\Views\Columns\ArrayColumn;
use Rappasoft\LaravelLivewireTables\Tests\Models\{Pet,Veterinary};
+use Rappasoft\LaravelLivewireTables\Views\Columns\ArrayColumn;
#[Group('Columns')]
final class ArrayColumnTest extends ColumnTestCase
From ce62107184b0161e83042e372bddde32df083240 Mon Sep 17 00:00:00 2001
From: Joe McElwee
Date: Fri, 2 May 2025 22:49:12 +0100
Subject: [PATCH 10/11] DocType fixes
---
.../Filters/FilterPillData.php | 32 +++++++++----------
.../Filters/StandardFilterPillData.php | 2 +-
.../CollapsingColumnConfiguration.php | 5 ++-
src/Views/Columns/LivewireComponentColumn.php | 3 ++
.../LivewireComponentColumnConfiguration.php | 3 ++
.../LivewireComponentColumnHelpers.php | 25 +++++++++++++--
6 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/src/DataTransferObjects/Filters/FilterPillData.php b/src/DataTransferObjects/Filters/FilterPillData.php
index 8ecc241a7..53a5d1c98 100644
--- a/src/DataTransferObjects/Filters/FilterPillData.php
+++ b/src/DataTransferObjects/Filters/FilterPillData.php
@@ -12,15 +12,15 @@ public function __construct(
protected string $filterKey,
protected string $filterPillTitle,
protected string|array|null $filterPillValue,
- protected string $separator,
- public bool $isAnExternalLivewireFilter,
- public bool $hasCustomPillBlade,
- protected ?string $customPillBlade,
- protected array $filterPillsItemAttributes,
- protected bool $renderPillsAsHtml,
- protected bool $watchForEvents,
- protected array $customResetButtonAttributes,
- protected bool $renderPillsTitleAsHtml) {}
+ protected string $separator = ',',
+ public bool $isAnExternalLivewireFilter = false,
+ public bool $hasCustomPillBlade = false,
+ protected ?string $customPillBlade = null,
+ protected array $filterPillsItemAttributes = [],
+ protected bool $renderPillsAsHtml = false,
+ protected bool $watchForEvents = false,
+ protected array $customResetButtonAttributes = [],
+ protected bool $renderPillsTitleAsHtml = false) {}
public static function make(string $filterKey, string $filterPillTitle, string|array|null $filterPillValue, string $separator = ', ', bool $isAnExternalLivewireFilter = false, bool $hasCustomPillBlade = false, ?string $customPillBlade = null, array $filterPillsItemAttributes = [], bool $renderPillsAsHtml = false, bool $watchForEvents = false, array $customResetButtonAttributes = [], bool $renderPillsTitleAsHtml = false): FilterPillData
{
@@ -43,7 +43,7 @@ public function getPillValue(): array|string|null
public function getHasCustomPillBlade(): bool
{
- return $this->hasCustomPillBlade ?? false;
+ return $this->hasCustomPillBlade;
}
public function getCustomPillBlade(): ?string
@@ -53,32 +53,32 @@ public function getCustomPillBlade(): ?string
public function getCustomResetButtonAttributes(): array
{
- return $this->customResetButtonAttributes ?? [];
+ return $this->customResetButtonAttributes;
}
public function getIsAnExternalLivewireFilter(): int
{
- return intval($this->isAnExternalLivewireFilter ?? 0);
+ return intval($this->isAnExternalLivewireFilter);
}
public function getSeparator(): string
{
- return $this->separator ?? ', ';
+ return $this->separator;
}
public function shouldUsePillsAsHtml(): int
{
- return intval($this->renderPillsAsHtml ?? 0);
+ return intval($this->renderPillsAsHtml);
}
public function shouldUsePillsTitleAsHtml(): int
{
- return intval($this->renderPillsTitleAsHtml ?? 0);
+ return intval($this->renderPillsTitleAsHtml);
}
public function shouldWatchForEvents(): int
{
- return intval($this->watchForEvents ?? 0);
+ return intval($this->watchForEvents);
}
public function isPillValueAnArray(): bool
diff --git a/src/DataTransferObjects/Filters/StandardFilterPillData.php b/src/DataTransferObjects/Filters/StandardFilterPillData.php
index 60a8ff5f9..978837ac1 100644
--- a/src/DataTransferObjects/Filters/StandardFilterPillData.php
+++ b/src/DataTransferObjects/Filters/StandardFilterPillData.php
@@ -28,7 +28,7 @@ public function getPillValue(): string
public function shouldUsePillsAsHtml(): bool
{
- return $this->renderPillsAsHtml ?? false;
+ return $this->renderPillsAsHtml;
}
public function toArray(): array
diff --git a/src/Traits/Configuration/CollapsingColumnConfiguration.php b/src/Traits/Configuration/CollapsingColumnConfiguration.php
index dada8b991..c1d2e51f3 100644
--- a/src/Traits/Configuration/CollapsingColumnConfiguration.php
+++ b/src/Traits/Configuration/CollapsingColumnConfiguration.php
@@ -27,8 +27,7 @@ public function setCollapsingColumnsDisabled(): self
public function unsetCollapsedStatuses(): void
{
- unset($this->shouldAlwaysCollapse);
- unset($this->shouldMobileCollapse);
- unset($this->shouldTabletCollapse);
+ $this->shouldAlwaysCollapse = $this->shouldMobileCollapse = $this->shouldTabletCollapse = false;
+
}
}
diff --git a/src/Views/Columns/LivewireComponentColumn.php b/src/Views/Columns/LivewireComponentColumn.php
index 4111a6728..b2538ee32 100644
--- a/src/Views/Columns/LivewireComponentColumn.php
+++ b/src/Views/Columns/LivewireComponentColumn.php
@@ -23,6 +23,9 @@ class LivewireComponentColumn extends Column
/**
* 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
{
diff --git a/src/Views/Columns/Traits/Configuration/LivewireComponentColumnConfiguration.php b/src/Views/Columns/Traits/Configuration/LivewireComponentColumnConfiguration.php
index e5a168484..235344ad8 100644
--- a/src/Views/Columns/Traits/Configuration/LivewireComponentColumnConfiguration.php
+++ b/src/Views/Columns/Traits/Configuration/LivewireComponentColumnConfiguration.php
@@ -8,6 +8,9 @@ trait LivewireComponentColumnConfiguration
{
/**
* Defines which component to use
+ *
+ * @param string $livewireComponent
+ * @return self
*/
public function component(string $livewireComponent): self
{
diff --git a/src/Views/Columns/Traits/Helpers/LivewireComponentColumnHelpers.php b/src/Views/Columns/Traits/Helpers/LivewireComponentColumnHelpers.php
index 55bedf325..6a175ad30 100644
--- a/src/Views/Columns/Traits/Helpers/LivewireComponentColumnHelpers.php
+++ b/src/Views/Columns/Traits/Helpers/LivewireComponentColumnHelpers.php
@@ -11,6 +11,8 @@ trait LivewireComponentColumnHelpers
{
/**
* Retrieves the defined Component View
+ *
+ * @return string|null
*/
public function getLivewireComponent(): ?string
{
@@ -19,6 +21,8 @@ public function getLivewireComponent(): ?string
/**
* Determines whether a Livewire Component has been set
+ *
+ * @return boolean
*/
public function hasLivewireComponent(): bool
{
@@ -27,6 +31,9 @@ public function hasLivewireComponent(): bool
/**
* Retrieves attributes based on callback
+ *
+ * @param Model $row
+ * @return array
*/
protected function retrieveAttributes(Model $row): array
{
@@ -45,8 +52,11 @@ protected function retrieveAttributes(Model $row): array
return $attributes;
}
+
/**
* Runs pre-checks
+ *
+ * @return boolean
*/
protected function runPreChecks(): bool
{
@@ -67,6 +77,9 @@ protected function runPreChecks(): bool
/**
* Implodes defined attributes to be used
+ *
+ * @param array $attributes
+ * @return string
*/
protected function implodeAttributes(array $attributes): string
{
@@ -77,8 +90,12 @@ protected function implodeAttributes(array $attributes): string
/**
* getBlade Render
+ *
+ * @param array $attributes
+ * @param string $key
+ * @return string
*/
- protected function getBlade(array $attributes, string $key)
+ protected function getBlade(array $attributes, string $key): string
{
return Blade::render(
'implodeAttributes($attributes).' />',
@@ -91,7 +108,11 @@ protected function getBlade(array $attributes, string $key)
}
/**
- * Gets HTML STring
+ * Gets HTML String
+ *
+ * @param array $attributes
+ * @param string $key
+ * @return HtmlString
*/
protected function getHtmlString(array $attributes, string $key): HtmlString
{
From 43c20a7b2c1b05a7b7b1d2a4eeebdbf8b0a9c32a Mon Sep 17 00:00:00 2001
From: lrljoe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 2 May 2025 21:49:36 +0000
Subject: [PATCH 11/11] Fix styling
---
src/Views/Columns/LivewireComponentColumn.php | 3 ---
.../LivewireComponentColumnConfiguration.php | 3 ---
.../LivewireComponentColumnHelpers.php | 21 ++++---------------
3 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/src/Views/Columns/LivewireComponentColumn.php b/src/Views/Columns/LivewireComponentColumn.php
index b2538ee32..4111a6728 100644
--- a/src/Views/Columns/LivewireComponentColumn.php
+++ b/src/Views/Columns/LivewireComponentColumn.php
@@ -23,9 +23,6 @@ class LivewireComponentColumn extends Column
/**
* 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
{
diff --git a/src/Views/Columns/Traits/Configuration/LivewireComponentColumnConfiguration.php b/src/Views/Columns/Traits/Configuration/LivewireComponentColumnConfiguration.php
index 235344ad8..e5a168484 100644
--- a/src/Views/Columns/Traits/Configuration/LivewireComponentColumnConfiguration.php
+++ b/src/Views/Columns/Traits/Configuration/LivewireComponentColumnConfiguration.php
@@ -8,9 +8,6 @@ trait LivewireComponentColumnConfiguration
{
/**
* Defines which component to use
- *
- * @param string $livewireComponent
- * @return self
*/
public function component(string $livewireComponent): self
{
diff --git a/src/Views/Columns/Traits/Helpers/LivewireComponentColumnHelpers.php b/src/Views/Columns/Traits/Helpers/LivewireComponentColumnHelpers.php
index 6a175ad30..296b100b0 100644
--- a/src/Views/Columns/Traits/Helpers/LivewireComponentColumnHelpers.php
+++ b/src/Views/Columns/Traits/Helpers/LivewireComponentColumnHelpers.php
@@ -11,8 +11,6 @@ trait LivewireComponentColumnHelpers
{
/**
* Retrieves the defined Component View
- *
- * @return string|null
*/
public function getLivewireComponent(): ?string
{
@@ -21,8 +19,6 @@ public function getLivewireComponent(): ?string
/**
* Determines whether a Livewire Component has been set
- *
- * @return boolean
*/
public function hasLivewireComponent(): bool
{
@@ -32,7 +28,6 @@ public function hasLivewireComponent(): bool
/**
* Retrieves attributes based on callback
*
- * @param Model $row
* @return array
*/
protected function retrieveAttributes(Model $row): array
@@ -52,11 +47,8 @@ protected function retrieveAttributes(Model $row): array
return $attributes;
}
-
/**
* Runs pre-checks
- *
- * @return boolean
*/
protected function runPreChecks(): bool
{
@@ -78,8 +70,7 @@ protected function runPreChecks(): bool
/**
* Implodes defined attributes to be used
*
- * @param array $attributes
- * @return string
+ * @param array $attributes
*/
protected function implodeAttributes(array $attributes): string
{
@@ -91,11 +82,9 @@ protected function implodeAttributes(array $attributes): string
/**
* getBlade Render
*
- * @param array $attributes
- * @param string $key
- * @return string
+ * @param array $attributes
*/
- protected function getBlade(array $attributes, string $key): string
+ protected function getBlade(array $attributes, string $key): string
{
return Blade::render(
'implodeAttributes($attributes).' />',
@@ -110,9 +99,7 @@ protected function getBlade(array $attributes, string $key): string
/**
* Gets HTML String
*
- * @param array $attributes
- * @param string $key
- * @return HtmlString
+ * @param array $attributes
*/
protected function getHtmlString(array $attributes, string $key): HtmlString
{